From 2b4fc51ea53e76b95429ea7a63463aaef66bbde3 Mon Sep 17 00:00:00 2001
From: hyt <958868763@qq.com>
Date: Thu, 11 Apr 2024 15:29:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A5=E5=8F=A3curd?=
 =?UTF-8?q?=E3=80=81=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90=E3=80=81=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E6=A0=8F=E6=A0=B7=E5=BC=8F=E5=8F=98=E6=9B=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/images/tagViewBgc.png              | Bin 0 -> 4397 bytes
 src/layout/components/TagsView/ScrollPane.vue |   4 +
 src/layout/components/TagsView/index.vue      | 696 +++++++++---------
 src/layout/components/images/tagViewBgc.png   | Bin 0 -> 4397 bytes
 src/views/apiAdmin/baseNewSelect.vue          | 222 ++++++
 src/views/apiAdmin/configData.js              | 169 +++++
 src/views/apiAdmin/index.vue                  | 222 ++++++
 src/views/apiAdmin/rightDialog.vue            | 323 ++++++++
 .../roleJurisdiction/dataPermissions.vue      | 114 ++-
 .../roleJurisdiction/index.vue                |   2 +-
 .../roleJurisdiction/rightDialog.vue          |  40 +-
 .../userJurisdiction/dataPermissions.vue      | 125 ++--
 .../userJurisdiction/index.vue                |   2 +-
 .../userJurisdiction/rightDialog.vue          |  75 +-
 14 files changed, 1463 insertions(+), 531 deletions(-)
 create mode 100644 src/assets/images/tagViewBgc.png
 create mode 100644 src/layout/components/images/tagViewBgc.png
 create mode 100644 src/views/apiAdmin/baseNewSelect.vue
 create mode 100644 src/views/apiAdmin/configData.js
 create mode 100644 src/views/apiAdmin/index.vue
 create mode 100644 src/views/apiAdmin/rightDialog.vue

diff --git a/src/assets/images/tagViewBgc.png b/src/assets/images/tagViewBgc.png
new file mode 100644
index 0000000000000000000000000000000000000000..24b2e0cf8d190d67b44876e0c280bf57a2a1e259
GIT binary patch
literal 4397
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

literal 0
HcmV?d00001

diff --git a/src/layout/components/TagsView/ScrollPane.vue b/src/layout/components/TagsView/ScrollPane.vue
index 090ad66..c230d42 100644
--- a/src/layout/components/TagsView/ScrollPane.vue
+++ b/src/layout/components/TagsView/ScrollPane.vue
@@ -77,7 +77,11 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+::v-deep .el-scrollbar__view{
+  display: flex;
+}
 .scroll-container {
+
   white-space: nowrap;
   position: relative;
   overflow: hidden;
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index ee8d5ca..f077d32 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -1,369 +1,395 @@
 <template>
-	<div id="tags-view-container" class="tags-view-container" style="">
-		<scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
-			<router-link v-for="tag in visitedViews" ref="tag" :key="tag.path" :class="isActive(tag) ? 'active' : ''"
-				:to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }" tag="span" class="tags-view-item"
-				:style="activeStyle(tag)" @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''"
-				@contextmenu.prevent.native="openMenu(tag, $event)">
-				{{ tag.meta.title ? tag.meta.title : tag.title }}
-				<span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
-			</router-link>
-		</scroll-pane>
-		<ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
-			<li @click="refreshSelectedTag(selectedTag)"><i class="el-icon-refresh-right"></i> 刷新页面</li>
-			<li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)"><i class="el-icon-close"></i> 关闭当前
-			</li>
-			<li @click="closeOthersTags"><i class="el-icon-circle-close"></i> 关闭其他</li>
-			<li v-if="!isFirstView()" @click="closeLeftTags"><i class="el-icon-back"></i> 关闭左侧</li>
-			<li v-if="!isLastView()" @click="closeRightTags"><i class="el-icon-right"></i> 关闭右侧</li>
-			<li @click="closeAllTags(selectedTag)"><i class="el-icon-circle-close"></i> 全部关闭</li>
-		</ul>
-	</div>
+  <div id="tags-view-container" class="tags-view-container" style="display: flex">
+    <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
+      <router-link v-for="tag in visitedViews" ref="tag" :key="tag.path" :class="isActive(tag) ? 'active' : ''"
+                   :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }" tag="span" class="tags-view-item"
+                   :style="activeStyle(tag)" @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''"
+                   @contextmenu.prevent.native="openMenu(tag, $event)"
+      >
+        <div class="showBox">
+          <div v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)"></div>
+          <div class="text">{{ tag.meta.title ? tag.meta.title : tag.title }}</div>
+        </div>
+      </router-link>
+    </scroll-pane>
+    <ul v-show="visible" :style="{ left: left + 'px', top: top + 'px' }" class="contextmenu">
+      <li @click="refreshSelectedTag(selectedTag)"><i class="el-icon-refresh-right"></i> 刷新页面</li>
+      <li v-if="!isAffix(selectedTag)" @click="closeSelectedTag(selectedTag)"><i class="el-icon-close"></i> 关闭当前
+      </li>
+      <li @click="closeOthersTags"><i class="el-icon-circle-close"></i> 关闭其他</li>
+      <li v-if="!isFirstView()" @click="closeLeftTags"><i class="el-icon-back"></i> 关闭左侧</li>
+      <li v-if="!isLastView()" @click="closeRightTags"><i class="el-icon-right"></i> 关闭右侧</li>
+      <li @click="closeAllTags(selectedTag)"><i class="el-icon-circle-close"></i> 全部关闭</li>
+    </ul>
+  </div>
 </template>
 
 <script>
 import ScrollPane from './ScrollPane'
 import path from 'path'
 import {
-	getCompanyId
+  getCompanyId
 } from '@/utils/auth'
