FT/foton-laws-system-front
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://101.36.229.190:90/LAWS/laws-system-front-FOTON into develop

Browse Source
This commit is contained in:
宋伟佳
2021-06-30 19:32:31 +08:00
parent 6c01ff4a97 04190a44a0
commit 75416241a6
8 changed files with 138 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/navMenu/index.vue
+5 -6
View File
@@ -189,7 +189,6 @@ export default {
}
]
},
{
title: '本地工具',
path: '/localTool',
@@ -383,11 +382,11 @@ export default {
// path: '/questionsAndAnswers',
// menuId: '8VKLZATQQG4NQHXV9UDS'
// },
// {
// title: '我的板块',
// path: '/plate',
// menuId: 'TUYHX8JBWV'
// }
{
title: '我的板块',
path: '/plate',
menuId: '971d576ef9bce3bddd6f0d6bcc55d184'
}
// {
// title: '个人信息',
// path: '/info',
src/pages/config/pages/mechanismManage/index.vue
+3 -3
View File
@@ -80,9 +80,9 @@
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-if="scope.row.disableFlag === '1'" :command="[scope.row, '启用']">启用</el-dropdown-item>
<el-dropdown-item v-if="scope.row.disableFlag === '0'" :command="[scope.row, '禁用']">禁用</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '配置岗位']">配置岗位</el-dropdown-item>
<el-dropdown-item v-btn-permission="'30db3b395deb5004266cd65d302c2776'" v-if="scope.row.disableFlag === '1'" :command="[scope.row, '启用']">启用</el-dropdown-item>
<el-dropdown-item v-btn-permission="'30db3b395deb5004266cd65d302c2776'" v-if="scope.row.disableFlag === '0'" :command="[scope.row, '禁用']">禁用</el-dropdown-item>
<el-dropdown-item v-btn-permission="'ce2d2b9bb8004e0d9efcabc42a9f354d'" :command="[scope.row, '配置岗位']">配置岗位</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
src/pages/config/pages/menuManage/index.vue
+14
View File
@@ -19,6 +19,10 @@
class="common-button-primary add-button"
@click="Add"
size="mini">新增</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="deleteList"
size="mini">删除</el-button>
</el-col>
</el-row>
<el-row>
@@ -92,6 +96,16 @@ export default {
}
},
methods: {
deleteList () {
this.$http.delete('lawss/sarMenu', {
menuId: this.form.id
}, {}, res=> {
if (res.ok) {
this.getTree()
this.$message.success('删除成功')
}
})
},
confirmDialog () {
var form = {}
form.parentId = this.form.id
src/pages/config/pages/postManage/index.vue
+10 -2
View File
@@ -5,10 +5,12 @@
<el-button type="primary"
class="common-button-primary add-button"
@click="addModal"
v-btn-permission="'980cb239683de9e29ee5335cec98e5b4'"
size="mini">新增</el-button>
<el-button type="primary"
class="common-button-primary add-button"
@click="addRole"
v-btn-permission="'779665b2e4bb20fc480cf9372a100f69'"
size="mini">配置角色</el-button>
</div>
<div class="content">
@@ -55,8 +57,8 @@
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '删除']">删除</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '编辑']">编辑</el-dropdown-item>
<el-dropdown-item v-btn-permission="'0fbb849e244e07433a90180fb314ad10'" :command="[scope.row, '删除']">删除</el-dropdown-item>
<el-dropdown-item v-btn-permission="'fa0846d977aeef07e9cb7faf648f8f7f'" :command="[scope.row, '编辑']">编辑</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -296,6 +298,12 @@
mounted () {
this.getData()
this.getRole()
const menuList = this.$store.getters.getMenuList
menuList.forEach(item => {
if (item.id === '980cb239683de9e29ee5335cec98e5b4') {
console.log('有')
}
})
}
}
</script>
src/pages/config/pages/roleManage/index.vue
+3 -3
View File
@@ -29,6 +29,7 @@
<el-button type="primary"
class="common-button-primary add-button"
@click="roleAdd"
v-btn-permission="'93e75b6ec0b2b6b0b40d2b11adeba88a'"
size="mini">配置角色资源</el-button>
</div>
<div class="content">
@@ -92,6 +93,7 @@
:default-checked-keys="nodeList"
default-expand-all
show-checkbox
check-strictly
ref="tree2">
</el-tree>
</div>
@@ -130,7 +132,6 @@ export default {
},
methods: {
closeDialog () {
this.nodeList = []
this.modalshowflag = false
},
confirmDialog () {
@@ -138,7 +139,6 @@ export default {
menuIds: this.$refs.tree2.getCheckedKeys().concat(this.$refs.tree2.getHalfCheckedKeys()),
roleId: this.id
}, {}, res=> {
console.log(res);
if (res.ok) {
this.$message.success('设置权限成功')
this.modalshowflag = false
@@ -157,8 +157,8 @@ export default {
roleId: this.id
}, {}, res=> {
if (res.ok) {
this.nodeList = res.data
this.modalshowflag = true
this.nodeList = res.data
}
})
},
src/pages/personal/pages/my-collection/components/CollectionStandard.vue
+1 -1
View File
@@ -62,7 +62,7 @@
<el-col :span="4" :offset="3">创建时间：{{getDate(item.createTime)}}</el-col>
</div>
<el-col :span="4">
<el-button size="mini" @click="cancelStandard(item.id)" style="margin-top: -5px; border: 1px dashed #dcdee2" v-btn-permission="'GSMRLL6A4Y'">取消收藏</el-button>
<el-button size="mini" @click="cancelStandard(item.id)" style="margin-top: -5px; border: 1px dashed #dcdee2">取消收藏</el-button>
</el-col>
</el-row>
</div>
src/pages/processCenter/pages/newProcess/index.vue
+1 -2
View File
@@ -110,8 +110,7 @@ export default {
* @returns {boolean}
*/
bzfggllc() {
const idArray = ['HXHHBXSBQ9P48K6X6DCJ', '4UUKE8XMZ65BFMSYWWCD', '97MZM7HL57HUJTRBLKLE', '927P4TCCMQ4MT8ZYR8A2']
return this.checkPermission(idArray)
return true
},
/**
* 政策管理流程
src/pages/regulatoryRepository/accessStandardsAndRegulations/index.vue
+101 -84
View File
@@ -2,24 +2,18 @@
<template>
<div id="accessStandardsAndRegulations" class="v-class">
<el-tabs v-model="tabValue" style="height: 100%;">
<el-tab-pane label="国家/地区清单" name="listOfCountries">
<div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<list-of-countries v-if="tabValue === 'listOfCountries'"></list-of-countries>
<el-tab-pane v-for="(item,index) in list" :key="index" :label="item.label" :name="item.name">
<div v-if="tabValue === 'listOfCountries'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<list-of-countries></list-of-countries>
</div>
</el-tab-pane>
<el-tab-pane label="项目类清单" name="listProject">
<div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<list-project v-if="tabValue === 'listProject'"></list-project>
<div v-else-if="tabValue === 'listProject'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<list-project></list-project>
</div>
</el-tab-pane>
<!-- <el-tab-pane label="重点标准跟踪清单" name="listTracking">-->
<!-- <div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">-->
<!-- <list-tracking v-if="tabValue === 'listTracking'"></list-tracking>-->
<!-- </div>-->
<!-- </el-tab-pane>-->
<el-tab-pane label="其他清单" name="listOther">
<div style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<list-other v-if="tabValue === 'listOther'"></list-other>
<div v-else-if="tabValue === 'listTracking'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<list-tracking></list-tracking>
</div>
<div v-else-if="tabValue === 'listOther'" style="position: absolute;top: 0;left: 0;right: 0;bottom: 0;">
<list-other></list-other>
</div>
</el-tab-pane>
</el-tabs>
@@ -27,90 +21,113 @@
</template>
<script>
import listOfCountries from "../accessStandardsAndRegulations/page/listOfCountries";
import listProject from "../accessStandardsAndRegulations/page/listProject";
import listTracking from "../accessStandardsAndRegulations/page/listTracking";
import listOther from "../accessStandardsAndRegulations/page/listOther";
export default {
name: "AccessStandardsAndRegulations",
data() {
return {
tabValue: "listOfCountries"
};
},
methods: {},
components: {
listOfCountries,
listProject,
listTracking,
listOther
},
props: {},
computed: {},
watch: {},
mounted() {
},
beforeRouteLeave(to, from, next) {
const toName = ['ListOfStandardsAndRegulationsDetails', 'Details', 'ProjectAddEit', 'OtherAddEit']
// 离开此页面之前,记录tabName以便返回使用,如果将要访问的页面不是这两个,则清空tabName
if (toName.includes(to.name)) {
this.$store.commit('SET_ACCESS_STANDARD_REG_TABS', this.tabValue)
} else {
this.$store.commit('SET_ACCESS_STANDARD_REG_TABS')
}
setTimeout(() => {
next()
}, 100)
},
beforeRouteEnter(to, from, next) {
next(vm => {
if (vm.$store.state.accessStandRegTabName !== '') {
vm.tabValue = vm.$store.state.accessStandRegTabName
import listOfCountries from "../accessStandardsAndRegulations/page/listOfCountries";
import listProject from "../accessStandardsAndRegulations/page/listProject";
import listTracking from "../accessStandardsAndRegulations/page/listTracking";
import listOther from "../accessStandardsAndRegulations/page/listOther";
export default {
name: "AccessStandardsAndRegulations",
data() {
return {
list: [],
tabValue: ''
};
},
methods: {},
components: {
listOfCountries,
listProject,
listTracking,
listOther
},
props: {},
computed: {},
watch: {},
mounted() {
var list = []
const menuList = this.$store.getters.getMenuList
menuList.forEach(item => {
if (item.id === '8e3894cbd5507008aaf949394b7d198b') {
list.push({
label: '国家/地区清单',
name: 'listOfCountries'
})
} else if (item.id === 'f4f95a8b9a02845c8dc0331dbe41e80c') {
list.push({
label: '项目类清单',
name: 'listProject'
})
} else if (item.id === 'df227899442db20b31b7cb0b2ac6f5e7') {
list.push({
label: '重点标准跟踪清单',
name: 'listTracking'
})
} else if (item.id === 'f19255f8e94f04fd85a33a23f4d1fc85') {
list.push({
label: '其他清单',
name: 'listOther'
})
}
})
this.list = list
this.tabValue = this.list[0].name
},
beforeRouteLeave(to, from, next) {
const toName = ['ListOfStandardsAndRegulationsDetails', 'Details', 'ProjectAddEit', 'OtherAddEit']
// 离开此页面之前,记录tabName以便返回使用,如果将要访问的页面不是这两个,则清空tabName
if (toName.includes(to.name)) {
this.$store.commit('SET_ACCESS_STANDARD_REG_TABS', this.tabValue)
} else {
this.$store.commit('SET_ACCESS_STANDARD_REG_TABS')
}
})
}
};
setTimeout(() => {
next()
}, 100)
},
beforeRouteEnter(to, from, next) {
next(vm => {
if (vm.$store.state.accessStandRegTabName !== '') {
vm.tabValue = vm.$store.state.accessStandRegTabName
}
})
}
};
</script>
<style lang="less" scoped>
@import '~@/assets/styles/style';
@import '~@/assets/styles/mixins';
@import '~@/assets/styles/style';
@import '~@/assets/styles/mixins';
#accessStandardsAndRegulations {
height: 100%;
padding: 0 10px;
background: #fff;
display: flex;
flex-direction: column;
/deep/ .el-tabs {
flex: auto;
#accessStandardsAndRegulations {
height: 100%;
padding: 0 10px;
background: #fff;
display: flex;
flex-direction: column;
/deep/ .el-tabs__header {
margin: 0 !important;
}
.el-tabs__content {
height: 100% !important;
/deep/ .el-tabs {
flex: auto;
position: relative;
display: flex;
flex-direction: column;
.el-tab-pane {
height: 100%;
/deep/ .el-tabs__header {
margin: 0 !important;
}
.el-tabs__content {
height: 100% !important;
flex: auto;
position: relative;
display: flex;
flex-direction: column;
.el-tab-pane {
height: 100%;
flex: auto;
display: flex;
flex-direction: column;
}
}
}
}
}
</style>