Skip to content

D
dsk-cr20g
Commit 90ae5091 authored by yht15023815643's avatar yht15023815643
Browse files
Options

UI优化

parent ae00c4f7
Hide whitespace changes
Inline Side-by-side
Showing with 287 additions and 114 deletions
dsk-operate-ui/src/router/index.js
View file @ 90ae5091
...@@ -155,7 +155,7 @@ export const constantRoutes = [ ...@@ -155,7 +155,7 @@ export const constantRoutes = [
path: '/biddetail/:id(\\d+)', path: '/biddetail/:id(\\d+)',
component: () => import('@/views/detail//biddetail/index'), component: () => import('@/views/detail//biddetail/index'),
name: 'Biddetail', name: 'Biddetail',
meta: { title: '中标业绩详情'} meta: { title: '中标业绩详情',icon: 'enterprise'}
} }
] ]
}, },
......
dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue
View file @ 90ae5091
...@@ -137,13 +137,15 @@ ...@@ -137,13 +137,15 @@
</div> </div>
</div> </div>
<div class="table-item-jf table-item-jf1" v-if="tableData.length==0"> <div class="table-item-jf 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>
<div class=" table-item-jf" v-if="tableData.length>0"> <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
<el-table :data="tableData" v-loading="loading" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" element-loading-text="Loading" class="table-item1 fixed-table" border highlight-current-row>
<div class=" table-item-jf" v-if="!isSkeleton&&tableData.length>0">
<el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}" class="table-item1 fixed-table" border highlight-current-row>
<el-table-column type="index" label="序号" fixed width="60"> <el-table-column type="index" label="序号" fixed width="60">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{(pageNum - 1) *20 + scope.$index + 1}}</span> <span>{{(pageNum - 1) *20 + scope.$index + 1}}</span>
...@@ -484,12 +486,15 @@ ...@@ -484,12 +486,15 @@
<script> <script>
import {encodeStr} from "@/assets/js/common.js" import {encodeStr} from "@/assets/js/common.js"
import jsk_data from '../../../../../public/jsk.json'; import jsk_data from '../../../../../public/jsk.json';
import skeleton from '@/views/project/projectList/component/skeleton'
import api from '@/api/enterpriseData/enterpriseData.js'; import api from '@/api/enterpriseData/enterpriseData.js';
export default { export default {
name: 'Owner', name: 'Owner',
components:{skeleton},
data() { data() {
return { return {
encodeStr, encodeStr,
isSkeleton:true,
keys:'', keys:'',
addressList: [], addressList: [],
addressType: [], addressType: [],
...@@ -498,10 +503,7 @@ export default { ...@@ -498,10 +503,7 @@ export default {
expandTrigger: "hover", expandTrigger: "hover",
value: "id", value: "id",
}, },
loading:false,
pageSize: 20, pageSize: 20,
jskBidQueryDto: { jskBidQueryDto: {
provinceIds: [], provinceIds: [],
cityIds: [], cityIds: [],
...@@ -918,9 +920,9 @@ export default { ...@@ -918,9 +920,9 @@ export default {
}else{ }else{
delete params.equityRelationship delete params.equityRelationship
} }
this.loading = true; this.isSkeleton = true;
api.uipSerach(params).then(res=>{ api.uipSerach(params).then(res=>{
this.loading = false; this.isSkeleton = false
// console.log(res) // console.log(res)
if (res.code==200) { if (res.code==200) {
this.tableData=res.rows; this.tableData=res.rows;
...@@ -928,7 +930,6 @@ export default { ...@@ -928,7 +930,6 @@ export default {
} }
}).catch(error=>{ }).catch(error=>{
this.loading = false;
}); });
}, },
......
dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue
View file @ 90ae5091
...@@ -454,12 +454,13 @@ ...@@ -454,12 +454,13 @@
</div> </div>
</div> </div>
<div class="table-item-jf1" v-if="tableData.length==0"> <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>
<ul class="bottomlist-content" v-if="tableData.length>0"> <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
<ul class="bottomlist-content" v-if="!isSkeleton&&tableData.length>0">
<li class="info-list" v-for="(item,index) in tableData" :key="index"> <li class="info-list" v-for="(item,index) in tableData" :key="index">
<div class="info-list-left"> <div class="info-list-left">
<img v-if="item.logoUrl" :src="item.logoUrl" :alt="item.name.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" /> <img v-if="item.logoUrl" :src="item.logoUrl" :alt="item.name.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" />
...@@ -584,8 +585,10 @@ ...@@ -584,8 +585,10 @@
import options from '@/assets/json/options.json'; import options from '@/assets/json/options.json';
import api from '@/api/enterpriseData/enterpriseData.js'; import api from '@/api/enterpriseData/enterpriseData.js';
import {encodeStr} from "@/assets/js/common.js" import {encodeStr} from "@/assets/js/common.js"
import skeleton from '@/views/project/projectList/component/skeleton'
export default { export default {
name: 'EnterpriseQuery', name: 'EnterpriseQuery',
components:{skeleton},
directives: { directives: {
numberOnly: { numberOnly: {
bind: function(el) { bind: function(el) {
...@@ -605,6 +608,7 @@ ...@@ -605,6 +608,7 @@
return { return {
encodeStr, encodeStr,
ename: '', ename: '',
isSkeleton:true,
enameQueryTypeList: [{ enameQueryTypeList: [{
key: 'and', key: 'and',
status: false, status: false,
...@@ -2752,7 +2756,9 @@ ...@@ -2752,7 +2756,9 @@
data.aptitudeQueryDto['aptitudeDtoList'] = aptitudeDtoList; data.aptitudeQueryDto['aptitudeDtoList'] = aptitudeDtoList;
data.aptitudeQueryDto['aptitudeSource'] = 'new'; data.aptitudeQueryDto['aptitudeSource'] = 'new';
} }
this.isSkeleton = true;
api.enterprisePage(data).then(res=>{ api.enterprisePage(data).then(res=>{
this.isSkeleton = false
if (res.code==200) { if (res.code==200) {
this.tableData=res.data.list; this.tableData=res.data.list;
this.total=res.data.total; this.total=res.data.total;
......
dsk-operate-ui/src/views/macro/financing/details.vue
View file @ 90ae5091
...@@ -225,7 +225,7 @@ export default { ...@@ -225,7 +225,7 @@ export default {
img{ img{
width: 28px; width: 28px;
height: 28px; height: 28px;
margin-bottom: -9px; // margin-bottom: -9px;
margin-right: 17px; margin-right: 17px;
} }
} }
......
dsk-operate-ui/src/views/radar/components/BidRecord/index.vue
View file @ 90ae5091
...@@ -119,7 +119,11 @@ ...@@ -119,7 +119,11 @@
</div> </div>
<div class="bottomlist"> <div class="bottomlist">
<div class="bottomlist-title"> <div class="bottomlist-title">
<div></div> <div class="bottomlist-title-left" >
<p class="title-left">
查询结果
</p>
</div>
<div class="title-right"> <div class="title-right">
<p>共有{{total}}条</p> <p>共有{{total}}条</p>
<p> <p>
...@@ -129,12 +133,13 @@ ...@@ -129,12 +133,13 @@
</div> </div>
</div> </div>
<div class="table-item-jf1" v-if="tableData.length==0"> <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>
<ul class="bottomlist-content" v-if="tableData.length>0"> <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
<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/BidRecord/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"></router-link> <router-link :to="'/radar/BidRecord/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"></router-link>
...@@ -184,11 +189,14 @@ ...@@ -184,11 +189,14 @@
<script> <script>
import jsk_data from '../../../../../public/jsk.json'; import jsk_data from '../../../../../public/jsk.json';
import {encodeStr} from "@/assets/js/common.js" import {encodeStr} from "@/assets/js/common.js"
import skeleton from '@/views/project/projectList/component/skeleton'
import api from '@/api/radar/radar.js'; import api from '@/api/radar/radar.js';
export default { export default {
name: 'BidRecord', name: 'BidRecord',
components:{skeleton},
data() { data() {
return { return {
isSkeleton:true,
addressList: [], addressList: [],
addressType: [], addressType: [],
props: { props: {
...@@ -434,7 +442,9 @@ export default { ...@@ -434,7 +442,9 @@ export default {
}else{ }else{
delete params.keywordNot delete params.keywordNot
} }
this.isSkeleton = true;
api.jskBidTenderPage(params).then(res=>{ api.jskBidTenderPage(params).then(res=>{
this.isSkeleton = false;
if (res.code==200) { if (res.code==200) {
this.tableData=res.data.list; this.tableData=res.data.list;
this.total=res.data.total; this.total=res.data.total;
...@@ -970,7 +980,20 @@ export default { ...@@ -970,7 +980,20 @@ export default {
cursor: pointer; cursor: pointer;
} }
} }
.bottomlist-title-left{
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;
}
}
} }
.bottomlist-content{ .bottomlist-content{
......
dsk-operate-ui/src/views/radar/components/Bidding/index.vue
View file @ 90ae5091
...@@ -204,7 +204,11 @@ ...@@ -204,7 +204,11 @@
</div> </div>
<div class="bottomlist"> <div class="bottomlist">
<div class="bottomlist-title"> <div class="bottomlist-title">
<div></div> <div class="bottomlist-title-left" >
<p class="title-left">
查询结果
</p>
</div>
<div class="title-right"> <div class="title-right">
<p>共有{{total}}条</p> <p>共有{{total}}条</p>
<p> <p>
...@@ -214,12 +218,13 @@ ...@@ -214,12 +218,13 @@
</div> </div>
</div> </div>
<div class="table-item-jf1" v-if="tableData.length==0"> <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>
<ul class="bottomlist-content" v-if="tableData.length>0"> <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
<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/Bidding/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link> <router-link :to="'/radar/Bidding/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link>
...@@ -306,12 +311,15 @@ ...@@ -306,12 +311,15 @@
<script> <script>
import jsk_data from '../../../../../public/jsk.json'; import jsk_data from '../../../../../public/jsk.json';
import {encodeStr} from "@/assets/js/common.js" import {encodeStr} from "@/assets/js/common.js"
import skeleton from '@/views/project/projectList/component/skeleton'
import api from '@/api/radar/radar.js'; import api from '@/api/radar/radar.js';
export default { export default {
name: 'Bidding', name: 'Bidding',
components:{skeleton},
data() { data() {
return { return {
encodeStr, encodeStr,
isSkeleton:true,
IssueTimeOptions: [ IssueTimeOptions: [
{ {
label: "不限", label: "不限",
...@@ -590,7 +598,9 @@ export default { ...@@ -590,7 +598,9 @@ export default {
}else{ }else{
delete params.keywordNot delete params.keywordNot
} }
this.isSkeleton = true;
api.jskBidPlanPage(params).then(res=>{ api.jskBidPlanPage(params).then(res=>{
this.isSkeleton = false;
if (res.code==200) { if (res.code==200) {
this.tableData=res.data.list; this.tableData=res.data.list;
this.total=res.data.total; this.total=res.data.total;
...@@ -1151,7 +1161,20 @@ export default { ...@@ -1151,7 +1161,20 @@ export default {
margin-top: 12px; margin-top: 12px;
padding: 16px ; padding: 16px ;
border-bottom: 1px solid #EFEFEF; border-bottom: 1px solid #EFEFEF;
.bottomlist-title-left{
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;
}
}
.title-right{ .title-right{
display: flex; display: flex;
align-items: center; align-items: center;
......
dsk-operate-ui/src/views/radar/components/Establishment/index.vue
View file @ 90ae5091
...@@ -175,7 +175,11 @@ ...@@ -175,7 +175,11 @@
</div> </div>
<div class="bottomlist"> <div class="bottomlist">
<div class="bottomlist-title"> <div class="bottomlist-title">
<div></div> <div class="bottomlist-title-left" >
<p class="title-left">
查询结果
</p>
</div>
<div class="title-right"> <div class="title-right">
<p>共有{{total}}条</p> <p>共有{{total}}条</p>
<p> <p>
...@@ -185,12 +189,13 @@ ...@@ -185,12 +189,13 @@
</div> </div>
</div> </div>
<div class="table-item-jf1" v-if="tableData.length==0"> <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>
<ul class="bottomlist-content" v-if="tableData.length>0"> <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
<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/Establishment/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link> <router-link :to="'/radar/Establishment/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link>
...@@ -269,14 +274,15 @@ ...@@ -269,14 +274,15 @@
<script> <script>
import jsk_data from '../../../../../public/jsk.json'; import jsk_data from '../../../../../public/jsk.json';
import {encodeStr} from "@/assets/js/common.js" import {encodeStr} from "@/assets/js/common.js"
import skeleton from '@/views/project/projectList/component/skeleton'
import api from '@/api/radar/radar.js'; import api from '@/api/radar/radar.js';
export default { export default {
name: 'Establishment', name: 'Establishment',
components: { components:{skeleton},
},
data() { data() {
return { return {
encodeStr, encodeStr,
isSkeleton:true,
//是否为向民间推介项目 //是否为向民间推介项目
isProjectOptions: [{ isProjectOptions: [{
value: 0, value: 0,
...@@ -625,8 +631,9 @@ ...@@ -625,8 +631,9 @@
}, },
establishmentDto: data, establishmentDto: data,
}; };
this.isSkeleton = true;
api.establishmentPage(params).then(res=>{ api.establishmentPage(params).then(res=>{
this.isSkeleton = false;
if (res.code==200) { if (res.code==200) {
this.tableData=res.data.list; this.tableData=res.data.list;
this.total=res.data.total; this.total=res.data.total;
...@@ -1264,7 +1271,20 @@ ...@@ -1264,7 +1271,20 @@
cursor: pointer; cursor: pointer;
} }
} }
.bottomlist-title-left{
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;
}
}
} }
.bottomlist-content{ .bottomlist-content{
......
dsk-operate-ui/src/views/radar/components/Land/index.vue
View file @ 90ae5091
...@@ -202,19 +202,24 @@ ...@@ -202,19 +202,24 @@
<div class="bottomlist"> <div class="bottomlist">
<div class="bottomlist-title"> <div class="bottomlist-title">
<el-popover v-model="fieldshow" placement="bottom-start" trigger="click" <div class="bottomlist-title-left" >
popper-class="viewlist-el-popover"> <p class="title-left">
<ul class="pup_list"> 查询结果
<li v-for="(itme,i) in fieldOptions" :class="itme.status?'active':''" </p>
@click="handsequencingList(i)" :key="i"> <el-popover v-model="fieldshow" placement="bottom-start" trigger="click"
{{itme.value}} popper-class="viewlist-el-popover">
</li> <ul class="pup_list">
</ul> <li v-for="(itme,i) in fieldOptions" :class="itme.status?'active':''"
<span slot="reference" class="toolbar-right-download" > @click="handsequencingList(i)" :key="i">
{{fieldText}}<i class="el-icon-arrow-down" {{itme.value}}
:style="{transform:fieldshow?'rotate(180deg)':''}"></i> </li>
</span> </ul>
</el-popover> <span slot="reference" class="toolbar-right-download" >
{{fieldText}}<i class="el-icon-arrow-down"
:style="{transform:fieldshow?'rotate(180deg)':''}"></i>
</span>
</el-popover>
</div>
<div class="title-right"> <div class="title-right">
<p>共有{{total}}条</p> <p>共有{{total}}条</p>
<p> <p>
...@@ -224,13 +229,13 @@ ...@@ -224,13 +229,13 @@
</div> </div>
</div> </div>
<div class="table-item-jf1" v-if="tableData.length==0"> <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>
<ul class="bottomlist-content" v-if="tableData.length>0"> <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>
...@@ -312,13 +317,16 @@ ...@@ -312,13 +317,16 @@
<script> <script>
import {encodeStr} from "@/assets/js/common.js" import {encodeStr} from "@/assets/js/common.js"
import skeleton from '@/views/project/projectList/component/skeleton'
import api from '@/api/radar/radar.js'; import api from '@/api/radar/radar.js';
import jsk_data from '../../../../../public/jsk.json'; import jsk_data from '../../../../../public/jsk.json';
export default { export default {
name: 'Land', name: 'Land',
components:{skeleton},
data() { data() {
return { return {
encodeStr, encodeStr,
isSkeleton:true,
conditionTitles: { conditionTitles: {
keyword: "关键词:", keyword: "关键词:",
landAddr: "土地坐落:", landAddr: "土地坐落:",
...@@ -612,7 +620,9 @@ ...@@ -612,7 +620,9 @@
}, },
landMarketDto: data, landMarketDto: data,
}; };
this.isSkeleton = true;
api.landMarketPage(params).then(res=>{ api.landMarketPage(params).then(res=>{
this.isSkeleton = false;
if (res.code==200) { if (res.code==200) {
this.tableData=res.data.list; this.tableData=res.data.list;
this.total=res.data.total; this.total=res.data.total;
...@@ -1041,7 +1051,20 @@ ...@@ -1041,7 +1051,20 @@
margin-top: 12px; margin-top: 12px;
padding: 16px ; padding: 16px ;
border-bottom: 1px solid #EFEFEF; border-bottom: 1px solid #EFEFEF;
.bottomlist-title-left{
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;
}
}
.title-right{ .title-right{
display: flex; display: flex;
align-items: center; align-items: center;
......
dsk-operate-ui/src/views/radar/components/Tender/index.vue
View file @ 90ae5091
...@@ -177,19 +177,26 @@ ...@@ -177,19 +177,26 @@
</div> </div>
<div class="bottomlist"> <div class="bottomlist">
<div class="bottomlist-title"> <div class="bottomlist-title">
<p>共有{{total}}条</p> <div class="bottomlist-title-left" >
<p> <p class="title-left">
<img src="@/assets/images/EXCEL.png" alt=""> 查询结果
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span> </p>
</div>
</p> <div class="title-right">
<p>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
</p>
</div>
</div> </div>
<div class="table-item-jf1" v-if="tableData.length==0"> <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>
<ul class="bottomlist-content" v-if="tableData.length>0"> <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
<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/Tender/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"></router-link> <router-link :to="'/radar/Tender/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"></router-link>
...@@ -285,18 +292,20 @@ ...@@ -285,18 +292,20 @@
import Select from "./Select.vue"; import Select from "./Select.vue";
import jsk_data from '../../../../../public/jsk.json'; import jsk_data from '../../../../../public/jsk.json';
import {encodeStr} from "@/assets/js/common.js" import {encodeStr} from "@/assets/js/common.js"
import skeleton from '@/views/project/projectList/component/skeleton'
import api from '@/api/radar/radar.js'; import api from '@/api/radar/radar.js';
export default { export default {
name: 'Tender', name: 'Tender',
components: { components: {
Select Select,skeleton
}, },
data() { data() {
return { return {
//有无联系方式 //有无联系方式
encodeStr, encodeStr,
isSkeleton:true,
phonePointType: [{ phonePointType: [{
value: '', value: '',
label: '不限' label: '不限'
...@@ -787,8 +796,9 @@ ...@@ -787,8 +796,9 @@
}; };
params.keyword = this.keyword; params.keyword = this.keyword;
params.keywordNot = this.keywordNot; params.keywordNot = this.keywordNot;
this.isSkeleton = true;
api.jskBidPage(params).then(res=>{ api.jskBidPage(params).then(res=>{
this.isSkeleton = false;
if (res.code==200) { if (res.code==200) {
this.tableData=res.data.list; this.tableData=res.data.list;
this.total=res.data.total; this.total=res.data.total;
...@@ -1232,31 +1242,48 @@ ...@@ -1232,31 +1242,48 @@
.bottomlist-title { .bottomlist-title {
display: flex; display: flex;
justify-content: end; justify-content: space-between;
align-items: center; align-items: center;
margin-top: 12px; margin-top: 12px;
padding: 24px; padding: 16px ;
border-bottom: 1px solid #EFEFEF; border-bottom: 1px solid #EFEFEF;
.bottomlist-title-left{
p:first-child { display: inline-flex;;
font-size: 12px; align-items: center;
font-weight: 400; .title-left{
color: #3D3D3D; border-left:2px solid #445781;
margin-right: 10px; padding-left:8px;
} padding-right:32px;
font-size: 16px;
p:last-child { height:16px;
font-size: 14px; line-height: 16px;
font-weight: 400; font-weight: bold;
color: rgba(35, 35, 35, 0.8); color: #232323;
} }
img {
width: 18px;
height: 18px;
} }
.excel{ .title-right{
cursor: pointer; 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;
font-size: 14px;
font-weight: 400;
color: rgba(35,35,35,0.8);
}
img{
width: 18px;
height: 18px;
}
.excel{
cursor: pointer;
}
} }
} }
......
dsk-operate-ui/src/views/radar/components/bxprozbgg/index.vue
View file @ 90ae5091
...@@ -331,7 +331,11 @@ ...@@ -331,7 +331,11 @@
</div> </div>
<div class="bottomlist"> <div class="bottomlist">
<div class="bottomlist-title"> <div class="bottomlist-title">
<div></div> <div class="bottomlist-title-left" >
<p class="title-left">
查询结果
</p>
</div>
<div class="title-right"> <div class="title-right">
<p>共有{{total}}条</p> <p>共有{{total}}条</p>
<p> <p>
...@@ -341,13 +345,13 @@ ...@@ -341,13 +345,13 @@
</div> </div>
</div> </div>
<div class="table-item-jf1" v-if="tableData.length==0"> <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>
<div class="table-item" v-if="tableData.length>0"> <div class="table-item" v-if="tableData.length>0&& !isSkeleton">
<el-table :data="tableData" element-loading-text="Loading" border fit highlight-current-row> <el-table :data="tableData" element-loading-text="Loading" border fit highlight-current-row>
<el-table-column label="序号" width="60"> <el-table-column label="序号" width="60">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -486,15 +490,17 @@ ...@@ -486,15 +490,17 @@
import jsk_data from '../../../../../public/jsk.json'; import jsk_data from '../../../../../public/jsk.json';
import Keyword from "@/components/Keyword"; import Keyword from "@/components/Keyword";
import {encodeStr} from "@/assets/js/common.js" import {encodeStr} from "@/assets/js/common.js"
import skeleton from '@/views/project/projectList/component/skeleton'
import api from '@/api/radar/radar.js'; import api from '@/api/radar/radar.js';
export default { export default {
name: "bxprozbgg", name: "bxprozbgg",
components: { components: {
Keyword Keyword,skeleton
}, },
data(){ data(){
return{ return{
encodeStr, encodeStr,
isSkeleton:true,
allDownloadList:[], allDownloadList:[],
province:[ province:[
{ {
...@@ -1635,7 +1641,9 @@ ...@@ -1635,7 +1641,9 @@
params.keyword = this.keyword; params.keyword = this.keyword;
params.keywordNot = this.keywordNot; params.keywordNot = this.keywordNot;
this.currentPage = params.page.page; this.currentPage = params.page.page;
this.isSkeleton = true;
api.jskBidNewsPage(params).then(res=>{ api.jskBidNewsPage(params).then(res=>{
this.isSkeleton = false;
if (res.code==200) { if (res.code==200) {
this.tableData=res.data.list; this.tableData=res.data.list;
this.total=res.data.total; this.total=res.data.total;
...@@ -1987,7 +1995,20 @@ ...@@ -1987,7 +1995,20 @@
align-items: center; align-items: center;
margin-top: 12px; margin-top: 12px;
padding: 16px ; padding: 16px ;
.bottomlist-title-left{
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;
}
}
.title-right{ .title-right{
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -2030,7 +2051,6 @@ ...@@ -2030,7 +2051,6 @@
} }
} }
} }
} }
.bottomlist-content{ .bottomlist-content{
......
dsk-operate-ui/src/views/radar/components/debtProject/index.vue
View file @ 90ae5091
...@@ -91,20 +91,26 @@ ...@@ -91,20 +91,26 @@
<div class="bottomlist"> <div class="bottomlist">
<div class="bottomlist-title"> <div class="bottomlist-title">
<p>共有{{total}}条</p> <div class="bottomlist-title-left" >
<p> <p class="title-left">
<img src="@/assets/images/EXCEL.png" alt=""> 查询结果
</p>
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span> </div>
<div class="title-right">
</p> <p>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
</p>
</div>
</div> </div>
<div class="table-item-jf1" v-if="tableData.length==0"> <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>
<ul class="bottomlist-content" v-if="tableData.length>0"> <skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
<ul class="bottomlist-content" v-if="!isSkeleton&&tableData.length>0">
<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/debtProject/details/'+ item.uuid" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link> <router-link :to="'/radar/debtProject/details/'+ item.uuid" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link>
...@@ -180,13 +186,16 @@ ...@@ -180,13 +186,16 @@
<script> <script>
import {encodeStr} from "@/assets/js/common.js" import {encodeStr} from "@/assets/js/common.js"
import skeleton from '@/views/project/projectList/component/skeleton'
import api from '@/api/radar/radar.js'; import api from '@/api/radar/radar.js';
import jsk_data from '../../../../../public/jsk.json'; import jsk_data from '../../../../../public/jsk.json';
export default { export default {
name: 'debtProject', name: 'debtProject',
components:{skeleton},
data() { data() {
return { return {
encodeStr, encodeStr,
isSkeleton:true,
projectName:'', projectName:'',
nameTypeList: [{ nameTypeList: [{
key: 'like', key: 'like',
...@@ -250,7 +259,7 @@ ...@@ -250,7 +259,7 @@
this.search(); this.search();
}, },
searchDic(){ searchDic(){
api.searchDic().then(res=>{ api.searchDic().then(res=>{
this.specialBondProjectType=res.specialBondProjectType; this.specialBondProjectType=res.specialBondProjectType;
}).catch(error=>{ }).catch(error=>{
...@@ -490,8 +499,9 @@ ...@@ -490,8 +499,9 @@
if(this.projectType.length>0&&this.projectType[0]!='不限'){ if(this.projectType.length>0&&this.projectType[0]!='不限'){
params.specialBondProjectDto['projectType'] = this.projectType.join(','); params.specialBondProjectDto['projectType'] = this.projectType.join(',');
} }
this.isSkeleton = true;
api.bondProjectPage(params).then(res=>{ api.bondProjectPage(params).then(res=>{
this.isSkeleton = false;
if (res.code==200) { if (res.code==200) {
this.tableData=res.data.list; this.tableData=res.data.list;
this.total=res.data.total; this.total=res.data.total;
...@@ -672,28 +682,48 @@ ...@@ -672,28 +682,48 @@
border-radius: 4px 4px 4px 4px; border-radius: 4px 4px 4px 4px;
.bottomlist-title{ .bottomlist-title{
display: flex; display: flex;
justify-content: end; justify-content: space-between;
align-items: center; align-items: center;
margin-top: 12px; margin-top: 12px;
padding: 24px ; padding: 16px ;
border-bottom: 1px solid #EFEFEF; border-bottom: 1px solid #EFEFEF;
p:first-child{ .bottomlist-title-left{
font-size: 12px; display: inline-flex;;
font-weight: 400; align-items: center;
color: #3D3D3D; .title-left{
margin-right: 10px; border-left:2px solid #445781;
} padding-left:8px;
p:last-child{ padding-right:32px;
font-size: 14px; font-size: 16px;
font-weight: 400; height:16px;
color: rgba(35,35,35,0.8); line-height: 16px;
} font-weight: bold;
img{ color: #232323;
width: 18px; }
height: 18px;
} }
.excel{ .title-right{
cursor: pointer; 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;
font-size: 14px;
font-weight: 400;
color: rgba(35,35,35,0.8);
}
img{
width: 18px;
height: 18px;
}
.excel{
cursor: pointer;
}
} }
} }
.bottomlist-content{ .bottomlist-content{
......
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