+
 export default {
-	components: {
-		ScrollPane
-	},
-	data() {
-		return {
-			visible: false,
-			top: 0,
-			left: 0,
-			selectedTag: {},
-			affixTags: [],
-		}
-	},
-	computed: {
-		visitedViews() {
-			return this.$store.state.tagsView.visitedViews
-		},
-		routes() {
-			return this.$store.state.permission.routes
-		},
-		theme() {
-			return this.$store.state.settings.theme;
-		},
-		companyID() {
-			return this.$store.state.user.companyID;
-		}
-	},
-	watch: {
-		$route() {
-			this.addTags()
-			this.moveToCurrentTag()
-		},
-		visible(value) {
-			if (value) {
-				document.body.addEventListener('click', this.closeMenu)
-			} else {
-				document.body.removeEventListener('click', this.closeMenu)
-			}
-		},
-		companyID: {
-			deep: true, //深度监听设置为 true
-			handler: function (newV, oldV) {
-				if (oldV) {
-					this.$vmNews("切换公司成功", "success")
-					this.closeAllTags(this.closeAllTags)
-				}
-			}
-		}
+  components: {
+    ScrollPane
+  },
+  data() {
+    return {
+      visible: false,
+      top: 0,
+      left: 0,
+      selectedTag: {},
+      affixTags: []
+    }
+  },
+  computed: {
+    visitedViews() {
+      return this.$store.state.tagsView.visitedViews
+    },
+    routes() {
+      return this.$store.state.permission.routes
+    },
+    theme() {
+      return this.$store.state.settings.theme
+    },
+    companyID() {
+      return this.$store.state.user.companyID
+    }
+  },
+  watch: {
+    $route() {
+      this.addTags()
+      this.moveToCurrentTag()
+    },
+    visible(value) {
+      if (value) {
+        document.body.addEventListener('click', this.closeMenu)
+      } else {
+        document.body.removeEventListener('click', this.closeMenu)
+      }
+    },
+    companyID: {
+      deep: true, //深度监听设置为 true
+      handler: function(newV, oldV) {
+        if (oldV) {
+          this.$vmNews('切换公司成功', 'success')
+          this.closeAllTags(this.closeAllTags)
+        }
+      }
+    }
 
-	},
-	mounted() {
-		this.initTags()
-		this.addTags()
-	},
-	methods: {
-		isActive(route) {
-			return route.path === this.$route.path
-		},
-		activeStyle(tag) {
-			if (!this.isActive(tag)) return {};
-			return {
-				"background-color": this.theme,
-				"border-color": this.theme
-			};
-		},
-		isAffix(tag) {
-			return tag.meta && tag.meta.affix
-		},
-		isFirstView() {
-			try {
-				return this.selectedTag.fullPath === this.visitedViews[1].fullPath || this.selectedTag.fullPath ===
-					'/index'
-			} catch (err) {
-				return false
-			}
-		},
-		isLastView() {
-			try {
-				return this.selectedTag.fullPath === this.visitedViews[this.visitedViews.length - 1].fullPath
-			} catch (err) {
-				return false
-			}
-		},
-		filterAffixTags(routes, basePath = '/') {
-			let tags = []
-			routes.forEach(route => {
-				if (route.meta && route.meta.affix) {
-					const tagPath = path.resolve(basePath, route.path)
-					tags.push({
-						fullPath: tagPath,
-						path: tagPath,
-						name: route.name,
-						id: route.id ? route.id : 0,
-						meta: {
-							...route.meta
-						}
-					})
-				}
-				if (route.children) {
-					const tempTags = this.filterAffixTags(route.children, route.path)
-					if (tempTags.length >= 1) {
-						tags = [...tags, ...tempTags]
-					}
-				}
-			})
-			return tags
-		},
-		initTags() {
-			const affixTags = this.affixTags = this.filterAffixTags(this.routes)
-			for (const tag of affixTags) {
-				// Must have tag name
-				if (tag.name) {
-					this.$store.dispatch('tagsView/addVisitedView', tag)
-				}
-			}
-		},
-		addTags() {
-			const name = this.$route.meta.title
-			// this.$route.meta.noCache = false
-			if (name) {
-				this.$store.dispatch('tagsView/addView', this.$route)
-				if (this.$route.meta.link) {
-					this.$store.dispatch('tagsView/addIframeView', this.$route)
-				}
-			}
-			return false
-		},
-		moveToCurrentTag() {
-			const tags = this.$refs.tag
-			this.$nextTick(() => {
-				for (const tag of tags) {
-					if (tag.to.path === this.$route.path) {
-						this.$refs.scrollPane.moveToTarget(tag)
-						// when query is different then update
-						if (tag.to.fullPath !== this.$route.fullPath) {
-							this.$store.dispatch('tagsView/updateVisitedView', this.$route)
-						}
-						break
-					}
-				}
-			})
-		},
-		refreshSelectedTag(view) {
-			this.$tab.refreshPage(view);
-			if (this.$route.meta.link) {
-				this.$store.dispatch('tagsView/delIframeView', this.$route)
-			}
-		},
-		closeSelectedTag(view) {
-			this.$tab.closePage(view).then(({
-				visitedViews
-			}) => {
-				if (this.isActive(view)) {
-					this.toLastView(visitedViews, view)
-				}
-			})
-		},
-		closeRightTags() {
-			this.$tab.closeRightPage(this.selectedTag).then(visitedViews => {
-				if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) {
-					this.toLastView(visitedViews)
-				}
-			})
-		},
-		closeLeftTags() {
-			this.$tab.closeLeftPage(this.selectedTag).then(visitedViews => {
-				if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) {
-					this.toLastView(visitedViews)
-				}
-			})
-		},
-		closeOthersTags() {
-			this.$router.push(this.selectedTag).catch(() => { });
-			this.$tab.closeOtherPage(this.selectedTag).then(() => {
-				this.moveToCurrentTag()
-			})
-		},
-		closeAllTags(view) {
-			this.$tab.closeAllPage().then(({
-				visitedViews
-			}) => {
-				if (this.affixTags.some(tag => tag.path === this.$route.path)) {
-					return
-				}
-				this.toLastView(visitedViews, view)
-			})
-		},
-		toLastView(visitedViews, view) {
-			const latestView = visitedViews.slice(-1)[0]
-			if (latestView) {
-				this.$router.push(latestView.fullPath)
-			} else {
-				// now the default is to redirect to the home page if there is no tags-view,
-				// you can adjust it according to your needs.
-				if (view.name === 'Dashboard') {
-					// to reload home page
-					this.$router.replace({
-						path: '/redirect' + view.fullPath
-					})
-				} else {
-					this.$router.push('/')
-				}
-			}
-		},
-		openMenu(tag, e) {
-			const menuMinWidth = 105
-			const offsetLeft = this.$el.getBoundingClientRect().left // container margin left
-			const offsetWidth = this.$el.offsetWidth // container width
-			const maxLeft = offsetWidth - menuMinWidth // left boundary
-			const left = e.clientX - offsetLeft + 15 // 15: margin right
+  },
+  mounted() {
+    this.initTags()
+    this.addTags()
+  },
+  methods: {
+    isActive(route) {
+      return route.path === this.$route.path
+    },
+    activeStyle(tag) {
+      if (!this.isActive(tag)) return {}
+      return {
+        // "background-color": this.theme,
+        'border-color': this.theme
+      }
+    },
+    isAffix(tag) {
+      return tag.meta && tag.meta.affix
+    },
+    isFirstView() {
+      try {
+        return this.selectedTag.fullPath === this.visitedViews[1].fullPath || this.selectedTag.fullPath ===
+          '/index'
+      } catch (err) {
+        return false
+      }
+    },
+    isLastView() {
+      try {
+        return this.selectedTag.fullPath === this.visitedViews[this.visitedViews.length - 1].fullPath
+      } catch (err) {
+        return false
+      }
+    },
+    filterAffixTags(routes, basePath = '/') {
+      let tags = []
+      routes.forEach(route => {
+        if (route.meta && route.meta.affix) {
+          const tagPath = path.resolve(basePath, route.path)
+          tags.push({
+            fullPath: tagPath,
+            path: tagPath,
+            name: route.name,
+            id: route.id ? route.id : 0,
+            meta: {
+              ...route.meta
+            }
+          })
+        }
+        if (route.children) {
+          const tempTags = this.filterAffixTags(route.children, route.path)
+          if (tempTags.length >= 1) {
+            tags = [...tags, ...tempTags]
+          }
+        }
+      })
+      return tags
+    },
+    initTags() {
+      const affixTags = this.affixTags = this.filterAffixTags(this.routes)
+      for (const tag of affixTags) {
+        // Must have tag name
+        if (tag.name) {
+          this.$store.dispatch('tagsView/addVisitedView', tag)
+        }
+      }
+    },
+    addTags() {
+      const name = this.$route.meta.title
+      // this.$route.meta.noCache = false
+      if (name) {
+        this.$store.dispatch('tagsView/addView', this.$route)
+        if (this.$route.meta.link) {
+          this.$store.dispatch('tagsView/addIframeView', this.$route)
+        }
+      }
+      return false
+    },
+    moveToCurrentTag() {
+      const tags = this.$refs.tag
+      this.$nextTick(() => {
+        for (const tag of tags) {
+          if (tag.to.path === this.$route.path) {
+            this.$refs.scrollPane.moveToTarget(tag)
+            // when query is different then update
+            if (tag.to.fullPath !== this.$route.fullPath) {
+              this.$store.dispatch('tagsView/updateVisitedView', this.$route)
+            }
+            break
+          }
+        }
+      })
+    },
+    refreshSelectedTag(view) {
+      this.$tab.refreshPage(view)
+      if (this.$route.meta.link) {
+        this.$store.dispatch('tagsView/delIframeView', this.$route)
+      }
+    },
+    closeSelectedTag(view) {
+      this.$tab.closePage(view).then(({
+        visitedViews
+      }) => {
+        if (this.isActive(view)) {
+          this.toLastView(visitedViews, view)
+        }
+      })
+    },
+    closeRightTags() {
+      this.$tab.closeRightPage(this.selectedTag).then(visitedViews => {
+        if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) {
+          this.toLastView(visitedViews)
+        }
+      })
+    },
+    closeLeftTags() {
+      this.$tab.closeLeftPage(this.selectedTag).then(visitedViews => {
+        if (!visitedViews.find(i => i.fullPath === this.$route.fullPath)) {
+          this.toLastView(visitedViews)
+        }
+      })
+    },
+    closeOthersTags() {
+      this.$router.push(this.selectedTag).catch(() => {
+      })
+      this.$tab.closeOtherPage(this.selectedTag).then(() => {
+        this.moveToCurrentTag()
+      })
+    },
+    closeAllTags(view) {
+      this.$tab.closeAllPage().then(({
+        visitedViews
+      }) => {
+        if (this.affixTags.some(tag => tag.path === this.$route.path)) {
+          return
+        }
+        this.toLastView(visitedViews, view)
+      })
+    },
+    toLastView(visitedViews, view) {
+      const latestView = visitedViews.slice(-1)[0]
+      if (latestView) {
+        this.$router.push(latestView.fullPath)
+      } else {
+        // now the default is to redirect to the home page if there is no tags-view,
+        // you can adjust it according to your needs.
+        if (view.name === 'Dashboard') {
+          // to reload home page
+          this.$router.replace({
+            path: '/redirect' + view.fullPath
+          })
+        } else {
+          this.$router.push('/')
+        }
+      }
+    },
+    openMenu(tag, e) {
+      console.log(e.target, 'e')
+      const menuMinWidth = 105
+      const offsetLeft = e.target.getBoundingClientRect().left // container margin left
+      const offsetWidth = e.target.offsetWidth // container width
+      const maxLeft = offsetWidth - menuMinWidth // left boundary
+      const left = offsetLeft + 100 // 15: margin right
 
-			if (left > maxLeft) {
-				this.left = maxLeft
-			} else {
-				this.left = left
-			}
-			this.top = e.clientY - 40
-			this.visible = true
-			this.selectedTag = tag
-		},
-		closeMenu() {
-			this.visible = false
-		},
-		handleScroll() {
-			this.closeMenu()
-		}
-	}
+      // if (left > maxLeft) {
+      // 	this.left = 800
+      // } else {
+      // 	this.left = 800
+      // }
+      this.left = left
+      this.top = e.clientY - 40
+      this.visible = true
+      this.selectedTag = tag
+    },
+    closeMenu() {
+      this.visible = false
+    },
+    handleScroll() {
+      this.closeMenu()
+    }
+  }
 }
 </script>
 
 <style lang="scss" scoped>
