Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
yanyizhou
2021-11-11 15:22:24 +08:00
6 changed files with 222 additions and 19 deletions
@@ -1,8 +1,8 @@
<!-- 标准法规库 - 国内标准法规-->
<template>
<div id="domesticStandardDatabase" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class">
<div class="tree-content" :class="{ 'tree-closed': sideClose }">
<div style="width: 100%">
<div id="left" class="tree-content" :class="{ 'tree-closed': sideClose }">
<div style="width: 100%" class="left">
<el-input
placeholder="输入树状图体系"
v-model="filterText">
@@ -61,7 +61,8 @@
<i class="el-icon-arrow-right" v-if="sideClose === true"></i>
</div>
</div>
<div class="tree-right">
<div id="resize"></div>
<div id="right" class="tree-right">
<!--高级查询 ------------按钮-->
<table-tools-bar
@search="getDomesticStandardTableBtn(sarStandardsSearch)"
@@ -2488,6 +2489,36 @@ export default {
}
},
methods: {
// 左右拖动事件
dragControllerLR: function() {
var resize = document.getElementById("resize");
var left = document.getElementById("left");
var right = document.getElementById("right");
var box = document.getElementById("domesticStandardDatabase");
resize.onmousedown = function(e){
var startX = e.clientX;
resize.left = resize.offsetLeft;
document.onmousemove = function(e){
var endX = e.clientX;
var moveLen = resize.left + (endX - startX);
var maxT = box.clientWidth - resize.offsetWidth;
if(moveLen<150) moveLen = 150;
if(moveLen>maxT-150) moveLen = maxT-150;
resize.style.left = moveLen;
left.style.width = moveLen + "px";
right.style.width = (box.clientWidth - moveLen - 5) + "px";
}
document.onmouseup = function(evt){
document.onmousemove = null;
document.onmouseup = null;
resize.releaseCapture && resize.releaseCapture();
}
resize.setCapture && resize.setCapture();
return false;
}
},
isPermission (value) {
let hasCount = 0
let set =new Set( value.split(","))
@@ -5104,6 +5135,7 @@ export default {
async mounted() {
// 进入页面后查询树形结构目录
await this.selectMenu()
this.dragControllerLR()
// 进入页面后查询标准体系树形结构目录 引用 数据字典配置
// await this.selectStandardMenu()
this.treeReload = true
@@ -5166,6 +5198,24 @@ export default {
}
</script>
<style lang="less" scoped>
#left{
width:calc(30% - 5px);
height:100%;
float:left;
}
#resize{
width:5px;
height:100%;
cursor: w-resize;
float:left;
}
#right{
float:right;
width:70%;
height:100%;
}
/deep/.contentTitle{
width: 100%;
}
@@ -2,7 +2,7 @@
<template>
<div id="EnterpriseStandardDatabase" :class="{ 'tree-close': sideClose }" class="v-class">
<!--左侧树-->
<div class="tree-content" :class="{ 'tree-closed': sideClose }" >
<div id="left" class="tree-content" :class="{ 'tree-closed': sideClose }" >
<div style="width: 100%">
<el-input
placeholder="输入树状图体系"
@@ -61,8 +61,9 @@
<i class="el-icon-arrow-right" v-if="sideClose === true"></i>
</div>
</div>
<!--右侧内容-->
<div class="tree-right v-class">
<div id="resize"></div>
<!--右侧内容-->
<div id="right" class="tree-right v-class">
<table-tools-bar
@search="getBussionStandTableBtn(sarBussionessSearch)"
@reset="clearAllSearch('sarBussionessSearch')"
@@ -1972,7 +1973,37 @@ export default {
}
},
methods: {
isPermission (value) {
// 左右拖动事件
dragControllerLR: function() {
var resize = document.getElementById("resize");
var left = document.getElementById("left");
var right = document.getElementById("right");
var box = document.getElementById("EnterpriseStandardDatabase");
resize.onmousedown = function(e){
var startX = e.clientX;
resize.left = resize.offsetLeft;
document.onmousemove = function(e){
var endX = e.clientX;
var moveLen = resize.left + (endX - startX);
var maxT = box.clientWidth - resize.offsetWidth;
if(moveLen<150) moveLen = 150;
if(moveLen>maxT-150) moveLen = maxT-150;
resize.style.left = moveLen;
left.style.width = moveLen + "px";
right.style.width = (box.clientWidth - moveLen - 5) + "px";
}
document.onmouseup = function(evt){
document.onmousemove = null;
document.onmouseup = null;
resize.releaseCapture && resize.releaseCapture();
}
resize.setCapture && resize.setCapture();
return false;
}
},
isPermission (value) {
let hasCount = 0
let set =new Set( value.split(","))
let menuList = store.getters.getMenuList
@@ -4055,7 +4086,8 @@ export default {
this.treeReload = true
// 进入页面后查询树形结构目录
this.selectMenuList()
// 查询各下拉框数据
this.dragControllerLR()
// 查询各下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
}, res => {
@@ -4107,6 +4139,24 @@ export default {
</script>
<style lang="less" scoped>
#left{
width:calc(30% - 5px);
height:100%;
float:left;
}
#resize{
width:5px;
height:100%;
cursor: w-resize;
float:left;
}
#right{
float:right;
width:70%;
height:100%;
}
/deep/.contentTitle{
width: 100%;
}
@@ -2,7 +2,7 @@
<template>
<div id="foreignRegulationsDatabase" :class="{ 'tree-close': sideClose }" class="v-class">
<!--左侧树-->
<div class="tree-content" :class="{ 'tree-closed': sideClose }" >
<div id="left" class="tree-content" :class="{ 'tree-closed': sideClose }" >
<div style="width: 100%">
<el-input
placeholder="输入树状图体系"
@@ -59,8 +59,9 @@
<i class="el-icon-arrow-right" v-if="sideClose === true"></i>
</div>
</div>
<div id="resize"></div>
<!--右侧内容-->
<div class="tree-right v-class">
<div id="right" class="tree-right v-class">
<table-tools-bar
@search="getBussionStandTableBtn(lawsStandInfoSearch)"
@reset="clearAllSearch('lawsStandInfoSearch')"
@@ -2139,6 +2140,36 @@
}
},
methods: {
// 左右拖动事件
dragControllerLR: function() {
var resize = document.getElementById("resize");
var left = document.getElementById("left");
var right = document.getElementById("right");
var box = document.getElementById("foreignRegulationsDatabase");
resize.onmousedown = function(e){
var startX = e.clientX;
resize.left = resize.offsetLeft;
document.onmousemove = function(e){
var endX = e.clientX;
var moveLen = resize.left + (endX - startX);
var maxT = box.clientWidth - resize.offsetWidth;
if(moveLen<150) moveLen = 150;
if(moveLen>maxT-150) moveLen = maxT-150;
resize.style.left = moveLen;
left.style.width = moveLen + "px";
right.style.width = (box.clientWidth - moveLen - 5) + "px";
}
document.onmouseup = function(evt){
document.onmousemove = null;
document.onmouseup = null;
resize.releaseCapture && resize.releaseCapture();
}
resize.setCapture && resize.setCapture();
return false;
}
},
isPermission (value) {
let hasCount = 0
let set =new Set( value.split(","))
@@ -4186,6 +4217,7 @@
this.treeReload = true
// 进入页面后查询树形结构目录
this.selectMenuList()
this.dragControllerLR()
// 查询各下拉框数据
this.$http.get('sys/dictype/getDicTypeListCode', '', {
_this: this
@@ -4252,6 +4284,24 @@
</script>
<style lang="less" scoped>
#left{
width:calc(30% - 5px);
height:100%;
float:left;
}
#resize{
width:5px;
height:100%;
cursor: w-resize;
float:left;
}
#right{
float:right;
width:70%;
height:100%;
}
/deep/.contentTitle{
width: 100%;
}
@@ -1,7 +1,7 @@
<!--标准法规--海外标准法规-->
<template>
<div id="foreignStandardsAndRegulations" :class="{ 'tree-close': sideClose }" class="demo-spin-article v-class">
<div class="tree-content" :class="{ 'tree-closed': sideClose }">
<div id="left" class="tree-content" :class="{ 'tree-closed': sideClose }">
<div style="width: 100%">
<el-input
placeholder="输入树状图体系"
@@ -61,7 +61,8 @@
<i class="el-icon-arrow-right" v-if="sideClose === true"></i>
</div>
</div>
<div class="tree-right">
<div id="resize"></div>
<div id="right" class="tree-right">
<!--高级查询 ------------按钮-->
<table-tools-bar>
<div slot="content">
@@ -2325,6 +2326,36 @@ export default {
}
},
methods: {
// 左右拖动事件
dragControllerLR: function() {
var resize = document.getElementById("resize");
var left = document.getElementById("left");
var right = document.getElementById("right");
var box = document.getElementById("foreignStandardsAndRegulations");
resize.onmousedown = function(e){
var startX = e.clientX;
resize.left = resize.offsetLeft;
document.onmousemove = function(e){
var endX = e.clientX;
var moveLen = resize.left + (endX - startX);
var maxT = box.clientWidth - resize.offsetWidth;
if(moveLen<150) moveLen = 150;
if(moveLen>maxT-150) moveLen = maxT-150;
resize.style.left = moveLen;
left.style.width = moveLen + "px";
right.style.width = (box.clientWidth - moveLen - 5) + "px";
}
document.onmouseup = function(evt){
document.onmousemove = null;
document.onmouseup = null;
resize.releaseCapture && resize.releaseCapture();
}
resize.setCapture && resize.setCapture();
return false;
}
},
isPermission (value) {
let hasCount = 0
let set =new Set( value.split(","))
@@ -4803,6 +4834,7 @@ export default {
// 进入页面后查询树形结构目录
this.menuTreeLoading = true
await this.selectMenu()
this.dragControllerLR()
this.menuTreeLoading = false
this.treeReload = true
// 从数据库中查询各下拉框数据
@@ -4871,6 +4903,24 @@ export default {
</script>
<style lang="less" scoped>
#left{
width:calc(30% - 5px);
height:100%;
float:left;
}
#resize{
width:5px;
height:100%;
cursor: w-resize;
float:left;
}
#right{
float:right;
width:70%;
height:100%;
}
/deep/.contentTitle{
width: 100%;
}