Skip to content

D
dsk-cr20g
Commit 09d529f0 authored by yht15023815643's avatar yht15023815643
Browse files
Options

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

parents c3fc63ff 06b7e352
Hide whitespace changes
Inline Side-by-side
Showing with 606 additions and 303 deletions
dsk-common/src/main/java/com/dsk/common/dtos/SpecialPurposeBondsPageDto.java
View file @ 09d529f0
...@@ -16,6 +16,15 @@ public class SpecialPurposeBondsPageDto extends BasePage { ...@@ -16,6 +16,15 @@ public class SpecialPurposeBondsPageDto extends BasePage {
* 省Id * 省Id
*/ */
private Integer provinceId; private Integer provinceId;
/**
* 市Id
*/
private Integer cityId;
/**
* 区Id
*/
private Integer areaId;
/** /**
* 市Id * 市Id
......
dsk-operate-ui/src/assets/js/jskplug.js
View file @ 09d529f0
...@@ -3,16 +3,19 @@ ...@@ -3,16 +3,19 @@
* 1、url地址，如企业详情：https://pre-plug.jiansheku.com/enterprise?ak=aec7b3ff2y2q8x6t49a7e2c463ce21912&uid=a704fb35bca54707b9b5f8c9bba57815（ak：平台唯一标识；uid：用户标识） * 1、url地址，如企业详情：https://pre-plug.jiansheku.com/enterprise?ak=aec7b3ff2y2q8x6t49a7e2c463ce21912&uid=a704fb35bca54707b9b5f8c9bba57815（ak：平台唯一标识；uid：用户标识）
* *
* */ * */
const steerScroll = function (iframeId, navHeight, state, parentId){ //state:监听or移除监听；navHeight:页面排除iframe后剩下高度；iframeId: iframe的id const steerScroll = function(iframeId, navigation, state, parentId) { // state:监听or移除监听；navigation:页面排除iframe后剩下高度；iframeId: iframe的id
let dom = window let dom = window
if(parentId){// 默认页面可以滚动 if (parentId) { // 默认页面可以滚动
dom = document.getElementById(parentId) dom = document.getElementById(parentId)
if(!dom){
return
}
dom.style.overflow = 'auto' dom.style.overflow = 'auto'
navHeight = 0 navigation.totalHeight = 0
}else{ } else {
document.body.style.overflow = 'visible' document.body.style.overflow = 'visible'
} }
if(state){ if (state) {
window.addEventListener('message', function(e) { window.addEventListener('message', function(e) {
const data = e.data const data = e.data
const sct = parentId ? dom.scrollTop : document && document.documentElement.scrollTop || document && document.body.scrollTop const sct = parentId ? dom.scrollTop : document && document.documentElement.scrollTop || document && document.body.scrollTop
...@@ -20,10 +23,11 @@ const steerScroll = function (iframeId, navHeight, state, parentId){ //state: ...@@ -20,10 +23,11 @@ const steerScroll = function (iframeId, navHeight, state, parentId){ //state:
// 动态设置iFrame高度 // 动态设置iFrame高度
if (data.height) { if (data.height) {
document.getElementById(iframeId).style.height = data.height+'px' document.getElementById(iframeId).style.height = data.height+'px'
scrolling(iframeId, navHeight, parentId) // 初始加载获取滚动条距离顶部高度 scrolling(iframeId, navigation, parentId) // 初始加载获取滚动条距离顶部高度
} }
// 点击企业详情页 栏目名动态设置滚动高度 // 点击企业详情页 栏目名动态设置滚动高度
if (data.scrollHeight) { if (data.scrollHeight) {
let navHeight = navigation.isFixed ? navigation.totalHeight - navigation.fixedHeight : navigation.totalHeight
dom.scrollTo(sct, parseInt(data.scrollHeight) + navHeight) dom.scrollTo(sct, parseInt(data.scrollHeight) + navHeight)
} }
// 点击企业详情页 栏目下拉子标签动态设置滚动高度 // 点击企业详情页 栏目下拉子标签动态设置滚动高度
...@@ -31,34 +35,39 @@ const steerScroll = function (iframeId, navHeight, state, parentId){ //state: ...@@ -31,34 +35,39 @@ const steerScroll = function (iframeId, navHeight, state, parentId){ //state:
dom.scrollTo(sct, sct - parseInt(data.clientHeight)) dom.scrollTo(sct, sct - parseInt(data.clientHeight))
} }
// 点击下拉子标签动态设置滚动高度 // 点击下拉子标签动态设置滚动高度
if (data.initHeight>=0) { if (data.initHeight >= 0) {
dom.scrollTo(sct, data.initHeight) dom.scrollTo(sct, data.initHeight)
} }
// 根据子页面弹窗显示隐藏控制当前页面是否固定不可滚动 // 根据子页面弹窗显示隐藏控制当前页面是否固定不可滚动
if (data.scrollDisabled||data.scrollDisabled==false) { if (data.scrollDisabled || data.scrollDisabled === false) {
if(parentId){ if (parentId) {
dom.style.overflow = data.scrollDisabled?'hidden':'auto' dom.style.overflow = data.scrollDisabled ? 'hidden' : 'auto'
}else{ } else {
document.body.style.overflow = data.scrollDisabled?'hidden':'visible' document.body.style.overflow = data.scrollDisabled ? 'hidden' : 'visible'
} }
} }
} }
}) })
dom.addEventListener('scroll', scrolling(iframeId, navHeight, parentId)) dom.addEventListener('scroll', (event) => {
}else{ scrolling(iframeId, navigation, parentId)
dom.removeEventListener('scroll', scrolling(iframeId, navHeight, parentId)) })
} else {
dom.removeEventListener('scroll', (event) => {
scrolling(iframeId, navigation, parentId)
})
} }
} }
const scrolling = function (iframeId, navHeight, parentId){ const scrolling = function(iframeId, navigation, parentId) {
// 滚动条距文档顶部的距离 // 滚动条距文档顶部的距离
let scrollTop = parentId ? document.getElementById(parentId).scrollTop : window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop let scrollTop = parentId ? document.getElementById(parentId).scrollTop : window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
// 将滚动距离传入子组件 // 将滚动距离传入子组件
const ifa = document.getElementById(iframeId) const ifa = document.getElementById(iframeId)
if(scrollTop<navHeight){ if ((scrollTop < navigation.totalHeight && !navigation.isFixed) || navigation.isFixed) {
scrollTop = scrollTop+navHeight scrollTop = scrollTop + navigation.totalHeight
} }
ifa.contentWindow.postMessage({ 'scrollTop': scrollTop }, '*') const bodyHeight = document.body.clientHeight - navigation.totalHeight
ifa.contentWindow.postMessage({ 'scrollTop': scrollTop, 'bodyHeight': bodyHeight }, '*')
} }
export { export {
......
dsk-operate-ui/src/assets/styles/index.scss
View file @ 09d529f0
...@@ -656,6 +656,9 @@ ul, li { ...@@ -656,6 +656,9 @@ ul, li {
height: 32px; height: 32px;
border: 0; border: 0;
} }
.el-input__suffix{
margin-top: -1px;
}
} }
.btn{ .btn{
background: #F5F5F5; background: #F5F5F5;
......
dsk-operate-ui/src/assets/styles/project.scss
View file @ 09d529f0
...@@ -827,10 +827,22 @@ ...@@ -827,10 +827,22 @@
right: 16px; right: 16px;
top: 17px; top: 17px;
.searchInput{ .searchInput{
width: 178px; &.small{
border: 1px solid #D9D9D9; border: 1px solid #d9d9d9;
.el-input--medium .el-input__inner{ width: 240px;
font-size: 12px; .el-input{
width: 180px;
}
.el-input__inner{
padding-right: 32px;
}
.el-input__prefix{
left: 8px;
top: -3px;
img{
width: 16px;
}
}
} }
} }
.b2{ .b2{
...@@ -1187,3 +1199,6 @@ ...@@ -1187,3 +1199,6 @@
//box-shadow: 4px 0 9px -5px rgba(0, 0, 0, 0.12); //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); //-webkit-box-shadow: 4px 0 9px -5px rgba(0, 0, 0, 0.12);
} }
.el-select .el-input__inner{
padding-left: 16px;
}
dsk-operate-ui/src/assets/styles/sidebar.scss
View file @ 09d529f0
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
transition: margin-left .28s; transition: margin-left .28s;
margin-left: $base-sidebar-width; margin-left: $base-sidebar-width;
position: relative; position: relative;
background: #F5F5F5;
} }
.sidebarHide { .sidebarHide {
...@@ -37,12 +38,12 @@ ...@@ -37,12 +38,12 @@
animation-fill-mode: forwards; animation-fill-mode: forwards;
z-index: 1002; z-index: 1002;
} }
@keyframes left-right{ @keyframes left-right{
0%{right: 0;} 0%{right: 0;}
100%{right: -21px;} 100%{right: -21px;}
} }
// reset element-ui css // reset element-ui css
.horizontal-collapse-transition { .horizontal-collapse-transition {
transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out; transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
...@@ -58,10 +59,10 @@ ...@@ -58,10 +59,10 @@
.el-scrollbar { .el-scrollbar {
height: 100%; height: 100%;
} }
&.has-logo { &.has-logo {
.el-scrollbar { .el-scrollbar {
...@@ -138,8 +139,8 @@ ...@@ -138,8 +139,8 @@
background: #fff!important; background: #fff!important;
} }
} }
// menu hover // menu hover
.submenu-title-noDropdown, .el-submenu__title { .submenu-title-noDropdown, .el-submenu__title {
color: #fff!important; color: #fff!important;
...@@ -150,9 +151,9 @@ ...@@ -150,9 +151,9 @@
border: 1px solid #2b3f69; border: 1px solid #2b3f69;
} }
} }
} }
.sidebar-container .el-submenu .el-menu-item:hover,.sidebar-container .nest-menu .el-submenu>.el-submenu__title:hover { .sidebar-container .el-submenu .el-menu-item:hover,.sidebar-container .nest-menu .el-submenu>.el-submenu__title:hover {
background-color: #1e2c4c!important; background-color: #1e2c4c!important;
...@@ -160,7 +161,7 @@ ...@@ -160,7 +161,7 @@
border-radius: 10px; border-radius: 10px;
border: 1px solid #2b3f69; border: 1px solid #2b3f69;
} }
.sidebar-container .el-submenu .el-menu-item:before, .sidebar-container .nest-menu .el-submenu>.el-submenu__title:before { .sidebar-container .el-submenu .el-menu-item:before, .sidebar-container .nest-menu .el-submenu>.el-submenu__title:before {
position: absolute; position: absolute;
width: 2px; width: 2px;
...@@ -210,7 +211,7 @@ ...@@ -210,7 +211,7 @@
vertical-align: -0.15em; vertical-align: -0.15em;
fill: currentColor; fill: currentColor;
overflow: hidden; overflow: hidden;
} }
} }
} }
...@@ -405,4 +406,4 @@ ...@@ -405,4 +406,4 @@
padding-top: 6px; padding-top: 6px;
padding-bottom: 10px; padding-bottom: 10px;
} }
} }
\ No newline at end of file
dsk-operate-ui/src/components/SvgIcon/index.vue
View file @ 09d529f0
...@@ -46,9 +46,9 @@ export default { ...@@ -46,9 +46,9 @@ export default {
<style scoped> <style scoped>
.svg-icon { .svg-icon {
width: 1em; width: 1.29em;
height: 1em; height: 1.29em;
vertical-align: -0.15em; /*vertical-align: -0.22em;*/
fill: currentColor; fill: currentColor;
overflow: hidden; overflow: hidden;
} }
......
dsk-operate-ui/src/layout/components/AppMain.vue
View file @ 09d529f0
...@@ -45,6 +45,7 @@ export default { ...@@ -45,6 +45,7 @@ export default {
min-height: calc(100vh - 56px); min-height: calc(100vh - 56px);
min-width:1440px; min-width:1440px;
background: #F5F5F5; background: #F5F5F5;
overflow: initial;
} }
.fixed-header + .app-main { .fixed-header + .app-main {
......
dsk-operate-ui/src/layout/components/Navbar.vue
View file @ 09d529f0
...@@ -147,9 +147,9 @@ export default { ...@@ -147,9 +147,9 @@ export default {
.user-avatar { .user-avatar {
display: inline-block; display: inline-block;
cursor: pointer; cursor: pointer;
width: 20px; width: 24px;
height: 20px; height: 24px;
line-height: 20px; line-height: 24px;
text-align: center; text-align: center;
background: #E3EEF9; background: #E3EEF9;
color: #0081FF; color: #0081FF;
......
dsk-operate-ui/src/views/custom/customList/index.vue
View file @ 09d529f0
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="app-container"> <div class="app-container">
<el-card class="box-card noborder"> <el-card class="box-card noborder">
<div class="tables"> <div class="tables">
<div class="empty" v-if="tableData.total==0"> <div class="empty" v-if="tableData.total==0 && !isSkeleton">
<img src="@/assets/images/project/empty.png"> <img src="@/assets/images/project/empty.png">
<div class="p1">抱歉，没找到相关数据</div> <div class="p1">抱歉，没找到相关数据</div>
<div class="p2">建议调整关键词或筛选条件，重新搜索</div> <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
...@@ -25,7 +25,8 @@ ...@@ -25,7 +25,8 @@
<div class="btn btn_primary h32 p10" @click="opennew"><div class="img img1"></div>添加客户</div> <div class="btn btn_primary h32 p10" @click="opennew"><div class="img img1"></div>添加客户</div>
</div> </div>
</div> </div>
<el-table v-if="tableData.total > 0" <skeleton v-if="isSkeleton"></skeleton>
<el-table v-if="!isSkeleton&&tableData.total > 0"
:data="tableData.rows" :data="tableData.rows"
stripe border stripe border
style="width: 100%"> style="width: 100%">
...@@ -159,8 +160,11 @@ ...@@ -159,8 +160,11 @@
label="主营业务" width="400"> label="主营业务" width="400">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.mainBusiness == null || scope.row.mainBusiness == ''">--</div> <div v-if="scope.row.mainBusiness == null || scope.row.mainBusiness == ''">--</div>
<div class="box" v-else-if="scope.row.sq1==true">{{scope.row.mainBusiness1}}...<span @click="sq1(scope.row,false)">更多</span></div> <div v-if="scope.row.mainBusiness1">
<div class="box" v-else>{{scope.row.mainBusiness}}<span @click="sq1(scope.row,true)">收起</span></div> <div class="box" v-if="scope.row.sq1==true">{{scope.row.mainBusiness1}}...<span @click="sq1(scope.row,false)">更多</span></div>
<div class="box" v-else>{{scope.row.mainBusiness}}<span @click="sq1(scope.row,true)">收起</span></div>
</div>
<div v-else>{{scope.row.mainBusiness}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -168,8 +172,11 @@ ...@@ -168,8 +172,11 @@
label="发包属性" width="400"> label="发包属性" width="400">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.companyAttribute == null || scope.row.companyAttribute == ''">--</div> <div v-if="scope.row.companyAttribute == null || scope.row.companyAttribute == ''">--</div>
<div class="box" v-else-if="scope.row.sq2==true">{{scope.row.companyAttribute1}}...<span @click="sq2(scope.row,false)">更多</span></div> <div v-if="scope.row.companyAttribute1">
<div class="box" v-else>{{scope.row.companyAttribute}}<span @click="sq2(scope.row,true)">收起</span></div> <div class="box" v-if="scope.row.sq2==true">{{scope.row.companyAttribute1}}...<span @click="sq2(scope.row,false)">更多</span></div>
<div class="box" v-else>{{scope.row.companyAttribute}}<span @click="sq2(scope.row,true)">收起</span></div>
</div>
<div v-else>{{scope.row.companyAttribute}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -245,11 +252,12 @@ ...@@ -245,11 +252,12 @@
import {getEnterprise,getDictType,} from '@/api/main' import {getEnterprise,getDictType,} from '@/api/main'
import prvinceTree from '@/assets/json/provinceTree' import prvinceTree from '@/assets/json/provinceTree'
import batchimport from '../../project/projectList/component/batchImport' import batchimport from '../../project/projectList/component/batchImport'
import skeleton from '../../project/projectList/component/skeleton'
import axios from 'axios' import axios from 'axios'
import {encodeStr} from "@/assets/js/common" import {encodeStr} from "@/assets/js/common"
export default { export default {
name: 'CustomList', name: 'CustomList',
components:{batchimport}, components:{batchimport,skeleton},
data() { data() {
return{ return{
encodeStr, encodeStr,
...@@ -297,6 +305,7 @@ export default { ...@@ -297,6 +305,7 @@ export default {
// isNew:true, // isNew:true,
showlist:false, showlist:false,
keys:1, keys:1,
isSkeleton:true,
} }
}, },
created() { created() {
...@@ -343,6 +352,7 @@ export default { ...@@ -343,6 +352,7 @@ export default {
//获取客户列表 //获取客户列表
getCustomerList(){ getCustomerList(){
getCustomerList(this.searchParam).then(result=>{ getCustomerList(this.searchParam).then(result=>{
this.isSkeleton = false
this.tableData = result this.tableData = result
this.tableData.rows.forEach(item=>{ this.tableData.rows.forEach(item=>{
item.registerCapital = item.registerCapital == null?null: item.registerCapital.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1') item.registerCapital = item.registerCapital == null?null: item.registerCapital.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')
...@@ -358,6 +368,7 @@ export default { ...@@ -358,6 +368,7 @@ export default {
}else{ }else{
item.sq2 = false item.sq2 = false
} }
console.log(item)
}) })
}) })
}, },
...@@ -378,6 +389,7 @@ export default { ...@@ -378,6 +389,7 @@ export default {
}, },
//翻页 //翻页
handleCurrentChange(val) { handleCurrentChange(val) {
this.isSkeleton = true
this.pldr=false this.pldr=false
// this.isNew = false // this.isNew = false
this.searchParam.pageNum=val this.searchParam.pageNum=val
......
dsk-operate-ui/src/views/custom/historicalCustomers/index.vue
View file @ 09d529f0
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="app-container"> <div class="app-container">
<el-card class="box-card noborder"> <el-card class="box-card noborder">
<div class="tables"> <div class="tables">
<div class="empty" v-if="tableData.total==0"> <div class="empty" v-if="tableData.total==0&& !isSkeleton">
<img src="@/assets/images/project/empty.png"> <img src="@/assets/images/project/empty.png">
<div class="p1">抱歉，没找到相关数据</div> <div class="p1">抱歉，没找到相关数据</div>
<div class="p2">建议调整关键词或筛选条件，重新搜索</div> <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
<div class="total">共{{tableData.total}}条</div> <div class="total">共{{tableData.total}}条</div>
</div> </div>
</div> </div>
<el-table v-if="tableData.total > 0" <skeleton v-if="isSkeleton"></skeleton>
<el-table v-if="!isSkeleton&&tableData.total > 0"
:data="tableData.rows" :data="tableData.rows"
stripe border stripe border
style="width: 100%"> style="width: 100%">
...@@ -42,13 +43,6 @@ ...@@ -42,13 +43,6 @@
<div @click="toRL(scope.row)"><img class="i" src="@/assets/images/project/khrl1.png"><img class="o" src="@/assets/images/project/khrl2.png"></div> <div @click="toRL(scope.row)"><img class="i" src="@/assets/images/project/khrl1.png"><img class="o" src="@/assets/images/project/khrl2.png"></div>
</div> </div>
</div> </div>
<div class="delform" v-if="scope.row.companyName == '重庆市永川区惠通建设发展有限公司'">
<div class="words">再次认领将会恢复默认客户数据</div>
<div>
<div class="btnsmall btn_primary h28" >确定</div>
<div class="btnsmall btn_cancel h28" >取消</div>
</div>
</div>
</template> </template>
</el-table-column> </el-table-column>
...@@ -157,8 +151,11 @@ ...@@ -157,8 +151,11 @@
label="主营业务" width="400"> label="主营业务" width="400">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.mainBusiness == null || scope.row.mainBusiness == ''">--</div> <div v-if="scope.row.mainBusiness == null || scope.row.mainBusiness == ''">--</div>
<div class="box" v-else-if="scope.row.sq1==true">{{scope.row.mainBusiness1}}...<span @click="sq1(scope.row,false)">更多</span></div> <div v-if="scope.row.mainBusiness1">
<div class="box" v-else>{{scope.row.mainBusiness}}<span @click="sq1(scope.row,true)">收起</span></div> <div class="box" v-if="scope.row.sq1==true">{{scope.row.mainBusiness1}}...<span @click="sq1(scope.row,false)">更多</span></div>
<div class="box" v-else>{{scope.row.mainBusiness}}<span @click="sq1(scope.row,true)">收起</span></div>
</div>
<div v-else>{{scope.row.mainBusiness}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -166,8 +163,11 @@ ...@@ -166,8 +163,11 @@
label="发包属性" width="400"> label="发包属性" width="400">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.companyAttribute == null || scope.row.companyAttribute == ''">--</div> <div v-if="scope.row.companyAttribute == null || scope.row.companyAttribute == ''">--</div>
<div class="box" v-else-if="scope.row.sq2==true">{{scope.row.companyAttribute1}}...<span @click="sq2(scope.row,false)">更多</span></div> <div v-if="scope.row.companyAttribute1">
<div class="box" v-else>{{scope.row.companyAttribute}}<span @click="sq2(scope.row,true)">收起</span></div> <div class="box" v-if="scope.row.sq2==true">{{scope.row.companyAttribute1}}...<span @click="sq2(scope.row,false)">更多</span></div>
<div class="box" v-else>{{scope.row.companyAttribute}}<span @click="sq2(scope.row,true)">收起</span></div>
</div>
<div v-else>{{scope.row.companyAttribute}}</div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
...@@ -188,6 +188,13 @@ ...@@ -188,6 +188,13 @@
:total="tableData.total"> :total="tableData.total">
</el-pagination> </el-pagination>
</div> </div>
<div class="delform" v-if="RLcompanyName">
<div class="words">再次认领将会恢复默认客户数据</div>
<div>
<div class="btnsmall btn_primary h28" @click="RL">确定</div>
<div class="btnsmall btn_cancel h28" @click="RLcompanyName = ''">取消</div>
</div>
</div>
</div> </div>
</el-card> </el-card>
</div> </div>
...@@ -201,15 +208,18 @@ ...@@ -201,15 +208,18 @@
import {getEnterprise,getDictType,} from '@/api/main' import {getEnterprise,getDictType,} from '@/api/main'
import {encodeStr} from "@/assets/js/common" import {encodeStr} from "@/assets/js/common"
import { historyClaim } from "@/api/common" //认领 import { historyClaim } from "@/api/common" //认领
import skeleton from '../../project/projectList/component/skeleton'
export default { export default {
name: 'CustomList', name: 'CustomList',
components:{skeleton},
data() { data() {
return{ return{
encodeStr, encodeStr,
searchParam:{ searchParam:{
companyName:'', companyName:'',
pageNum:1, pageNum:1,
pageSize:20 pageSize:20,
status:1,
}, },
tableData: [],//列表 tableData: [],//列表
...@@ -226,12 +236,13 @@ export default { ...@@ -226,12 +236,13 @@ export default {
// isNew:true, // isNew:true,
showlist:false, showlist:false,
keys:1, keys:1,
RLcompanyName:'',//重新认领企业名称
isSkeleton:true,
} }
}, },
created() { created() {
this.getCustomerList() this.getCustomerList()
this.getDictType() this.getDictType()
this.prvinceTree()
}, },
methods:{ methods:{
sq1(item,sq){ sq1(item,sq){
...@@ -266,6 +277,7 @@ export default { ...@@ -266,6 +277,7 @@ export default {
//获取客户列表 //获取客户列表
getCustomerList(){ getCustomerList(){
getCustomerList(this.searchParam).then(result=>{ getCustomerList(this.searchParam).then(result=>{
this.isSkeleton = false
this.tableData = result this.tableData = result
this.tableData.rows.forEach(item=>{ this.tableData.rows.forEach(item=>{
item.registerCapital = item.registerCapital == null?null: item.registerCapital.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1') item.registerCapital = item.registerCapital == null?null: item.registerCapital.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')
...@@ -296,13 +308,15 @@ export default { ...@@ -296,13 +308,15 @@ export default {
}, },
//认领客户 //认领客户
async toRL(row){ async toRL(row){
let param = row.companyName this.RLcompanyName = row.companyName
let res = await historyClaim(param) },
async RL(){
let res = await historyClaim(this.RLcompanyName)
if(res.code==200){ if(res.code==200){
this.$message.success('认领成功！') this.$message.success('认领成功！')
this.handleCurrentChange(1) this.handleCurrentChange(1)
this.RLcompanyName=''
} }
}, },
clearname(value){ clearname(value){
if(value == ""){ if(value == ""){
...@@ -311,6 +325,7 @@ export default { ...@@ -311,6 +325,7 @@ export default {
}, },
//翻页 //翻页
handleCurrentChange(val) { handleCurrentChange(val) {
this.isSkeleton = true
this.searchParam.pageNum=val this.searchParam.pageNum=val
this.getCustomerList() this.getCustomerList()
}, },
...@@ -320,9 +335,14 @@ export default { ...@@ -320,9 +335,14 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.delform{ .delform{
right: 5px;
top: 40px;
width: 228px; width: 228px;
left: 50%;
top: 50%;
margin-left: -114px;
margin-top: -57px;
.words{
font-size: 14px;
}
} }
.app-container{ .app-container{
height: calc(100vh - 134px) height: calc(100vh - 134px)
......
dsk-operate-ui/src/views/custom/overview/index.vue
View file @ 09d529f0
...@@ -118,9 +118,10 @@ ...@@ -118,9 +118,10 @@
</template> </template>
<script> <script>
import "@/assets/styles/project.scss" import '@/assets/styles/project.scss'
import * as echarts from 'echarts' import * as echarts from 'echarts'
export default {
export default {
name: 'Overview', name: 'Overview',
data() { data() {
return { return {
...@@ -192,9 +193,9 @@ export default { ...@@ -192,9 +193,9 @@ export default {
initChart(){ initChart(){
//客户级别 //客户级别
this.option = { this.option = {
tooltip: { tooltip: {
trigger: 'item' trigger: 'item',
extraCssText: 'border:0',
}, },
color:['#8A82F3','#5B9CF7','#8DCF96','#FFDC6B','#FE9C77'],//修改配色 color:['#8A82F3','#5B9CF7','#8DCF96','#FFDC6B','#FE9C77'],//修改配色
series: [ series: [
...@@ -203,17 +204,17 @@ export default { ...@@ -203,17 +204,17 @@ export default {
type: 'pie', type: 'pie',
radius: ['50%','70%'], radius: ['50%','70%'],
data: [ data: [
{ value: 23, name: '集团总部：11%' }, { value: 23, name: '集团总部：11%',borderWidth:0 },
{ value: 61, name: '一级单位：29%' }, { value: 61, name: '一级单位：29%',borderWidth:0 },
{ value: 60, name: '二级单位：29%' }, { value: 60, name: '二级单位：29%',borderWidth:0 },
{ value: 21, name: '三级单位：10%' }, { value: 21, name: '三级单位：10%',borderWidth:0 },
{ value: 44, name: '其他单位: 21%' } { value: 44, name: '其他单位: 21%',borderWidth:0 }
], ],
emphasis: { emphasis: {
itemStyle: { itemStyle: {
shadowBlur: 10, shadowBlur: 10,
shadowOffsetX: 0, shadowOffsetX: 0,
shadowColor: 'rgba(0, 0, 0, 0.5)' shadowColor: 'rgba(0, 0, 0, 0)'
} }
} }
} }
...@@ -267,7 +268,14 @@ export default { ...@@ -267,7 +268,14 @@ export default {
} }
} }
} }
] ],
emphasis: {
itemStyle: {
// 高亮时点的颜色。
color: 'rgb(90,146,247)'
},
}
} }
this.option2 && this.myChart2.setOption(this.option2) this.option2 && this.myChart2.setOption(this.option2)
//客户资质分析 //客户资质分析
...@@ -317,7 +325,14 @@ export default { ...@@ -317,7 +325,14 @@ export default {
}, },
} }
} }
] ],
emphasis: {
itemStyle: {
// 高亮时点的颜色。
color: 'rgb(134,231,231)'
},
}
} }
this.option3 && this.myChart3.setOption(this.option3) this.option3 && this.myChart3.setOption(this.option3)
...@@ -358,6 +373,7 @@ export default { ...@@ -358,6 +373,7 @@ export default {
axisPointer:{ //悬浮于圆点展示标签 axisPointer:{ //悬浮于圆点展示标签
type:'axis' type:'axis'
}, },
extraCssText: 'border:0',
// trigger: 'axis' // trigger: 'axis'
}, },
series: [ series: [
......
dsk-operate-ui/src/views/detail/party-a/component/HeadForm.vue
View file @ 09d529f0
...@@ -210,10 +210,12 @@ export default { ...@@ -210,10 +210,12 @@ export default {
display: flex; display: flex;
border-radius: 2px 0px 0px 2px; border-radius: 2px 0px 0px 2px;
border: 1px solid #D9D9D9; border: 1px solid #D9D9D9;
line-height: 32px;
height: 32px;
span { span {
width: 60px; width: 60px;
height: 32px; height: 30px;
line-height: 32px; line-height: 28px;
font-size: 14px; font-size: 14px;
background: #F5F5F5; background: #F5F5F5;
text-align: center; text-align: center;
...@@ -234,9 +236,12 @@ export default { ...@@ -234,9 +236,12 @@ export default {
flex: 1; flex: 1;
} }
::v-deep .el-input__inner { ::v-deep .el-input__inner {
border-radius: 2px 0 2px 0;
border: 0; border: 0;
border-right: 0; line-height: 30px;
height: 30px;
position: absolute;
top: 0;
padding-right: 32px;
} }
} }
.fromTime{ .fromTime{
...@@ -251,6 +256,11 @@ export default { ...@@ -251,6 +256,11 @@ export default {
.fromTime-icon { .fromTime-icon {
display: none; display: none;
} }
.el-select{
.el-input__suffix{
right: 10px;
}
}
} }
::v-deep .form-content-width{ ::v-deep .form-content-width{
width: 170px; width: 170px;
......
dsk-operate-ui/src/views/detail/party-b/index.vue
View file @ 09d529f0
...@@ -16,8 +16,8 @@ export default { ...@@ -16,8 +16,8 @@ export default {
loading: false, // 是否加载完成-当前页控制 loading: false, // 是否加载完成-当前页控制
iframeTimer: '', // 是否加载中定时器-当前页控制 iframeTimer: '', // 是否加载中定时器-当前页控制
iframeHight: window.innerHeight, // iframe高度-当前页控制 iframeHight: window.innerHeight, // iframe高度-当前页控制
navHeight: 68, // iframe以为的高度px navigation: {isFixed: true, fixedHeight: 56, totalHeight: 68}, // iframe之外页面顶部对象，ifFixed:是否浮动；fixedHeight：浮动对象高度；totalHeight：顶部整体高度
src: '', src: '', //iframe嵌套页面地址
domain: 'https://pre-plug.jiansheku.com', domain: 'https://pre-plug.jiansheku.com',
// domain: 'http://192.168.60.30:3300', // domain: 'http://192.168.60.30:3300',
ak: 'aec7b3ff2y2q8x6t49a7e2c463ce21912' // 需要携带的sdkId ak: 'aec7b3ff2y2q8x6t49a7e2c463ce21912' // 需要携带的sdkId
...@@ -36,11 +36,11 @@ export default { ...@@ -36,11 +36,11 @@ export default {
}, },
mounted() { mounted() {
this.iframeLoading() // 判断iframe页面是否加载完成-当前页控制 this.iframeLoading() // 判断iframe页面是否加载完成-当前页控制
steerScroll('companyIframe', this.navHeight, true) // 监听滚动（iframe的id、页面排除iframe后页面剩下高度[例:80]、增加监听[不传就是移除监听]、父级id[不带默认就是铺满整个页面]]） steerScroll('companyIframe', this.navigation, true) // 监听滚动（iframe的id、页面排除iframe后页面剩下顶部高度[例:80]、增加监听[不传就是移除监听]、父级id[不带默认就是铺满整个页面]]）
}, },
beforeDestroy() { beforeDestroy() {
clearInterval(this.iframeTimer) // -当前页控制 clearInterval(this.iframeTimer) // -当前页控制
steerScroll('companyIframe', this.navHeight) // 销毁滚动 steerScroll('companyIframe', this.navigation) // 销毁滚动
}, },
methods: { methods: {
//判断iframe页面是否加载完成-当前页控制 //判断iframe页面是否加载完成-当前页控制
......
dsk-operate-ui/src/views/enterpriseData/index.vue
View file @ 09d529f0
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
}, },
], ],
personnelHerf:'Owner' personnelHerf:'Owner'
} }
}, },
......
dsk-operate-ui/src/views/macro/economies/component/industrialStructure.vue
View file @ 09d529f0
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
<div id="echarts" style="height: 400px"></div> <div id="echarts" style="height: 400px"></div>
<p class="tips"> 注：数据均来源于统计公报、统计年鉴，实际披露中由于部分地区最新年度数据不全，导致年份间数据差距较大</p> <p class="tips"> 注：数据均来源于统计公报、统计年鉴，实际披露中由于部分地区最新年度数据不全，导致年份间数据差距较大</p>
</div> </div>
<div class="content-right"> <div class="content-right table-item">
<el-table <el-table
v-loading="tableLoading" v-loading="tableLoading"
:data="tableData" :data="tableData"
...@@ -296,6 +296,24 @@ export default { ...@@ -296,6 +296,24 @@ export default {
.caret-wrapper{ .caret-wrapper{
width: 10px; width: 10px;
} }
.has-gutter{
tr{
th:nth-child(4){
border-right:0;
.cell{
padding-right: 24px !important;
}
}
td:nth-child(6){
border-right:0;
}
}
}
.el-table__cell.gutter{
background: #F5F7FA;
width: 16px !important;
border-top: 1px solid #dfe6ec;
}
} }
} }
} }
......
dsk-operate-ui/src/views/macro/economies/component/regionalEconomy.vue
View file @ 09d529f0
...@@ -11,8 +11,8 @@ ...@@ -11,8 +11,8 @@
<img v-else src="@/assets/images/economies/icon_down.png"> <img v-else src="@/assets/images/economies/icon_down.png">
</div> </div>
<div id="echartsGDP" style="height: 75px;"></div> <div id="echartsGDP" style="height: 75px;"></div>
<div class="item-text up" v-if="recentlyYear.gdpGrowth > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gdpGrowth}}%</span></div> <div class="item-text up" v-if="Number(recentlyYear.gdpGrowth) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gdpGrowth}}%</span></div>
<div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gdpGrowth).toString().substring(1)}}%</span></div> <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gdpGrowth).toFixed(2).toString().substring(1)}}%</span></div>
</div> </div>
<div class="item"> <div class="item">
<div class="item-title"><i style="background: #718AFF;"></i>{{recentlyYear.year}}年GDP增速</div> <div class="item-title"><i style="background: #718AFF;"></i>{{recentlyYear.year}}年GDP增速</div>
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
<img v-else src="@/assets/images/economies/icon_down.png"> <img v-else src="@/assets/images/economies/icon_down.png">
</div> </div>
<div id="echartsZS" style="height: 75px;"></div> <div id="echartsZS" style="height: 75px;"></div>
<div class="item-text up" v-if="(recentlyYear.gdpGrowth-nextYearMap.gdpGrowth) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gdpGrowthCompare}}%</span></div> <div class="item-text up" v-if="(Number(getMoneyNum(recentlyYear.gdpGrowth))-Number(getMoneyNum(nextYearMap.gdpGrowth))) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gdpGrowthCompare}}%</span></div>
<div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{recentlyYear.gdpGrowthCompare}}%</span></div> <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gdpGrowthCompare).toFixed(2).toString().substring(1)}}%</span></div>
</div> </div>
<div class="item"> <div class="item">
<div class="item-title"><i style="background: #3AD0D1;"></i>{{recentlyYear.year}}年人口</div> <div class="item-title"><i style="background: #3AD0D1;"></i>{{recentlyYear.year}}年人口</div>
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
<img v-else src="@/assets/images/economies/icon_down.png"> <img v-else src="@/assets/images/economies/icon_down.png">
</div> </div>
<div id="echartsRK" style="height: 75px;"></div> <div id="echartsRK" style="height: 75px;"></div>
<div class="item-text up" v-if="recentlyYear.populationGrowthRate > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.populationGrowthRate}}%</span></div> <div class="item-text up" v-if="Number(recentlyYear.populationGrowthRate) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.populationGrowthRate}}%</span></div>
<div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{recentlyYear.populationGrowthRate}}%</span></div> <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.populationGrowthRate).toFixed(2).toString().substring(1)}}%</span></div>
</div> </div>
<div class="item"> <div class="item">
<div class="item-title"><i style="background: #FFBE5D;"></i>{{recentlyYear.year}}年一般公共预算收入</div> <div class="item-title"><i style="background: #FFBE5D;"></i>{{recentlyYear.year}}年一般公共预算收入</div>
...@@ -44,8 +44,8 @@ ...@@ -44,8 +44,8 @@
<img v-else src="@/assets/images/economies/icon_down.png"> <img v-else src="@/assets/images/economies/icon_down.png">
</div> </div>
<div id="echartsSR" style="height: 75px;"></div> <div id="echartsSR" style="height: 75px;"></div>
<div class="item-text up" v-if="recentlyYear.gbrGrowth > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gbrGrowth}}%</span></div> <div class="item-text up" v-if="Number(recentlyYear.gbrGrowth) > 0">较{{nextYearMap.year}}年上升<span>{{recentlyYear.gbrGrowth}}%</span></div>
<div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gbrGrowth).toString().substring(1)}}%</span></div> <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{Number(recentlyYear.gbrGrowth).toFixed(2).toString().substring(1)}}%</span></div>
</div> </div>
<div class="item"> <div class="item">
<div class="item-title"><i style="background: #FF8935;"></i>{{recentlyYear.year}}年地方政府债务余额</div> <div class="item-title"><i style="background: #FF8935;"></i>{{recentlyYear.year}}年地方政府债务余额</div>
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<img v-else src="@/assets/images/economies/icon_down.png"> <img v-else src="@/assets/images/economies/icon_down.png">
</div> </div>
<div id="echartsYE" style="height: 75px;"></div> <div id="echartsYE" style="height: 75px;"></div>
<div class="item-text up" v-if="recentlyYear.govDebtBalance > nextYearMap.govDebtBalance"> <div class="item-text up" v-if="Number(getMoneyNum(recentlyYear.govDebtBalance)) > Number(getMoneyNum(nextYearMap.govDebtBalance))">
较{{nextYearMap.year}}年上升<span>{{recentlyYear.govDebtBalanceCompare}}%</span></div> 较{{nextYearMap.year}}年上升<span>{{recentlyYear.govDebtBalanceCompare}}%</span></div>
<div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{recentlyYear.govDebtBalanceCompare}}%</span></div> <div class="item-text down" v-else>较{{nextYearMap.year}}年下降<span>{{recentlyYear.govDebtBalanceCompare}}%</span></div>
</div> </div>
...@@ -823,6 +823,7 @@ export default { ...@@ -823,6 +823,7 @@ export default {
.table-item{ .table-item{
margin-top: 22px; margin-top: 22px;
::v-deep .el-table{ ::v-deep .el-table{
overflow:visible;
th{ th{
font-size: 12px !important; font-size: 12px !important;
font-weight: 400 !important; font-weight: 400 !important;
...@@ -836,6 +837,16 @@ export default { ...@@ -836,6 +837,16 @@ export default {
.caret-wrapper{ .caret-wrapper{
width: 10px; width: 10px;
} }
.el-table__body-wrapper{
overflow:visible;
}
.el-table__body{
tr:first-child{
position: sticky;
top:56px;
z-index: 9;
}
}
} }
} }
} }
......
dsk-operate-ui/src/views/macro/enterprises/index.vue
View file @ 09d529f0
...@@ -135,7 +135,23 @@ export default { ...@@ -135,7 +135,23 @@ export default {
this.aptitudeCode() this.aptitudeCode()
}, },
mounted() {
window.addEventListener("scroll",this.scrolling)
},
beforeDestroy() {
window.removeEventListener("scroll", this.scrolling);
},
methods: { methods: {
scrolling() {
let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0]
let scrollTop =window.pageYOffset ||document.documentElement.scrollTop ||document.body.scrollTop;
if (scrollTop>197){
let top = scrollTop-197
el.style.top = top+'px'
}else{
el.style.top = 0
}
},
//资质Json //资质Json
async aptitudeCode() { async aptitudeCode() {
// await axios.post("https://files.jiansheku.com/file/json/common/aptitudeCode.json", {}, { // await axios.post("https://files.jiansheku.com/file/json/common/aptitudeCode.json", {}, {
...@@ -405,6 +421,15 @@ export default { ...@@ -405,6 +421,15 @@ export default {
} }
} }
::v-deep .el-table{ ::v-deep .el-table{
overflow:visible;
.el-table__header-wrapper{
position: sticky;
top:56px;
z-index: 9;
}
.el-table__fixed-header-wrapper{
z-index: 9;
}
th{ th{
font-size: 12px !important; font-size: 12px !important;
font-weight: 400 !important; font-weight: 400 !important;
......
dsk-operate-ui/src/views/macro/financing/index.vue
View file @ 09d529f0
...@@ -431,7 +431,7 @@ export default { ...@@ -431,7 +431,7 @@ export default {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
.box-left{ .box-left{
width: 55%; width: 50%;
} }
.empty{ .empty{
margin: 0 auto; margin: 0 auto;
...@@ -509,6 +509,9 @@ export default { ...@@ -509,6 +509,9 @@ export default {
padding: 0; padding: 0;
line-height: 40px; line-height: 40px;
} }
.el-table__body tr:hover > td.el-table__cell{
background: #DCEBFF;
}
::-webkit-scrollbar-track-piece { ::-webkit-scrollbar-track-piece {
//滚动条凹槽的颜色，还可以设置边框属性 //滚动条凹槽的颜色，还可以设置边框属性
background-color: #F3F4F5; background-color: #F3F4F5;
...@@ -538,6 +541,9 @@ export default { ...@@ -538,6 +541,9 @@ export default {
th:nth-child(4){ th:nth-child(4){
border-right:0; border-right:0;
} }
td:nth-child(4){
border-right:0;
}
} }
} }
.el-table__cell.gutter{ .el-table__cell.gutter{
......
dsk-operate-ui/src/views/macro/nationalEconomies/component/economies-detail.vue
View file @ 09d529f0
...@@ -295,5 +295,17 @@ export default { ...@@ -295,5 +295,17 @@ export default {
} }
.table-item{ .table-item{
padding: 16px 10px 16px 16px; padding: 16px 10px 16px 16px;
::v-deep .el-table{
/*.el-table__body-wrapper{*/
/*overflow:visible;*/
/*}*/
/*.el-table__body{*/
/*tr:first-child{*/
/*position: fixed;*/
/*top: 49px;*/
/*z-index: 9;*/
/*}*/
/*}*/
}
} }
</style> </style>
dsk-operate-ui/src/views/macro/nationalEconomies/component/qgjjdq.vue
View file @ 09d529f0
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<span class="common-title">全国经济大全</span> <span class="common-title">全国经济大全</span>
<el-form ref="queryForm" :model="queryParams" :inline="true" size="small"> <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
<el-form-item prop="year"> <el-form-item prop="year">
<el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择" @change="handleSearch"> <el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择" @change="handleSearch" :popper-append-to-body='false'>
<el-option v-for="(item, index) in yearOptions" :key="index" :label="item.year" :value="item.year" /> <el-option v-for="(item, index) in yearOptions" :key="index" :label="item.year" :value="item.year" />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -31,11 +31,11 @@ ...@@ -31,11 +31,11 @@
<div class="table-item"> <div class="table-item">
<el-table <el-table
v-loading="tableLoading" v-loading="tableLoading"
class="fixed-table"
:data="tableData" :data="tableData"
element-loading-text="Loading" element-loading-text="Loading"
@sort-change="sortChange" @sort-change="sortChange"
border border
fit
highlight-current-row highlight-current-row
v-if="tableDataTotal > 0" v-if="tableDataTotal > 0"
:default-sort = "{prop: 'gdp', order: 'descending'}" :default-sort = "{prop: 'gdp', order: 'descending'}"
...@@ -150,7 +150,23 @@ ...@@ -150,7 +150,23 @@
this.dataRegion() this.dataRegion()
this.getYears() this.getYears()
}, },
mounted() {
window.addEventListener("scroll",this.scrolling)
},
beforeDestroy() {
window.removeEventListener("scroll", this.scrolling);
},
methods: { methods: {
scrolling() {
let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0]
let scrollTop =window.pageYOffset ||document.documentElement.scrollTop ||document.body.scrollTop;
if (scrollTop>138){
let top = scrollTop-138
el.style.top = top+'px'
}else{
el.style.top = 0
}
},
getYears(){ getYears(){
getYears({}).then(res => { getYears({}).then(res => {
this.yearOptions=res.data.reverse(); this.yearOptions=res.data.reverse();
...@@ -322,6 +338,7 @@ ...@@ -322,6 +338,7 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.qgjjdq{ .qgjjdq{
.query-box{ .query-box{
margin: -8px 0 8px 0; margin: -8px 0 8px 0;
...@@ -346,13 +363,18 @@ ...@@ -346,13 +363,18 @@
} }
} }
} }
::v-deep .el-select-dropdown{
.el-select-dropdown__item.hover{
color: #0081FF;
}
}
.content{ .content{
background: #ffffff; background: #ffffff;
padding: 16px; padding: 16px;
margin-top: 12px; margin-top: 12px;
/*height: calc(100vh - 300px);*/ /*height: calc(100vh - 300px);*/
.table-item{ .table-item{
position: relative; /*position: relative;*/
.empty{ .empty{
/*position: absolute;*/ /*position: absolute;*/
/*top: 50%;*/ /*top: 50%;*/
...@@ -379,6 +401,15 @@ ...@@ -379,6 +401,15 @@
} }
} }
::v-deep .el-table{ ::v-deep .el-table{
overflow:visible;
.el-table__header-wrapper{
position: sticky;
top:56px;
z-index: 9;
}
.el-table__fixed-header-wrapper{
z-index: 9;
}
th{ th{
font-size: 12px !important; font-size: 12px !important;
font-weight: 400 !important; font-weight: 400 !important;
...@@ -393,6 +424,9 @@ ...@@ -393,6 +424,9 @@
width: 10px; width: 10px;
} }
} }
::v-deep .fixed-table{
}
} }
} }
} }
......
dsk-operate-ui/src/views/macro/nationalEconomies/index.vue
View file @ 09d529f0
<template> <template>
<div class="app-container container-box nationalEconomies"> <div class="app-container nationalEconomies">
<div class="header"> <div class="header">
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="全国经济大全" name="first"></el-tab-pane> <el-tab-pane label="全国经济大全" name="first"></el-tab-pane>
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
<el-tab-pane label="全国中标市场分析" name="third"></el-tab-pane> <el-tab-pane label="全国中标市场分析" name="third"></el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
<Economic v-if="activeName === 'first'"></Economic> <Economic v-if="activeName === 'first'"></Economic>
<ZhaoBiao v-if="activeName === 'second'"></ZhaoBiao> <ZhaoBiao v-if="activeName === 'second'"></ZhaoBiao>
<ZhongBiao v-if="activeName === 'third'"></ZhongBiao> <ZhongBiao v-if="activeName === 'third'"></ZhongBiao>
......
dsk-operate-ui/src/views/macro/urban/index.vue
View file @ 09d529f0
...@@ -145,94 +145,95 @@ ...@@ -145,94 +145,95 @@
</div> </div>
</div> </div>
<div class="table-item"> <div class="table-item">
<el-table <div v-if="tableDataTotal > 0">
v-if="tableDataTotal > 0" <el-table
v-loading="tableLoading" v-loading="tableLoading"
:data="tableData" :data="tableData"
element-loading-text="Loading" element-loading-text="Loading"
@sort-change="sortChange" @sort-change="sortChange"
border border
fit fit
highlight-current-row highlight-current-row
> >
<el-table-column label="序号" width="60" align="left" fixed> <el-table-column label="序号" width="60" align="left" fixed>
<template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template> <template slot-scope="scope">{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</template>
</el-table-column> </el-table-column>
<el-table-column prop="companyName" label="公司名称" width="300" fixed> <el-table-column prop="companyName" label="公司名称" width="300" fixed>
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link companyName" v-html="scope.row.companyName" ></router-link> <router-link :to="`/enterprise/${encodeStr(scope.row.companyId)}`" tag="a" class="a-link companyName" v-html="scope.row.companyName" ></router-link>
<span @click="handleClick(scope.row)" class="table-span" style="color: #3D3D3D;cursor: pointer;" v-if="scope.row.claimStatus === 0"><img src="@/assets/images/urban/rl_icon1.png"/>认领</span> <span @click="handleClick(scope.row)" class="table-span" style="color: #3D3D3D;cursor: pointer;" v-if="scope.row.claimStatus === 0"><img src="@/assets/images/urban/rl_icon1.png"/>认领</span>
<span @click="cancelClaim(scope.row.companyName)" class="table-span" style="color: rgba(35,35,35,0.4);cursor: pointer;" v-if="scope.row.claimStatus === 1"><img src="@/assets/images/urban/rl_icon2.png"/>已认领</span> <span @click="cancelClaim(scope.row.companyName)" class="table-span" style="color: rgba(35,35,35,0.4);cursor: pointer;" v-if="scope.row.claimStatus === 1"><img src="@/assets/images/urban/rl_icon2.png"/>已认领</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="city" label="区域" :formatter="formatStatus" width="150"> <el-table-column prop="city" label="区域" :formatter="formatStatus" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<router-link :to="{path:'/macro/economies',query:{provinceId:scope.row.provinceId,province:scope.row.province}}" tag="a" class="a-link"> <router-link :to="{path:'/macro/economies',query:{provinceId:scope.row.provinceId,province:scope.row.province}}" tag="a" class="a-link">
{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}} {{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}
</router-link> </router-link>
<!--<span v-else>-</span>--> <!--<span v-else>-</span>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="biddingCount" label="招标数量" :formatter="formatStatus" sortable="custom" width="110" align="right"/> <el-table-column prop="biddingCount" label="招标数量" :formatter="formatStatus" sortable="custom" width="110" align="right"/>
<el-table-column prop="landInfoCount" label="城投拿地" :formatter="formatStatus" sortable="custom" width="100" align="right"/> <el-table-column prop="landInfoCount" label="城投拿地" :formatter="formatStatus" sortable="custom" width="100" align="right"/>
<el-table-column prop="supplierCount" label="供应商" :formatter="formatStatus" sortable="custom" width="100" align="right"/> <el-table-column prop="supplierCount" label="供应商" :formatter="formatStatus" sortable="custom" width="100" align="right"/>
<el-table-column prop="bondBalance" label="债券余额（亿元）" :formatter="formatStatus" sortable="custom" width="140" align="right"/> <el-table-column prop="bondBalance" label="债券余额（亿元）" :formatter="formatStatus" sortable="custom" width="140" align="right"/>
<el-table-column prop="bratingSubjectLevel" label="主体评级" :formatter="formatStatus" width="110" /> <el-table-column prop="bratingSubjectLevel" label="主体评级" :formatter="formatStatus" width="110" />
<el-table-column prop="uipExecutiveLevel" label="行政级别" :formatter="formatStatus" width="110" /> <el-table-column prop="uipExecutiveLevel" label="行政级别" :formatter="formatStatus" width="110" />
<el-table-column prop="shareholderBg" label="股东背景" :formatter="formatStatus" width="110" /> <el-table-column prop="shareholderBg" label="股东背景" :formatter="formatStatus" width="110" />
<el-table-column prop="equityRelationship" label="股权关系" :formatter="formatStatus" width="110" /> <el-table-column prop="equityRelationship" label="股权关系" :formatter="formatStatus" width="110" />
<el-table-column prop="platformImportance" label="平台重要性" :formatter="formatStatus" width="110" /> <el-table-column prop="platformImportance" label="平台重要性" :formatter="formatStatus" width="110" />
<el-table-column prop="uipBusinessType" label="城投业务类型" :formatter="formatStatus" width="140" > <el-table-column prop="uipBusinessType" label="城投业务类型" :formatter="formatStatus" width="140" >
<template slot="header" slot-scope="scope"> <template slot="header" slot-scope="scope">
<span>城投业务类型 <span>城投业务类型
<el-tooltip popper-class="tips" effect="light" content=" 根据主营业务构成划分为土地开发整理、基础设施建设、交通建设运营、棚改保障房建设、公用事业等7大类型。" placement="top"> <el-tooltip popper-class="tips" effect="light" content=" 根据主营业务构成划分为土地开发整理、基础设施建设、交通建设运营、棚改保障房建设、公用事业等7大类型。" placement="top">
<i class="el-icon-warning-outline"></i> <i class="el-icon-warning-outline"></i>
</el-tooltip> </el-tooltip>
</span> </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="actualController" label="实控人" :formatter="formatStatus" width="250" /> <el-table-column prop="actualController" label="实控人" :formatter="formatStatus" width="250" />
<el-table-column prop="latestReportPeriod" label="最新报告期" :formatter="formatStatus" width="120" /> <el-table-column prop="latestReportPeriod" label="最新报告期" :formatter="formatStatus" width="120" />
<el-table-column prop="totalAssets" label="总资产（亿元）" :formatter="formatStatus" sortable="custom" width="130" align="right"/> <el-table-column prop="totalAssets" label="总资产（亿元）" :formatter="formatStatus" sortable="custom" width="130" align="right"/>
<el-table-column prop="belongNetAssets" label="归母净资产（亿元）" :formatter="formatStatus" sortable="custom" width="160" align="right"/> <el-table-column prop="belongNetAssets" label="归母净资产（亿元）" :formatter="formatStatus" sortable="custom" width="160" align="right"/>
<el-table-column prop="monetaryFunds" label="货币资金（亿元）" :formatter="formatStatus" sortable="custom" width="150" align="right"/> <el-table-column prop="monetaryFunds" label="货币资金（亿元）" :formatter="formatStatus" sortable="custom" width="150" align="right"/>
<el-table-column prop="landAssets" label="土地资产（亿元）" :formatter="formatStatus" sortable="custom" width="150" align="right"/> <el-table-column prop="landAssets" label="土地资产（亿元）" :formatter="formatStatus" sortable="custom" width="150" align="right"/>
<el-table-column prop="restrictedAssets" label="受限资产（亿元）" :formatter="formatStatus" sortable="custom" width="150" align="right"/> <el-table-column prop="restrictedAssets" label="受限资产（亿元）" :formatter="formatStatus" sortable="custom" width="150" align="right"/>
<el-table-column prop="accountsReceivable" label="应收账款（亿元）" :formatter="formatStatus" sortable="custom" width="150" align="right"/> <el-table-column prop="accountsReceivable" label="应收账款（亿元）" :formatter="formatStatus" sortable="custom" width="150" align="right"/>
<el-table-column prop="otherReceivable" label="其他应收款（亿元）" :formatter="formatStatus" sortable="custom" width="160" align="right"/> <el-table-column prop="otherReceivable" label="其他应收款（亿元）" :formatter="formatStatus" sortable="custom" width="160" align="right"/>
<el-table-column prop="econData001" label="公益性＆准公益性主营占比（%）" :formatter="formatStatus" width="160" align="right"/> <el-table-column prop="econData001" label="公益性＆准公益性主营占比（%）" :formatter="formatStatus" width="160" align="right"/>
<el-table-column prop="receivableFromGovRatio" label="应收类款项来自政府占比（%）" :formatter="formatStatus" width="160" align="right"/> <el-table-column prop="receivableFromGovRatio" label="应收类款项来自政府占比（%）" :formatter="formatStatus" width="160" align="right"/>
<el-table-column prop="govSubsidy" label="政府补助（亿元）" :formatter="formatStatus" width="130" align="right" /> <el-table-column prop="govSubsidy" label="政府补助（亿元）" :formatter="formatStatus" width="130" align="right" />
<el-table-column prop="specialPayable" label="专项应付款（亿元）" :formatter="formatStatus" width="140" align="right"/> <el-table-column prop="specialPayable" label="专项应付款（亿元）" :formatter="formatStatus" width="140" align="right"/>
<el-table-column prop="operatingIncome" label="营业收入（亿元）" :formatter="formatStatus" width="130" align="right"/> <el-table-column prop="operatingIncome" label="营业收入（亿元）" :formatter="formatStatus" width="130" align="right"/>
<el-table-column prop="belongNetProfit" label="归母净利润（亿元）" :formatter="formatStatus" width="140" align="right"/> <el-table-column prop="belongNetProfit" label="归母净利润（亿元）" :formatter="formatStatus" width="140" align="right"/>
<el-table-column prop="roe" label="净资产收益率（%）" :formatter="formatStatus" width="140" align="right"/> <el-table-column prop="roe" label="净资产收益率（%）" :formatter="formatStatus" width="140" align="right"/>
<el-table-column prop="netOperatingCashFlow" label="经营现金流量净额（亿元）" :formatter="formatStatus" width="160" align="right"/> <el-table-column prop="netOperatingCashFlow" label="经营现金流量净额（亿元）" :formatter="formatStatus" width="160" align="right"/>
<el-table-column prop="netFinancingCashFlow" label="筹资现金流量净额（亿元）" :formatter="formatStatus" width="160" align="right"/> <el-table-column prop="netFinancingCashFlow" label="筹资现金流量净额（亿元）" :formatter="formatStatus" width="160" align="right"/>
<el-table-column prop="netInvestmentCashFlow" label="投资现金流量净额（亿元）" :formatter="formatStatus" width="160" align="right"/> <el-table-column prop="netInvestmentCashFlow" label="投资现金流量净额（亿元）" :formatter="formatStatus" width="160" align="right"/>
<el-table-column prop="totalLiabilities" label="总负债（亿元）" :formatter="formatStatus" width="120" align="right"/> <el-table-column prop="totalLiabilities" label="总负债（亿元）" :formatter="formatStatus" width="120" align="right"/>
<el-table-column prop="uipInterestBearingDebt" label="有息债务（亿元）" :formatter="formatStatus" width="140" align="right"/> <el-table-column prop="uipInterestBearingDebt" label="有息债务（亿元）" :formatter="formatStatus" width="140" align="right"/>
<el-table-column prop="econData002" label="有息债务/总负债（%）" :formatter="formatStatus" width="160" align="right"/> <el-table-column prop="econData002" label="有息债务/总负债（%）" :formatter="formatStatus" width="160" align="right"/>
<el-table-column prop="tdr" label="资产负债率（%）" :formatter="formatStatus" width="140" align="right"/> <el-table-column prop="tdr" label="资产负债率（%）" :formatter="formatStatus" width="140" align="right"/>
<el-table-column prop="ofcb" label="综合融资成本（%）" :formatter="formatStatus" width="150" align="right"/> <el-table-column prop="ofcb" label="综合融资成本（%）" :formatter="formatStatus" width="150" align="right"/>
<el-table-column prop="cashRatio" label="现金比率" :formatter="formatStatus" width="110" align="right"/> <el-table-column prop="cashRatio" label="现金比率" :formatter="formatStatus" width="110" align="right"/>
<el-table-column prop="cashFlowRatio" label="现金流量比率" :formatter="formatStatus" width="120" align="right"/> <el-table-column prop="cashFlowRatio" label="现金流量比率" :formatter="formatStatus" width="120" align="right"/>
<el-table-column prop="cashDebtRatio" label="现金到期债务比" :formatter="formatStatus" width="120" align="right"/> <el-table-column prop="cashDebtRatio" label="现金到期债务比" :formatter="formatStatus" width="120" align="right"/>
<el-table-column prop="creditBalance" label="授信余额（亿元）" :formatter="formatStatus" width="130" align="right"/> <el-table-column prop="creditBalance" label="授信余额（亿元）" :formatter="formatStatus" width="130" align="right"/>
<el-table-column prop="econData003" label="授信余额/全部债务（%）" :formatter="formatStatus" width="160" align="right"/> <el-table-column prop="econData003" label="授信余额/全部债务（%）" :formatter="formatStatus" width="160" align="right"/>
<el-table-column prop="ebitdaIcr" label="EBITDA保障倍数" :formatter="formatStatus" width="150" align="right"/> <el-table-column prop="ebitdaIcr" label="EBITDA保障倍数" :formatter="formatStatus" width="150" align="right"/>
<el-table-column prop="ppnBalanceProp" label="私募债余额占比（%）" :formatter="formatStatus" width="160" align="right"/> <el-table-column prop="ppnBalanceProp" label="私募债余额占比（%）" :formatter="formatStatus" width="160" align="right"/>
<el-table-column prop="econData004" label="一年内到期债权占比（%）" :formatter="formatStatus" width="160" align="right"/> <el-table-column prop="econData004" label="一年内到期债权占比（%）" :formatter="formatStatus" width="160" align="right"/>
<el-table-column prop="econData005" label="债券余额/有息债务（%）" :formatter="formatStatus" width="160" align="right"/> <el-table-column prop="econData005" label="债券余额/有息债务（%）" :formatter="formatStatus" width="160" align="right"/>
<el-table-column prop="loan" label="借款余额（亿元）" :formatter="formatStatus" width="140" align="right"/> <el-table-column prop="loan" label="借款余额（亿元）" :formatter="formatStatus" width="140" align="right"/>
<el-table-column prop="econData006" label="借款/有息债务（%）" :formatter="formatStatus" width="160" align="right"/> <el-table-column prop="econData006" label="借款/有息债务（%）" :formatter="formatStatus" width="160" align="right"/>
<el-table-column prop="nonStandardBalance" label="非标余额（亿元）" :formatter="formatStatus" width="140" align="right"/> <el-table-column prop="nonStandardBalance" label="非标余额（亿元）" :formatter="formatStatus" width="140" align="right"/>
<el-table-column prop="nonStandardRatio" label="非标余额/有息债务（%）" :formatter="formatStatus" width="160" align="right"/> <el-table-column prop="nonStandardRatio" label="非标余额/有息债务（%）" :formatter="formatStatus" width="160" align="right"/>
<el-table-column prop="guaranteeAmount" label="对外担保金额（亿元）" :formatter="formatStatus" width="160" align="right"/> <el-table-column prop="guaranteeAmount" label="对外担保金额（亿元）" :formatter="formatStatus" width="160" align="right"/>
<el-table-column prop="guaranteeRatio" label="对外担保比例（%）" :formatter="formatStatus" width="160" align="right"/> <el-table-column prop="guaranteeRatio" label="对外担保比例（%）" :formatter="formatStatus" width="160" align="right"/>
<el-table-column prop="developmentZone" label="所属开发区" :formatter="formatStatus" width="160" /> <el-table-column prop="developmentZone" label="所属开发区" :formatter="formatStatus" width="160" />
<!--<el-table-column prop="bl" label="开发区类别" width="160" />--> <!--<el-table-column prop="bl" label="开发区类别" width="160" />-->
</el-table> </el-table>
</div>
<div class="empty" v-if="tableDataTotal === 0"> <div class="empty" v-if="tableDataTotal === 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>
...@@ -344,6 +345,7 @@ export default { ...@@ -344,6 +345,7 @@ export default {
} }
}, },
mounted(){ mounted(){
window.addEventListener("scroll",this.scrolling)
window.addEventListener('scroll', this.handleScroll); window.addEventListener('scroll', this.handleScroll);
const _this = this, erd = elementResizeDetectorMaker(), partBox = document.getElementById("content") const _this = this, erd = elementResizeDetectorMaker(), partBox = document.getElementById("content")
erd.listenTo(partBox, element => { erd.listenTo(partBox, element => {
...@@ -355,6 +357,9 @@ export default { ...@@ -355,6 +357,9 @@ export default {
destroyed () { destroyed () {
window.removeEventListener('scroll', this.handleScroll) window.removeEventListener('scroll', this.handleScroll)
}, },
beforeDestroy() {
window.removeEventListener("scroll", this.scrolling);
},
created() { created() {
this.dataRegion() this.dataRegion()
this.getType() this.getType()
...@@ -409,6 +414,16 @@ export default { ...@@ -409,6 +414,16 @@ export default {
}) })
}, },
methods: { methods: {
scrolling() {
let el = document.getElementsByClassName("el-table__fixed-header-wrapper")[0]
let scrollTop =window.pageYOffset ||document.documentElement.scrollTop ||document.body.scrollTop;
if (scrollTop>368){
let top = scrollTop-368
el.style.top = top+'px'
}else{
el.style.top = 0
}
},
handleScroll () { handleScroll () {
let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
if (scrollTop > 300) { if (scrollTop > 300) {
...@@ -912,6 +927,15 @@ export default { ...@@ -912,6 +927,15 @@ export default {
} }
} }
::v-deep .el-table{ ::v-deep .el-table{
overflow:visible;
.el-table__header-wrapper{
position: sticky;
top:56px;
z-index: 9;
}
.el-table__fixed-header-wrapper{
z-index: 9;
}
th{ th{
font-size: 12px !important; font-size: 12px !important;
font-weight: 400 !important; font-weight: 400 !important;
......
dsk-operate-ui/src/views/project/overview/index.vue
View file @ 09d529f0
...@@ -346,6 +346,7 @@ export default { ...@@ -346,6 +346,7 @@ export default {
axisPointer:{ //悬浮于圆点展示标签 axisPointer:{ //悬浮于圆点展示标签
type:'axis' type:'axis'
}, },
extraCssText: 'border:0',
// trigger: 'axis' // trigger: 'axis'
}, },
legend: { legend: {
......
dsk-operate-ui/src/views/project/projectList/component/gjjl.vue
View file @ 09d529f0
...@@ -61,69 +61,71 @@ ...@@ -61,69 +61,71 @@
</div> </div>
</div> </div>
</div> </div>
<div class="recordlist" v-if="showtype=='gjdt'"> <skeleton v-if="isSkeleton" style="padding-top: 16px"></skeleton>
<div class="rec_detail" v-for="(item,index) in recordlist.rows"> <div v-else>
<div class="delform" v-if="isdel && delID == item.id"> <div class="recordlist" v-if="showtype=='gjdt'">
<div class="words">是否删除该条记录</div> <div class="rec_detail" v-for="(item,index) in recordlist.rows">
<div> <div class="delform" v-if="isdel && delID == item.id">
<div class="btnsmall btn_primary h28" @click="delele">确定</div> <div class="words">是否删除该条记录</div>
<div class="btnsmall btn_cancel h28" @click="isdel=false">取消</div> <div>
<div class="btnsmall btn_primary h28" @click="delele">确定</div>
<div class="btnsmall btn_cancel h28" @click="isdel=false">取消</div>
</div>
</div> </div>
</div>
<div class="rec_time"> <div class="rec_time">
<i class="el-icon-time"></i> <i class="el-icon-time"></i>
<div>{{item.createTime && item.createTime.slice(0, 16)}}</div> <div>{{item.createTime && item.createTime.slice(0, 16)}}</div>
<div class="operate"> <div class="operate">
<!--<img src="@/assets/images/edit.png">第一期不做编辑--> <!--<img src="@/assets/images/edit.png">第一期不做编辑-->
<img @click="delRecord(item.id)" src="@/assets/images/delete.png"> <img @click="delRecord(item.id)" src="@/assets/images/delete.png">
</div>
</div> </div>
</div> <div class="rec_con">
<div class="rec_con"> <div><strong>{{item.nickName}}</strong> <span v-if="item.visitMode">({{item.visitMode}})</span></div>
<div><strong>{{item.nickName}}</strong> <span v-if="item.visitMode">({{item.visitMode}})</span></div> <div><span>{{item.content}}</span></div>
<div><span>{{item.content}}</span></div> <div class="rec_text">
<div class="rec_text"> <span v-if="item.name">拜访对象：{{item.name||'--'}}</span>
<span v-if="item.name">拜访对象：{{item.name||'--'}}</span> <span v-if="showtype == 'gjdt' && item.companyName != ''">关联企业：{{item.companyName}}</span>
<span v-if="showtype == 'gjdt' && item.companyName != ''">关联企业：{{item.companyName}}</span> <span v-if="item.position">职位：{{item.position}}</span>
<span v-if="item.position">职位：{{item.position}}</span> <span v-if="item.visitTime">拜访时间：{{item.visitTime.slice(0, 10)}}</span>
<span v-if="item.visitTime">拜访时间：{{item.visitTime.slice(0, 10)}}</span> <span v-if="item.nextVisitTime">下次拜访时间：{{item.nextVisitTime.slice(0, 10)}}</span>
<span v-if="item.nextVisitTime">下次拜访时间：{{item.nextVisitTime.slice(0, 10)}}</span> </div>
</div> </div>
</div> </div>
</div> </div>
</div> <div class="recordlist" v-if="showtype=='gjjl' || showtype == 'projectgjdt' && recordlist.total>0">
<div class="recordlist" v-if="showtype=='gjjl' || showtype == 'projectgjdt' && recordlist.total>0"> <div class="rec_detail" v-for="(item,index) in recordlist.rows">
<div class="rec_detail" v-for="(item,index) in recordlist.rows"> <div class="delform" v-if="isdel && delID == item.id">
<div class="delform" v-if="isdel && delID == item.id"> <div class="words">是否删除该条记录</div>
<div class="words">是否删除该条记录</div> <div>
<div> <div class="btnsmall btn_primary h28" @click="delele">确定</div>
<div class="btnsmall btn_primary h28" @click="delele">确定</div> <div class="btnsmall btn_cancel h28" @click="isdel=false">取消</div>
<div class="btnsmall btn_cancel h28" @click="isdel=false">取消</div> </div>
</div> </div>
</div>
<div class="rec_time"> <div class="rec_time">
<i class="el-icon-time"></i> <i class="el-icon-time"></i>
<div>{{item.creatTime}}</div> <div>{{item.creatTime}}</div>
<div class="operate" v-if="isDisableds == false"> <div class="operate" v-if="isDisableds == false">
<!--<img src="@/assets/images/edit.png">第一期不做编辑--> <!--<img src="@/assets/images/edit.png">第一期不做编辑-->
<img @click="delRecord(item.id)" src="@/assets/images/delete.png"> <img @click="delRecord(item.id)" src="@/assets/images/delete.png">
</div>
</div> </div>
</div> <div class="rec_con">
<div class="rec_con"> <div><strong>{{item.nickName}}</strong> <span v-if="item.visitWay">({{item.visitWay}})</span></div>
<div><strong>{{item.nickName}}</strong> <span v-if="item.visitWay">({{item.visitWay}})</span></div> <div><span>{{item.recordInfo}}</span></div>
<div><span>{{item.recordInfo}}</span></div> <div class="rec_text">
<div class="rec_text"> <span v-if="item.projectName && showtype == 'projectgjdt'">关联项目：{{item.projectName||'--'}}</span>
<span v-if="item.projectName && showtype == 'projectgjdt'">关联项目：{{item.projectName||'--'}}</span> <span v-if="item.visitPerson">拜访对象：{{item.visitPerson||'--'}}</span>
<span v-if="item.visitPerson">拜访对象：{{item.visitPerson||'--'}}</span> <span v-if="item.position">职位：{{item.position||'--'}}</span>
<span v-if="item.position">职位：{{item.position||'--'}}</span> <span v-if="item.visitTime">拜访时间：{{item.visitTime}}</span>
<span v-if="item.visitTime">拜访时间：{{item.visitTime}}</span> <span v-if="item.nextVisitTime">下次拜访时间：{{item.nextVisitTime || '--'}}</span>
<span v-if="item.nextVisitTime">下次拜访时间：{{item.nextVisitTime || '--'}}</span> </div>
</div> </div>
</div> </div>
</div> </div>
</div> <div class="tables" v-if="recordlist.total>pageSize">
<div class="tables" v-if="recordlist.total>pageSize">
<div class="bottems"> <div class="bottems">
<el-pagination <el-pagination
background background
...@@ -135,6 +137,7 @@ ...@@ -135,6 +137,7 @@
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
</div>
</div> </div>
</el-card> </el-card>
</div> </div>
...@@ -145,7 +148,9 @@ ...@@ -145,7 +148,9 @@
import {getFollowList,addFollowRecord,getUserList,delFollowRecord} from '@/api/custom/custom' import {getFollowList,addFollowRecord,getUserList,delFollowRecord} from '@/api/custom/custom'
import {getGJJL,addGJJL,delGJJL,relateProject,allRecord} from '@/api/project/project' import {getGJJL,addGJJL,delGJJL,relateProject,allRecord} from '@/api/project/project'
import {getEnterprise,getDictType,} from '@/api/main' import {getEnterprise,getDictType,} from '@/api/main'
import skeleton from './skeleton'
export default { export default {
components:{skeleton},
props:{ props:{
types: { //当前组件展示类型 types: { //当前组件展示类型
type: String, type: String,
...@@ -191,6 +196,7 @@ ...@@ -191,6 +196,7 @@
projectList:[],//关联项目 projectList:[],//关联项目
isDisableds:this.isDisabled, isDisableds:this.isDisabled,
keys:1, keys:1,
isSkeleton:true,
} }
}, },
computed: { computed: {
...@@ -220,6 +226,7 @@ ...@@ -220,6 +226,7 @@
this.isDisableds = false this.isDisableds = false
this.projectId = null//项目id暂时清空，必须手选id this.projectId = null//项目id暂时清空，必须手选id
relateProject(this.userId).then(res=>{ relateProject(this.userId).then(res=>{
this.isSkeleton = false
this.projectList = res.data this.projectList = res.data
}) })
this.getGJDT() this.getGJDT()
...@@ -323,6 +330,7 @@ ...@@ -323,6 +330,7 @@
param.customerId = this.customerIds param.customerId = this.customerIds
} }
getFollowList(param).then(result=>{ getFollowList(param).then(result=>{
this.isSkeleton = false
this.recordlist = result.code == 200?result:[] this.recordlist = result.code == 200?result:[]
this.recordlist.rows.forEach(item=>{ this.recordlist.rows.forEach(item=>{
item.createTime = this.gettime(item.createTime) item.createTime = this.gettime(item.createTime)
...@@ -339,6 +347,7 @@ ...@@ -339,6 +347,7 @@
userId: this.userId userId: this.userId
} }
allRecord(param).then(result=>{ allRecord(param).then(result=>{
this.isSkeleton = false
this.recordlist = result.code == 200?result:[] this.recordlist = result.code == 200?result:[]
// this.recordlist.rows.forEach(item=>{ // this.recordlist.rows.forEach(item=>{
// item.createTime = this.gettime(item.createTime) // item.createTime = this.gettime(item.createTime)
...@@ -354,10 +363,12 @@ ...@@ -354,10 +363,12 @@
businessId:this.projectId businessId:this.projectId
} }
getGJJL(param).then(result=>{ getGJJL(param).then(result=>{
this.isSkeleton = false
this.recordlist = result.code == 200?result:[] this.recordlist = result.code == 200?result:[]
}) })
}, },
handleCurrentChange(val){ handleCurrentChange(val){
this.isSkeleton = true
this.pageNum = val this.pageNum = val
if(this.showtype == 'gjdt'){ if(this.showtype == 'gjdt'){
this.getGJDTlist() this.getGJDTlist()
......
dsk-operate-ui/src/views/project/projectList/component/gzdb.vue
View file @ 09d529f0
...@@ -3,51 +3,53 @@ ...@@ -3,51 +3,53 @@
<el-card class="box-card noborder"> <el-card class="box-card noborder">
<div class="cardtitles">工作待办</div> <div class="cardtitles">工作待办</div>
<div class="records"> <div class="records">
<div class="writeIn" v-if="isDisableds == false"> <div class="writeIn" v-if="isDisableds == false">
<div class="default" v-if="isEdit == false" @click="getEdit"> <div class="default" v-if="isEdit == false" @click="getEdit">
<img src="@/assets/images/project/add_3.png">
<div>新建一条工作代办，如:周五上午预约客户上门拜访</div>
</div>
<div class="writting" v-if="isEdit == true">
<div class="wri_top">
<img src="@/assets/images/project/add_3.png"> <img src="@/assets/images/project/add_3.png">
<el-input v-model="queryParam.task" placeholder="新建一条跟进记录，如:周五上午预约客户上门拜访"></el-input> <div>新建一条工作代办，如:周五上午预约客户上门拜访</div>
</div> </div>
<div class="wr_bot"> <div class="writting" v-if="isEdit == true">
<div class="times"><img src="@/assets/images/project/ico_4.png"> <div class="wri_top">
<el-date-picker value-format="yyyy-MM-dd" <img src="@/assets/images/project/add_3.png">
v-model="queryParam.finishTime" <el-input v-model="queryParam.task" placeholder="新建一条跟进记录，如:周五上午预约客户上门拜访"></el-input>
type="date"
placeholder="完成时间">
</el-date-picker>
</div> </div>
<div class="sels"> <div class="wr_bot">
<img src="@/assets/images/project/ico_2.png"> <div class="times"><img src="@/assets/images/project/ico_4.png">
<el-input v-model="queryParam.target" placeholder="拜访对象" style="width: 100px;"> <el-date-picker value-format="yyyy-MM-dd"
</el-input> v-model="queryParam.finishTime"
type="date"
placeholder="完成时间">
</el-date-picker>
</div>
<div class="sels">
<img src="@/assets/images/project/ico_2.png">
<el-input v-model="queryParam.target" placeholder="拜访对象" style="width: 100px;">
</el-input>
</div>
<div class="btn btn_primary h32 wc" @click="add" :class="{'btn_disabled':queryParam.task == ''}">完成</div>
</div> </div>
<div class="btn btn_primary h32 wc" @click="add" :class="{'btn_disabled':queryParam.task == ''}">完成</div>
</div> </div>
</div> </div>
</div> <skeleton v-if="isSkeleton" style="padding-top: 16px"></skeleton>
<div class="tasktitle"><strong>我的任务</strong><span @click="getYQ">{{yqnum}}条已逾期</span><!--<span class="on">4条已逾期</span>--></div> <div v-else>
<div class="tasklist" v-for="(item,index) in datalist.rows"> <div class="tasktitle"><strong>我的任务</strong><span @click="getYQ">{{yqnum}}条已逾期</span><!--<span class="on">4条已逾期</span>--></div>
<div class="task_name">{{item.task}}</div> <div class="tasklist" v-for="(item,index) in datalist.rows">
<div class="task_con"><span>发起时间：{{item.createTime}}</span><span v-if="item.target">关联客户：<font class="wordprimary">{{item.target}}</font></span><span v-if="item.finishTime">完成时间：{{item.finishTime}}</span></div> <div class="task_name">{{item.task}}</div>
<div class="select" :class="{'on':item.state == 2}"> <div class="task_con"><span>发起时间：{{item.createTime}}</span><span v-if="item.target">关联客户：<font class="wordprimary">{{item.target}}</font></span><span v-if="item.finishTime">完成时间：{{item.finishTime}}</span></div>
<div class="select-popper"> <div class="select" :class="{'on':item.state == 2}">
<span> <div class="select-popper">
{{item.state == 2?"已完成":"未完成"}} <span>
<i class="el-icon-caret-bottom"></i> {{item.state == 2?"已完成":"未完成"}}
</span> <i class="el-icon-caret-bottom"></i>
<el-select v-if="isDisableds == false" placeholder="请选择" v-model="item.state" class="select-multiple" @change="changes(item.id,$event)"> </span>
<el-option label="未完成" value="1"></el-option> <el-select v-if="isDisableds == false" placeholder="请选择" v-model="item.state" class="select-multiple" @change="changes(item.id,$event)">
<el-option label="已完成" value="2"></el-option> <el-option label="未完成" value="1"></el-option>
</el-select> <el-option label="已完成" value="2"></el-option>
</div></div> </el-select>
</div> </div></div>
</div>
<div class="tables" v-if="datalist.total>searchPram.pageSize"> <div class="tables" v-if="datalist.total>searchPram.pageSize">
<div class="bottems"> <div class="bottems">
<el-pagination <el-pagination
background background
...@@ -59,6 +61,7 @@ ...@@ -59,6 +61,7 @@
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
</div>
</div> </div>
</el-card> </el-card>
</div> </div>
...@@ -68,8 +71,10 @@ ...@@ -68,8 +71,10 @@
import "@/assets/styles/project.scss" import "@/assets/styles/project.scss"
import "@/assets/styles/public.css" import "@/assets/styles/public.css"
import {addGZDB,getGZDB,editGZDB} from '@/api/project/project' import {addGZDB,getGZDB,editGZDB} from '@/api/project/project'
import skeleton from './skeleton'
export default { export default {
components:{skeleton},
name: 'gjjl', name: 'gjjl',
props: { props: {
detailId: { //从企业详情跳转过来ID detailId: { //从企业详情跳转过来ID
...@@ -98,6 +103,7 @@ ...@@ -98,6 +103,7 @@
datalist:[], datalist:[],
yqnum:0,//已逾期数量 yqnum:0,//已逾期数量
isDisableds:this.isDisabled, isDisableds:this.isDisabled,
isSkeleton:true,
} }
}, },
created(){ created(){
...@@ -124,7 +130,9 @@ ...@@ -124,7 +130,9 @@
}) })
}, },
getList(){ getList(){
this.isSkeleton = true
getGZDB(this.searchPram).then(result=>{ getGZDB(this.searchPram).then(result=>{
this.isSkeleton = false
this.datalist = result.code == 200?result:[] this.datalist = result.code == 200?result:[]
let num = 0 let num = 0
this.datalist.rows.forEach(item=>{ this.datalist.rows.forEach(item=>{
......
dsk-operate-ui/src/views/project/projectList/component/lxr.vue
View file @ 09d529f0
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
<div> <div>
<el-card class="box-card noborder"> <el-card class="box-card noborder">
<div class="cardtitles">基本信息</div> <div class="cardtitles">基本信息</div>
<div class="tables">
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<div class="tables" v-else>
<el-table <el-table
:data="tableData" :data="tableData"
stripe border stripe border
...@@ -135,7 +137,9 @@ ...@@ -135,7 +137,9 @@
<script> <script>
import "@/assets/styles/project.scss" import "@/assets/styles/project.scss"
import {getLXR,editLXR,addLXR} from '@/api/project/project' import {getLXR,editLXR,addLXR} from '@/api/project/project'
import skeleton from './skeleton'
export default { export default {
components:{skeleton},
name: 'lxr', name: 'lxr',
props: { props: {
detailId: { //从企业详情跳转过来ID detailId: { //从企业详情跳转过来ID
...@@ -163,6 +167,7 @@ ...@@ -163,6 +167,7 @@
projectname:this.$route.query.projectname, projectname:this.$route.query.projectname,
queryParam:[], queryParam:[],
isDisableds:this.isDisabled, isDisableds:this.isDisabled,
isSkeleton:true,
} }
}, },
created(){ created(){
...@@ -180,7 +185,9 @@ ...@@ -180,7 +185,9 @@
this.isnew = false this.isnew = false
}, },
getList(){ getList(){
this.isSkeleton = true
getLXR(this.searchParam).then(result=>{ getLXR(this.searchParam).then(result=>{
this.isSkeleton = false
this.tableData = result.code == 200?result.rows:[] this.tableData = result.code == 200?result.rows:[]
this.total = result.code == 200?result.total:0 this.total = result.code == 200?result.total:0
}) })
......
dsk-operate-ui/src/views/project/projectList/component/skeleton.vue 0 → 100644
View file @ 09d529f0
<template>
<el-skeleton animated>
<template slot="template">
<el-skeleton-item variant="text" style="width: 60%;"/>
<el-skeleton-item variant="text" style="width: 100%;" />
<el-skeleton-item variant="text" style="width: 100%;" />
<el-skeleton-item variant="text" style="width: 100%;" />
<el-skeleton-item variant="text" style="width: 60%;" />
<el-skeleton-item variant="text" style="width: 100%;" />
<el-skeleton-item variant="text" style="width: 100%;" />
<el-skeleton-item variant="text" style="width: 100%;" />
</template>
</el-skeleton>
</template>
<script>
export default {
name: 'skeleton'
}
</script>
<style lang="scss" scoped>
.el-skeleton__item{
height: 20px;
border-radius: 0;
margin: 9px 0;
background: #f0f0f0;
}
</style>
dsk-operate-ui/src/views/project/projectList/component/xgqy.vue
View file @ 09d529f0
...@@ -7,14 +7,16 @@ ...@@ -7,14 +7,16 @@
<el-select class="select" placeholder="企业类型" clearable v-model="searchParam.companyType" @change="handleCurrentChange(1)"> <el-select class="select" placeholder="企业类型" clearable v-model="searchParam.companyType" @change="handleCurrentChange(1)">
<el-option v-for="(item,index) in companytype" :label="item.dictLabel" :value="item.dictValue"></el-option> <el-option v-for="(item,index) in companytype" :label="item.dictLabel" :value="item.dictValue"></el-option>
</el-select> </el-select>
<div class="searchInput"> <div class="searchInput small">
<el-input type="text" placeholder="输入关键词查询" clearable v-model="searchParam.companyName"></el-input> <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> <div class="btn" @click="handleCurrentChange(1)">搜索</div>
</div> </div>
<div class="btn btn_primary h32 b3" @click="opennew" v-if="isDisableds == false"><div class="img img1"></div>添加相关企业</div> <div class="btn btn_primary h32 b3" @click="opennew" v-if="isDisableds == false"><div class="img img1"></div>添加相关企业</div>
</div> </div>
<div class="document tables"> <div class="document tables">
<el-table <skeleton v-if="isSkeleton" style="padding-top: 16px"></skeleton>
<el-table v-else
:data="tableData.rows" :data="tableData.rows"
style="width: 100%" style="width: 100%"
:default-sort = "{prop: 'depth', order: 'descending'}" :default-sort = "{prop: 'depth', order: 'descending'}"
...@@ -143,7 +145,9 @@ ...@@ -143,7 +145,9 @@
import "@/assets/styles/project.scss" import "@/assets/styles/project.scss"
import {getXGQY,addXGQY,delXGQY} from '@/api/project/project' import {getXGQY,addXGQY,delXGQY} from '@/api/project/project'
import {getDictType,getEnterprise} from '@/api/main' import {getDictType,getEnterprise} from '@/api/main'
import skeleton from './skeleton'
export default { export default {
components:{skeleton},
name: 'xgqy', name: 'xgqy',
props: { props: {
detailId: { //从企业详情跳转过来ID detailId: { //从企业详情跳转过来ID
...@@ -189,6 +193,7 @@ ...@@ -189,6 +193,7 @@
isDisableds:this.isDisabled, isDisableds:this.isDisabled,
showlist:false, showlist:false,
companData:[], companData:[],
isSkeleton:true,
} }
}, },
created(){ created(){
...@@ -261,8 +266,9 @@ ...@@ -261,8 +266,9 @@
}) })
}, },
getlist(){ getlist(){
this.isSkeleton = true
getXGQY(this.searchParam).then(result=>{ getXGQY(this.searchParam).then(result=>{
console.log(result) this.isSkeleton = false
this.tableData = result this.tableData = result
}) })
}, },
......
dsk-operate-ui/src/views/project/projectList/component/zlwd.vue
View file @ 09d529f0
...@@ -5,8 +5,10 @@ ...@@ -5,8 +5,10 @@
<div class="cardtitles">资料文档</div> <div class="cardtitles">资料文档</div>
<div class="searchbtns"> <div class="searchbtns">
<!--<div class="searchbtns" v-if="fileDatas.rows != null && fileDatas.rows.length>0">--> <!--<div class="searchbtns" v-if="fileDatas.rows != null && fileDatas.rows.length>0">-->
<div class="searchInput"> <div class="searchInput small">
<el-input type="text" v-model="param.keyword" clearable placeholder="输入关键词查询"></el-input> <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>
</el-input>
<div class="btn" @click="handleCurrentChange(1)">搜索</div> <div class="btn" @click="handleCurrentChange(1)">搜索</div>
</div> </div>
<!--<div class="btn btn_primary h32 b2" @click="getUP" v-if="fileDatas.total>0"><div class="img img2"></div>上传</div>--> <!--<div class="btn btn_primary h32 b2" @click="getUP" v-if="fileDatas.total>0"><div class="img img2"></div>上传</div>-->
...@@ -58,7 +60,8 @@ ...@@ -58,7 +60,8 @@
</div> </div>
</div> </div>
<div class="document tables"> <div class="document tables">
<el-table <skeleton v-if="isSkeleton" style="padding-top: 16px"></skeleton>
<el-table v-else
:data="fileDatas.rows" :data="fileDatas.rows"
style="width: 100%" style="width: 100%"
:default-sort = "{prop: 'creatTime', order: 'descending'}" :default-sort = "{prop: 'creatTime', order: 'descending'}"
...@@ -147,10 +150,13 @@ ...@@ -147,10 +150,13 @@
</template> </template>
<script> <script>
import "@/assets/styles/project.scss" import '@/assets/styles/project.scss'
import { getToken } from "@/utils/auth"; import { getToken } from '@/utils/auth'
import { getZLWD ,delZLWD} from "@/api/project/project"; import { delZLWD, getZLWD } from '@/api/project/project'
import skeleton from './skeleton'
export default { export default {
components:{skeleton},
name: 'zlwd', name: 'zlwd',
props: { props: {
detailId: { //从企业详情跳转过来ID detailId: { //从企业详情跳转过来ID
...@@ -181,6 +187,7 @@ ...@@ -181,6 +187,7 @@
ondel:"", ondel:"",
isDisableds:this.isDisabled, isDisableds:this.isDisabled,
keys:1, keys:1,
isSkeleton:true,
} }
}, },
created(){ created(){
...@@ -195,8 +202,10 @@ ...@@ -195,8 +202,10 @@
this.handleCurrentChange(1) this.handleCurrentChange(1)
}, },
getList(){ getList(){
this.isSkeleton = true
getZLWD(this.param).then(res=>{ getZLWD(this.param).then(res=>{
this.fileDatas = res this.fileDatas = res
this.isSkeleton = false
if(this.fileDatas.rows!=null && this.fileDatas.rows.length>0){ if(this.fileDatas.rows!=null && this.fileDatas.rows.length>0){
this.fileDatas.rows.forEach(item=>{ this.fileDatas.rows.forEach(item=>{
let names = item.filePath.split('/') let names = item.filePath.split('/')
...@@ -300,6 +309,7 @@ ...@@ -300,6 +309,7 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
v-deep.el-upload:focus{ v-deep.el-upload:focus{
color: #FFFFFF !important; color: #FFFFFF !important;
} }
...@@ -382,7 +392,4 @@ ...@@ -382,7 +392,4 @@
} }
} }
} }
.searchInput .el-input{
width: 68%;
}
</style> </style>
dsk-operate-ui/src/views/project/projectList/index.vue
View file @ 09d529f0
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<el-tab-pane label="公司全部项目" name="second"></el-tab-pane> <el-tab-pane label="公司全部项目" name="second"></el-tab-pane>
<div class="searchInput"> <div class="searchInput">
<el-input type="text" v-model="searchParam.projectName" placeholder="请输入项目或业主单位名称关键词进行搜索"></el-input> <el-input type="text" style="width: 530px;" v-model="searchParam.projectName" placeholder="请输入项目或业主单位名称关键词进行搜索"></el-input>
<div class="btn" @click="getList(1)">搜索</div> <div class="btn" @click="getList(1)">搜索</div>
</div> </div>
<div class="sellist"> <div class="sellist">
...@@ -97,14 +97,16 @@ ...@@ -97,14 +97,16 @@
<el-card class="box-card noborder overflows"> <el-card class="box-card noborder overflows">
<div class="titles">项目明细 <div class="titles">项目明细
<div class="dc"> <div class="dc">
<div class="total">共{{total}}条</div> <div class="total">共{{total}}条</div>
<!--<el-tooltip class="item" effect="dark" content="功能正在开发中" placement="top">--> <!--<el-tooltip class="item" effect="dark" content="功能正在开发中" placement="top">-->
<div class="btn-export" @click="dc"><img src="@/assets/images/EXCEL.png">导出EXCEL</div> <div class="btn-export" @click="dc"><img src="@/assets/images/EXCEL.png">导出EXCEL</div>
<!--</el-tooltip>--> <!--</el-tooltip>-->
</div> </div>
</div> </div>
<div class="tables" v-if="total == 0">
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<div class="tables" v-if="total == 0 && !isSkeleton">
<div class="empty"> <div class="empty">
<img src="@/assets/images/project/empty.png"> <img src="@/assets/images/project/empty.png">
<div class="p1">抱歉，没找到相关数据</div> <div class="p1">抱歉，没找到相关数据</div>
...@@ -113,7 +115,7 @@ ...@@ -113,7 +115,7 @@
<div class="btn btn_primary btn_shallow h36 w88" @click="pldrs">批量导入</div> <div class="btn btn_primary btn_shallow h36 w88" @click="pldrs">批量导入</div>
</div> </div>
</div> </div>
<div class="datalist"> <div class="datalist" v-if="!isSkeleton">
<div class="datali" v-for="(item,index) in datalist"> <div class="datali" v-for="(item,index) in datalist">
<div class="det-title" @click="toDetail(item.id,'xmsl')"> <div class="det-title" @click="toDetail(item.id,'xmsl')">
{{item.projectName}}<span v-if="activeName!='first' && item.followTime" class="people"><i>{{item.nickName1}}</i> {{item.projectName}}<span v-if="activeName!='first' && item.followTime" class="people"><i>{{item.nickName1}}</i>
...@@ -182,9 +184,10 @@ ...@@ -182,9 +184,10 @@
import {getDictType,} from '@/api/main' import {getDictType,} from '@/api/main'
import addproject from './component/addProject' import addproject from './component/addProject'
import batchimport from './component/batchImport' import batchimport from './component/batchImport'
import skeleton from './component/skeleton'
export default { export default {
name: 'ProjectList', name: 'ProjectList',
components:{addproject,batchimport}, components:{addproject,batchimport,skeleton},
data() { data() {
return { return {
types:'project', types:'project',
...@@ -240,6 +243,7 @@ export default { ...@@ -240,6 +243,7 @@ export default {
datalist:[],//列表数据 datalist:[],//列表数据
ondel:-1, ondel:-1,
total:0, total:0,
isSkeleton:true
} }
}, },
created() { created() {
...@@ -289,6 +293,7 @@ export default { ...@@ -289,6 +293,7 @@ export default {
}, },
//获取商机列表 //获取商机列表
getList(pageNum){ getList(pageNum){
this.isSkeleton = true
this.searchParam.pageNum = pageNum this.searchParam.pageNum = pageNum
if(this.activeName == 'first'){ if(this.activeName == 'first'){
this.searchParam.userId = this.$store.state.user.userId this.searchParam.userId = this.$store.state.user.userId
...@@ -297,6 +302,7 @@ export default { ...@@ -297,6 +302,7 @@ export default {
} }
this.searchParam.ownerCompany = this.searchParam.projectName this.searchParam.ownerCompany = this.searchParam.projectName
getProjectlist(this.searchParam).then(result=>{ getProjectlist(this.searchParam).then(result=>{
this.isSkeleton = false
if(result.code == 200){ if(result.code == 200){
this.datalist = result.rows this.datalist = result.rows
this.total = result.total this.total = result.total
...@@ -382,7 +388,7 @@ export default { ...@@ -382,7 +388,7 @@ export default {
this.$router.push({ path: '/project/projectList/detail', query: {id:id,tag:tag} }); this.$router.push({ path: '/project/projectList/detail', query: {id:id,tag:tag} });
}, },
handleClick(){ handleClick(){
this.getList(1) this.reset()
}, },
handleChange(value) { handleChange(value) {
// console.log(value); // console.log(value);
......
dsk-operate-ui/vue.config.js
View file @ 09d529f0
...@@ -34,8 +34,8 @@ module.exports = { ...@@ -34,8 +34,8 @@ 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://47.104.91.229:9099/prod-api`,
// target: `http://122.9.160.122:9011`, target: `http://122.9.160.122:9011`,
// target: `http://192.168.60.126:9011`, // target: `http://192.168.60.126:9011`,
// target: `http://192.168.60.27:8766`, // target: `http://192.168.60.27:8766`,
changeOrigin: true, changeOrigin: true,
......
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