+::v-deep .scrollbar__view {
+  display: flex;
+  align-items: center;
+}
+
 .tags-view-container {
-	// height: 34px;
-	width: 100%;
-	// width: calc(100% - 180px);
-	margin-left: 10px;
-	background: #fff;
-	border-radius: 4px;
-	// border-bottom: 1px solid #d8dce5;
-	// box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
-	//position: fixed;
-	//top: 22px;
-	// margin-top: 60px;
-	z-index: 1000;
 
-	.tags-view-wrapper {
+  // height: 34px;
+  width: 80vw;
+  overflow: auto;
+  // width: calc(100% - 180px);
+  //margin-left: 10px;
+  background: #fff;
+  border-radius: 4px;
+  // border-bottom: 1px solid #d8dce5;
+  // box-shadow: 0 1px 3px 0 rgba(0, 0, 0, .12), 0 0 3px 0 rgba(0, 0, 0, .04);
+  //position: fixed;
+  //top: 22px;
+  // margin-top: 60px;
+  z-index: 1000;
+
+  .tags-view-wrapper {
     display: flex;
+    align-items: center;
 
-		.tags-view-item {
-			display: inline-block;
-			position: relative;
-			cursor: pointer;
-			border: 1px solid #d8dce5;
-			color: #495060;
-			background: #fff;
-			padding: 5px 8px;
-			font-size: 18px;
-			margin-left: 5px;
-			margin: 4px;
+    .tags-view-item {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      position: relative;
+      cursor: pointer;
+      //border: 1px solid #d8dce5;
+      color: #495060;
+      background: #fff;
+      padding: 0 15px;
+      height: 39px;
+      font-size: 14px;
+      .showBox{
+        position: relative;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+      &:first-of-type {
+        // margin-left: 15px;
+      }
 
-			&:first-of-type {
-				// margin-left: 15px;
-			}
+      &:last-of-type {
+      }
 
-			&:last-of-type {
-				margin-right: 15px;
-			}
+      &.active {
+        //background-color: #42b983;
+        color: #fff;
+        border-color: #42b983;
+        background: #3876ee;
+        background-size: 100% 100%;
+        border-radius: 20px;
+        //&::before {
+        //	content: '';
+        //	background: #fff;
+        //	display: inline-block;
+        //	width: 8px;
+        //	height: 8px;
+        //	border-radius: 50%;
+        //	position: relative;
+        //	margin-right: 2px;
+        //}
+      }
+    }
+  }
 
-			&.active {
-				background-color: #42b983;
-				color: #fff;
-				border-color: #42b983;
+  .contextmenu {
+    margin: 0;
+    background: #fff;
+    z-index: 999999;
+    position: absolute;
+    list-style-type: none;
+    padding: 5px 0;
+    border-radius: 4px;
+    font-size: 12px;
+    font-weight: 400;
+    color: #333;
+    box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
 
-				&::before {
-					content: '';
-					background: #fff;
-					display: inline-block;
-					width: 8px;
-					height: 8px;
-					border-radius: 50%;
-					position: relative;
-					margin-right: 2px;
-				}
-			}
-		}
-	}
+    li {
+      margin: 0;
+      padding: 7px 16px;
+      cursor: pointer;
 
-	.contextmenu {
-		margin: 0;
-		background: #fff;
-		z-index: 3000;
-		position: absolute;
-		list-style-type: none;
-		padding: 5px 0;
-		border-radius: 4px;
-		font-size: 12px;
-		font-weight: 400;
-		color: #333;
-		box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, .3);
-
-		li {
-			margin: 0;
-			padding: 7px 16px;
-			cursor: pointer;
-
-			&:hover {
-				background: #eee;
-			}
-		}
-	}
+      &:hover {
+        background: #eee;
+      }
+    }
+  }
 }
 </style>
 
 <style lang="scss">
 //reset element css of el-icon-close
 .tags-view-wrapper {
-	.tags-view-item {
-		.el-icon-close {
-			width: 16px;
-			height: 16px;
-			vertical-align: 2px;
-			border-radius: 50%;
-			text-align: center;
-			transition: all .3s cubic-bezier(.645, .045, .355, 1);
-			transform-origin: 100% 50%;
+  .tags-view-item {
+    .el-icon-close {
+      //width: 16px;
+      //height: 16px;
+      left: -14px;
+      top: -3px;
+      position: absolute;
+      vertical-align: 2px;
+      border-radius: 50%;
+      text-align: center;
+      //transition: all .3s cubic-bezier(.645, .045, .355, 1);
+      transform-origin: 100% 50%;
+      font-weight: 700;
 
-			&:before {
-				transform: scale(.6);
-				display: inline-block;
-				vertical-align: -3px;
-			}
+      &:before {
+        transform: scale(.6);
+        display: inline-block;
+        vertical-align: -3px;
+      }
 
-			&:hover {
-				background-color: #b4bccc;
-				color: #fff;
-			}
-		}
-	}
+      &:hover {
+        background-color: #b4bccc;
+        color: #fff;
+      }
+    }
+  }
 }
 </style>
diff --git a/src/layout/components/images/tagViewBgc.png b/src/layout/components/images/tagViewBgc.png
new file mode 100644
index 0000000000000000000000000000000000000000..24b2e0cf8d190d67b44876e0c280bf57a2a1e259
GIT binary patch
literal 4397
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

literal 0
HcmV?d00001

