Skip to content

D
dsk-cr20g
Commit 10f24e41 authored by danfuman's avatar danfuman
Browse files
Options

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

parents 6335038a 70ea19d3
Hide whitespace changes
Inline Side-by-side
Showing with 113 additions and 179 deletions
dsk-operate-ui/src/assets/styles/index.scss
View file @ 10f24e41
......@@ -806,3 +806,7 @@ ul, li {
}
}
.min1370{
min-width: 1370px;
}
dsk-operate-ui/src/assets/styles/public.scss
View file @ 10f24e41
......@@ -441,14 +441,15 @@ select {
.toolbar-right-download {
padding: 6px 18px;
padding: 6px 16px;
position: relative;
top: 1px;
margin: 0px;
cursor: pointer;
font-weight: 400;
color: #232323;
background: #FFFFFF;
border-radius: 2px;
border: 1px solid #D9D9D9;
text-align: center;
font-size: 14px;
font-weight: 400;
......
dsk-operate-ui/src/layout/index.vue
View file @ 10f24e41
......@@ -2,7 +2,7 @@
<div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
<div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
<sidebar v-if="!sidebar.hide" class="sidebar-container" @handleBar="handleSideBar" id="sidebar"/>
<div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide,EnterpriseData:$route.name=='Group',width1350:$route.name=='Radar',width1240:$route.name=='Overview'}" class="main-container">
<div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide,width1350:$route.name=='Radar'||$route.name=='Group',width1240:$route.name=='Overview'}" class="main-container">
<div :class="{'fixed-header':fixedHeader}" style="position: relative;z-index: 1000;">
<navbar :offsetWidth="offsetWidth"/>
</div>
......@@ -133,9 +133,6 @@ export default {
.mobile .fixed-header {
width: 100%;
}
.EnterpriseData{
min-width: 1710px;
}
.width1350{
min-width: 1350px;
}
......
dsk-operate-ui/src/views/custom/customList/index.vue
View file @ 10f24e41
......@@ -5,7 +5,7 @@
<span> / 客户列表</span>
</div>
<div class="app-container">
<el-card class="box-card noborder">
<el-card class="box-card noborder min1370">
<div class="tables ">
<div class="empty" v-if="tableData.total==0 && !isSkeleton">
<img src="@/assets/images/project/empty.png">
......
dsk-operate-ui/src/views/detail/party-a/component/Header.vue
View file @ 10f24e41
......@@ -9,7 +9,7 @@
<el-breadcrumb-item>{{companyInfo.simpleName || companyInfo.companyName || '&#45;&#45;'}}</el-breadcrumb-item>
</el-breadcrumb>
</div>-->
<div class="flex-box part-header">
<div class="flex-box part-header" style="min-width:1248px;">
<img class="header-logo" :src="companyInfo && companyInfo.logoUrl || require('@/assets/images/detail/company_logo.png')">
{{companyInfo && companyInfo.companyName || '--'}}
</div>
......
dsk-operate-ui/src/views/enterpriseData/components/Group/index.vue
View file @ 10f24e41
......@@ -23,7 +23,7 @@
<div>
<span style="font-size: 14px;color: #0384FA;" v-html="item.combineName" ></span>
<div style="height:22px;line-height: 22px;"><span class="infinite-label">集团成员：</span>{{ item.combineMemberNum }}</div>
<div ><span class="infinite-label">集团本身：</span>{{ item.combineMemberName }}</div>
<div ><span class="infinite-label">集团本身：</span><el-tooltip class="item" effect="dark" :content="item.combineMemberName" placement="bottom-start"><span>{{ item.combineMemberName }}</span></el-tooltip></div>
</div>
</div>
</div>
......@@ -45,7 +45,7 @@
<div style="float: left;">
<span class="name" v-html="item.combineName" ></span>
<div style="height:28px;line-height: 28px;"><span class="infinite-label">集团成员：</span>{{ item.combineMemberNum }}</div>
<div class="name1"><span class="infinite-label">集团本身：</span>{{ item.combineMemberName }}</div>
<div class="name1"><span class="infinite-label">集团本身：</span><el-tooltip class="item" effect="dark" :content="item.combineMemberName" placement="bottom-start"><span>{{ item.combineMemberName }}</span></el-tooltip></div>
</div>
</div>
</div>
......@@ -57,7 +57,7 @@
<div style="float: left;">
<span class="name" v-html="item.combineName" ></span>
<div style="height:28px;line-height: 28px;"><span class="infinite-label">集团成员：</span>{{ item.combineMemberNum }}</div>
<div class="name1"><span class="infinite-label">集团本身：</span>{{ item.combineMemberName }}</div>
<div class="name1"><span class="infinite-label">集团本身：</span><el-tooltip class="item" effect="dark" :content="item.combineMemberName" placement="bottom-start"><span>{{ item.combineMemberName }}</span></el-tooltip></div>
</div>
</div>
</div>
......@@ -101,7 +101,7 @@
<div style="float: left;">
<span class="name" v-html="item.combineName" ></span>
<div style="height:28px;line-height: 28px;"><span class="infinite-label">集团成员：</span>{{ item.combineMemberNum }}</div>
<div class="name1"><span class="infinite-label">集团本身：</span>{{ item.combineMemberName }}</div>
<div class="name1"><span class="infinite-label">集团本身：</span><el-tooltip class="item" effect="dark" :content="item.combineMemberName" placement="bottom-start"><span>{{ item.combineMemberName }}</span></el-tooltip></div>
</div>
</div>
</template>
......@@ -395,7 +395,7 @@ export default {
border-radius: 4px 4px 4px 4px;
background: #FFFFFF;
font-size: 14px;
min-width: 1580px;
min-width: 1280px;
.content_item{
.content_right{
......@@ -506,11 +506,11 @@ export default {
}
.contetn_wrap{
position: relative;
min-width: 1668px;
min-width: 1280px;
.wrap{
margin-top: 12px;
min-width: 1628px;
min-width: 1228px;
overflow: auto;
background: #FFFFFF;
border-radius: 4px 4px 4px 4px;
......@@ -532,7 +532,7 @@ export default {
.infinite-list-item{
margin-right: 16px;
margin-top: 16px;
width: 383px;
width: 283px;
height: 90px;
background: #FFFFFF;
border-radius: 0px 0px 0px 0px;
......@@ -555,7 +555,7 @@ export default {
float: left;
}
.name{
width: 283px;
width: 178px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
......@@ -566,7 +566,7 @@ export default {
display: inline-block;
}
.name1{
width: 283px;
width: 178px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
......
dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue
View file @ 10f24e41
......@@ -113,7 +113,7 @@
<div class="bottomlist-title">
<div class="bottomlist-title-left" >
<p class="title-left">
查询结果列表
<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
</p>
<el-popover v-model="fieldshow" placement="bottom-start" trigger="click"
popper-class="viewlist-el-popover">
......@@ -132,7 +132,6 @@
<div class="title-right">
<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......@@ -1159,12 +1158,6 @@
.title-right{
display: flex;
align-items: center;
p:first-child{
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
margin-right: 10px;
}
p:last-child{
display: flex;
align-items: center;
......@@ -1186,15 +1179,12 @@
display: inline-flex;;
align-items: center;
.title-left{
border-left:2px solid #445781;
padding-left:8px;
padding-right:32px;
font-size: 16px;
height:16px;
line-height: 16px;
font-weight: bold;
color: #232323;
}
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
}
}
.bottomlist-content{
......
dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue
View file @ 10f24e41
......@@ -432,6 +432,9 @@
<div class="bottomlist">
<div class="bottomlist-title">
<div class="bottomlist-title-left">
<p class="title-left">
<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
</p>
<el-popover v-model="fieldshow" placement="bottom-start" trigger="click"
popper-class="viewlist-el-popover">
<ul class="pup_list">
......@@ -452,7 +455,6 @@
</div>
</div>
<div class="title-right">
<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......@@ -2989,16 +2991,16 @@
margin-top: 12px;
padding: 16px 0px ;
border-bottom: 1px solid #EFEFEF;
.title-left{
height:16px;
line-height: 16px;
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
}
.title-right{
display: flex;
align-items: center;
p:first-child{
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
margin-right: 10px;
}
p:last-child{
display: flex;
align-items: center;
......
dsk-operate-ui/src/views/radar/components/BidRecord/index.vue
View file @ 10f24e41
......@@ -121,11 +121,10 @@
<div class="bottomlist-title">
<div class="bottomlist-title-left" >
<p class="title-left">
查询结果
<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
</p>
</div>
<div class="title-right">
<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......@@ -964,12 +963,7 @@ export default {
.title-right{
display: flex;
align-items: center;
p:first-child{
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
margin-right: 10px;
}
p:last-child{
display: flex;
align-items: center;
......@@ -989,15 +983,12 @@ export default {
display: inline-flex;;
align-items: center;
.title-left{
border-left:2px solid #445781;
padding-left:8px;
padding-right:32px;
font-size: 16px;
height:16px;
line-height: 16px;
font-weight: bold;
color: #232323;
}
height:16px;
line-height: 16px;
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
}
}
}
.bottomlist-content{
......
dsk-operate-ui/src/views/radar/components/Bidding/index.vue
View file @ 10f24e41
......@@ -206,11 +206,10 @@
<div class="bottomlist-title">
<div class="bottomlist-title-left" >
<p class="title-left">
查询结果
<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
</p>
</div>
<div class="title-right">
<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......@@ -1163,25 +1162,16 @@ export default {
display: inline-flex;;
align-items: center;
.title-left{
border-left:2px solid #445781;
padding-left:8px;
padding-right:32px;
font-size: 16px;
height:16px;
line-height: 16px;
font-weight: bold;
color: #232323;
}
height:16px;
line-height: 16px;
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
}
}
.title-right{
display: flex;
align-items: center;
p:first-child{
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
margin-right: 10px;
}
p:last-child{
display: flex;
align-items: center;
......
dsk-operate-ui/src/views/radar/components/Establishment/index.vue
View file @ 10f24e41
......@@ -177,11 +177,10 @@
<div class="bottomlist-title">
<div class="bottomlist-title-left" >
<p class="title-left">
查询结果
<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
</p>
</div>
<div class="title-right">
<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......@@ -1256,12 +1255,7 @@
.title-right{
display: flex;
align-items: center;
p:first-child{
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
margin-right: 10px;
}
p:last-child{
display: flex;
align-items: center;
......@@ -1281,15 +1275,12 @@
display: inline-flex;;
align-items: center;
.title-left{
border-left:2px solid #445781;
padding-left:8px;
padding-right:32px;
font-size: 16px;
height:16px;
line-height: 16px;
font-weight: bold;
color: #232323;
}
height:16px;
line-height: 16px;
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
}
}
}
.bottomlist-content{
......
dsk-operate-ui/src/views/radar/components/Land/index.vue
View file @ 10f24e41
......@@ -204,7 +204,7 @@
<div class="bottomlist-title">
<div class="bottomlist-title-left" >
<p class="title-left">
查询结果
<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
</p>
<el-popover v-model="fieldshow" placement="bottom-start" trigger="click"
popper-class="viewlist-el-popover">
......@@ -221,8 +221,7 @@
</el-popover>
</div>
<div class="title-right">
<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
<p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
</p>
......@@ -1053,25 +1052,17 @@
display: inline-flex;;
align-items: center;
.title-left{
border-left:2px solid #445781;
padding-left:8px;
padding-right:32px;
font-size: 16px;
height:16px;
line-height: 16px;
font-weight: bold;
color: #232323;
}
height:16px;
line-height: 16px;
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
}
}
.title-right{
display: flex;
align-items: center;
p:first-child{
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
margin-right: 10px;
}
p:last-child{
display: flex;
align-items: center;
......
dsk-operate-ui/src/views/radar/components/MajorProject/index.vue
View file @ 10f24e41
......@@ -123,8 +123,8 @@
<div class="bottomlist-title">
<div class="bottomlist-title-left" >
<p class="title-left">
查询结果
</p>
<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
</p>
<el-popover v-model="fieldshow" placement="bottom-start" trigger="click" popper-class="viewlist-el-popover">
<ul class="pup_list pup_zhclist">
<li v-for="(itme,i) in fieldOptions" :class="itme.status?'active':''"
......@@ -137,7 +137,6 @@
</el-popover>
</div>
<div class="title-right">
<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
<p v-hasPermi="['radar:export:important']" >
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="clickDialog">导出EXCEL</span>
......@@ -918,12 +917,7 @@ export default {
.title-right{
display: flex;
align-items: center;
p:first-child{
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
margin-right: 10px;
}
p:last-child{
display: flex;
align-items: center;
......@@ -943,15 +937,12 @@ export default {
display: inline-flex;;
align-items: center;
.title-left{
border-left:2px solid #445781;
padding-left:8px;
padding-right:32px;
font-size: 16px;
height:16px;
line-height: 16px;
font-weight: bold;
color: #232323;
}
height:16px;
line-height: 16px;
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
}
}
}
.bottomlist-content{
......
dsk-operate-ui/src/views/radar/components/Tender/index.vue
View file @ 10f24e41
......@@ -179,11 +179,10 @@
<div class="bottomlist-title">
<div class="bottomlist-title-left" >
<p class="title-left">
查询结果
<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
</p>
</div>
<div class="title-right">
<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......@@ -1257,25 +1256,17 @@
display: inline-flex;;
align-items: center;
.title-left{
border-left:2px solid #445781;
padding-left:8px;
padding-right:32px;
font-size: 16px;
height:16px;
line-height: 16px;
font-weight: bold;
color: #232323;
}
height:16px;
line-height: 16px;
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
}
}
.title-right{
display: flex;
align-items: center;
p:first-child{
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
margin-right: 10px;
}
p:last-child{
display: flex;
align-items: center;
......
dsk-operate-ui/src/views/radar/components/bxprozbgg/index.vue
View file @ 10f24e41
......@@ -333,11 +333,10 @@
<div class="bottomlist-title">
<div class="bottomlist-title-left" >
<p class="title-left">
查询结果
<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
</p>
</div>
<div class="title-right">
<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......@@ -2009,25 +2008,17 @@
display: inline-flex;;
align-items: center;
.title-left{
border-left:2px solid #445781;
padding-left:8px;
padding-right:32px;
font-size: 16px;
height:16px;
line-height: 16px;
font-weight: bold;
color: #232323;
}
height:16px;
line-height: 16px;
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
}
}
.title-right{
display: flex;
align-items: center;
p:first-child{
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
margin-right: 10px;
}
p:last-child{
display: flex;
align-items: center;
......
dsk-operate-ui/src/views/radar/components/debtProject/index.vue
View file @ 10f24e41
......@@ -93,11 +93,10 @@
<div class="bottomlist-title">
<div class="bottomlist-title-left" >
<p class="title-left">
查询结果
<span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条
</p>
</div>
<div class="title-right">
<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......@@ -697,25 +696,17 @@
display: inline-flex;;
align-items: center;
.title-left{
border-left:2px solid #445781;
padding-left:8px;
padding-right:32px;
font-size: 16px;
height:16px;
line-height: 16px;
font-weight: bold;
color: #232323;
}
height:16px;
line-height: 16px;
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
}
}
.title-right{
display: flex;
align-items: center;
p:first-child{
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
margin-right: 10px;
}
p:last-child{
display: flex;
align-items: center;
......
dsk-operate-ui/src/views/system/user/index.vue
View file @ 10f24e41
......@@ -767,3 +767,16 @@ export default {
}
};
</script>
<style lang="scss" scoped>
.head-container{
::v-deep .el-tree-node__content{
white-space: normal !important;
height: auto;
padding: 2px 0;
.el-tree-node__expand-icon{
padding: 2px 6px;
align-self: flex-start;
}
}
}
</style>
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