Skip to content

D
dsk-cr20g
Commit f0035f76 authored by liuChang's avatar liuChang
Browse files
Options

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

parents 2bed64b5 c8dc1c63
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1398 additions and 1129 deletions
dsk-operate-ui/src/assets/styles/index.scss
View file @ f0035f76
......@@ -345,7 +345,10 @@ ul, li {
}
}
.is-scrolling-left+.el-table__fixed,.is-scrolling-middle+.el-table__fixed,.is-scrolling-right+.el-table__fixed{
box-shadow:none;
//box-shadow:none;
//-webkit-box-shadow: 2px 0px 1px -2px #C3CBD5;
box-shadow: 2px 0 8px -7px #202020;
border-right: 1px solid #C3CBD5;
height: auto !important;
bottom: 16px !important;
}
......@@ -721,6 +724,29 @@ ul, li {
}
}
}
//无边框搜索框
.newSearch{
width: 238px;
height: 32px;
border-radius: 4px;
.el_input{
height: 32px !important;
}
.el-input__prefix{
left: 12px;
.el-input__icon{
img{
float: left;
margin-top: 7px;
}
}
}
.el-input__inner{
padding-left: 36px;
border-color: #fff !important;
height: 32px !important;
}
}
//导出EXCEL
.btn-export{
display: inline-block;
......@@ -766,3 +792,21 @@ ul, li {
box-shadow: 4px 0 9px -5px rgba(0, 0, 0, 0.12);
-webkit-box-shadow: 4px 0 9px -5px rgba(0, 0, 0, 0.12);
}
//下拉选项样式
.el-select-dropdown {
box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.08);
border: 0;
.el-select-dropdown__list {
padding: 0;
.el-select-dropdown__item {
padding: 0 16px;
}
}
}
.min1370{
min-width: 1370px;
}
dsk-operate-ui/src/assets/styles/project.scss
View file @ f0035f76
......@@ -836,19 +836,27 @@
}
//资料文档、相关企业
.searchbtns{
display: flex;
position: absolute;
right: 16px;
left: 100px;
top: 17px;
width: calc(100% - 116px);
.searchInput, .el-select {
float: left;
}
.btn{
float: right;
}
.searchInput{
position: relative;
&.small{
border: 1px solid #d9d9d9;
border: 1px solid #fff;
width: 240px;
.el-input{
width: 180px;
//width: 180px;
}
.el-input__inner{
padding-right: 32px;
//padding-right: 32px;
}
.el-input__prefix{
left: 8px;
......@@ -868,19 +876,25 @@
border-radius: 2px;
}
.select{
width: 110px;
width: 94px;
.el-input__inner{
width: 110px;
//width: 110px;
height: 32px;
background: #FFFFFF;
border-radius: 2px;
border: 1px solid #D9D9D9;
border-radius: 4px;
border: 0;
padding:5px 28px 5px 8px;
}
.el-input--medium .el-input__icon{
line-height: 32px;
}
margin-right: 10px;
.is-focus{
.el-input__inner{
background: #F4F6F9;
}
}
}
}
.document{
......@@ -1273,3 +1287,6 @@
}
}
}
.top12{
margin-top: 12px;
}
dsk-operate-ui/src/assets/styles/public.scss
View file @ f0035f76
......@@ -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 @ f0035f76
......@@ -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/component/CustomMoneySelect.vue
View file @ f0035f76
......@@ -242,7 +242,11 @@ export default {
width: 120px;
height: 34px;
position: relative;
.rote {
.el-input__inner{
background: #F4F6F9;
}
}
.input-block {
margin: 0;
width: 100%;
......@@ -256,6 +260,9 @@ export default {
>.custom-money-input.el-input {
width: 100%;
height: 100%;
.el-input__inner{
border: 0;
}
>input {
width: 100%;
height: 100%;
......@@ -290,10 +297,9 @@ export default {
font-size: 14px;
color: #666666;
background-color: #fff;
border: 1px solid #E4E7ED;
padding: 6px 0;
border-radius: 4px;
z-index: 10;
box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.08);
// .arrow {
......
dsk-operate-ui/src/views/component/CustomTimeSelect.vue
View file @ f0035f76
......@@ -248,6 +248,11 @@ export default {
width: 120px;
height: 34px;
.rote {
.el-input__inner{
background: #F4F6F9;
}
}
.input-block {
width: 100%;
height: 100%;
......@@ -261,6 +266,9 @@ export default {
>.custom-time-input.el-input {
width: 100%;
height: 100%;
.el-input__inner{
border: 0;
}
>input {
width: 100%;
height: 100%;
......@@ -295,10 +303,9 @@ export default {
font-size: 14px;
color: #666666;
background-color: #fff;
border: 1px solid #E4E7ED;
padding: 6px 0;
border-radius: 4px;
z-index: 10;
box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.08);
.option {
padding: 0 24px 0 16px;
......
dsk-operate-ui/src/views/custom/customList/index.vue
View file @ f0035f76
......@@ -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">
......@@ -18,10 +18,11 @@
<div>
<el-form ref="queryForm" :model="searchParam" :inline="true" size="small">
<el-form-item prop="companyName">
<div class="searchInput">
<el-input type="text" clearable v-model="searchParam.companyName" @change="clearname" placeholder="输入企业名称查询"></el-input>
<div class="btn" @click="handleCurrentChange(1)">搜索</div>
</div>
<div class="newSearch">
<el-input type="text" v-model="searchParam.companyName" clearable placeholder="输入企业名称查询" @change="clearname" >
<i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/sousuo.png" width="16px" @click="handleCurrentChange(1)"></i>
</el-input>
</div>
</el-form-item>
<el-form-item>
<el-cascader
......@@ -839,8 +840,5 @@
}
.searchInput{
width: 240px;
.el-input{
/*width: 260px;*/
}
}
</style>
dsk-operate-ui/src/views/custom/historicalCustomers/index.vue
View file @ f0035f76
......@@ -9,9 +9,10 @@
<div class="p2">建议调整关键词或筛选条件，重新搜索</div>
</div>
<div class="table_search">
<div class="searchInput">
<el-input type="text" clearable v-model="searchParam.companyName" @change="clearname" placeholder="输入企业名称查询"></el-input>
<div class="btn" @click="handleCurrentChange(1)">搜索</div>
<div class="newSearch">
<el-input type="text" v-model="searchParam.companyName" clearable placeholder="输入企业名称查询" @change="clearname" >
<i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/sousuo.png" width="16px" @click="handleCurrentChange(1)"></i>
</el-input>
</div>
<div class="dc">
<div class="total">共{{tableData.total}}条</div>
......
dsk-operate-ui/src/views/custom/overview/index.vue
View file @ f0035f76
......@@ -601,7 +601,7 @@
padding: 16px;
background: #ffffff;
height: 152px;
margin-bottom: 22px;
margin-bottom: 12px;
.item{
display: flex;
.icons{
......@@ -680,6 +680,9 @@
.el-input-group__append{
background: #F5F5F5;
color: #0081FF;
padding: 0;
width: 70px;
text-align: center;
}
.el-input__inner:focus{
border-color: #3181fa;
......
dsk-operate-ui/src/views/detail/groupAccount/component/members.vue
View file @ f0035f76
......@@ -395,9 +395,6 @@
provinceIds.length>0?params.provinceIds = provinceIds:''
cityIds.length>0?params.cityIds = cityIds:''
districtIds.length>0?params.districtIds = districtIds:''
// provinceIds.length>0?this.queryParams.provinceIds = provinceIds:''
// cityIds.length>0?this.queryParams.cityIds = cityIds:''
// districtIds.length>0?this.queryParams.districtIds = districtIds:''
}
return params
},
......@@ -450,8 +447,8 @@
.search-box {
display: inline-block;
border-radius: 4px;
border: 1px solid #D9D9D9;
width: 82px;
/*border: 1px solid #D9D9D9;*/
width: 70px;
/*cursor: pointer;*/
position: relative;
.search-box-t {
......@@ -461,7 +458,7 @@
color: #999999;
margin-right: 8px;
text-align: center;
width: 82px;
width: 70px;
display: inline-block;
cursor: pointer;
i {
......@@ -479,7 +476,7 @@
background: #ffffff;
box-shadow: 0px 4px 10px 0px rgba(0,0,0,0.1);
border-radius: 4px;
width: 640px;
width: 500px;
//height: 337px;
padding: 16px;
position: absolute;
......@@ -501,7 +498,7 @@
}
.item_ckquery{
position: relative;
width: 520px;
width: 400px;
/*float: left;*/
/*flex: 1;*/
span{
......
dsk-operate-ui/src/views/detail/groupAccount/component/performance.vue
View file @ f0035f76
......@@ -139,7 +139,8 @@
{ type: 4, fieldName: 'boundTypes', value: '', placeholder: '业绩类型', options: [],width:150},
{ type: 4, fieldName: 'projectTypes', value: '', placeholder: '项目类型', options: [],width:150},
{ type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: [],width:100},
{ type: 3, fieldName: 'searchValue', value: '', placeholder: '搜索中标成员名称/项目名称'},
// { type: 3, fieldName: 'searchValue', value: '', placeholder: '搜索中标成员名称/项目名称'},
{ type: 3, fieldName: 'searchValue', value: '', placeholder: '查询'},
],
tableData:[],
tableDataTotal:0,
......
dsk-operate-ui/src/views/detail/groupAccount/component/zbxmfx.vue 0 → 100644
View file @ f0035f76
<template>
<div class="performance">
<div class="content">
<head-form
title="集团施工项目最新招标"
:form-data="formData"
:query-params="queryParams"
:slots="true"
:isExcel="false"
></head-form>
</div>
<div class="content">
<head-form
title="集团年度发包统计"
:slots="true"
:isExcel="false"
></head-form>
</div>
<div class="content">
<head-form
title="集团施工项目发包金额区间"
:slots="true"
:isExcel="false"
></head-form>
</div>
<div class="content">
<head-form
title="集团施工项目发包类型统计"
:slots="true"
:isExcel="false"
></head-form>
</div>
<div class="content">
<head-form
title="施工项目下浮率统计"
:slots="true"
:isExcel="false"
></head-form>
</div>
<div class="content">
<head-form
title="历史发包项目金额TOP10"
:form-data="formData"
:query-params="queryParams1"
:slots="true"
:isExcel="false"
></head-form>
</div>
</div>
</template>
<script>
import mixin from '../../party-a/mixins/mixin'
import { getDictType } from '@/api/main'
export default {
name: 'qualifications',
props: ['customerId','combineName'],
mixins: [mixin],
components:{},
data(){
return{
queryParams: {},
queryParams1: {},
forData: [
{label: '项目类型', prop: 'projectType',minWidth: '80',slot: true},
{label: '持股比例', prop: 'stockPercent',slot: true,minWidth: '80'},
],
formData: [
{ type: 4, fieldName: 'projectTypes', value: '', placeholder: '项目类型', options: [],width:150},
{ type: 1, fieldName: 'cgbl', value: '', placeholder: '持股比例', options: [],width:110},
],
cgblList: [
{name:'100%',value:'100%'},
{name:'50%以上',value:'50%以上'},
{name:'20%以上',value:'20%以上'},
{name:'5%以上',value:'5%以上'},
{name:'1%-5%',value:'1%-5%'},
],
}
},
created() {
this.formData[1].options=this.cgblList;
//项目类型
getDictType('project_type_new').then(result=>{
let data = result.code == 200 ? result.data:[];
if(data.length > 0){
for (var i=0;i<data.length;i++){
this.formData[0].options.push({
name: data[i].dictLabel,
value: data[i].dictValue,
})
}
}
})
},
methods: {
}
}
</script>
<style lang="scss" scoped>
.performance{
height: calc(100% - 64px);
.content{
background: #ffffff;
border-radius: 4px;
padding: 16px;
margin-bottom: 16px;
}
}
</style>
dsk-operate-ui/src/views/detail/groupAccount/index.vue
View file @ f0035f76
......@@ -115,6 +115,9 @@
top:0;
z-index: 9;
}
#groupBox{
height: 100%;
}
}
.part-header{
font-size: 16px;
......
dsk-operate-ui/src/views/detail/party-a/component/CustomMoneySelect.vue
View file @ f0035f76
......@@ -229,7 +229,15 @@ export default {
width: 120px;
height: 34px;
position: relative;
.el-input__inner{
width: 100px !important;
}
.rote {
background: #F4F6F9;
.el-input__inner{
background: #F4F6F9;
}
}
.input-block {
margin: 0;
width: 100%;
......@@ -243,6 +251,9 @@ export default {
>.custom-money-input.el-input {
width: 100%;
height: 100%;
.el-input__inner{
border: 0;
}
>input {
width: 100%;
height: 100%;
......@@ -277,10 +288,10 @@ export default {
font-size: 14px;
color: #666666;
background-color: #fff;
border: 1px solid #E4E7ED;
padding: 6px 0;
/*padding: 6px 0;*/
border-radius: 4px;
z-index: 10;
box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.08);
// .arrow {
......
dsk-operate-ui/src/views/detail/party-a/component/CustomTimeSelect.vue
View file @ f0035f76
......@@ -241,6 +241,11 @@ export default {
width: 120px;
height: 34px;
.rote {
.el-input__inner{
background: #F4F6F9;
}
}
.input-block {
width: 100%;
height: 100%;
......@@ -254,13 +259,16 @@ export default {
>.custom-time-input.el-input {
width: 100%;
height: 100%;
.el-input__inner{
border: 0;
}
>input {
width: 100%;
height: 100%;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
border-radius: 2px;
border-radius: 4px;
}
}
}
......@@ -283,15 +291,15 @@ export default {
.options-block {
position: absolute;
margin-top: 12px;
margin-top: 6px;
min-width: 120px;
font-size: 14px;
color: #666666;
background-color: #fff;
border: 1px solid #E4E7ED;
padding: 6px 0;
border-radius: 4px;
z-index: 10;
overflow: hidden;
box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.08);
.option {
padding: 0 24px 0 16px;
......
dsk-operate-ui/src/views/detail/party-a/component/Header.vue
View file @ f0035f76
......@@ -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/detail/party-a/cooperate/index.vue
View file @ f0035f76
......@@ -158,9 +158,9 @@ export default {
{label: '项目状态', prop: 'status', width: '90', slot: true}
],
formData: [
{ type: 1, fieldName: 'projectStage', value: '', placeholder: '项目阶段', options: []},
{ type: 1, fieldName: 'status', value: '', placeholder: '项目状态', options: []},
{ type: 3, fieldName: 'projectName', width:'200', value: '', placeholder: '输入项目名称关键字搜索'},
{ type: 1, fieldName: 'projectStage',width:'94', value: '', placeholder: '项目阶段', options: []},
{ type: 1, fieldName: 'status', width:'94',value: '', placeholder: '项目状态', options: []},
{ type: 3, fieldName: 'projectName', width:'240', value: '', placeholder: '输入项目名称关键字搜索'},
],
stageOptions:[],
statusOptions:[],
......
dsk-operate-ui/src/views/detail/party-a/opport/announcement.vue
View file @ f0035f76
......@@ -56,11 +56,11 @@ export default {
},
defaultSort: {prop: 'issueTime', order: 'descending'},
forData: [
{label: '项目名称', prop: 'projectName', minWidth: '300', slot: true},
{label: '项目名称', prop: 'projectName', minWidth: '300', slot: true, fixed: true},
{label: '发布日期', prop: 'issueTime', sortable: 'custom', descending: '3', ascending: '4', width: '120'},
{label: '预算金额（万元）', prop: 'projectAmount', sortable: 'custom', descending: '1', ascending: '2', width: '140'},
{label: '项目地区', prop: 'province', width: '120', slot: true},
{label: '项目类别', prop: 'tenderStage', width: '90'},
{label: '招标阶段', prop: 'tenderStage', width: '90'},
{label: '招采单位联系人', prop: 'contact', width: '120'},
{label: '招采单位联系方式', prop: 'contactTel', width: '130'},
{label: '代理单位', prop: 'agency', minWidth: '170'},
......
dsk-operate-ui/src/views/enterpriseData/components/Group/index.vue
View file @ f0035f76
......@@ -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 @ f0035f76
......@@ -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 @ f0035f76
......@@ -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/index.vue
View file @ f0035f76
......@@ -71,8 +71,16 @@
<router-link :to="`/groupAccount/${scope.row.combineId}?name=${scope.row.combineName}`" tag="a" class="a-link">{{scope.row.combineName}}</router-link>
</template>
</el-table-column>
<el-table-column prop="count" label="中标数量（个）" align="right" sortable width="150"/>
<el-table-column prop="money" label="中标金额（万元)" align="right" :sort-method="(a,b)=>{return a.money - b.money}" sortable/>
<el-table-column prop="count" label="中标数量" align="right" sortable width="150">
<template slot-scope="scope">
{{scope.row.count}}个
</template>
</el-table-column>
<el-table-column prop="money" label="中标金额" align="right" :sort-method="(a,b)=>{return a.money - b.money}" sortable>
<template slot-scope="scope">
{{scope.row.money}}万元
</template>
</el-table-column>
</el-table>
</div>
</el-col>
......@@ -140,8 +148,16 @@
<span style="cursor: pointer;" class="a-link companyName" @click="getUipIdByCid(scope.row.companyId)">{{scope.row.companyName}}</span>
</template>
</el-table-column>
<el-table-column prop="count" label="中标数量（个）" align="right" sortable width="150"/>
<el-table-column prop="money" label="中标金额（万元)" align="right" :sort-method="(a,b)=>{return a.money - b.money}" sortable/>
<el-table-column prop="count" label="中标数量" align="right" sortable width="150">
<template slot-scope="scope">
{{scope.row.count}}个
</template>
</el-table-column>
<el-table-column prop="money" label="中标金额" align="right" :sort-method="(a,b)=>{return a.money - b.money}" sortable>
<template slot-scope="scope">
{{scope.row.money}}万元
</template>
</el-table-column>
</el-table>
</div>
</el-col>
......@@ -1578,7 +1594,13 @@ export default {
.el-input__inner{
height: 32px;
line-height: 32px;
border-radius: 4px
border-radius: 4px;
border: 0;
}
}
.is-focus{
.el-input__inner{
background: #F4F6F9;
}
}
......
dsk-operate-ui/src/views/macro/component/CustomTimeSelect.vue
View file @ f0035f76
......@@ -256,6 +256,11 @@ export default {
width: 120px;
height: 34px;
.rote {
.el-input__inner{
background: #F4F6F9;
}
}
.input-block {
width: 100%;
height: 100%;
......@@ -269,6 +274,9 @@ export default {
>.custom-time-input.el-input {
width: 100%;
height: 100%;
.el-input__inner{
border: 0;
}
>input {
width: 100%;
height: 100%;
......@@ -303,10 +311,9 @@ export default {
font-size: 14px;
color: #666666;
background-color: #fff;
border: 1px solid #E4E7ED;
padding: 6px 0;
border-radius: 4px;
z-index: 10;
box-shadow: 0px 0px 4px 0px rgba(0, 0, 0, 0.08);
.option {
padding: 0 24px 0 16px;
......
dsk-operate-ui/src/views/macro/economies/component/industrialStructure.vue
View file @ f0035f76
......@@ -32,17 +32,17 @@
show-summary
@sort-change="sortChange"
>
<el-table-column label="序号" width="60" align="left">
<el-table-column label="序号" width="55" align="left">
<template slot-scope="scope">{{ scope.$index + 2 }}</template>
</el-table-column>
<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="占比（%）" :sort-method="(a,b)=>{return a.rate - b.rate}" sortable> </el-table-column>
<el-table-column prop="money" label="金额（亿元）" sortable="custom" :formatter="formatStatus" min-width="115"></el-table-column>
<el-table-column prop="rate" label="占比（%）" :sort-method="(a,b)=>{return a.rate - b.rate}" sortable min-width="100"> </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="占比（%）" :sort-method="(a,b)=>{return a.lastRate - b.lastRate}" sortable> </el-table-column>
<el-table-column prop="lastMoney" label="金额（亿元）" sortable="custom" :formatter="formatStatus" min-width="115"> </el-table-column>
<el-table-column prop="lastRate" label="占比（%）" :sort-method="(a,b)=>{return a.lastRate - b.lastRate}" sortable min-width="100"> </el-table-column>
</el-table-column>
</el-table>
</div>
......@@ -393,7 +393,7 @@ export default {
th:nth-child(4){
border-right:0;
.cell{
padding-right: 24px !important;
/*padding-right: 24px !important;*/
}
}
td:nth-child(6){
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/tdjy.vue
View file @ f0035f76
......@@ -31,10 +31,10 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column prop="type" label="供应方式" :formatter="formatStatus"/>
<el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable>
<el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable min-width="120">
<template slot-scope="scope">{{ scope.row.count }}个</template>
</el-table-column>
<el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="90">
<el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="80">
<template slot-scope="scope">{{ scope.row.rate }}%</template>
</el-table-column>
</el-table>
......@@ -74,10 +74,10 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column prop="type" label="供应方式" :formatter="formatStatus"/>
<el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable>
<el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable min-width="120">
<template slot-scope="scope">{{ scope.row.count }}个</template>
</el-table-column>
<el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="90">
<el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="80">
<template slot-scope="scope">{{ scope.row.rate }}%</template>
</el-table-column>
</el-table>
......@@ -120,10 +120,10 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column prop="province" label="地区" :formatter="formatStatus"/>
<el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable>
<el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable min-width="120">
<template slot-scope="scope">{{ scope.row.count }}个</template>
</el-table-column>
<el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="90">
<el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="80">
<template slot-scope="scope">{{ scope.row.rate }}%</template>
</el-table-column>
</el-table>
......@@ -159,10 +159,10 @@
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column prop="type" label="年份" :formatter="formatStatus"/>
<el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable>
<el-table-column prop="count" label="土地交易项目" align="right" :formatter="formatStatus" sortable min-width="120">
<template slot-scope="scope">{{ scope.row.count }}个</template>
</el-table-column>
<el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="90">
<el-table-column prop="rate" label="占比" align="right" :formatter="formatStatus" width="80">
<template slot-scope="scope">{{ scope.row.rate }}%</template>
</el-table-column>
</el-table>
......
dsk-operate-ui/src/views/project/projectList/component/lxr.vue
View file @ f0035f76
......@@ -143,21 +143,22 @@
<el-radio label=0>女</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="联系人角色：" class="row">
<el-input type="text" v-model="queryParam.role" placeholder="请输入"></el-input>
<el-form-item label="联系方式：" class="row">
<el-input type="text" maxlength="11" @input="inputphone" v-model="queryParam.contactInformation" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="关联企业：" class="row" v-if="thistype == 'project'">
<!--<el-form-item label="关联企业：" class="row" v-if="thistype == 'project'">-->
<el-form-item label="关联企业：" class="row">
<el-input type="text" v-model="queryParam.companyName" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="联系人角色：" class="row">
<el-input type="text" v-model="queryParam.role" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="联系人职位：" class="row">
<el-input type="text" v-model="queryParam.position" placeholder="请输入"></el-input>
</el-form-item>
<!--<el-form-item label="内部维护人：" class="row">-->
<!--<el-input type="text" v-model="queryParam.accendant" placeholder="请输入"></el-input>-->
<!--</el-form-item>-->
<el-form-item label="联系方式：" class="row">
<el-input type="text" maxlength="11" @input="inputphone" v-model="queryParam.contactInformation" placeholder="请输入"></el-input>
</el-form-item>
<el-form-item label="备注：" class="row">
<el-input
type="textarea"
......@@ -339,14 +340,17 @@
position:"",
contactInformation:"",
remark:"",
companyName:"",
// accendant:"",
}
if(this.thistype == 'project'){
this.queryParam.businessId = this.searchParam.businessId
this.companyName = ""
this.queryParam.companyName=this.$route.query.projectname
}
if(this.thistype == 'custom'){
this.queryParam.customerId = this.searchParam.customerId
this.queryParam.companyName=this.customname
}
},
}
......
dsk-operate-ui/src/views/project/projectList/component/xgqy.vue
View file @ f0035f76
<template>
<div>
<el-card class="box-card noborder">
<el-card class="box-card noborder" >
<div class="cardtitles">相关企业</div>
<div class="searchbtns">
<el-select class="select" placeholder="企业类型" clearable v-model="searchParam.companyRole" @change="handleCurrentChange(1)">
......@@ -9,8 +9,8 @@
</el-select>
<div class="searchInput small">
<el-input type="text" placeholder="输入关键词查询" clearable v-model="searchParam.companyName">
<i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/sousuo.png"></i></el-input>
<div class="btn" @click="handleCurrentChange(1)">搜索</div>
<i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/sousuo.png" @click="handleCurrentChange(1)"></i></el-input>
<!--<div class="btn" @click="handleCurrentChange(1)">搜索</div>-->
</div>
<div class="btn btn_primary h32 b3" @click="opennew" v-if="isDisableds == false"><div class="img img1"></div>添加相关企业</div>
</div>
......
dsk-operate-ui/src/views/project/projectList/component/zlwd.vue
View file @ f0035f76
......@@ -7,9 +7,9 @@
<!--<div class="searchbtns" v-if="fileDatas.rows != null && fileDatas.rows.length>0">-->
<div class="searchInput small">
<el-input type="text" v-model="param.keyword" clearable placeholder="输入关键词查询">
<i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/sousuo.png"></i>
<i slot="prefix" class="el-input__icon"><img src="@/assets/images/project/sousuo.png" @click="handleCurrentChange(1)"></i>
</el-input>
<div class="btn" @click="handleCurrentChange(1)">搜索</div>
<!--<div class="btn" @click="handleCurrentChange(1)">搜索</div>-->
</div>
<!--<div class="btn btn_primary h32 b2" @click="getUP" v-if="fileDatas.total>0"><div class="img img2"></div>上传</div>-->
......
dsk-operate-ui/src/views/project/projectList/detail.vue
View file @ f0035f76
......@@ -105,7 +105,7 @@
</div>
</el-card>
<el-card class="box-card noborder">
<el-card class="box-card noborder top12" style="margin-bottom: 12px">
<div class="tabslist">
<div class="tab" v-for="(item,index) in tabslist" :class="{'on':thistag == item.tag}" @click="getCom(item.tag)">
<span>{{item.name}}</span>
......
dsk-operate-ui/src/views/project/projectList/index.vue
View file @ f0035f76
......@@ -110,8 +110,8 @@
</el-tabs>
</el-card>
<el-card class="box-card noborder overflows">
<div class="titles">项目明细
<el-card class="box-card noborder overflows top12">
<div class="titles"><!--项目明细-->
<div class="dc">
<div class="total">共{{total}}条</div>
<!--<el-tooltip class="item" effect="dark" content="功能正在开发中" placement="top">-->
......@@ -573,8 +573,9 @@ export default {
height: 60px;
line-height: 64px;
border-bottom: 1px solid #EFEFEF;
padding-left: 26px;
&::after{
padding-left: 2px;
padding-right: 24px;
/*&::after{
content: " ";
width: 2px;
height: 14px;
......@@ -582,13 +583,13 @@ export default {
float: left;
margin-left: -10px;
margin-top: 24px;
}
}*/
.dc{
width: 100%;
float: right;
font-size: 12px;
color: #3D3D3D;
font-weight: 400;
padding-right: 24px;
position: relative;
&::after{
content: ' ';
......@@ -604,6 +605,10 @@ export default {
display: inline-block;
margin-left: 20px;
}
.btn-export{
float: right;
margin-top: 18px;
}
}
}
.datalist{
......@@ -641,6 +646,9 @@ export default {
.delform{
right: 16px;
top: -94px;
.btnsmall{
margin-top: 0;
}
}
&:hover{
background-color: #F6F9FC;
......
dsk-operate-ui/src/views/radar/components/BidRecord/index.vue
View file @ f0035f76
......@@ -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 @ f0035f76
......@@ -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 @ f0035f76
......@@ -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 @ f0035f76
......@@ -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/Tender/index.vue
View file @ f0035f76
......@@ -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 @ f0035f76
......@@ -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 @ f0035f76
......@@ -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 @ f0035f76
......@@ -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>
dsk-system/src/main/java/com/dsk/system/service/impl/SysUserServiceImpl.java
View file @ f0035f76
......@@ -79,7 +79,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
QueryWrapper<SysUser> wrapper = Wrappers.query();
wrapper.eq("u.del_flag", UserConstants.USER_NORMAL)
.eq(ObjectUtil.isNotNull(user.getUserId()), "u.user_id", user.getUserId())
.like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
.like(StringUtils.isNotBlank(user.getUserName()), "u.nick_name", user.getUserName())
.eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
.like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
.between(params.get("beginTime") != null && params.get("endTime") != null,
......@@ -91,7 +91,8 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
List<Long> ids = StreamUtils.toList(deptList, SysDept::getDeptId);
ids.add(user.getDeptId());
w.in("u.dept_id", ids);
}).orderByDesc("u.create_time");
})
.orderByDesc("u.create_time");
return wrapper;
}
......@@ -290,7 +291,7 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
//租户新增成功,发送短信通知租户
LinkedHashMap<String, String> map = new LinkedHashMap<>(1);
map.put("company", user.getNickName());
map.put("pwd",password);
map.put("pwd", password);
SmsBlend smsBlend = SmsFactory.createSmsBlend(SupplierType.ALIBABA);
SmsResponse smsResponse = smsBlend.sendMessage(user.getPhonenumber(), "SMS_463175230", map);
if (!"OK".equals(smsResponse.getCode())) {
......
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