diff --git a/src/views/apiAdmin/baseNewSelect.vue b/src/views/apiAdmin/baseNewSelect.vue
new file mode 100644
index 0000000..d314abb
--- /dev/null
+++ b/src/views/apiAdmin/baseNewSelect.vue
@@ -0,0 +1,222 @@
+<template>
+  <div>
+    <template v-if="!lookflag">
+      <el-select
+        v-loading="selLoading"
+        class="w-100"
+        v-model="selectValue"
+        :placeholder="placeholder"
+        :clearable="false"
+        style="width: 240px"
+        size="mini"
+        refs="mySelect"
+        :reserve-keyword="true"
+        :disabled="disabled"
+        filterable
+        popper-class="sele"
+        :filter-method="filter"
+        @change="fun"
+        @focus="funx"
+        @blur="funb"
+        @visible-change="hidden"
+        clearable
+      >
+        <el-option
+          v-for="item in options"
+          :key="item.plugId"
+          :label="item.plugName"
+          remote
+          :value="item.plugName"
+          placeholder="请输入"
+        >
+        </el-option>
+
+        <div style="bottom: -10px">
+          <el-pagination
+            v-if="pageModel.total > pageModel.limit"
+            small
+            @current-change="handleCurrentChange"
+            :current-page="pageModel.pageIndex"
+            :page-size="pageModel.limit"
+            layout="prev, pager,next,total"
+            :total="pageModel.total"
+          >
+          </el-pagination>
+        </div>
+      </el-select>
+    </template>
+    <template v-else
+    ><div v-loading="selLoading">{{ showValue }}</div></template
+    >
+  </div>
+</template>
+
+
+
+<style scoped lang="scss">
+::v-deep .el-input--mini .el-input__inner {
+  height: 38px;
+}
+.w-100 {
+  width: 100% !important;
+}
+.drop >>> .el-input__inner {
+  background: #5183ff !important;
+  color: white;
+  border: none;
+  height: 26px;
+  padding: 10px 22px 10px 10px;
+  text-align: center;
+}
+.drop {
+  width: 250px;
+}
+.drop >>> .el-select .el-input .el-select__caret {
+  display: none;
+}
+</style>
+
+
+
+<script>
+import debounce from "lodash/debounce";
+import { getUserModuleApi } from "@/api/integrationOption/integrationOption.js";
+export default {
+  props: {
+    ruleForm: {
+      type: Object,
+      default: {},
+    },
+    selectInfo: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+    // 是否禁用
+    disabled: {
+      type: Boolean,
+      default: false,
+    },
+    placeholder: String,
+    value: {
+      type: String,
+    },
+    itemObj: {
+      type: Object,
+      default: () => {
+        return {};
+      },
+    },
+    lookflag: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      options: [], //当前页码的数据
+      pageModel: {
+        total: 0,
+        pageIndex: 1,
+        limit: 10,
+      },
+      selLoading: false,
+      showValue: "",
+      lookLoading: false,
+    };
+  },
+  computed: {
+    selectValue: {
+      get() {
+        return this.value;
+      },
+      set(val) {
+        this.$emit("input", val);
+      },
+    },
+  },
+  created() {
+  },
+  mounted() {
+    this.getUserModuleApi()
+  },
+  methods: {
+    // 请求select信息（分页）
+    async getUserModuleApi(obj = {}) {
+      this.selLoading = true;
+      const res = await getUserModuleApi(
+        {
+          tl: "sysPlugArgService",
+          as: "integrationTaskService",
+          dj: "queryPlugArg",
+        },
+        {
+          pageNum: this.pageModel.pageIndex,
+          pageSize: this.pageModel.limit,
+          ...obj,
+        }
+      );
+      if (res.status === '200') {
+        this.pageModel.total = res.attribute.total;
+        this.options = res.attribute.list;
+      }
+      console.log(this.options,'options')
+      this.selLoading = false;
+    },
+    // 根据selectid找到value
+    async getSelectdata(id) {
+      this.selLoading = true;
+      const res = await getUserModuleApi(
+        {
+          tl: "mdmService",
+          as: "mdmService",
+          dj: "queryTemplateData",
+        },
+        {
+          tableName: this.itemObj.service,
+          id: id,
+          label: this.itemObj.label,
+          value: this.itemObj.value,
+        }
+      );
+      if (res.status == 200 && res.attribute.length) {
+        this.selLoading = false;
+        this.options = res.attribute;
+        this.showValue = res.attribute[0][this.itemObj.label];
+      } else {
+        this.selLoading = false;
+        this.options.push({
+          [this.itemObj.label]: "请选择",
+          [this.itemObj.value]: id,
+        });
+      }
+    },
+    // 页码改变事件
+    handleCurrentChange(val) {
+      this.pageModel.pageIndex = val;
+      this.getUserModuleApi();
+    },
+    // select选中更改事件
+    fun(val) {
+      console.log(val)
+      this.$emit("selectChangeHandle",val,this.options)
+      // this.$emit(`${this.funName}`, arr);
+    },
+    // 获得焦点
+    funx() {
+      this.getUserModuleApi();
+    },
+    // 失去焦点
+    funb() {},
+    hidden() {},
+    //搜索方法,将符合的数据存入options中，并分页展示
+    filter: debounce(function (val) {
+      // this.pageModel.pageIndex = 1;
+      // this.getUserModuleApi({ lableValue: val });
+    }, 300),
+  },
+  //监听来自父组件的数据，当数据更新时，重置展示
+  watch: {},
+};
+</script>
diff --git a/src/views/apiAdmin/configData.js b/src/views/apiAdmin/configData.js
new file mode 100644
index 0000000..7ec053b
--- /dev/null
+++ b/src/views/apiAdmin/configData.js
@@ -0,0 +1,169 @@
+/**
+ * @desc 集成产品清单
+ * @date 2023-07-10
+ */
+// 表头
+const tableColumnData = [
+  {
+    label: '接口名称',
+    prop: 'name'
+  }, {
+    label: '服务名',
+    prop: 'beanName'
+  },
+  {
+    label: '方法名',
+    prop: 'interfaceName'
+  },
+  {
+    label: '备注',
+    prop: 'remark'
+  },
+  {
+    label: '状态',
+    prop: 'state'
+  }
+]
+const tableVersionColumn = [
+  {
+    label: '参数',
+    prop: 'argName'
+  },
+  {
+    label: '参数值',
+    prop: 'argValue'
+  },
+  {
+    label: '备注',
+    prop: 'remark'
+  }
+
+]
+
+// 基本信息内容
+const formRow = [
+  {
+    elCol: [{
+      label: '接口名称',
+      prop: 'name',
+      tag: 'elInput',
+      span: 24
+    }]
+  },
+  {
+    elCol: [{
+      label: '服务名',
+      prop: 'beanName',
+      tag: 'elInput',
+      span: 24
+    }]
+  },
+  {
+    elCol: [{
+      label: '方法名',
+      prop: 'interfaceName',
+      tag: 'elInput',
+      span: 24
+    }]
+  },
+  {
+    elCol: [{
+      label: '状态',
+      prop: 'state',
+      tag: 'elRadio',
+      span: 24,
+      options: [
+        {
+          label: '启用',
+          value: '0'
+        },
+        {
+          label: '停用',
+          value: '1'
+        }
+      ]
+    }]
+  },
+  {
+    elCol: [{
+      label: '描述',
+      prop: 'remark',
+      tag: 'elInput',
+      type: 'textarea',
+      span: 24
+    }]
+  }
+]
+
+const basicsRules = {
+  name: [{
+    required: true,
+    message: '请输入接口名称',
+    trigger: 'blur'
+  }],
+  beanName: [{
+    required: true,
+    message: '请输入服务名',
+    trigger: 'blur'
+  }],
+  interfaceName: [{
+    required: true,
+    message: '请输入方法名',
+    trigger: 'blur'
+  }],
+}
+
+// 查看
+const formRowShow = [
+  {
+    elCol: [{
+      label: '工坊名称',
+      prop: 'workshopName',
+      tag: 'elLook',
+      span: 24,
+      disabled: true
+    }]
+  },
+  {
+    elCol: [{
+      label: '插件',
+      prop: 'plugName',
+      slotName: 'plugName',
+      tag: 'elLook',
+      span: 24,
+      disabled: true
+    }]
+  },
+  {
+    elCol: [{
+      label: '描述',
+      prop: 'remark',
+      tag: 'elLook',
+      type: 'textarea',
+      span: 24,
+      disabled: true
+    }]
+  }
+]
+const operationTableColumn = [
+  {
+    label: '本次推送的执行时间',
+    prop: 'create_time'
+  },
+  {
+    label: '本次推送的入参',
+    prop: 'inParameter'
+  },
+  {
+    label: '推送人名称',
+    prop: 'create_user_id'
+  }
+]
+export default {
+  tableColumnData,
+  formRow,
+  basicsRules,
+  formRowShow,
+  tableVersionColumn,
+  operationTableColumn
+}
diff --git a/src/views/apiAdmin/index.vue b/src/views/apiAdmin/index.vue
new file mode 100644
index 0000000..18707dc
--- /dev/null
+++ b/src/views/apiAdmin/index.vue
@@ -0,0 +1,222 @@
+<template>
+  <div>
+    <base-layout
+      ref="baseLayout"
+      :buttonList="buttonList"
+      @onFuncBtn="onFuncBtn"
+      :querySwitch="true"
+      :searchList="requirementList"
+      @search="handleSearchEvent"
+      :isPage="true"
+      @pageChange="handlePageChange"
+    >
+      <div slot="main" slot-scope="{ tableHeight }">
+        <base-table
+          ref="baseTable"
+          :showIndex="true"
+          :funWidth="180"
+          :funData="funData"
+          @onFunc="onFunc"
+          :tabLoading.sync="tabLoading"
+          :tableHeight="tableHeight"
+          :tableData="tableData"
+          :tableColumn="tableColumnData"
+          @onCellClick="onCellClick"
+        >
+          <template #state="{row}">
+            {{ row.state == 0 ? '启用' : '停用'}}
+          </template>
+        </base-table>
+      </div>
+    </base-layout>
+    <right-dialog ref="rightDialog" @resetTable="resetTable"></right-dialog>
+  </div>
+</template>
+
+<script>
+import baseLayout from "@/components/base/baseLayout";
+import baseTable from "@/components/base/baseTable";
+import rightDialog from "./rightDialog";
+import configData from "./configData";
+import { authApi } from "@/api/apis/auth";
+export default {
+  components: {
+    baseLayout,
+    baseTable,
+    rightDialog,
+  },
+  data() {
+    return {
+      buttonList: [
+        {
+          menuName: "新增",
+          icon: "el-icon-plus",
+          btnFunction: "add",
+        },
+        {
+          menuName: "刷新",
+          icon: "el-icon-refresh",
+          btnFunction: "resetLoad",
+        },
+      ], //按钮组
+      requirementList: [
+        {
+          placeholder: "接口名称",
+          prop: "name",
+          tag: "elInput",
+        },
+        {
+          placeholder: "服务名",
+          prop: "beanName",
+          tag: "elInput",
+        },
+        {
+          placeholder: "方法名",
+          prop: "interfaceName",
+          tag: "elInput",
+        },
+      ], //查询模板list
+      tabLoading: false,
+      tableColumnData: configData.tableColumnData, //表头数据
+      funData: [
+
+        {
+          color: "#6a9af1",
+          text: "编辑",
+        },
+        {
+          color: "#d67a74",
+          text: "删除",
+        },
+      ],
+      tableData: [], //表格数据
+      pageModel: {
+        pageNum: 1,
+        pageSize: 100,
+      },
+      queryModel: {
+        code: "",
+        name: "",
+        classify: "",
+        productionCompany: "",
+      },
+    };
+  },
+  mounted() {
+    this.queryProductClassfy();
+    this.GetProductionTableData();
+  },
+  methods: {
+    onCellClick(row){
+      this.openLoading("detail");
+      this.$refs.rightDialog.openDialog("show", row);
+    },
+    // 表格数据
+    async GetProductionTableData() {
+      this.tabLoading = true;
+      let param = {
+        ...this.pageModel,
+        ...this.queryModel,
+      };
+      let res = await authApi(
+        "sysInterfaceService",
+        "",
+        "queryEntityPage",
+        "",
+        param
+      );
+      this.tabLoading = false;
+      if (res.status == "200") {
+        this.tableData = res.attribute.list;
+        this.$refs.baseLayout.setPageTotal(res.attribute.total);
+      }
+    },
+    // 分页变化
+    handlePageChange(val) {
+      this.pageModel.pageNum = val.pageIndex;
+      this.pageModel.pageSize = val.pageSize;
+      this.GetProductionTableData();
+    },
+    // 按钮组
+    onFuncBtn(btn) {
+      this[btn.btnFunction]();
+    },
+    // 新增
+    add() {
+      this.$refs.rightDialog.openDialog("add");
+    },
+    // 表格操作事件 查看 重推 删除
+    onFunc(index, row,item) {
+      // 查看
+      if (item.text==='查看') {
+        this.openLoading("detail");
+        this.$refs.rightDialog.openDialog("show", row);
+      }
+      // 重推
+      if (item.text==='编辑') {
+        this.openLoading("detail");
+        this.$refs.rightDialog.openDialog("edit", row);
+      }
+      // 删除
+      if (item.text==='删除') {
+        this.$delConfirm().then(() => {
+          this.openLoading("del");
+          this.productionDeleteById(row.id);
+        });
+      }
+    },
+    async productionDeleteById(id) {
+      let param = {
+        id: id,
+      };
+      let res = await authApi(
+        "sysInterfaceService",
+        "",
+        "deleteEntity",
+        "",
+        param
+      );
+      if (res.status == "200") {
+        this.$vmNews("删除成功", "success");
+        this.resetTable();
+      }
+    },
+    // 重置表格
+    resetTable() {
+      this.pageModel.pageNum = 1;
+      this.$refs.baseLayout.pageClear();
+      this.GetProductionTableData();
+    },
+    // 搜索
+    handleSearchEvent() {
+      let data = this.$refs.baseLayout.ruleForm;
+      this.queryModel = data;
+      this.resetTable();
+    },
+    // 获取所有产品分类
+    async queryProductClassfy() {
+      let params = {
+        tab_name: "sys_product",
+        column_name: "classify",
+      };
+      let res = await authApi(
+        "generalServiceImpl",
+        "dictionaryshop",
+        "selectDictionaryshop",
+        "",
+        params
+      );
+      if (res.status == "200") {
+        this.requirementList[2].options = res.attribute;
+      }
+    },
+  },
+};
+</script>
+
+<style scoped>
+.clickTitle {
+  color: #409eff;
+  cursor: pointer;
+}
+</style>
diff --git a/src/views/apiAdmin/rightDialog.vue b/src/views/apiAdmin/rightDialog.vue
new file mode 100644
index 0000000..1fdf8eb
--- /dev/null
+++ b/src/views/apiAdmin/rightDialog.vue
@@ -0,0 +1,323 @@
+<template>
+  <div>
+    <base-right-dialog
+      size="1000px"
+      ref="baseRightDialog"
+      :footerShow="true"
+      :dialogVisible.sync="dialogVisible"
+      :title="dialogTitle + ' 集成前台任务'"
+      @handleClose="handleDialogClose"
+      :type="dialogType"
+      :submitShow="submitShow"
+      @handleConfirmClick="handleConfirmClick"
+    >
+      <base-form
+        ref="basicsForm"
+        :formRow="formRow"
+        :isFunBtn="false"
+        :rules="basicsRules"
+        class="dialog_form"
+        :spanWidth="`120px`"
+        :loading="vLoading"
+
+      >
+      </base-form>
+
+    </base-right-dialog>
+  </div>
+</template>
+
+<script>
+import baseRightDialog from '@/components/base/baseRightDialog'
+import baseNewSelect from './baseNewSelect.vue'
+import baseForm from '@/components/base/baseNewForm'
+import baseTable from '@/components/base/baseTable'
+import configData from './configData'
+import { authApi } from '@/api/apis/auth'
+
+export default {
+  components: {
+    baseRightDialog,
+    baseForm,
+    baseTable,
+    baseNewSelect
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      dialogTitle: '',
+      dialogType: '',
+      formRow: configData.formRow,
+      basicsRules: configData.basicsRules,
+      vLoading: false,
+      newMarryOptions: [],
+      submitShow: true,
+      loadingType: true,
+      tableVersionData: [],
+      tableVersionColumn: configData.tableVersionColumn,
+      funData: [],
+      isEdit: false,
+      select_dist: {},
+      plugNameOptions: [],
+      tableColumn: configData.operationTableColumn,//操作记录
+      tableData: []
+    }
+  },
+  mounted() {
+    this.initSelect()
+  },
+  methods: {
+    // 插件下拉
+    async initSelect() {
+      let res = await authApi(
+        'pluginService',
+        'plugins',
+        'queryPluginsByType',
+        '',
+        {
+          'pluginType': '1'
+        }
+      )
+      if (res.status == 200) {
+        console.log(res.attribute)
+        res.attribute.forEach(item => {
+          this.$set(this.select_dist, item.pluginId, item)
+        })
+        this.formRow[0].elCol[0].options = res.attribute
+      }
+    },
+    //下拉改变事件
+    selectChangeHandle(val, options) {
+      if (!val) {
+        this.tableVersionData = []
+        return
+      }
+      //找到这条
+      let obj = options.find(item => {
+        return item.plugName === val
+      })
+      console.log(obj)
+      this.$set(this.$refs.basicsForm.ruleForm, 'plugId', obj.plugId)
+      this.$set(this.$refs.basicsForm.ruleForm, 'plugName', obj.plugName)
+      this.searchInfo(obj.plugId)
+    },
+    //下拉后查询单据详情
+    async searchInfo(plugId) {
+      let params = {
+        plugId
+      }
+      let res = await authApi(
+        'sysPlugArgService',
+        'integrationTaskService',
+        'getPlugArgByPlugId',
+        '',
+        params
+      )
+      console.log(res, 'res')
+      if (res.status == 200) {
+        //数据处理
+        let arr = []
+        res.attribute.forEach(item => {
+          arr.push({
+            startDate: '',
+            endDate: '',
+            remark: '',
+            argValue: '',
+            argName: item.argName,
+            argCode: item.argCode,
+            argType: item.argType
+          })
+
+        })
+        this.tableVersionData = arr
+      }
+    },
+    openDialog(type, row) {
+
+      this.formRow = configData.formRow
+      this.submitShow = true
+
+      this.isEdit = false
+      this.funData = []
+
+      // 编辑
+      if (type == 'edit') {
+        this.isEdit = true
+        this.dialogTitle = '编辑'
+        this.dialogType = 'edit'
+        this.productGetById(row.id)
+      }
+      // 查看
+      if (type == 'show') {
+        this.funData = Object.assign([], [])
+        this.submitShow = false
+        this.formRow = configData.formRowShow
+        this.dialogTitle = '查看'
+        this.dialogType = 'show'
+        this.productGetById(row.id)
+
+      }
+      this.dialogVisible = true
+      // 新增
+      if (type == 'add') {
+        this.dialogTitle = '新增'
+        this.dialogType = 'add'
+        this.$nextTick(()=>{
+          this.$set(this.$refs.basicsForm.ruleForm,'state','0')
+        })
+      }
+
+    },
+    // 编辑详情
+    async productGetById(id) {
+      let params = {
+        id: id
+      }
+      let res = await authApi(
+        'sysInterfaceService',
+        '',
+        'getEntity',
+        '',
+        params
+      )
+      if (res.status == '200') {
+        this.$nextTick(() => {
+          this.$refs.basicsForm.incomingParameters(res.attribute)
+        })
+      }
+    },
+    addVersionDialog() {
+      let obj = {
+        argName: '',
+        argCode: '',
+        argType: '1',
+        remark: ''
+      }
+      this.tableVersionData.push(obj)
+    },
+    // 删除
+    onFunc(index, row) {
+      if (index == 0) {
+        this.$delConfirm().then(() => {
+          this.tableVersionData.forEach((item, itemIndex) => {
+            if (item.id === row.id) {
+              this.tableVersionData.splice(itemIndex, 1)
+            }
+          })
+        })
+      }
+    },
+    // 弹窗关闭
+    handleDialogClose() {
+      this.tableVersionData = Object.assign([], [])
+      this.$refs.basicsForm.resetFields()
+      this.dialogVisible = false
+    },
+    // 弹窗确认按钮
+    handleConfirmClick() {
+      this.$refs.basicsForm.$refs['ruleForm'].validate((valid) => {
+        if (!valid) {
+          return
+        } else {
+          let params = {
+            ...this.$refs.basicsForm.ruleForm,
+          }
+          if (this.dialogType == 'add') {
+            this.openLoading('submit')
+            this.productSaveDto(params)
+          }
+          if (this.dialogType == 'edit') {
+            this.openLoading('submit')
+            this.productUpdateDto(params)
+          }
+        }
+      })
+    },
+    // 新增保存
+    async productSaveDto(params) {
+      let res = await authApi(
+        'sysInterfaceService',
+        '',
+        'saveEntity',
+        '',
+        params
+      )
+      if (res.status == '200') {
+        this.handleDialogClose()
+        this.$vmNews('新增成功', 'success')
+        this.$emit('resetTable')
+      }
+    },
+    // 编辑保存
+    async productUpdateDto(params) {
+      let res = await authApi(
+        'sysInterfaceService',
+        '',
+        'updateEntity',
+        '',
+        params
+      )
+      if (res.status == '200') {
+        this.handleDialogClose()
+        this.$vmNews('更新成功', 'success')
+        this.$emit('resetTable')
+      }
+    },
+    // 获取所有产品分类
+    async queryProductClassfy() {
+      let params = {
+        tab_name: 'sys_product',
+        column_name: 'classify'
+      }
+      let res = await authApi(
+        'generalServiceImpl',
+        'dictionaryshop',
+        'selectDictionaryshop',
+        '',
+        params
+      )
+      if (res.status == '200') {
+        this.formRow[1].elCol[0].options = res.attribute
+      }
+    }
+  }
+}
+</script>
+
+<style scoped lang="scss">
+.small_title {
+  margin: 10px 0;
+  font-size: 16px;
+}
+
+.dialogList {
+  padding: 16px 0;
+  border-top: 1px solid #dcdfe6;
+  display: flex;
+  flex-direction: column;
+}
+
+.updateBtn {
+  border: 1px solid #ebedf1;
+  padding: 5px 0;
+  border-radius: 3px;
+  text-align: center;
+  font-size: 14px;
+  cursor: pointer;
+  width: 100px;
+}
+
+.updateBtn:hover {
+  color: #1890ff;
+  border-color: #badeff;
+  background-color: #e8f4ff;
+}
+
+::v-deep .el-table__body-wrapper.is-scrolling-none {
+  height: auto !important;
+}
+
+::v-deep .app-container {
+  height: auto !important;
+}
+</style>
diff --git a/src/views/systemSettings/jurisdictionManage/roleJurisdiction/dataPermissions.vue b/src/views/systemSettings/jurisdictionManage/roleJurisdiction/dataPermissions.vue
index 0bc9b92..0ccc422 100644
--- a/src/views/systemSettings/jurisdictionManage/roleJurisdiction/dataPermissions.vue
+++ b/src/views/systemSettings/jurisdictionManage/roleJurisdiction/dataPermissions.vue
@@ -5,43 +5,33 @@
       </el-table-column>
       <el-table-column prop="dataList" label="字段">
         <template slot-scope="scope">
