Skip to content

D
dsk-cr20g
Commit c5fcb911 authored by huangjie's avatar huangjie
Browse files
Options

Merge branch 'zuhuduan' of http://192.168.60.201/root/dsk-operate-sys into zuhuduan

parents e2b8bf86 5a19e780
Show whitespace changes
Inline Side-by-side
Showing with 208 additions and 141 deletions
dsk-admin/src/main/java/com/dsk/web/controller/system/SysMenuController.java
View file @ c5fcb911
......@@ -39,7 +39,8 @@ public class SysMenuController extends BaseController {
@SaCheckPermission("system:menu:list")
@GetMapping("/list")
public R<List<SysMenu>> list(SysMenu menu) {
List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
List<SysMenu> menus = menuService.selectAllMenu(menu,getUserId());
//List<SysMenu> menus = menuService.selectMenuList(menu, getUserId());
return R.ok(menus);
}
......
dsk-operate-ui/src/assets/styles/index.scss
View file @ c5fcb911
......@@ -538,7 +538,7 @@ ul, li {
.el-card.noborder{
border: 0;
box-shadow: none;
margin-bottom: 12px;
//margin-bottom: 12px;
color: #232323;
.el-card__body{
padding: 0;
......
dsk-operate-ui/src/router/index.js
View file @ c5fcb911
......@@ -70,7 +70,7 @@ export const constantRoutes = [
path: 'index',
component: () => import('@/views/index'),
name: 'Index',
meta: { title: '首页', icon: 'index',noCache: false }
meta: { title: '首页', icon: 'index',noCache: true }
}
]
},
......
dsk-operate-ui/src/views/detail/groupAccount/component/members.vue
View file @ c5fcb911
......@@ -428,11 +428,7 @@
params.pageNum = e
this.queryParams.pageNum = e
this.handleQuery(params)
setTimeout(() => {
this.$nextTick(() => {
this.$children[1].$refs.tableRef.bodyWrapper.scrollTop = 0
});
}, 500);
this.$emit('handle-scroll')
},
}
}
......
dsk-operate-ui/src/views/detail/groupAccount/component/performance.vue
View file @ c5fcb911
......@@ -261,10 +261,7 @@
params.pageNum = e
this.queryParams.pageNum = e
this.handleQuery(params)
console.log(this.$children[1].$refs.tableRef.bodyWrapper.scrollTop)
setTimeout(() => {
// this.$children[1].$refs.tableRef.bodyWrapper.scrollTop = 0
}, 500);
this.$emit('handle-scroll')
},
clickEXCEL() {
this.dataEXCEL.combineName=this.combineName;
......
dsk-operate-ui/src/views/detail/groupAccount/component/zhaobiao.vue
View file @ c5fcb911
......@@ -350,10 +350,7 @@
params.pageNum = e
this.queryParams.pageNum = e
this.handleQuery(params)
console.log(this.$children[1].$refs.tableRef.bodyWrapper.scrollTop)
setTimeout(() => {
// this.$children[1].$refs.tableRef.bodyWrapper.scrollTop = 0
}, 500);
this.$emit('handle-scroll')
},
changeSelect(){
this.handleSearch()
......
dsk-operate-ui/src/views/detail/groupAccount/index.vue
View file @ c5fcb911
......@@ -6,16 +6,16 @@
{{name || '--'}}
</div>
</div>
<div class="flex-box group-main">
<div class="flex-box group-main" ref="contentData">
<div class="group-left">
<side-bar ref="sidebar" @currentPath="showPartPage" :pathName="currentPath.pathName" :customerId="customerId"/>
</div>
<div class="group-right">
<div id="groupBox" v-if="customerId">
<Members v-if="currentPath.pathName=='members'" :customer-id="customerId" :isSkeleton="isSkeleton" :combineName="name"/>
<Qualifications v-if="currentPath.pathName=='qualifications'" :customer-id="customerId" :isSkeleton="isSkeleton" :combineName="name"/>
<Performance v-if="currentPath.pathName=='performance'" :customer-id="customerId" :isSkeleton="isSkeleton" :combineName="name"/>
<Zhaobiao v-if="currentPath.pathName=='zhaobiao'" :customer-id="customerId" :isSkeleton="isSkeleton" :combineName="name"/>
<Members v-if="currentPath.pathName=='members'" @handle-scroll="scrollToTop" :customer-id="customerId" :isSkeleton="isSkeleton" :combineName="name"/>
<Qualifications v-if="currentPath.pathName=='qualifications'" @handle-scroll="scrollToTop" :customer-id="customerId" :isSkeleton="isSkeleton" :combineName="name"/>
<Performance v-if="currentPath.pathName=='performance'" @handle-scroll="scrollToTop" :customer-id="customerId" :isSkeleton="isSkeleton" :combineName="name"/>
<Zhaobiao v-if="currentPath.pathName=='zhaobiao'" @handle-scroll="scrollToTop" :customer-id="customerId" :isSkeleton="isSkeleton" :combineName="name"/>
</div>
</div>
</div>
......@@ -65,6 +65,11 @@
showPartPage(e){
this.currentPath = e
},
scrollToTop() {
this.$nextTick(() => {
this.$refs.contentData.scrollTop = 0
})
},
}
}
</script>
......@@ -75,18 +80,30 @@
}
.group-main{
margin-top: 12px;
position: fixed;
width: calc(100% - 192px);
height: calc(100vh - 155px);
overflow-y: auto;
align-items: initial;
}
.group-left{
margin-right: 16px;
padding-bottom: 16px;
position: fixed;
background: #FFFFFF;
}
.group-right{
min-width: 1088px;
/*width: calc(100% - 162px);*/
width: 100%;
background: #FFFFFF;
border-radius: 4px;
margin-left: 160px;
::v-deep .el-table__header-wrapper{
position: sticky;
top:0;
z-index: 9;
}
}
.part-header{
font-size: 16px;
......
dsk-operate-ui/src/views/detail/party-a/component/HeadForm.vue
View file @ c5fcb911
......@@ -360,7 +360,7 @@ export default {
cursor: pointer;
}
&.span-ba{
/*border: 1px solid #0081FF;*/
border: 1px solid #0081FF;
span{
color: #ffffff;
background: #0081FF;
......
dsk-operate-ui/src/views/detail/party-a/component/Tables.vue
View file @ c5fcb911
<template>
<div class="Tables">
<div class="table-item">
<el-table v-if="tableDataTotal>0" class="fixed-table" max-height="640"
<el-table v-if="tableDataTotal>0" class="fixed-table"
v-loading="tableLoading"
:data="tableData"
element-loading-text="Loading"
......@@ -222,4 +222,21 @@ export default {
::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td {
background-color: #DCEBFF;
}
::v-deep .fixed-table{
overflow: visible;
}
::v-deep .el-table__header-wrapper{
position: sticky;
top:56px;
z-index: 9;
}
::v-deep .el-table__fixed-header-wrapper{
position: sticky;
z-index: 9;
top: 56px;
}
::v-deep .el-table__fixed{
overflow-x: clip;
overflow-y: clip;
}
</style>
dsk-operate-ui/src/views/detail/party-a/mixins/mixin.js
View file @ c5fcb911
......@@ -77,6 +77,7 @@ export default {
params.pageNum = e
this.queryParams.pageNum = e
this.handleQuery(params,1)
this.$emit('handle-scroll')
},
handleSizeChange(e){
......
dsk-operate-ui/src/views/enterpriseData/components/Group/index.vue
View file @ c5fcb911
......@@ -38,7 +38,7 @@
<template v-if="activeIndex==0">
<span class="count">共{{ total+otherTotal }}条</span><el-popover style="margin-left:8px;position: relative;top: 2px;color:#515a6e;" trigger="hover" content="央企集团数据包含国资委及财政部公示的央企名录。" placement="right"><i slot="reference" class="el-icon-warning-outline"></i></el-popover>
<div >
<h3 style="margin-top:10px;"><b>央企 {{ total }}</b></h3>
<div style="margin-top:10px;" class="count1" >央企<span> {{ total }}</span></div>
<div class="infinite-list-item" v-for="(item,index) in companData" @click="selCompany(item)" :key="index">
<img v-if="item.logoUrl" :src="item.logoUrl" alt="" >
<div v-else class="logo" :style="{background:colors[index%5]}">{{ item.combineMemberName.slice(0,4) }}</div>
......@@ -50,7 +50,7 @@
</div>
</div>
<div >
<h3 style="margin-top:10px;"><b>其他央企 {{ otherTotal }}</b></h3>
<div style="margin-top:10px;" class="count1" >其他央企<span> {{ otherTotal }}</span></div>
<div class="infinite-list-item" v-for="(item,index) in otherCompanData" @click="selCompany(item)" :key="index">
<img v-if="item.logoUrl" :src="item.logoUrl" alt="" >
<div v-else class="logo" :style="{background:colors[index%5]}">{{ item.combineMemberName.slice(0,4) }}</div>
......
dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue
View file @ c5fcb911
......@@ -514,7 +514,6 @@
expandTrigger: "hover",
value: "id",
},
pageSize: 20,
dialogVisible2:false,
jskBidQueryDto: {
provinceIds: [],
......@@ -578,7 +577,7 @@
tableData:[],
total:0,
pageNum:1,
pageSize:20
pageSize:50
};
},
computed: {
......@@ -908,7 +907,7 @@
this.pageNum = 1;
}
if (!pageSize) {
this.pageSize = 20;
this.pageSize = 50;
}
if (!pageNum && !pageSize) {
this.reloadPage();
......@@ -968,12 +967,8 @@
this.isSkeleton = true;
api.uipSerach(params).then(res=>{
this.isSkeleton = false
// console.log(res)
if (res.code==200) {
this.tableData=res.rows;
this.total=res.total;
}
}).catch(error=>{
});
......
dsk-operate-ui/src/views/index.vue
View file @ c5fcb911
......@@ -102,7 +102,7 @@
</template>
</el-table-column>
<el-table-column prop="count" label="中标数量（个）" align="right" sortable width="150"/>
<el-table-column prop="money" label="中标金额（万元)" align="right" sortable/>
<el-table-column prop="money" label="中标金额（万元)" align="right" :sort-method="(a,b)=>{return a.money - b.money}" sortable/>
</el-table>
</div>
</el-col>
......@@ -171,7 +171,7 @@
</template>
</el-table-column>
<el-table-column prop="count" label="中标数量（个）" align="right" sortable width="150"/>
<el-table-column prop="money" label="中标金额（万元)" align="right" sortable/>
<el-table-column prop="money" label="中标金额（万元)" align="right" :sort-method="(a,b)=>{return a.money - b.money}" sortable/>
</el-table>
</div>
</el-col>
......@@ -185,6 +185,10 @@
<el-tabs v-model="activeName" @tab-click="handleClickTab">
<el-tab-pane label="大项目最新中标" name="first">
<skeleton v-if="zxzbIsSkeleton" style="padding: 16px"></skeleton>
<div class="empty" v-if="projectList.length === 0 && !zxzbIsSkeleton">
<img class="img" src="@/assets/images/project/empty.png">
<div class="p1">抱歉，暂无数据展示</div>
</div>
<div class="list" v-if="!zxzbIsSkeleton">
<div class="item" v-for="(item,index) in projectList" :key="index">
<p class="list-title"><router-link :to="`/biddetail/${item.pid}`" tag="a" class="a-link" v-if="item.pid" v-html="item.projectName"></router-link></p>
......@@ -1357,7 +1361,6 @@ export default {
if(this.activeName === 'second'){
this.getBigBidPage()
}
// this.jump()
}
},
......@@ -1386,44 +1389,6 @@ export default {
});
},
jump() {
let total = 500
let distance = document.documentElement.scrollTop || document.body.scrollTop
// 平滑滚动，时长500ms，每10ms一跳，共50跳
let step = total / 50
if (total > distance) {
smoothDown()
} else {
let newTotal = distance - total
step = newTotal / 50
smoothUp()
}
function smoothDown() {
if (distance < total) {
distance += step
document.body.scrollTop = distance
document.documentElement.scrollTop = distance
setTimeout(smoothDown, 10)
} else {
document.body.scrollTop = total
document.documentElement.scrollTop = total
}
}
function smoothUp() {
if (distance > total) {
distance -= step
document.body.scrollTop = distance
document.documentElement.scrollTop = distance
setTimeout(smoothUp, 10)
} else {
document.body.scrollTop = total
document.documentElement.scrollTop = total
}
}
},
// 时间格式化
formatDate(timeStr) {
let date = new Date(Number(timeStr))
......
dsk-operate-ui/src/views/macro/economies/component/industrialStructure.vue
View file @ c5fcb911
......@@ -38,11 +38,11 @@
<el-table-column label="产业类型" prop="projectType"></el-table-column>
<el-table-column :label="oneYear">
<el-table-column prop="money" label="金额（亿元）" sortable="custom" :formatter="formatStatus"></el-table-column>
<el-table-column prop="rate" label="占比（%）" sortable> </el-table-column>
<el-table-column prop="rate" label="占比（%）" :sort-method="(a,b)=>{return a.rate - b.rate}" sortable> </el-table-column>
</el-table-column>
<el-table-column :label="twoYear">
<el-table-column prop="lastMoney" label="金额（亿元）" sortable="custom" :formatter="formatStatus"> </el-table-column>
<el-table-column prop="lastRate" label="占比（%）" sortable> </el-table-column>
<el-table-column prop="lastRate" label="占比（%）" :sort-method="(a,b)=>{return a.lastRate - b.lastRate}" sortable> </el-table-column>
</el-table-column>
</el-table>
</div>
......
dsk-operate-ui/src/views/macro/enterprises/index.vue
View file @ c5fcb911
......@@ -371,9 +371,13 @@ export default {
}
}
}
::v-deep .el-input.el-input-group:has(:focus){
border-color: #0081FF;
}
::v-deep .el-input.el-input-group{
width: 240px;
height: 30px;
border-radius:2px;
border: 1px solid #e0e0e0;
.el-input__inner{
height: 30px;
......@@ -389,11 +393,8 @@ export default {
margin-left: 6px;
margin-right: 4px;
}
.el-input__inner:focus{
/*border-color: #0081FF;*/
}
.el-input__inner:focus ~.el-input-group__append{
/*border: 1px solid #0081FF;*/
border: 1px solid #0081FF;
color: #ffffff;
background: #0081FF;
}
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/jzqyfx.vue
View file @ c5fcb911
......@@ -8,7 +8,7 @@
<span class="common-title">全国建筑企业概览</span>
</div>
</div>
<div class="text">截止{{currentdate}}，全国共有{{glDetail.major}}资质的企业{{total}}家，其中特级资质企业{{glDetail.tjCount}}家，占比{{glDetail.tjRate}}%；一级资质企业{{glDetail.tjCount}}家，占比{{glDetail.oneRate}}%；二级资质企业{{glDetail.twoCount}}家，占比{{glDetail.twoRate}}%；三级资质企业{{glDetail.threeCount}}家，占比{{glDetail.threeRate}}%</div>
<div class="text">截止{{currentdate}}，全国共有{{glDetail.major}}资质的企业{{total}}家，其中特级资质企业{{glDetail.tjCount}}家，占比{{glDetail.tjRate}}%；一级资质企业{{glDetail.oneCount}}家，占比{{glDetail.oneRate}}%；二级资质企业{{glDetail.twoCount}}家，占比{{glDetail.twoRate}}%；三级资质企业{{glDetail.threeCount}}家，占比{{glDetail.threeRate}}%</div>
<div class="main1">
<div style="height: 300px;">
<div class="left">
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue
View file @ c5fcb911
......@@ -46,7 +46,12 @@
</el-table-column>
<el-table-column label="地区" width="150" align="left" fixed>
<template slot-scope="scope">
<span @click="clickTo(scope.row)" style="cursor: pointer;" class="a-link">{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}</span>
<span @click="clickTo(scope.row,1)" style="cursor: pointer;" class="a-link" v-if="scope.row.province === '北京市' || scope.row.province === '上海市' || scope.row.province === '重庆市' || scope.row.province === '天津市'">
{{ scope.row.province}}{{scope.row.area ? '-': ''}}{{ scope.row.area ? scope.row.city :''}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}
</span>
<span @click="clickTo(scope.row,2)" style="cursor: pointer;" class="a-link" v-else>
{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}
</span>
</template>
</el-table-column>
<el-table-column label="年度明细" prop="id" width="90" align="center" fixed>
......@@ -294,9 +299,13 @@
})
}else {
this.pageIndex = val
this.querySubmit()
this.querySubmit();
this.scrollToTop();
}
},
scrollToTop() {
window.scrollTo(0, 0);
},
formatStatus: function(row, column, cellValue) {
return cellValue? cellValue : '-'
},
......@@ -325,16 +334,15 @@
type: 'warning'
});
},
clickTo(item){
clickTo(item,key){
let params={
// id:item.id,
province:item.area ? item.area : item.city ? item.city : item.province,
}
};
if(item.areaId){
params.provinceId=item.provinceId
params.cityId=item.cityId
params.areaId=item.areaId
}else if(item.cityId !=0){
}else if(item.cityId !=0 && key === 2){
params.provinceId=item.provinceId
params.cityId=item.cityId
}else {
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/zhaobiao.vue
View file @ c5fcb911
......@@ -503,8 +503,8 @@
type: 'category',
boundaryGap: false,
axisLabel: {
show: true,
interval: 0
// show: true,
// interval: 0
},
data: data.map(item => item.label),
},
......@@ -764,10 +764,10 @@
}
.has-gutter{
tr{
th:nth-child(4){
th:nth-last-child(2){
border-right:0;
}
td:nth-child(4){
td:nth-last-child(2){
border-right:0;
}
}
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/zhongbiao.vue
View file @ c5fcb911
......@@ -424,8 +424,8 @@
axisLabel: { //坐标轴刻度标签的相关设置
margin: 10, //刻度标签与轴线之间的距离
color:"#666666",
show: true,
interval: 0
// show: true,
// interval: 0
},
axisTick: false, //坐标轴刻度
axisPointer: {
......@@ -609,8 +609,8 @@
type: 'category',
boundaryGap: false,
axisLabel: {
show: true,
interval: 0
// show: true,
// interval: 0
},
data: data.map(item => item.province),
},
......@@ -915,8 +915,8 @@
type: 'category',
boundaryGap: false,
axisLabel: {
show: true,
interval: 0,
// show: true,
// interval: 0,
},
data: data.map(item => item.month),
},
......
dsk-operate-ui/src/views/macro/urban/index.vue
View file @ c5fcb911
......@@ -907,11 +907,15 @@ export default {
}
}
}
::v-deep .search-input:has(:focus){
border-color: #0081FF;
}
::v-deep .search-input{
/*::v-deep .el-input{*/
width: 235px;
height: 30px;
border: 1px solid #e0e0e0;
border-radius:2px;
.el-input__inner{
height: 30px;
line-height: 30px;
......@@ -929,10 +933,10 @@ export default {
margin-right: 4px;
}
.el-input__inner:focus{
/*border-color: #0081FF;*/
border-color: #0081FF;
}
.el-input__inner:focus ~.el-input-group__append{
/*border: 1px solid #0081FF;*/
border: 1px solid #0081FF;
color: #ffffff;
background: #0081FF;
}
......
dsk-operate-ui/src/views/project/projectList/index.vue
View file @ c5fcb911
......@@ -173,8 +173,7 @@
</div>
</div>
</div>
<div class="tables">
<div class="bottems" v-if="total>searchParam.pageSize">
<div class="pagination-box" v-if="total>searchParam.pageSize">
<el-pagination
background
:page-size="searchParam.pageSize"
......@@ -184,7 +183,6 @@
:total="total">
</el-pagination>
</div>
</div>
</el-card>
<addproject v-if="isshow" @addproject="add" @cancel="addNew"></addproject>
<batchimport v-if="pldr" :importtype="types" @cancels="cancelimport" @getdatas="getdatas"></batchimport>
......
dsk-operate-ui/src/views/radar/components/BidRecord/index.vue
View file @ c5fcb911
......@@ -171,14 +171,14 @@
</li>
</ul>
<div class="pagination clearfix" v-show="total>0">
<div class="pagination clearfix" v-if="total>0&&pageFlag">
<el-pagination
background
:page-size="limit"
:current-page="page"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total">
:total="total>limit*500?501*limit:total">
</el-pagination>
</div>
......@@ -488,8 +488,13 @@ export default {
});
},
handleCurrentChange(page) {
if(page>500){
this.$message.warning(`对不起，最多只能访问500页`);
this.reloadPage()
}else{
this.page = page;
this.search(page, this.limit);
}
},
handleSizeChange(limit) {
this.limit = limit;
......
dsk-operate-ui/src/views/radar/components/Bidding/index.vue
View file @ c5fcb911
......@@ -286,14 +286,14 @@
</li>
</ul>
<div class="pagination clearfix" v-show="total>0">
<div class="pagination clearfix" v-if="total>0&&pageFlag">
<el-pagination
background
:page-size="limit"
:current-page="page"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total">
:total="total>limit*500?501*limit:total">
</el-pagination>
</div>
......@@ -611,8 +611,13 @@ export default {
});
},
handleCurrentChange(page) {
if(page>500){
this.$message.warning(`对不起，最多只能访问500页`);
this.reloadPage()
}else{
this.page = page;
this.search(page, this.limit);
}
},
handleSizeChange(limit) {
this.limit = limit;
......
dsk-operate-ui/src/views/radar/components/Establishment/index.vue
View file @ c5fcb911
......@@ -253,14 +253,14 @@
</li>
</ul>
<div class="pagination clearfix" v-show="total>0">
<div class="pagination clearfix" v-if="total>0&&pageFlag">
<el-pagination
background
:page-size="limit"
:current-page="page"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total">
:total="total>limit*500?501*limit:total">
</el-pagination>
</div>
......@@ -593,8 +593,14 @@
});
},
handleCurrentChange(page) {
if(page>500){
this.$message.warning(`对不起，最多只能访问500页`);
this.reloadPage()
}else{
this.page = page;
this.search(page, this.limit);
this.jump1();
}
},
fieldCommand(command) {
this.field = command;
......
dsk-operate-ui/src/views/radar/components/Land/index.vue
View file @ c5fcb911
......@@ -291,14 +291,14 @@
</div>
</li>
</ul>
<div class="pagination clearfix" v-show="total>0">
<div class="pagination clearfix" v-if="total>0&&pageFlag">
<el-pagination
background
:page-size="pageSize"
:current-page="page"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total">
:total="total>limit*500?501*limit:total">
</el-pagination>
</div>
......@@ -640,8 +640,14 @@
});
},
handleCurrentChange(page) {
if(page>500){
this.$message.warning(`对不起，最多只能访问500页`);
this.reloadPage()
}else{
this.page = page;
this.search(page, this.limit);
this.jump1();
}
},
handleSizeChange(limit) {
this.limit = limit;
......
dsk-operate-ui/src/views/radar/components/MajorProject/index.vue
View file @ c5fcb911
......@@ -222,14 +222,14 @@
</div>
</li>
</ul>
<div class="pagination clearfix" v-show="total>0">
<div class="pagination clearfix" v-if="total>0&&pageFlag">
<el-pagination
background
:page-size="limit"
:current-page="page"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total">
:total="total>limit*500?501*limit:total">
</el-pagination>
</div>
......@@ -494,8 +494,13 @@ export default {
});
},
handleCurrentChange(page) {
if(page>500){
this.$message.warning(`对不起，最多只能访问500页`);
this.reloadPage()
}else{
this.page = page;
this.search(page, this.limit);
}
},
handleSizeChange(limit) {
this.limit = limit;
......
dsk-operate-ui/src/views/radar/components/Tender/index.vue
View file @ c5fcb911
......@@ -270,14 +270,14 @@
</div>
</li>
</ul>
<div class="pagination clearfix" v-show="total>0">
<div class="pagination clearfix" v-if="total>0&&pageFlag">
<el-pagination
background
:page-size="limit"
:current-page="page"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total">
:total="total>limit*500?501*limit:total">
</el-pagination>
</div>
......@@ -839,8 +839,14 @@
});
},
handleCurrentChange(page) {
if(page>500){
this.$message.warning(`对不起，最多只能访问500页`);
this.reloadPage()
}else{
this.page = page;
this.search(page, this.limit);
this.jump1();
}
},
handleSizeChange(limit) {
this.limit = limit;
......
dsk-operate-ui/src/views/radar/components/bxprozbgg/index.vue
View file @ c5fcb911
......@@ -468,14 +468,14 @@
<div class="pagination clearfix" v-show="total>0">
<div class="pagination clearfix" v-if="total>0&&pageFlag">
<el-pagination
background
:page-size="pageSize"
:current-page="page"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total">
:total="total>limit*500?501*limit:total">
</el-pagination>
</div>
......@@ -1522,10 +1522,15 @@
this.selectedHeights = this.selectedHeights ? false : true
},
handleCurrentChange(e){
this.page = e;
handleCurrentChange(page) {
if(page>500){
this.$message.warning(`对不起，最多只能访问500页`);
this.reloadPage()
}else{
this.page = page;
this.search(page, this.limit);
this.jump1();
this.search(e, this.limit);
}
},
handleSizeChange(e){
this.limit = e;
......
dsk-operate-ui/src/views/radar/components/debtProject/index.vue
View file @ c5fcb911
......@@ -165,14 +165,14 @@
</li>
</ul>
<template v-if="pageFlag">
<div class="pagination clearfix" v-show="total>0">
<div class="pagination clearfix" v-if="total>0&&pageFlag">
<el-pagination
background
:page-size="pageSize"
:current-page="page"
@current-change="handleCurrentChange"
layout="prev, pager, next"
:total="total">
:total="total>limit*500?501*limit:total">
</el-pagination>
</div>
</template>
......@@ -446,8 +446,14 @@
});
},
handleCurrentChange(page) {
if(page>500){
this.$message.warning(`对不起，最多只能访问500页`);
this.reloadPage()
}else{
this.page = page;
this.search(page, this.limit);
this.jump1();
}
},
search(page, limit,exportFlag) {
if (!page) {
......
dsk-system/src/main/java/com/dsk/system/service/ISysMenuService.java
View file @ c5fcb911
......@@ -13,6 +13,13 @@ import java.util.Set;
* @author Lion Li
*/
public interface ISysMenuService {
/**
* 根据用户查询全部系统菜单列表
*
* @param userId 用户ID
* @return 菜单列表
*/
List<SysMenu> selectAllMenu(SysMenu menu, Long userId);
/**
* 根据用户查询系统菜单列表
......
dsk-system/src/main/java/com/dsk/system/service/impl/SysMenuServiceImpl.java
View file @ c5fcb911
......@@ -40,6 +40,25 @@ public class SysMenuServiceImpl implements ISysMenuService {
private final SysTenantMapper tenantMapper;
private final SysTenantPackageMapper tenantPackageMapper;
/**
* 根据用户查询全部系统菜单列表
*
* @param userId 用户ID
* @return 菜单列表
*/
@Override
public List<SysMenu> selectAllMenu(SysMenu menu, Long userId) {
List<SysMenu> menuList = null;
// 管理员显示所有菜单信息
if (LoginHelper.isSuperAdmin(userId)) {
menuList = baseMapper.selectList(new LambdaQueryWrapper<SysMenu>()
.like(StringUtils.isNotBlank(menu.getMenuName()), SysMenu::getMenuName, menu.getMenuName())
.orderByAsc(SysMenu::getParentId)
.orderByAsc(SysMenu::getOrderNum));
}
return menuList;
}
/**
* 根据用户查询系统菜单列表
*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment