Skip to content

D
dsk-cr20g
Commit 0dbd8f7e authored by danfuman's avatar danfuman
Browse files
Options

修改

parent f292f73b
Hide whitespace changes
Inline Side-by-side
Showing with 152 additions and 134 deletions
dsk-operate-ui/src/assets/styles/index.scss
View file @ 0dbd8f7e
...@@ -823,6 +823,9 @@ li { ...@@ -823,6 +823,9 @@ li {
.el-select-dropdown__item { .el-select-dropdown__item {
padding: 0 16px; padding: 0 16px;
} }
.el-select-dropdown__item.selected::after {
right:8px;
}
} }
} }
......
dsk-operate-ui/src/views/custom/overview/index.vue
View file @ 0dbd8f7e
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</el-col> </el-col>
<div class="empty" v-if="hzqkTotal === 0"> <div class="empty" v-if="hzqkTotal === 0">
<img class="img" src="@/assets/images/project/empty.png"> <img class="img" src="@/assets/images/project/empty.png">
<div class="p1">抱歉，您还未添加合作客户</div> <div class="p1">抱歉，您还未添加与客户的合作中标项目情况</div>
</div> </div>
</el-row> </el-row>
</div> </div>
...@@ -240,9 +240,10 @@ ...@@ -240,9 +240,10 @@
this.hzqkList=res.data; this.hzqkList=res.data;
let list=[]; let list=[];
for(let i=0; i<res.data.length; i++){ for(let i=0; i<res.data.length; i++){
if(res.data[i].totalAmount){ if(!res.data[i].totalAmount){
list.push(res.data[i]) res.data[i].totalAmount=0
} }
list.push(res.data[i])
} }
if(list.length > 0){ if(list.length > 0){
this.initChart(list) this.initChart(list)
......
dsk-operate-ui/src/views/macro/enterprises/index.vue
View file @ 0dbd8f7e
...@@ -360,6 +360,12 @@ export default { ...@@ -360,6 +360,12 @@ export default {
sortChange({ column, prop, order }){ sortChange({ column, prop, order }){
if(prop === 'aptitudeCountNew'){ if(prop === 'aptitudeCountNew'){
this.queryParams.field ='aptitudeCountNew' this.queryParams.field ='aptitudeCountNew'
}else if(prop === 'recentlyCount'){
this.queryParams.field ='winBidCount'
}else if(prop === 'customerCount'){
this.queryParams.field ='customer'
}else if(prop === 'supplierCount'){
this.queryParams.field ='supplier'
}else { }else {
this.queryParams.field = prop this.queryParams.field = prop
} }
......
dsk-operate-ui/src/views/project/projectList/component/BidOpeningRecord.vue
View file @ 0dbd8f7e
...@@ -205,7 +205,7 @@ export default { ...@@ -205,7 +205,7 @@ export default {
// 设置上传的请求头部 // 设置上传的请求头部
headers: { Authorization: "Bearer " + getToken() }, headers: { Authorization: "Bearer " + getToken() },
// 上传的地址 // 上传的地址
url: process.env.VUE_APP_BASE_API + `"/business/open/tender/importData/"}${this.detailId ? this.detailId : parseInt(this.$route.query.id)}`, url: process.env.VUE_APP_BASE_API + `/business/open/tender/importData/${this.detailId ? this.detailId : parseInt(this.$route.query.id)}`,
// 展示上传结果 // 展示上传结果
showResult: false, showResult: false,
// 模板下载地址 // 模板下载地址
......
dsk-operate-ui/src/views/radar/components/Bidding/index.vue
View file @ 0dbd8f7e
...@@ -4,21 +4,21 @@ ...@@ -4,21 +4,21 @@
<div class="content_item content_item_padding0"> <div class="content_item content_item_padding0">
<div class="label">项目名称</div> <div class="label">项目名称</div>
<div class="content_right"> <div class="content_right">
<el-input class="ename_input" <el-input class="ename_input"
placeholder="请输入项目名称关键字" v-model="jskBidPlanDto.projectName" ></el-input> placeholder="请输入项目名称关键字" v-model="jskBidPlanDto.projectName" ></el-input>
</div> </div>
</div> </div>
<div class="content_item"> <div class="content_item">
<div class="label">招标单位</div> <div class="label">招标单位</div>
<div class="content_right"> <div class="content_right">
<el-input class="ename_input" <el-input class="ename_input"
placeholder="请输入招标采购单位关键字" v-model="jskBidPlanDto.tenderee" ></el-input> placeholder="请输入招标采购单位关键字" v-model="jskBidPlanDto.tenderee" ></el-input>
</div> </div>
</div> </div>
<div class="content_item"> <div class="content_item">
<div class="label">工程规模</div> <div class="label">工程规模</div>
<div class="content_right"> <div class="content_right">
<el-input class="ename_input" <el-input class="ename_input"
placeholder="请输入工程规模关键字" v-model="jskBidPlanDto.projectScale" ></el-input> placeholder="请输入工程规模关键字" v-model="jskBidPlanDto.projectScale" ></el-input>
</div> </div>
</div> </div>
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
招标方式{{jskBidPlanDto.tenderWay.length? jskBidPlanDto.tenderWay.length + "项": ""}} 招标方式{{jskBidPlanDto.tenderWay.length? jskBidPlanDto.tenderWay.length + "项": ""}}
<i class="el-icon-caret-bottom"></i> <i class="el-icon-caret-bottom"></i>
</span> </span>
<el-select v-model="jskBidPlanDto.tenderWay" class="select-multiple" multiple placeholder="请选择"> <el-select v-model="jskBidPlanDto.tenderWay" class="select-multiple" popper-class="select-option" multiple placeholder="请选择">
<el-option v-for="(item, i) in tenderWayList" :key="i":label="item" :value="item"> <el-option v-for="(item, i) in tenderWayList" :key="i":label="item" :value="item">
</el-option> </el-option>
</el-select> </el-select>
...@@ -180,27 +180,27 @@ ...@@ -180,27 +180,27 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
</div> </div>
<div class="content_item content_item_padding0"> <div class="content_item content_item_padding0">
<div class="geduan"> <div class="geduan">
</div> </div>
</div> </div>
<div class="content_item content_item_padding0"> <div class="content_item content_item_padding0">
<div class="search-new"> <div class="search-new">
<span @click="search()">查询</span> <span @click="search()">查询</span>
<span @click="reset">重置</span> <span @click="reset">重置</span>
</div> </div>
</div> </div>
</div> </div>
<div class="bottomlist"> <div class="bottomlist">
<div class="bottomlist-title"> <div class="bottomlist-title">
...@@ -215,7 +215,7 @@ ...@@ -215,7 +215,7 @@
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span> <span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
</p> </p>
</div> </div>
</div> </div>
<div class="table-item-jf1" v-if="tableData.length==0&& !isSkeleton"> <div class="table-item-jf1" v-if="tableData.length==0&& !isSkeleton">
<img class="item-jf-img" src="@/assets/images/kong.png" alt=""> <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
...@@ -234,9 +234,9 @@ ...@@ -234,9 +234,9 @@
</span> </span>
<span class="list-label list-label-wl" v-if="item.objectType">{{item.objectType}}</span> <span class="list-label list-label-wl" v-if="item.objectType">{{item.objectType}}</span>
<span class="list-label list-label-lx" v-if="item.projectType">{{item.projectType}}</span> <span class="list-label list-label-lx" v-if="item.projectType">{{item.projectType}}</span>
</div> </div>
<div class="list-content" v-if="item.tenderee||item.planTenderAmount||item.projectCapitalSource"> <div class="list-content" v-if="item.tenderee||item.planTenderAmount||item.projectCapitalSource">
<p class="list-content-text" v-if="item.tenderee"> <p class="list-content-text" v-if="item.tenderee">
<span>招采单位：</span> <span>招采单位：</span>
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
</span> </span>
<span v-else v-html="item.tenderee"> <span v-else v-html="item.tenderee">
</span> </span>
</span> </span>
</p> </p>
<p class="list-content-text" v-if="item.planTenderAmount"> <p class="list-content-text" v-if="item.planTenderAmount">
...@@ -256,8 +256,8 @@ ...@@ -256,8 +256,8 @@
<span>资金来源：</span> <span>资金来源：</span>
<span>{{item.projectCapitalSource||'--'}}</span> <span>{{item.projectCapitalSource||'--'}}</span>
</p> </p>
</div> </div>
<div class="list-content list-content1" v-if="item.issueTime||item.planTenderDateStart||item.sourceName"> <div class="list-content list-content1" v-if="item.issueTime||item.planTenderDateStart||item.sourceName">
<p class="list-content-text" v-if="item.issueTime"> <p class="list-content-text" v-if="item.issueTime">
...@@ -272,17 +272,17 @@ ...@@ -272,17 +272,17 @@
<span>来源网站：</span> <span>来源网站：</span>
<span >{{item.sourceName||'--'}}</span> <span >{{item.sourceName||'--'}}</span>
</p> </p>
</div> </div>
<div class="list-content list-addree" v-if="item.projectScale"> <div class="list-content list-addree" v-if="item.projectScale">
<p class="list-content-text"> <p class="list-content-text">
<span class="content-text-gc">工程规模：</span> <span class="content-text-gc">工程规模：</span>
<span class="content-text-p" v-html="item.projectScale"></span> <span class="content-text-p" v-html="item.projectScale"></span>
</p> </p>
</div> </div>
</li> </li>
</ul> </ul>
<div class="pagination clearfix" v-if="total>0&&pageFlag"> <div class="pagination clearfix" v-if="total>0&&pageFlag">
...@@ -295,7 +295,7 @@ ...@@ -295,7 +295,7 @@
:total="total>limit*500?501*limit:total"> :total="total>limit*500?501*limit:total">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
...@@ -378,7 +378,7 @@ export default { ...@@ -378,7 +378,7 @@ export default {
PlanTenderDateValue: "", PlanTenderDateValue: "",
PlanTenderDate: "", PlanTenderDate: "",
PlanTenderDateShowPopper: false, PlanTenderDateShowPopper: false,
addressList: [], addressList: [],
addressType: [], addressType: [],
props: { props: {
...@@ -433,16 +433,16 @@ export default { ...@@ -433,16 +433,16 @@ export default {
endIssueTime:'', endIssueTime:'',
startPlanTenderDate:'', startPlanTenderDate:'',
endPlanTenderDate:'', endPlanTenderDate:'',
}, },
planTenderAmountShowPopper:false, planTenderAmountShowPopper:false,
startPlanTenderAmount:'', startPlanTenderAmount:'',
endPlanTenderAmount:'', endPlanTenderAmount:'',
domicile: [], domicile: [],
pageFlag: true, pageFlag: true,
conditionsArr: [], conditionsArr: [],
tableData:[], tableData:[],
total:0, total:0,
page:1, page:1,
...@@ -462,7 +462,7 @@ export default { ...@@ -462,7 +462,7 @@ export default {
} }
arr.push(data) arr.push(data)
} }
if(this.jskBidPlanDto.tenderee){ if(this.jskBidPlanDto.tenderee){
data = { data = {
title: "招标单位:", title: "招标单位:",
...@@ -526,14 +526,14 @@ export default { ...@@ -526,14 +526,14 @@ export default {
} }
arr.push(data) arr.push(data)
} }
this.conditionsArr = arr this.conditionsArr = arr
}, },
}, },
mounted() { mounted() {
this.init(); this.init();
}, },
methods: { methods: {
getCapitalSourceSelect(){ getCapitalSourceSelect(){
...@@ -553,7 +553,7 @@ export default { ...@@ -553,7 +553,7 @@ export default {
keywordClick(val) { keywordClick(val) {
this.projectName = val this.projectName = val
}, },
search(page, limit,exportFlag) { search(page, limit,exportFlag) {
if (!page) { if (!page) {
this.page = 1; this.page = 1;
...@@ -598,10 +598,10 @@ export default { ...@@ -598,10 +598,10 @@ export default {
this.total=res.data.total; this.total=res.data.total;
} }
}).catch(error=>{ }).catch(error=>{
}); });
}, },
reloadPage() { reloadPage() {
this.pageFlag = false; this.pageFlag = false;
...@@ -928,7 +928,7 @@ export default { ...@@ -928,7 +928,7 @@ export default {
deleteDomicile() { deleteDomicile() {
this.$refs.address.handleClear(); this.$refs.address.handleClear();
}, },
domicileChange() { domicileChange() {
let arr = this.$refs.address.getCheckedNodes(); let arr = this.$refs.address.getCheckedNodes();
let province = [], let province = [],
...@@ -1042,10 +1042,10 @@ export default { ...@@ -1042,10 +1042,10 @@ export default {
}else{ }else{
this.$router.push({path: '/company/'+this.encodeStr(companyId)}) this.$router.push({path: '/company/'+this.encodeStr(companyId)})
} }
} }
}).catch(error=>{ }).catch(error=>{
}); });
}, },
reset() { reset() {
...@@ -1059,11 +1059,19 @@ export default { ...@@ -1059,11 +1059,19 @@ export default {
this.searchDic(); this.searchDic();
this.getCapitalSourceSelect(); this.getCapitalSourceSelect();
}, },
}, },
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.select-option{
.el-select-dropdown__list{
.el-select-dropdown__item{
padding: 0 26px 0 16px;
}
}
}
.content{ .content{
padding: 0px 16px; padding: 0px 16px;
padding-top: 16px; padding-top: 16px;
...@@ -1080,7 +1088,7 @@ export default { ...@@ -1080,7 +1088,7 @@ export default {
color: rgba(35,35,35,0.8); color: rgba(35,35,35,0.8);
} }
.content_right{ .content_right{
.ename_input{ .ename_input{
width: 640px; width: 640px;
margin-right: 20px; margin-right: 20px;
...@@ -1089,12 +1097,12 @@ export default { ...@@ -1089,12 +1097,12 @@ export default {
width: 640px; width: 640px;
} }
} }
.item_ckquery_list { .item_ckquery_list {
display: flex; display: flex;
} }
.item_ckquery_list .el-input__icon { .item_ckquery_list .el-input__icon {
position: relative; position: relative;
top: 1px; top: 1px;
...@@ -1104,7 +1112,7 @@ export default { ...@@ -1104,7 +1112,7 @@ export default {
} }
.register_count_ipt{ .register_count_ipt{
margin-left: 0px; margin-left: 0px;
} }
.register_count_ipt .el-input__inner{ .register_count_ipt .el-input__inner{
width: 174px; width: 174px;
...@@ -1137,19 +1145,19 @@ export default { ...@@ -1137,19 +1145,19 @@ export default {
padding: 1px 5px !important; padding: 1px 5px !important;
} }
} }
} }
.content_item_padding0{ .content_item_padding0{
padding: 0; padding: 0;
} }
} }
.bottomlist{ .bottomlist{
width: 100%; width: 100%;
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 4px 4px 4px 4px; border-radius: 4px 4px 4px 4px;
.bottomlist-title{ .bottomlist-title{
display: flex; display: flex;
...@@ -1187,10 +1195,10 @@ export default { ...@@ -1187,10 +1195,10 @@ export default {
cursor: pointer; cursor: pointer;
} }
} }
} }
.bottomlist-content{ .bottomlist-content{
padding-bottom: 0px; padding-bottom: 0px;
} }
.bottomlist-list{ .bottomlist-list{
...@@ -1220,33 +1228,33 @@ export default { ...@@ -1220,33 +1228,33 @@ export default {
padding: 3px 7px; padding: 3px 7px;
font-size: 12px; font-size: 12px;
margin-right: 8px; margin-right: 8px;
} }
.list-label-wl{ .list-label-wl{
background: #e8f7f0; background: #e8f7f0;
color: #38c8bf; color: #38c8bf;
} }
.list-label-lx{ .list-label-lx{
background: #e4f3fd; background: #e4f3fd;
color: #41a1fd; color: #41a1fd;
} }
} }
.list-content{ .list-content{
margin-top: 12px; margin-top: 12px;
display: flex; display: flex;
justify-content: start; justify-content: start;
align-items: center; align-items: center;
.list-content-text{ .list-content-text{
display: flex; display: flex;
justify-content: start; justify-content: start;
align-items:flex-start ; align-items:flex-start ;
margin-right: 32px; margin-right: 32px;
font-size: 14px; font-size: 14px;
span:first-child{ span:first-child{
font-weight: 400; font-weight: 400;
color: rgba(35,35,35,0.4); color: rgba(35,35,35,0.4);
...@@ -1266,12 +1274,12 @@ export default { ...@@ -1266,12 +1274,12 @@ export default {
.blue{ .blue{
color: #0081FF !important; color: #0081FF !important;
cursor: pointer; cursor: pointer;
} }
} }
} }
.list-addree{ .list-addree{
width: auto; width: auto;
...@@ -1287,20 +1295,20 @@ export default { ...@@ -1287,20 +1295,20 @@ export default {
img{ img{
width: 14px; width: 14px;
margin: 0 8px; margin: 0 8px;
} }
} }
.list-content1{ .list-content1{
margin-top: 8px; margin-top: 8px;
} }
} }
.bottomlist-list:hover{ .bottomlist-list:hover{
background: #F6F9FC; background: #F6F9FC;
cursor: pointer; cursor: pointer;
} }
.pagination{ .pagination{
padding: 14px ; padding: 14px ;
.el-pagination{ .el-pagination{
...@@ -1308,7 +1316,7 @@ export default { ...@@ -1308,7 +1316,7 @@ export default {
} }
} }
} }
</style> </style>
dsk-operate-ui/src/views/radar/components/Land/index.vue
View file @ 0dbd8f7e
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="content_item content_item_padding0"> <div class="content_item content_item_padding0">
<div class="label">项目名称</div> <div class="label">项目名称</div>
<div class="content_right"> <div class="content_right">
<el-input class="ename_input" <el-input class="ename_input"
placeholder="请输入项目名称关键字" v-model="landMarketDto.keyword" ></el-input> placeholder="请输入项目名称关键字" v-model="landMarketDto.keyword" ></el-input>
</div> </div>
</div> </div>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<el-dropdown @command="handleCommand" class="el-dropdown-land" placement="bottom-start" trigger="click" ref="popper" :hide-on-click="false"> <el-dropdown @command="handleCommand" class="el-dropdown-land" placement="bottom-start" trigger="click" ref="popper" :hide-on-click="false">
<span class="el-dropdown-link" :class="landMarketDto.startAcreage || landMarketDto.endAcreage? 'color_text': ''"> <span class="el-dropdown-link" :class="landMarketDto.startAcreage || landMarketDto.endAcreage? 'color_text': ''">
出让面积{{landMarketDto.startAcreage || landMarketDto.endAcreage? " 1项": ""}}<i class="el-icon-caret-bottom"></i> 出让面积{{landMarketDto.startAcreage || landMarketDto.endAcreage? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
...@@ -108,7 +108,7 @@ ...@@ -108,7 +108,7 @@
</span> </span>
</el-popover> </el-popover>
</div> </div>
</div> </div>
</div> </div>
<div class="content_item"> <div class="content_item">
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
<span :class=" contractSignTimeValue == '自定义' ? 'color_text' : ''"> <span :class=" contractSignTimeValue == '自定义' ? 'color_text' : ''">
自定义<i class="el-icon-arrow-right"></i> 自定义<i class="el-icon-arrow-right"></i>
</span> </span>
<el-date-picker v-if="contractSignTimeShowPopper"@change="changeContractSignTime" class="land_date_picker"v-model="contractSignTime" <el-date-picker v-if="contractSignTimeShowPopper"@change="changeContractSignTime" class="land_date_picker"v-model="contractSignTime"
ref="datePicker" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" ref="datePicker" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期"
end-placeholder="结束日期"> end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
...@@ -188,18 +188,18 @@ ...@@ -188,18 +188,18 @@
</div> </div>
<div class="content_item content_item_padding0"> <div class="content_item content_item_padding0">
<div class="geduan"> <div class="geduan">
</div> </div>
</div> </div>
<div class="content_item content_item_padding0"> <div class="content_item content_item_padding0">
<div class="search-new"> <div class="search-new">
<span @click="search()">查询</span> <span @click="search()">查询</span>
<span @click="reset">重置</span> <span @click="reset">重置</span>
</div> </div>
</div> </div>
</div> </div>
<div class="bottomlist"> <div class="bottomlist">
<div class="bottomlist-title"> <div class="bottomlist-title">
<div class="bottomlist-title-left" > <div class="bottomlist-title-left" >
...@@ -226,20 +226,20 @@ ...@@ -226,20 +226,20 @@
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span> <span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
</p> </p>
</div> </div>
</div> </div>
<div class="table-item-jf1" v-if="tableData.length==0&& !isSkeleton"> <div class="table-item-jf1" v-if="tableData.length==0&& !isSkeleton">
<img class="item-jf-img" src="@/assets/images/kong.png" alt=""> <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
<div class="item-jf-titel">抱歉，没找到相关数据！</div> <div class="item-jf-titel">抱歉，没找到相关数据！</div>
<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</div> <div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</div>
</div> </div>
<skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton> <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
<ul class="bottomlist-content" v-if="tableData.length>0&& !isSkeleton"> <ul class="bottomlist-content" v-if="tableData.length>0&& !isSkeleton">
<li class="bottomlist-list" v-for="item in tableData"> <li class="bottomlist-list" v-for="item in tableData">
<p class="list-titel"> <p class="list-titel">
<router-link :to="'/radar/Land/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"></router-link> <router-link :to="'/radar/Land/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"></router-link>
</p> </p>
<div class="list-content" v-if="item.companyName||item.transactionPrice||item.acreage||item.acreage"> <div class="list-content" v-if="item.companyName||item.transactionPrice||item.acreage||item.acreage">
<p class="list-content-text" v-if="item.companyName"> <p class="list-content-text" v-if="item.companyName">
<span>受让人：</span> <span>受让人：</span>
...@@ -248,7 +248,7 @@ ...@@ -248,7 +248,7 @@
</span> </span>
<span v-else v-html="item.companyName"> <span v-else v-html="item.companyName">
</span> </span>
</p> </p>
<p class="list-content-text" v-if="item.transactionPrice"> <p class="list-content-text" v-if="item.transactionPrice">
<span>成交金额：</span> <span>成交金额：</span>
...@@ -300,9 +300,9 @@ ...@@ -300,9 +300,9 @@
:total="total>limit*500?501*limit:total"> :total="total>limit*500?501*limit:total">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
</div> </div>
</template> </template>
...@@ -463,7 +463,7 @@ ...@@ -463,7 +463,7 @@
contractSignTime: "", contractSignTime: "",
contractSignTimeShowPopper: false, contractSignTimeShowPopper: false,
pageFlag: true, pageFlag: true,
showList:true, showList:true,
fieldshow: false, fieldshow: false,
fieldText: '默认排序', fieldText: '默认排序',
...@@ -485,14 +485,14 @@ ...@@ -485,14 +485,14 @@
status: false, status: false,
}, },
], ],
tableData:[], tableData:[],
total:0, total:0,
page:1, page:1,
pageSize:20 pageSize:20
}; };
}, },
computed: { computed: {
checkLandMarketDto() { checkLandMarketDto() {
let arr = []; let arr = [];
...@@ -577,9 +577,9 @@ ...@@ -577,9 +577,9 @@
this.landMarketIndustryList = res.landMarketIndustry; this.landMarketIndustryList = res.landMarketIndustry;
this.landUseOptions = res.landUse this.landUseOptions = res.landUse
}).catch(error=>{ }).catch(error=>{
}); });
}, },
refresh(value) { refresh(value) {
if (value) { if (value) {
...@@ -619,9 +619,9 @@ ...@@ -619,9 +619,9 @@
this.total=res.data.total; this.total=res.data.total;
} }
}).catch(error=>{ }).catch(error=>{
}); });
}, },
//关闭支付弹窗 //关闭支付弹窗
...@@ -938,10 +938,10 @@ ...@@ -938,10 +938,10 @@
}else{ }else{
this.$router.push({path: '/company/'+this.encodeStr(companyId)}) this.$router.push({path: '/company/'+this.encodeStr(companyId)})
} }
} }
}).catch(error=>{ }).catch(error=>{
}); });
}, },
init() { init() {
...@@ -970,21 +970,21 @@ ...@@ -970,21 +970,21 @@
color: rgba(35,35,35,0.8); color: rgba(35,35,35,0.8);
} }
.content_right{ .content_right{
.ename_input{
.ename_input{ width: 640px;
width: 640px; margin-right: 20px;
margin-right: 20px; }
} .land_ipt_470 {
.land_ipt_470 { width: 640px;
width: 640px; }
}
} }
.item_ckquery_list { .item_ckquery_list {
display: flex; display: flex;
} }
.item_ckquery_list .el-input__icon { .item_ckquery_list .el-input__icon {
position: relative; position: relative;
top: 1px; top: 1px;
...@@ -994,7 +994,7 @@ ...@@ -994,7 +994,7 @@
} }
.register_count_ipt{ .register_count_ipt{
margin-left: 0px; margin-left: 0px;
} }
.register_count_ipt .el-input__inner{ .register_count_ipt .el-input__inner{
width: 174px; width: 174px;
...@@ -1027,19 +1027,19 @@ ...@@ -1027,19 +1027,19 @@
padding: 1px 5px !important; padding: 1px 5px !important;
} }
} }
} }
.content_item_padding0{ .content_item_padding0{
padding: 0; padding: 0;
} }
} }
.bottomlist{ .bottomlist{
width: 100%; width: 100%;
background-color: #FFFFFF; background-color: #FFFFFF;
border-radius: 4px 4px 4px 4px; border-radius: 4px 4px 4px 4px;
.bottomlist-title{ .bottomlist-title{
display: flex; display: flex;
...@@ -1062,7 +1062,7 @@ ...@@ -1062,7 +1062,7 @@
.title-right{ .title-right{
display: flex; display: flex;
align-items: center; align-items: center;
p:last-child{ p:last-child{
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -1078,10 +1078,10 @@ ...@@ -1078,10 +1078,10 @@
cursor: pointer; cursor: pointer;
} }
} }
} }
.bottomlist-content{ .bottomlist-content{
padding-bottom: 0px; padding-bottom: 0px;
} }
.bottomlist-list{ .bottomlist-list{
...@@ -1109,20 +1109,20 @@ ...@@ -1109,20 +1109,20 @@
background: #F3F3FF; background: #F3F3FF;
color: #8491E8; color: #8491E8;
border-radius: 1px 1px 1px 1px; border-radius: 1px 1px 1px 1px;
padding: 3px 7px; padding: 3px 7px;
font-size: 12px; font-size: 12px;
} }
} }
.list-content{ .list-content{
margin-top: 3px; margin-top: 3px;
display: flex; display: flex;
justify-content: start; justify-content: start;
align-items: center; align-items: center;
.list-content-text{ .list-content-text{
margin-top: 7px; margin-top: 7px;
display: flex; display: flex;
...@@ -1130,7 +1130,7 @@ ...@@ -1130,7 +1130,7 @@
align-items: center; align-items: center;
margin-right: 32px; margin-right: 32px;
font-size: 14px; font-size: 14px;
span:first-child{ span:first-child{
font-weight: 400; font-weight: 400;
color: rgba(35,35,35,0.4); color: rgba(35,35,35,0.4);
...@@ -1144,12 +1144,12 @@ ...@@ -1144,12 +1144,12 @@
.blue{ .blue{
color: #0081FF !important; color: #0081FF !important;
cursor: pointer; cursor: pointer;
} }
} }
} }
.list-addree{ .list-addree{
width: auto; width: auto;
...@@ -1165,15 +1165,15 @@ ...@@ -1165,15 +1165,15 @@
img{ img{
width: 14px; width: 14px;
margin: 0 8px; margin: 0 8px;
} }
} }
} }
.bottomlist-list:hover{ .bottomlist-list:hover{
background: #F6F9FC; background: #F6F9FC;
} }
.pagination{ .pagination{
padding: 14px ; padding: 14px ;
...@@ -1182,6 +1182,6 @@ ...@@ -1182,6 +1182,6 @@
} }
} }
} }
</style> </style>
\ No newline at end of file
dsk-operate-ui/vue.config.js
View file @ 0dbd8f7e
...@@ -35,7 +35,7 @@ module.exports = { ...@@ -35,7 +35,7 @@ module.exports = {
proxy: { proxy: {
// detail: https://cli.vuejs.org/config/#devserver-proxy // detail: https://cli.vuejs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: { [process.env.VUE_APP_BASE_API]: {
target: `http://47.104.91.229:9099/prod-api`,//测试 target: `http://120.46.64.239:9099/prod-api`,//测试
// target: `https://szhapi.jiansheku.com`,//线上 // target: `https://szhapi.jiansheku.com`,//线上
// target: `http://122.9.160.122:9011`, //线上 // target: `http://122.9.160.122:9011`, //线上
// target: `http://192.168.0.165:9098`,//施-无线 // target: `http://192.168.0.165:9098`,//施-无线
...@@ -146,4 +146,4 @@ module.exports = { ...@@ -146,4 +146,4 @@ module.exports = {
} }
); );
} }
}; };
\ No newline at end of file
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