-          <i
-            class="el-icon-star-on"
-            style="
+          <div style="display: flex;align-items: center">
+            <i
+              class="el-icon-star-on"
+              style="
               height: 30px;
               line-height: 30px;
               font-size: 25px;
               margin-right: 7px;
             "
-            v-show="
-              scope.row.dataList.length != 0 &&
-              scope.row.dataList.length == scope.row.buttonList.length
-            "
-            @click="cancellation(scope.row)"
-          ></i>
-          <i
-            class="el-icon-star-on"
-            style="
+              v-show="btnShowHandle(interfaceList,true)"
+              @click="cancellation(interfaceList)"
+            ></i>
+            <i
+              class="el-icon-star-on"
+              style="
               height: 30px;
               line-height: 30px;
               font-size: 25px;
               margin-right: 7px;
               color: #808080;
             "
-            v-show="
-              scope.row.dataList.length != 0 &&
-              scope.row.dataList.length != scope.row.buttonList.length
-            "
-            @click="selectAllButton(scope.row)"
-          ></i>
-          <el-checkbox-group v-model="scope.row.buttonList" size="small">
-            <el-checkbox
-              v-for="item in scope.row.dataList"
-              :label="item.id"
-              :key="item.id"
-            >{{ item.name }}</el-checkbox
-            >
-          </el-checkbox-group>
+              v-show="btnShowHandle(interfaceList,false)"
+              @click="selectAllButton(interfaceList)"
+            ></i>
+            <el-checkbox v-model="item.check" v-for="item in interfaceList">{{ item.name }}</el-checkbox>
+          </div>
+
         </template>
       </el-table-column>
     </el-table>
