Skip to content

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

UI优化

parent ae00c4f7
Show 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 = [
path: '/biddetail/:id(\\d+)',
component: () => import('@/views/detail//biddetail/index'),
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 @@
</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="">
<div class="item-jf-titel">抱歉，没找到相关数据！</div>
<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</div>
</div>
<div class=" table-item-jf" v-if="tableData.length>0">
<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>
<skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
<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">
<template slot-scope="scope">
<span>{{(pageNum - 1) *20 + scope.$index + 1}}</span>
......@@ -484,12 +486,15 @@
<script>
import {encodeStr} from "@/assets/js/common.js"
import jsk_data from '../../../../../public/jsk.json';
import skeleton from '@/views/project/projectList/component/skeleton'
import api from '@/api/enterpriseData/enterpriseData.js';
export default {
name: 'Owner',
components:{skeleton},
data() {
return {
encodeStr,
isSkeleton:true,
keys:'',
addressList: [],
addressType: [],
......@@ -498,10 +503,7 @@ export default {
expandTrigger: "hover",
value: "id",
},
loading:false,
pageSize: 20,
jskBidQueryDto: {
provinceIds: [],
cityIds: [],
......@@ -918,9 +920,9 @@ export default {
}else{
delete params.equityRelationship
}
this.loading = true;
this.isSkeleton = true;
api.uipSerach(params).then(res=>{
this.loading = false;
this.isSkeleton = false
// console.log(res)
if (res.code==200) {
this.tableData=res.rows;
......@@ -928,7 +930,6 @@ export default {
}
}).catch(error=>{
this.loading = false;
});
},
......
dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue
View file @ 90ae5091
......@@ -454,12 +454,13 @@
</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="">
<div class="item-jf-titel">抱歉，没找到相关数据！</div>
<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</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">
<div class="info-list-left">
<img v-if="item.logoUrl" :src="item.logoUrl" :alt="item.name.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" />
......@@ -584,8 +585,10 @@
import options from '@/assets/json/options.json';
import api from '@/api/enterpriseData/enterpriseData.js';
import {encodeStr} from "@/assets/js/common.js"
import skeleton from '@/views/project/projectList/component/skeleton'
export default {
name: 'EnterpriseQuery',
components:{skeleton},
directives: {
numberOnly: {
bind: function(el) {
......@@ -605,6 +608,7 @@
return {
encodeStr,
ename: '',
isSkeleton:true,
enameQueryTypeList: [{
key: 'and',
status: false,
......@@ -2752,7 +2756,9 @@
data.aptitudeQueryDto['aptitudeDtoList'] = aptitudeDtoList;
data.aptitudeQueryDto['aptitudeSource'] = 'new';
}
this.isSkeleton = true;
api.enterprisePage(data).then(res=>{
this.isSkeleton = false
if (res.code==200) {
this.tableData=res.data.list;
this.total=res.data.total;
......
dsk-operate-ui/src/views/macro/financing/details.vue
View file @ 90ae5091
......@@ -225,7 +225,7 @@ export default {
img{
width: 28px;
height: 28px;
margin-bottom: -9px;
// margin-bottom: -9px;
margin-right: 17px;
}
}
......
dsk-operate-ui/src/views/radar/components/BidRecord/index.vue
View file @ 90ae5091
......@@ -119,7 +119,11 @@
</div>
<div class="bottomlist">
<div class="bottomlist-title">
<div></div>
<div class="bottomlist-title-left" >
<p class="title-left">
查询结果
</p>
</div>
<div class="title-right">
<p>共有{{total}}条</p>
<p>
......@@ -129,12 +133,13 @@
</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="">
<div class="item-jf-titel">抱歉，没找到相关数据！</div>
<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</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">
<p class="list-titel">
<router-link :to="'/radar/BidRecord/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"></router-link>
......@@ -184,11 +189,14 @@
<script>
import jsk_data from '../../../../../public/jsk.json';
import {encodeStr} from "@/assets/js/common.js"
import skeleton from '@/views/project/projectList/component/skeleton'
import api from '@/api/radar/radar.js';
export default {
name: 'BidRecord',
components:{skeleton},
data() {
return {
isSkeleton:true,
addressList: [],
addressType: [],
props: {
......@@ -434,7 +442,9 @@ export default {
}else{
delete params.keywordNot
}
this.isSkeleton = true;
api.jskBidTenderPage(params).then(res=>{
this.isSkeleton = false;
if (res.code==200) {
this.tableData=res.data.list;
this.total=res.data.total;
......@@ -970,7 +980,20 @@ export default {
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{
......
dsk-operate-ui/src/views/radar/components/Bidding/index.vue
View file @ 90ae5091
......@@ -204,7 +204,11 @@
</div>
<div class="bottomlist">
<div class="bottomlist-title">
<div></div>
<div class="bottomlist-title-left" >
<p class="title-left">
查询结果
</p>
</div>
<div class="title-right">
<p>共有{{total}}条</p>
<p>
......@@ -214,12 +218,13 @@
</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="">
<div class="item-jf-titel">抱歉，没找到相关数据！</div>
<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</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">
<p class="list-titel">
<router-link :to="'/radar/Bidding/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link>
......@@ -306,12 +311,15 @@
<script>
import jsk_data from '../../../../../public/jsk.json';
import {encodeStr} from "@/assets/js/common.js"
import skeleton from '@/views/project/projectList/component/skeleton'
import api from '@/api/radar/radar.js';
export default {
name: 'Bidding',
components:{skeleton},
data() {
return {
encodeStr,
isSkeleton:true,
IssueTimeOptions: [
{
label: "不限",
......@@ -590,7 +598,9 @@ export default {
}else{
delete params.keywordNot
}
this.isSkeleton = true;
api.jskBidPlanPage(params).then(res=>{
this.isSkeleton = false;
if (res.code==200) {
this.tableData=res.data.list;
this.total=res.data.total;
......@@ -1151,7 +1161,20 @@ export default {
margin-top: 12px;
padding: 16px ;
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{
display: flex;
align-items: center;
......
dsk-operate-ui/src/views/radar/components/Establishment/index.vue
View file @ 90ae5091
......@@ -175,7 +175,11 @@
</div>
<div class="bottomlist">
<div class="bottomlist-title">
<div></div>
<div class="bottomlist-title-left" >
<p class="title-left">
查询结果
</p>
</div>
<div class="title-right">
<p>共有{{total}}条</p>
<p>
......@@ -185,12 +189,13 @@
</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="">
<div class="item-jf-titel">抱歉，没找到相关数据！</div>
<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</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">
<p class="list-titel">
<router-link :to="'/radar/Establishment/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link>
......@@ -269,14 +274,15 @@
<script>
import jsk_data from '../../../../../public/jsk.json';
import {encodeStr} from "@/assets/js/common.js"
import skeleton from '@/views/project/projectList/component/skeleton'
import api from '@/api/radar/radar.js';
export default {
name: 'Establishment',
components: {
},
components:{skeleton},
data() {
return {
encodeStr,
isSkeleton:true,
//是否为向民间推介项目
isProjectOptions: [{
value: 0,
......@@ -625,8 +631,9 @@
},
establishmentDto: data,
};
this.isSkeleton = true;
api.establishmentPage(params).then(res=>{
this.isSkeleton = false;
if (res.code==200) {
this.tableData=res.data.list;
this.total=res.data.total;
......@@ -1264,7 +1271,20 @@
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{
......
dsk-operate-ui/src/views/radar/components/Land/index.vue
View file @ 90ae5091
......@@ -202,6 +202,10 @@
<div class="bottomlist">
<div class="bottomlist-title">
<div class="bottomlist-title-left" >
<p class="title-left">
查询结果
</p>
<el-popover v-model="fieldshow" placement="bottom-start" trigger="click"
popper-class="viewlist-el-popover">
<ul class="pup_list">
......@@ -215,6 +219,7 @@
:style="{transform:fieldshow?'rotate(180deg)':''}"></i>
</span>
</el-popover>
</div>
<div class="title-right">
<p>共有{{total}}条</p>
<p>
......@@ -224,13 +229,13 @@
</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="">
<div class="item-jf-titel">抱歉，没找到相关数据！</div>
<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</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">
<p class="list-titel">
<router-link :to="'/radar/Land/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"></router-link>
......@@ -312,13 +317,16 @@
<script>
import {encodeStr} from "@/assets/js/common.js"
import skeleton from '@/views/project/projectList/component/skeleton'
import api from '@/api/radar/radar.js';
import jsk_data from '../../../../../public/jsk.json';
export default {
name: 'Land',
components:{skeleton},
data() {
return {
encodeStr,
isSkeleton:true,
conditionTitles: {
keyword: "关键词:",
landAddr: "土地坐落:",
......@@ -612,7 +620,9 @@
},
landMarketDto: data,
};
this.isSkeleton = true;
api.landMarketPage(params).then(res=>{
this.isSkeleton = false;
if (res.code==200) {
this.tableData=res.data.list;
this.total=res.data.total;
......@@ -1041,7 +1051,20 @@
margin-top: 12px;
padding: 16px ;
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{
display: flex;
align-items: center;
......
dsk-operate-ui/src/views/radar/components/Tender/index.vue
View file @ 90ae5091
......@@ -177,19 +177,26 @@
</div>
<div class="bottomlist">
<div class="bottomlist-title">
<div class="bottomlist-title-left" >
<p class="title-left">
查询结果
</p>
</div>
<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 class="table-item-jf1" v-if="tableData.length==0">
</div>
<div class="table-item-jf1" v-if="tableData.length==0&& !isSkeleton">
<img class="item-jf-img" src="@/assets/images/kong.png" alt="">
<div class="item-jf-titel">抱歉，没找到相关数据！</div>
<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</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">
<p class="list-titel">
<router-link :to="'/radar/Tender/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"></router-link>
......@@ -285,18 +292,20 @@
import Select from "./Select.vue";
import jsk_data from '../../../../../public/jsk.json';
import {encodeStr} from "@/assets/js/common.js"
import skeleton from '@/views/project/projectList/component/skeleton'
import api from '@/api/radar/radar.js';
export default {
name: 'Tender',
components: {
Select
Select,skeleton
},
data() {
return {
//有无联系方式
encodeStr,
isSkeleton:true,
phonePointType: [{
value: '',
label: '不限'
......@@ -787,8 +796,9 @@
};
params.keyword = this.keyword;
params.keywordNot = this.keywordNot;
this.isSkeleton = true;
api.jskBidPage(params).then(res=>{
this.isSkeleton = false;
if (res.code==200) {
this.tableData=res.data.list;
this.total=res.data.total;
......@@ -1232,26 +1242,42 @@
.bottomlist-title {
display: flex;
justify-content: end;
justify-content: space-between;
align-items: center;
margin-top: 12px;
padding: 24px;
padding: 16px ;
border-bottom: 1px solid #EFEFEF;
p:first-child {
.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{
display: flex;
align-items: center;
p:first-child{
font-size: 12px;
font-weight: 400;
color: #3D3D3D;
margin-right: 10px;
}
p:last-child {
p:last-child{
display: flex;
align-items: center;
font-size: 14px;
font-weight: 400;
color: rgba(35, 35, 35, 0.8);
color: rgba(35,35,35,0.8);
}
img {
img{
width: 18px;
height: 18px;
}
......@@ -1259,6 +1285,7 @@
cursor: pointer;
}
}
}
.bottomlist-content {
......
dsk-operate-ui/src/views/radar/components/bxprozbgg/index.vue
View file @ 90ae5091
......@@ -331,7 +331,11 @@
</div>
<div class="bottomlist">
<div class="bottomlist-title">
<div></div>
<div class="bottomlist-title-left" >
<p class="title-left">
查询结果
</p>
</div>
<div class="title-right">
<p>共有{{total}}条</p>
<p>
......@@ -341,13 +345,13 @@
</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="">
<div class="item-jf-titel">抱歉，没找到相关数据！</div>
<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</div>
</div>
<div class="table-item" v-if="tableData.length>0">
<skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
<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-column label="序号" width="60">
<template slot-scope="scope">
......@@ -486,15 +490,17 @@
import jsk_data from '../../../../../public/jsk.json';
import Keyword from "@/components/Keyword";
import {encodeStr} from "@/assets/js/common.js"
import skeleton from '@/views/project/projectList/component/skeleton'
import api from '@/api/radar/radar.js';
export default {
name: "bxprozbgg",
components: {
Keyword
Keyword,skeleton
},
data(){
return{
encodeStr,
isSkeleton:true,
allDownloadList:[],
province:[
{
......@@ -1635,7 +1641,9 @@
params.keyword = this.keyword;
params.keywordNot = this.keywordNot;
this.currentPage = params.page.page;
this.isSkeleton = true;
api.jskBidNewsPage(params).then(res=>{
this.isSkeleton = false;
if (res.code==200) {
this.tableData=res.data.list;
this.total=res.data.total;
......@@ -1987,7 +1995,20 @@
align-items: center;
margin-top: 12px;
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{
display: flex;
align-items: center;
......@@ -2030,7 +2051,6 @@
}
}
}
}
.bottomlist-content{
......
dsk-operate-ui/src/views/radar/components/debtProject/index.vue
View file @ 90ae5091
......@@ -91,20 +91,26 @@
<div class="bottomlist">
<div class="bottomlist-title">
<div class="bottomlist-title-left" >
<p class="title-left">
查询结果
</p>
</div>
<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 class="table-item-jf1" v-if="tableData.length==0">
</div>
<div class="table-item-jf1" v-if="tableData.length==0&& !isSkeleton">
<img class="item-jf-img" src="@/assets/images/kong.png" alt="">
<div class="item-jf-titel">抱歉，没找到相关数据！</div>
<div class="item-jf-text">建议调整关键词或筛选条件，重新搜索！</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">
<p class="list-titel">
<router-link :to="'/radar/debtProject/details/'+ item.uuid" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link>
......@@ -180,13 +186,16 @@
<script>
import {encodeStr} from "@/assets/js/common.js"
import skeleton from '@/views/project/projectList/component/skeleton'
import api from '@/api/radar/radar.js';
import jsk_data from '../../../../../public/jsk.json';
export default {
name: 'debtProject',
components:{skeleton},
data() {
return {
encodeStr,
isSkeleton:true,
projectName:'',
nameTypeList: [{
key: 'like',
......@@ -490,8 +499,9 @@
if(this.projectType.length>0&&this.projectType[0]!='不限'){
params.specialBondProjectDto['projectType'] = this.projectType.join(',');
}
this.isSkeleton = true;
api.bondProjectPage(params).then(res=>{
this.isSkeleton = false;
if (res.code==200) {
this.tableData=res.data.list;
this.total=res.data.total;
......@@ -672,11 +682,28 @@
border-radius: 4px 4px 4px 4px;
.bottomlist-title{
display: flex;
justify-content: end;
justify-content: space-between;
align-items: center;
margin-top: 12px;
padding: 24px ;
padding: 16px ;
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{
display: flex;
align-items: center;
p:first-child{
font-size: 12px;
font-weight: 400;
......@@ -684,6 +711,8 @@
margin-right: 10px;
}
p:last-child{
display: flex;
align-items: center;
font-size: 14px;
font-weight: 400;
color: rgba(35,35,35,0.8);
......@@ -696,6 +725,7 @@
cursor: pointer;
}
}
}
.bottomlist-content{
padding-bottom: 0px;
......
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