@@ -50,11 +40,27 @@
 
 <script>
 import { GetAllBilldata, GetAllBillDataPepedom } from "@/api/apis/jurisdiction";
+import config from '@/views/doraChunk/config/indexChunkConfig'
 export default {
   data() {
     return {
-      tableData: [],
-      selectedList: []
+      tableData: [
+        {
+          billName: '数据权限控制',
+          dataList: config.config.map((item) => {
+            let obj = {
+              id: item.componentName,
+              name: item.name
+            }
+            return obj
+          }),
+          buttonList: [],
+
+        }
+      ],
+      selectedList: [],
+      interfaceList:[],
+
     };
   },
 
@@ -73,15 +79,28 @@ export default {
   },
 
   methods: {
+    //判断全选是否显示
+    btnShowHandle(list, flag = false) {
+      if (!list.length) return false
+      let flagResult = list.every(item => {
+        return item.check
+      })
+      if (flag) {
+        return flagResult
+      } else {
+        return !flagResult
+      }
+    },
     selectAllButton(item) {
-      let data = [];
-      item.dataList.forEach((el) => {
-        data.push(el.id);
-      });
-      item.buttonList = data;
+      console.log(item)
+      item.forEach(item => {
+        item.check = true
+      })
     },
     cancellation(item) {
-      item.buttonList = [];
+      item.forEach(item => {
+        item.check = false
+      })
     },
     handleTabClick() {
       this.$nextTick(() => {
@@ -89,32 +108,7 @@ export default {
       })
     },
     async init() {
-      return
-      let data = [];
-      const res = await GetAllBilldata({});
-      if (res.code == 1) {
-        data = res.data[0];
-        data.forEach((el) => {
-          el.dataList = [];
-          el.buttonList = []
-        });
-      }
-      const item = await GetAllBillDataPepedom({});
-      if (item.code == 1) {
-        data.forEach((el) => {
-          item.data[0].forEach((e) => {
-            if (el.billKindID == e.billKindID) {
-              el.dataList.push(e);
-            }
-          })
-          this.selectedList.forEach(add => {
-            if (el.billKindID == add.dp_billKindID) {
-              el.buttonList = add.dp_popeList.split("\,")
-            }
-          })
-        });
-      }
-      this.tableData = data;
+      console.log(this.tableData,'23')
     },
   },
 };
diff --git a/src/views/systemSettings/jurisdictionManage/roleJurisdiction/index.vue b/src/views/systemSettings/jurisdictionManage/roleJurisdiction/index.vue
index 5cd090e..7740757 100644
--- a/src/views/systemSettings/jurisdictionManage/roleJurisdiction/index.vue
+++ b/src/views/systemSettings/jurisdictionManage/roleJurisdiction/index.vue
@@ -300,7 +300,7 @@ export default {
         const res = await authApi('sysUserService', '', 'jurisdiction', '',params)
         if (res.status == 200) {
           const data = res.attribute
-          this.$refs.rightDialog.exhibitList(res.attribute.menvVoList,res.attribute.homeList,this.userRadioId)
+          this.$refs.rightDialog.exhibitList(res.attribute.menvVoList,res.attribute,this.userRadioId)
         }
       })
     },
diff --git a/src/views/systemSettings/jurisdictionManage/roleJurisdiction/rightDialog.vue b/src/views/systemSettings/jurisdictionManage/roleJurisdiction/rightDialog.vue
index 499e429..39ab06f 100644
--- a/src/views/systemSettings/jurisdictionManage/roleJurisdiction/rightDialog.vue
+++ b/src/views/systemSettings/jurisdictionManage/roleJurisdiction/rightDialog.vue
@@ -183,9 +183,12 @@ export default {
       row.check = !row.check
     },
     // 默认选中
-    exhibitList(menu, homeList, id) {
-      this.$refs.layOutPermissions.homeList = homeList
-      console.log(menu, 'menu')
+    exhibitList(menu, list, id) {
+      //首页拖拽权限
+      this.$refs.layOutPermissions.homeList = list.homeList
+      //数据权限
+      this.$refs.dataPermissions.interfaceList = list.interfaceList
+      console.log(this.$refs.dataPermissions.interfaceList, 'this.$refs.dataPermissions.interfaceList')
       // let data = this.treeToArray(this.menuDatas);
       this.build = id
       // data.forEach((el, index) => {
@@ -235,19 +238,32 @@ export default {
         kindId: 2,
         sysPopedomHomeEntities: [],
         sysPopedomMenuEntities: [],
-        sysPopedomOperateEntities: []
+        sysPopedomOperateEntities: [],
+        sysPopedomInterfaceEntities: []
       }
+      //数据权限处理
+      this.interfaceListHandle(params.sysPopedomInterfaceEntities)
+      //首页拖拽处理
       this.homeListHandle(params.sysPopedomHomeEntities)
+      //菜单、按钮处理
       this.menuListHandle(this.menuDatas, params.sysPopedomMenuEntities, params.sysPopedomOperateEntities)
-      const res = await authApi("sysUserService","","saveJurisdiction","",params)
-      if(res.status == '200'){
-        this.handleDialogClose();
+      const res = await authApi('sysUserService', '', 'saveJurisdiction', '', params)
+      if (res.status == '200') {
+        this.handleDialogClose()
         this.$message({
-          message: "保存成功",
-          type: "success",
-        });
+          message: '保存成功',
+          type: 'success'
+        })
       }
     },
+    //接口权限数据处理
+    interfaceListHandle(arr) {
+      this.$refs.dataPermissions.interfaceList.forEach(item => {
+        if (item.check) {
+          arr.push({ interfaceId: item.id })
+        }
+      })
+    },
     //处理首页拖拽
     homeListHandle(arr) {
       this.$refs.layOutPermissions.homeList.forEach(item => {
@@ -265,7 +281,7 @@ export default {
           })
         }
         if (item.children.length) {
-          this.menuListHandle(item.children, result,btnResult)
+          this.menuListHandle(item.children, result, btnResult)
         }
         if (item.buttonList.length) {
           this.btnListHandle(item.buttonList, btnResult, item.id)
@@ -276,7 +292,7 @@ export default {
     btnListHandle(list, btnResult, menuId) {
       list.forEach(item => {
         if (item.check) {
-          console.log(btnResult,'btnResult')
+          console.log(btnResult, 'btnResult')
           btnResult.push({
             menuId,
             operate: item.id
diff --git a/src/views/systemSettings/jurisdictionManage/userJurisdiction/dataPermissions.vue b/src/views/systemSettings/jurisdictionManage/userJurisdiction/dataPermissions.vue
index a80b2fb..0ccc422 100644
--- a/src/views/systemSettings/jurisdictionManage/userJurisdiction/dataPermissions.vue
+++ b/src/views/systemSettings/jurisdictionManage/userJurisdiction/dataPermissions.vue
@@ -1,52 +1,37 @@
 <template>
   <div>
-    <el-table
-      ref="multipleTable"
-      :data="tableData"
-      style="width: 100%"
-      :show-header="false"
-    >
+    <el-table ref="multipleTable" :data="tableData" style="width: 100%" :show-header="false">
       <el-table-column prop="billName" label="单据" width="120">
       </el-table-column>
       <el-table-column prop="dataList" label="字段">
         <template slot-scope="scope">
-          <i
-            class="el-icon-star-on"
-            style="
+          <div style="display: flex;align-items: center">
+            <i
+              class="el-icon-star-on"
+              style="
               height: 30px;
               line-height: 30px;
               font-size: 25px;
               margin-right: 7px;
             "
-            v-show="
-              scope.row.dataList.length != 0 &&
-              scope.row.dataList.length == scope.row.buttonList.length
-            "
-            @click="cancellation(scope.row)"
-          ></i>
-          <i
-            class="el-icon-star-on"
-            style="
+              v-show="btnShowHandle(interfaceList,true)"
+              @click="cancellation(interfaceList)"
+            ></i>
+            <i
+              class="el-icon-star-on"
+              style="
               height: 30px;
               line-height: 30px;
               font-size: 25px;
               margin-right: 7px;
               color: #808080;
             "
-            v-show="
-              scope.row.dataList.length != 0 &&
-              scope.row.dataList.length != scope.row.buttonList.length
-            "
-            @click="selectAllButton(scope.row)"
-          ></i>
-          <el-checkbox-group v-model="scope.row.buttonList" size="small">
-            <el-checkbox
-              v-for="item in scope.row.dataList"
-              :label="item.id"
-              :key="item.id"
-              >{{ item.name }}</el-checkbox
-            >
-          </el-checkbox-group>
+              v-show="btnShowHandle(interfaceList,false)"
+              @click="selectAllButton(interfaceList)"
+            ></i>
+            <el-checkbox v-model="item.check" v-for="item in interfaceList">{{ item.name }}</el-checkbox>
+          </div>
+
         </template>
       </el-table-column>
     </el-table>
@@ -55,11 +40,27 @@
 
 <script>
 import { GetAllBilldata, GetAllBillDataPepedom } from "@/api/apis/jurisdiction";
+import config from '@/views/doraChunk/config/indexChunkConfig'
 export default {
   data() {
     return {
-      tableData: [],
+      tableData: [
+        {
+          billName: '数据权限控制',
+          dataList: config.config.map((item) => {
+            let obj = {
+              id: item.componentName,
+              name: item.name
+            }
+            return obj
+          }),
+          buttonList: [],
+
+        }
+      ],
       selectedList: [],
+      interfaceList:[],
+
     };
   },
 
@@ -74,52 +75,40 @@ export default {
   mounted() {},
 
   beforeUpdate() {
-    this.handleTabClick();
+    this.handleTabClick()
   },
 
   methods: {
+    //判断全选是否显示
+    btnShowHandle(list, flag = false) {
+      if (!list.length) return false
+      let flagResult = list.every(item => {
+        return item.check
+      })
+      if (flag) {
+        return flagResult
+      } else {
+        return !flagResult
+      }
+    },
     selectAllButton(item) {
-      let data = [];
-      item.dataList.forEach((el) => {
-        data.push(el.id);
-      });
-      item.buttonList = data;
+      console.log(item)
+      item.forEach(item => {
+        item.check = true
+      })
     },
     cancellation(item) {
-      item.buttonList = [];
+      item.forEach(item => {
+        item.check = false
+      })
     },
     handleTabClick() {
       this.$nextTick(() => {
-        this.$refs.multipleTable && this.$refs.multipleTable.doLayout();
-      });
+        this.$refs.multipleTable && this.$refs.multipleTable.doLayout()
+      })
     },
     async init() {
-      return
-      let data = [];
-      const res = await GetAllBilldata({});
-      if (res.code == 1) {
-        data = res.data[0];
-        data.forEach((el) => {
-          el.dataList = [];
-          el.buttonList = [];
-        });
-      }
-      const item = await GetAllBillDataPepedom({});
-      if (item.code == 1) {
-        data.forEach((el) => {
-          item.data[0].forEach((e) => {
-            if (el.billKindID == e.billKindID) {
-              el.dataList.push(e);
-            }
-          });
-          this.selectedList.forEach((add) => {
-            if (el.billKindID == add.dp_billKindID) {
-              el.buttonList = add.dp_popeList.split(",");
-            }
-          });
-        });
-      }
-      this.tableData = data;
+      console.log(this.tableData,'23')
     },
   },
 };
diff --git a/src/views/systemSettings/jurisdictionManage/userJurisdiction/index.vue b/src/views/systemSettings/jurisdictionManage/userJurisdiction/index.vue
index 4531b47..23231ce 100644
--- a/src/views/systemSettings/jurisdictionManage/userJurisdiction/index.vue
+++ b/src/views/systemSettings/jurisdictionManage/userJurisdiction/index.vue
@@ -336,7 +336,7 @@ export default {
         const res = await authApi('sysUserService', '', 'jurisdiction', '',params)
         if (res.status == 200) {
           const data = res.attribute
-          this.$refs.rightDialog.exhibitList(res.attribute.menvVoList,res.attribute.homeList,this.userRadioId)
+          this.$refs.rightDialog.exhibitList(res.attribute.menvVoList,res.attribute,this.userRadioId)
         }
       })
     },
diff --git a/src/views/systemSettings/jurisdictionManage/userJurisdiction/rightDialog.vue b/src/views/systemSettings/jurisdictionManage/userJurisdiction/rightDialog.vue
index b88c2c7..3f7cc13 100644
--- a/src/views/systemSettings/jurisdictionManage/userJurisdiction/rightDialog.vue
+++ b/src/views/systemSettings/jurisdictionManage/userJurisdiction/rightDialog.vue
@@ -180,61 +180,15 @@ export default {
       })
     },
     handleSelectionChange(val, row) {
-      this.multipleSelection = val
-      let data = this.treeToArray([row])
-      this.childNode = !row.check
-      console.log(this.childNode,'this.childNode')
-      if (data.length > 1) {
-        console.log(data,'data')
-        data.forEach((el, index) => {
-          el.check = this.childNode
-          this.$refs.multipleTable.toggleRowSelection(el, this.childNode)
-        })
-        let ids = data[0].id
-        let arr = this.treeFindPath(
-          this.menuDatas,
-          (data) => data.id == ids,
-          'id'
-        )
-        arr = arr.splice(0, arr.length - 1)
-        let dataList = []
-        let allList = this.treeToArray(this.menuDatas)
-        allList.forEach((el, index) => {
-          if (arr.includes(el.id)) {
-            dataList.push(el)
-          }
-        })
-        dataList.forEach((el, index) => {
-          el.check = true
-          this.$refs.multipleTable.toggleRowSelection(el, true)
-        })
-      } else {
-        let ids = data[0].id
-        let arr = this.treeFindPath(
-          this.menuDatas,
-          (data) => data.id == ids,
-          'id'
-        )
-        console.log(arr,'arr')
-        // arr = arr.splice(0, arr.length - 1)
-        let dataList = []
-        let allList = this.treeToArray(this.menuDatas)
-        allList.forEach((el, index) => {
-          if (arr.includes(el.id)) {
-            dataList.push(el)
-          }
-        })
-        console.log(dataList,'dataList')
-        dataList.forEach((el, index) => {
-          el.check = this.childNode
-          this.$refs.multipleTable.toggleRowSelection(el, this.childNode )
-        })
-      }
+      row.check = !row.check
     },
     // 默认选中
-    exhibitList(menu, homeList, id) {
-      this.$refs.layOutPermissions.homeList = homeList
-      console.log(menu, 'menu')
+    exhibitList(menu, list, id) {
+      //首页拖拽权限
+      this.$refs.layOutPermissions.homeList = list.homeList
+      //数据权限
+      this.$refs.dataPermissions.interfaceList = list.interfaceList
+      console.log(this.$refs.dataPermissions.interfaceList, 'this.$refs.dataPermissions.interfaceList')
       // let data = this.treeToArray(this.menuDatas);
       this.build = id
       // data.forEach((el, index) => {
@@ -284,9 +238,14 @@ export default {
         kindId: 1,
         sysPopedomHomeEntities: [],
         sysPopedomMenuEntities: [],
-        sysPopedomOperateEntities: []
+        sysPopedomOperateEntities: [],
+        sysPopedomInterfaceEntities: []
       }
+      //数据权限处理
+      this.interfaceListHandle(params.sysPopedomInterfaceEntities)
+      //首页拖拽处理
       this.homeListHandle(params.sysPopedomHomeEntities)
+      //菜单、按钮处理
       this.menuListHandle(this.menuDatas, params.sysPopedomMenuEntities, params.sysPopedomOperateEntities)
       const res = await authApi('sysUserService', '', 'saveJurisdiction', '', params)
       if (res.status == '200') {
@@ -297,6 +256,14 @@ export default {
         })
       }
     },
+    //接口权限数据处理
+    interfaceListHandle(arr) {
+      this.$refs.dataPermissions.interfaceList.forEach(item => {
+        if (item.check) {
+          arr.push({ interfaceId: item.id })
+        }
+      })
+    },
     //处理首页拖拽
     homeListHandle(arr) {
       this.$refs.layOutPermissions.homeList.forEach(item => {