Skip to content

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

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

# Conflicts:
#	dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue
parents 045b7b3a 28718ad1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1847 additions and 1563 deletions
dsk-operate-ui/src/assets/styles/project.scss
View file @ bc97af64
......@@ -1176,9 +1176,6 @@
}
.none{display: none}
.el-popper[x-placement^=bottom]{
margin-top: 0 !important;
}
.el-dialog__body{
padding-top: 14px;
padding-bottom: 18px;
......
dsk-operate-ui/src/assets/styles/public.css → dsk-operate-ui/src/assets/styles/public.scss
View file @ bc97af64
......@@ -323,7 +323,7 @@ select {
}
.el-dropdown-land .el-icon-caret-bottom {
color: #333333;
color: #666666;
margin-left: 2px;
}
......@@ -397,6 +397,7 @@ select {
.content_item .search-new {
width: 100%;
padding-bottom: 24px;
font-size: 14px;
}
.content_item .search-new span:last-child {
......@@ -406,7 +407,7 @@ select {
color: #5B5B5B;
line-height: 32px;
cursor: pointer;
border-radius: 2px 2px 2px 2px;
border-radius: 4px;
border: 1px solid #D4D4D4;
opacity: 1;
}
......@@ -420,7 +421,7 @@ select {
background: #0089ff;
color: #fff;
line-height: 34px;
border-radius: 2px 2px 2px 2px;
border-radius: 4px;
opacity: 1;
}
......@@ -461,7 +462,7 @@ select {
.viewlist-el-popover .pup_list {
line-height: 36px;
text-align: left;
margin: 5px 0;
margin: 4px 0;
cursor: pointer;
}
......@@ -553,7 +554,7 @@ select {
}
.content_item_ckquery .item_ckquery_btn:hover {
background: #0074E5;
background: #0080FF;
color: #fff;
}
......@@ -1218,4 +1219,23 @@ select {
.enterprise_contatiner{
padding: 0;
padding-bottom: 16px;
}
\ No newline at end of file
}
.el-input-group__append{
cursor: pointer;
padding: 0px;
border-radius:2px;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
&:hover{
background: #0081FF!important;
.btn-search{
color: #FFFFFF;
}
}
.btn-search{
width: 70px;
color: #0081ff;
text-align: center;
}
}
\ No newline at end of file
dsk-operate-ui/src/layout/index.vue
View file @ bc97af64
......@@ -2,7 +2,7 @@
<div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
<div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
<sidebar v-if="!sidebar.hide" class="sidebar-container" @handleBar="handleSideBar" id="sidebar"/>
<div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide,EnterpriseData:$route.name=='Group'}" class="main-container">
<div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide,EnterpriseData:$route.name=='Group',width1350:$route.name=='Radar'}" class="main-container">
<div :class="{'fixed-header':fixedHeader}">
<navbar :offsetWidth="offsetWidth"/>
</div>
......@@ -131,4 +131,7 @@ export default {
.EnterpriseData{
min-width: 1710px;
}
.width1350{
min-width: 1350px;
}
</style>
dsk-operate-ui/src/router/index.js
View file @ bc97af64
......@@ -155,7 +155,7 @@ export const constantRoutes = [
path: '/enterprise/:id',
component: () => import('@/views/detail/party-a/index'),
name: 'PartyA',
meta: { title: '甲方详情', icon: 'enterprise', noCache: false },
meta: { title: '甲方详情', icon: 'enterpriseData', noCache: false },
}
]
},
......@@ -319,6 +319,20 @@ export const constantRoutes = [
}
]
},
{
path: '/MajorProject',
component: Layout,
hidden: true,
redirect: 'noredirect',
children: [
{
path: '/radar/MajorProject/details/:id',
component: () => import('@/views/radar/MajorProject/details'),
name: 'MajorProjectDetails',
meta: { title: '重点项目详情', icon: 'radar' }
}
]
},
{
path: '/Bidding',
component: Layout,
......
dsk-operate-ui/src/views/detail/biddetail/index.vue
View file @ bc97af64
......@@ -98,7 +98,7 @@
</template>
<script>
import "@/assets/styles/public.css";
import "@/assets/styles/public.scss";
import {encodeStr} from "@/assets/js/common.js"
import {getBiddetail} from '@/api/detail/party-a/biddetail.js';
export default {
......
dsk-operate-ui/src/views/detail/party-a/component/Sidebar.vue
View file @ bc97af64
......@@ -295,6 +295,8 @@ export default {
},
handleItem(item){
console.log(this.defaultRoute)
this.sideRoute = this.defaultRoute
this.$emit("currentPath", item)
},
......
dsk-operate-ui/src/views/detail/party-a/mixins/mixin.js
View file @ bc97af64
......@@ -27,7 +27,7 @@ export default {
formParams(){
let condtion = {}
let reqData = {}
this.formData.forEach(item => {
this.formData&&this.formData.forEach(item => {
if(item.value || (item.value && item.value.length) || item.value===0) {
if(item.fieldName == 'time') {
condtion[item.startTime] = item.value[0];
......@@ -76,7 +76,7 @@ export default {
let params = this.formParams()
params.pageNum = e
this.queryParams.pageNum = e
this.handleQuery(params)
this.handleQuery(params,1)
},
handleSizeChange(e){
......
dsk-operate-ui/src/views/detail/party-a/overview/businfo.vue
View file @ bc97af64
......@@ -3,7 +3,7 @@
<div class="app-container detail-container" v-else>
<el-tabs v-model="activeName" @tab-click="handleClick" class="detail-tab">
<el-tab-pane label="工商信息" name="first"></el-tab-pane>
<el-tab-pane label="工商变更" :disabled="tableDataTotal>0" name="second"></el-tab-pane>
<el-tab-pane label="工商变更" :disabled="tableDataTotal==0" name="second"></el-tab-pane>
</el-tabs>
......@@ -31,7 +31,9 @@
<tables
:tableLoading="tableLoading"
:tableData="tableData"
:tableDataTotal="tableDataTotal"
:forData="forData"
@handle-current-change="handleCurrentChange"
:queryParams="queryParams"
v-if="activeName=='second'"
/>
......@@ -102,9 +104,16 @@ export default {
},
methods: {
handleClick(){
this.handleQuery()
if(this.activeName=='first'){
this.handleQuery()
}else{
this.handleQuery1()
}
},
async handleQuery() {
async handleQuery(params,flag) {
if(flag){
return this.handleQuery1(params)
}
this.isSkeleton = true;
this.tableLoading = true
let param = this.baseParams;
......@@ -115,8 +124,8 @@ export default {
this.forInfo = res.data
}
},
async handleQuery1() {
let param = this.queryParams
async handleQuery1(params) {
let param = params?params:this.queryParams
let res = await changeInfo(param)
if(res.code==200){
this.tableData = res.rows;
......
dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue
View file @ bc97af64
......@@ -97,25 +97,24 @@
<div class="company-swiper">
<div class="swiper-containers swiper-info" :style="graphList.length<=6?'margin-left:0px; width: 100%;':''">
<ul class="swiper-wrapper">
<li class="swiper-slide" v-if="statistic.combineMember">
<div class="flex-box" @click="linkTo(statistic.combineMember)">
<img src="@/assets/images/detail/overview/company_ssjt.png" alt="所属集团" title="所属集团" class="swiper-img">
<div class="swiper-item">
<template v-for="(item, index) in graphList" >
<li class="swiper-slide" :key="index">
<div class="flex-box" v-if="item.id==0" @click="linkTo(statistic.combineMember)">
<img :src="`${item.ico}`" :alt="item.name" :title="item.name" class="swiper-img">
<div class="swiper-item" >
<el-popover v-if="statistic.combineMember.companyName.length>9" trigger="hover" :content="'所属集团-'+statistic.combineMember.companyName">
<span class="swiper-name" slot="reference">
所属集团-{{ statistic.combineMember.companyName }}
</span>
</el-popover>
<span v-else class="swiper-name">所属集团-{{statistic.combineMember.companyName}}</span>
<div >
<span class="swiper-name" slot="reference">
所属集团-{{ statistic.combineMember.companyName }}
</span>
</el-popover>
<span v-else class="swiper-name">所属集团-{{statistic.combineMember.companyName}}</span>
<div >
<span >集团成员：</span><i class="num" >{{statistic.combineMember.memberNum}}</i>
</div>
</div>
</div>
</li>
<template v-for="(item, index) in graphList" >
<li class="swiper-slide" :key="index">
<div class="flex-box" @click="handleGraph(item)">
<div class="flex-box" v-else @click="handleGraph(item)">
<img :src="`${item.ico}`" :alt="item.name" :title="item.name" class="swiper-img">
<div class="swiper-item">
<span class="swiper-name">
......@@ -217,6 +216,11 @@ export default {
},
mounted() {
this.handleWidth() //企业背景是否收起
if(this.statistic.combineMember){
this.graphList.unshift({
id:0,name:'所属集团-'+this.statistic.combineMember.companyName,isShow:true,intro:[],ico:require('@/assets/images/detail/overview/company_ssjt.png')
})
}
this.companySwiper() //swiper滚动板块
api.label({companyId:this.companyId}).then(res=>{
if(res.code==200){
......@@ -320,6 +324,11 @@ export default {
}
})
this.graphList = this.graphList.filter(item => item.isShow)
if(this.statistic.combineMember){
this.graphList.unshift({
id:0,name:'所属集团-'+this.statistic.combineMember.companyName,isShow:true,intro:[],ico:require('@/assets/images/detail/overview/company_ssjt.png')
})
}
this.companySwiper() //swiper滚动板块
},
//获取认领状态
......
dsk-operate-ui/src/views/enterpriseData/components/Group/index.vue
View file @ bc97af64
......@@ -34,7 +34,7 @@
<skeleton style="margin-left:16px;" v-if="isSkeleton"></skeleton>
<div v-else id="anchorRef_wrap">
<div class="contetn_wrap">
<div class="wrap" id="anchorRef" @scroll="handleScroll">
<div class="wrap" :class="activeIndex==0?'':'wrap1'" id="anchorRef" @scroll="handleScroll">
<template v-if="activeIndex==0">
<span class="count">共{{ total }}条</span><el-popover style="margin-left:8px;position: relative;top: 2px;color:#515a6e;" trigger="hover" content="央企集团数据包含国资委及财政部公示的央企名录。" placement="right"><i slot="reference" class="el-icon-warning-outline"></i></el-popover>
<div >
......@@ -150,7 +150,7 @@
<script>
import api from '@/api/enterpriseData/enterpriseData.js';
import skeleton from '@/views/project/projectList/component/skeleton'
import "@/assets/styles/public.css";
import "@/assets/styles/public.scss";
export default {
name: 'Group',
......@@ -312,8 +312,8 @@ export default {
anchorClick(i) {
var a = document.getElementById('anchor-'+i)
a.scrollIntoView()
// document.body.scrollTop += -40
// document.documentElement.scrollTop += -40
document.body.scrollTop += -40
document.documentElement.scrollTop += -40
setTimeout(() => {
this.anchorIndex = i
}, 1);
......@@ -498,7 +498,6 @@ export default {
background: #FFFFFF;
border-radius: 4px 4px 4px 4px;
padding: 16px;
max-height: 848px;
.anchor{
height: 24px;
}
......@@ -584,6 +583,9 @@ export default {
}
}
}
.wrap1{
max-height: 1048px;
}
.anchor_box {
position: absolute;
top: 48px;
......
dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue
View file @ bc97af64
......@@ -452,7 +452,7 @@
</div>
</div>
<div class="title-right">
<p>共有{{total}}条</p>
<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......@@ -592,7 +592,7 @@
import api from '@/api/enterpriseData/enterpriseData.js';
import {encodeStr} from "@/assets/js/common.js"
import skeleton from '@/views/project/projectList/component/skeleton'
import "@/assets/styles/public.css";
import "@/assets/styles/public.scss";
export default {
name: 'EnterpriseQuery',
......
dsk-operate-ui/src/views/enterpriseData/index.vue
View file @ bc97af64
......@@ -48,7 +48,7 @@
import Group from "./components/Group/index.vue";
import "@/assets/styles/public.css";
import "@/assets/styles/public.scss";
export default {
name: 'EnterpriseData',
components: { SearchEnterprise,Owner,Group },
......
dsk-operate-ui/src/views/index.vue
View file @ bc97af64
......@@ -470,7 +470,7 @@
import * as echarts from 'echarts';
import {encodeStr} from "@/assets/js/common.js"
import dataRegion from '@/assets/json/dataRegion'
import "@/assets/styles/public.css";
import "@/assets/styles/public.scss";
import CustomTimeSelect from './component/CustomTimeSelect'
import CustomMoneySelect from './component/CustomMoneySelect'
import skeleton from './component/skeleton'
......
dsk-operate-ui/src/views/index_v2.vue
View file @ bc97af64
......@@ -356,7 +356,7 @@
<script>
import * as echarts from 'echarts';
import "@/assets/styles/public.css";
import "@/assets/styles/public.scss";
export default {
name: "Index",
data() {
......
dsk-operate-ui/src/views/project/projectList/component/gzdb.vue
View file @ bc97af64
......@@ -81,7 +81,7 @@
<script>
import "@/assets/styles/project.scss"
import "@/assets/styles/public.css"
import "@/assets/styles/public.scss"
import {addGZDB,getGZDB,editGZDB} from '@/api/project/project'
import skeleton from './skeleton'
......
dsk-operate-ui/src/views/project/projectList/detail.vue
View file @ bc97af64
......@@ -132,7 +132,7 @@
<script>
import "@/assets/styles/project.scss"
import "@/assets/styles/public.css"
import "@/assets/styles/public.scss"
import {getDictType,} from '@/api/main'
import xmsl from './component/xmsl.vue'
import jsnr from './component/jsnr.vue'
......
dsk-operate-ui/src/views/project/projectList/index.vue
View file @ bc97af64
......@@ -194,7 +194,7 @@
<script>
import "@/assets/styles/project.scss"
import "@/assets/styles/public.css"
import "@/assets/styles/public.scss"
import prvinceTree from '@/assets/json/provinceTree'
import {getProjectlist,delProject} from '@/api/project/project'
import {getDictType,} from '@/api/main'
......
dsk-operate-ui/src/views/radar/BidRecord/details.vue
View file @ bc97af64
......@@ -7,16 +7,7 @@
{{textList.name}}
</p>
<div class="content-label">
<span class="list-label list-label-zb" v-if="textList.province||textList.city||textList.district">
{{textList.province}}
<template v-if="textList.city">
-{{textList.city}}
</template>
<template v-if="textList.district">
-{{textList.district}}
</template>
</span>
<span class="list-label list-label-zb" v-if="textList.province||textList.city||textList.area">{{textList.province}}<template v-if="textList.city">-{{textList.city}}</template><template v-if="textList.area">-{{textList.area}}</template></span>
</div>
<div class="list-content">
......@@ -104,7 +95,7 @@
</template>
<script>
import "@/assets/styles/public.css";
import "@/assets/styles/public.scss";
import {encodeStr} from "@/assets/js/common.js"
import api from '@/api/radar/radar.js';
......
dsk-operate-ui/src/views/radar/Bidding/details.vue
View file @ bc97af64
......@@ -7,16 +7,7 @@
<!-- <div v-else-if="item.projectName" ></div> -->
</p>
<div class="content-label">
<span class="list-label list-label-zb" v-if="textList.province||textList.city||textList.district">
{{textList.province}}
<template v-if="textList.city">
-{{textList.city}}
</template>
<template v-if="textList.district">
-{{textList.district}}
</template>
</span>
<span class="list-label list-label-zb" v-if="textList.province||textList.city||textList.district">{{textList.province}}<template v-if="textList.city">-{{textList.city}}</template><template v-if="textList.area">-{{textList.area}}</template></span>
<span class="list-label list-label-lx" v-if="textList.objectType">{{textList.objectType}}</span>
<span class="list-label list-label-lx" v-if="textList.buildingProjectType">{{textList.buildingProjectType}}</span>
......@@ -83,7 +74,7 @@
<script>
import api from '@/api/radar/radar.js';
import "@/assets/styles/public.css";
import "@/assets/styles/public.scss";
import {encodeStr} from "@/assets/js/common.js"
export default {
......
dsk-operate-ui/src/views/radar/Establishment/details.vue
View file @ bc97af64
......@@ -9,16 +9,7 @@
</p>
<div class="content-label">
<span class="list-label list-label-lx" v-if="textList.projectCategories">{{textList.projectCategories}}</span>
<span class="list-label list-label-zb" v-if="textList.province||textList.city||textList.district">
{{textList.province}}
<template v-if="textList.city">
-{{textList.city}}
</template>
<template v-if="textList.district">
-{{textList.district}}
</template>
</span>
<span class="list-label list-label-zb" v-if="textList.province||textList.city||textList.district">{{textList.province}}<template v-if="textList.city">-{{textList.city}}</template><template v-if="textList.district">-{{textList.district}}</template></span>
</div>
......@@ -63,15 +54,7 @@
<p>
<label class="label">项目属地</label>
<span>
{{textList.province}}
<template v-if="textList.city">
-{{textList.city}}
</template>
<template v-if="textList.district">
-{{textList.district}}
</template>
</span>
<span>{{textList.province}}<template v-if="textList.city">-{{textList.city}}</template><template v-if="textList.district">-{{textList.district}}</template></span>
<label class="label">审批类型</label>
<span>{{textList.projectType||'--'}}</span>
</p>
......
dsk-operate-ui/src/views/radar/Land/details.vue
View file @ bc97af64
......@@ -53,15 +53,7 @@
<div class="main3-box">
<p>
<label class="label">行政区</label>
<span>
{{textList.province}}
<template v-if="textList.city">
-{{textList.city}}
</template>
<template v-if="textList.area">
-{{textList.area}}
</template>
</span>
<span>{{textList.province}}<template v-if="textList.city">-{{textList.city}}</template><template v-if="textList.area">-{{textList.area}}</template></span>
<label class="label">电子监督号</label>
<span>{{textList.electronicNumber||"--"}}</span>
</p>
......
dsk-operate-ui/src/views/radar/Tender/details.vue
View file @ bc97af64
......@@ -11,15 +11,7 @@
{{textList.tenderStage}}
</span>
<span class="list-label" v-if="textList.province||textList.city||textList.area">
{{textList.province}}
<template v-if="textList.city">
-{{textList.city}}
</template>
<template v-if="textList.area">
-{{textList.area}}
</template>
</span>
<span class="list-label" v-if="textList.province||textList.city||textList.area">{{textList.province}}<template v-if="textList.city">-{{textList.city}}</template><template v-if="textList.area">-{{textList.area}}</template></span>
<span class="list-label list-label-zb" v-if="textList.businessType">
{{textList.businessType}}
</span>
......@@ -101,7 +93,7 @@
</template>
<script>
import "@/assets/styles/public.css";
import "@/assets/styles/public.scss";
import api from '@/api/radar/radar.js';
import {encodeStr} from "@/assets/js/common.js"
export default {
......
dsk-operate-ui/src/views/radar/bxprozbgg/details.vue
View file @ bc97af64
......@@ -102,15 +102,7 @@
</template>
</span>
<label class="label">项目属地</label>
<span>
{{textList.province}}
<template v-if="textList.city">
-{{textList.city}}
</template>
<template v-if="textList.area">
-{{textList.area}}
</template>
</span>
<span>{{textList.province}}<template v-if="textList.city">-{{textList.city}}</template><template v-if="textList.area">-{{textList.area}}</template></span>
</p>
<p>
<label class="label">发布时间</label>
......@@ -212,7 +204,7 @@
</template>
<script>
import "@/assets/styles/public.css";
import "@/assets/styles/public.scss";
import api from '@/api/radar/radar.js';
import {encodeStr} from "@/assets/js/common.js"
export default {
......
dsk-operate-ui/src/views/radar/components/BidRecord/index.vue
View file @ bc97af64
......@@ -125,7 +125,7 @@
</p>
</div>
<div class="title-right">
<p>共有{{total}}条</p>
<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......
dsk-operate-ui/src/views/radar/components/Bidding/index.vue
View file @ bc97af64
......@@ -210,7 +210,7 @@
</p>
</div>
<div class="title-right">
<p>共有{{total}}条</p>
<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......@@ -231,14 +231,7 @@
<!-- <div v-else-if="item.projectName" v-html="item.projectName"></div> -->
</p>
<div class="content-label" v-if="(item.province||item.city||item.area)||(item.projectType&&item.projectType!='其他'&&item.projectType!='空白')||(item.objectType&&item.objectType!='其他'&&item.objectType!='空白')">
<span class="list-label" v-if="item.domicile">
{{item.province}}
<template v-if="item.city">
-{{item.city}}
</template>
<template v-if="item.area">
-{{item.area}}
</template>
<span class="list-label" v-if="item.domicile">{{item.province}}<template v-if="item.city">-{{item.city}}</template><template v-if="item.area">-{{item.area}}</template>
</span>
<span class="list-label list-label-wl" v-if="item.objectType">{{item.objectType}}</span>
<span class="list-label list-label-lx" v-if="item.projectType">{{item.projectType}}</span>
......
dsk-operate-ui/src/views/radar/components/Establishment/index.vue
View file @ bc97af64
......@@ -181,7 +181,7 @@
</p>
</div>
<div class="title-right">
<p>共有{{total}}条</p>
<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......
dsk-operate-ui/src/views/radar/components/Land/index.vue
View file @ bc97af64
......@@ -221,7 +221,7 @@
</el-popover>
</div>
<div class="title-right">
<p>共有{{total}}条</p>
<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......
dsk-operate-ui/src/views/radar/components/MajorProject/index.vue
View file @ bc97af64
......@@ -138,9 +138,9 @@
</div>
</div>
<div class="content_item content_item1">
<div class="label">项目类型</div>
<div class="label" style="float:left;">项目类型</div>
<div class="content_right">
<el-checkbox-group v-model="projectType">
<el-checkbox-group v-model="projectType" class="checkbox_1122">
<template v-for="(item,index) in projectTypeList">
<el-checkbox v-if="index<showNum" :label="item" :key="index">{{item}}</el-checkbox>
</template>
......@@ -170,9 +170,19 @@
<p class="title-left">
查询结果
</p>
<el-popover v-model="fieldshow" placement="bottom-start" trigger="click" popper-class="viewlist-el-popover">
<ul class="pup_list">
<li v-for="(itme,i) in fieldOptions" :class="itme.status?'active':''"
@click="handsequencingList(i)" :key="i">
{{itme.value}}
</li>
</ul>
<span slot="reference" class="toolbar-right-download" >{{fieldText}}<i class="el-icon-arrow-down" :style="{transform:fieldshow?'rotate(180deg)':''}"></i>
</span>
</el-popover>
</div>
<div class="title-right">
<p>共有{{total}}条</p>
<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......@@ -189,33 +199,69 @@
<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>
<router-link :to="'/radar/MajorProject/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"></router-link>
</p>
<div class="content-label" v-if="item.domicile">
<span class="list-label list-label-zb" v-if="item.domicile">
{{item.domicile}}
</span>
<span class="list-label list-label-zb" v-if="item.domicile">
{{item.domicile}}
</span>
<span class="list-label list-label-zb" v-if="item.domicile">
{{item.domicile}}
</span>
</div>
<div class="list-content list-content1" v-if="item.tenderTime||item.source||item.punishDate">
<p class="list-content-text" v-if="item.tenderTime">
<span>开标时间：</span>
<span>项目年度：</span>
<span>{{item.tenderTime||'--'}}</span>
</p>
<p class="list-content-text" v-if="item.punishDate">
<span>发布时间：</span>
<span>拟开工时间：</span>
<span>{{item.punishDate||'--'}}</span>
</p>
<p class="list-content-text" v-if="item.source">
<span>来源网站：</span>
<span>{{item.source||'--'}}</span>
<p class="list-content-text" v-if="item.punishDate">
<span>拟建成时间：</span>
<span>{{item.punishDate||'--'}}</span>
</p>
</div>
<div class="list-content list-content1" v-if="item.tenderTime||item.source||item.punishDate">
<p class="list-content-text" v-if="item.tenderTime">
<span>归属产业：</span>
<span>{{item.tenderTime||'--'}}</span>
</p>
<p class="list-content-text" v-if="item.punishDate">
<span>项目投资金额：</span>
<span>{{item.punishDate||'--'}}</span>
</p>
<p class="list-content-text" v-if="item.punishDate">
<span>已完成投资额：</span>
<span>{{item.punishDate||'--'}}</span>
</p>
<p class="list-content-text" v-if="item.punishDate">
<span>年度投资金额：</span>
<span>{{item.punishDate||'--'}}</span>
</p>
</div>
<div class="list-content list-content1" v-if="item.tenderTime||item.source||item.punishDate">
<p class="list-content-text" v-if="item.tenderTime">
<span>主管部门：</span>
<span>{{item.tenderTime||'--'}}</span>
</p>
<p class="list-content-text" v-if="item.punishDate">
<span>项目法人：</span>
<span>{{item.punishDate||'--'}}</span>
</p>
<p class="list-content-text" v-if="item.punishDate">
<span>联系人及联系方式：</span>
<span>{{item.punishDate||'--'}}</span>
</p>
</div>
<div class="list-content list-content1" v-if="item.tenderTime||item.source||item.punishDate">
<p class="list-content-text" v-if="item.tenderTime">
<span>建设规模：</span>
<span>{{item.tenderTime||'--'}}</span>
</p>
</div>
</li>
</ul>
<div class="pagination clearfix" v-show="total>0">
......@@ -243,6 +289,30 @@ export default {
components:{skeleton},
data() {
return {
fieldshow: false,
fieldText: '默认排序',
field: '', //查询结果排序方式
fieldOptions: [{
key: "contractSignTime",
value: "默认排序",
status: true,
},
{
key: "transactionPrice",
value: "按拟开工时间倒序",
status: false,
},
{
key: "acreage",
value: "按拟建成时间倒序",
status: false,
},
{
key: "acreage",
value: "按项目总投资金额倒序排列",
status: false,
},
],
isSkeleton:true,
addressList: [],
addressType: [],
......@@ -266,7 +336,7 @@ export default {
endTransactionPrice: "",
transactionPriceShowPopper: false,
projectLevel:"",
projectType:"",
projectType:[],
projectTypeList:['项目名称','项目法人','主管单位','建设规模','项目名称','项目法人','主管单位','建设规模','项目名称','项目法人','主管单位','建设规模','项目名称','项目法人','主管单位','建设规模'],
transactionPriceOptions: [
{
......@@ -294,22 +364,6 @@ export default {
keywordNot:"",
fieldshow: false,
fieldText: '默认排序',
field: '', //查询结果排序方式
fieldOptions: [
{
key: "",
value: "默认排序",
status: true,
},
{
key: "publishDate",
value: "发布日期从晚到早",
status: false,
},
],
punishDateOptions: [
{
label: "不限",
......@@ -1021,8 +1075,6 @@ export default {
color: rgba(35,35,35,0.8);
}
.content_right{
display: flex;
position: relative;
.ename_input{
width: 240px;
margin-right: 20px;
......@@ -1031,28 +1083,32 @@ export default {
margin-top: 6px;
}
.el-checkbox-group{
width: 1064px
display: inline-block;
}
.checkbox_1122{
width: 1122px;
margin-right: 6px;
}
.el-checkbox{
margin-right: 24px;
height: 22px;
line-height: 22px;
margin-bottom: 16px;
::v-deep .el-checkbox__label{
padding-left: 8px;
}
}
.more{
font-size: 12px;
cursor: pointer;
color: #0081FF;
position: absolute;
right: 0;
img{
width: 12px;
height: 8px;
width: 8px;
height: 4px;
margin-left: 4px;
}
}
.more1{
img{
transform: rotate(180deg);
}
}
}
......
dsk-operate-ui/src/views/radar/components/Tender/index.vue
View file @ bc97af64
......@@ -183,7 +183,7 @@
</p>
</div>
<div class="title-right">
<p>共有{{total}}条</p>
<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......
dsk-operate-ui/src/views/radar/components/bxprozbgg/index.vue
View file @ bc97af64
......@@ -337,7 +337,7 @@
</p>
</div>
<div class="title-right">
<p>共有{{total}}条</p>
<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......@@ -1722,6 +1722,9 @@
}
</script>
<style lang="scss" scoped>
::v-deep .el-input-group__append{
border-color: #EFEFEF;
}
.content{
padding: 0px 16px;
border-radius: 4px 4px 4px 4px;
......@@ -1729,12 +1732,12 @@
.content_item{
padding-top: 12px;
display: flex;
font-size: 14px;
align-items: center;
.label{
width: 84px;
font-size: 14px;
font-weight: 400;
color: rgba(35,35,35,0.8);
width: 84px;
font-weight: 400;
color: rgba(35,35,35,0.8);
}
.content_right{
......@@ -1764,6 +1767,7 @@
display: inline-flex;
.bxpro_city_fex_nr{
width: 1138px;
font-size: 14px;
overflow: hidden;
}
.bxpro_city_fex_click{
......@@ -1807,7 +1811,7 @@
display: inline-block;
background: #F3F4F5;
color: #333;
border: 1px solid #F3F4F5;
border: 1px solid #EFEFEF;
border-right: none;
opacity: 1;
width: 44px;
......@@ -1830,6 +1834,7 @@
.commonly-input {
::v-deep .el-input__inner {
padding-right: 100px;
border-color: #EFEFEF;
}
}
......
dsk-operate-ui/src/views/radar/components/debtProject/index.vue
View file @ bc97af64
......@@ -97,7 +97,7 @@
</p>
</div>
<div class="title-right">
<p>共有{{total}}条</p>
<p><span style="margin-right:4;color:rgba(35, 35, 35, 0.40);font-size: 18px;position: relative;top:2px;">·</span>共有{{total}}条</p>
<p>
<img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......
dsk-operate-ui/src/views/radar/index.vue
View file @ bc97af64
......@@ -9,7 +9,7 @@
<p>{{itme.value}}</p>
</div>
</div>
</div>
</div>
<p class="solid"></p>
......@@ -30,8 +30,8 @@
<Tender v-if="personnelHerf=='Tender'" />
<!-- 开标记录 -->
<BidRecord v-if="personnelHerf=='BidRecord'" />
</div>
</template>
......@@ -44,8 +44,8 @@
import BidRecord from "./components/BidRecord/index.vue";
import Bidding from "./components/Bidding/index.vue";
import MajorProject from "./components/MajorProject/index.vue";
import "@/assets/styles/public.css";
import "@/assets/styles/public.scss";
export default {
name: 'Radar',
components: { MajorProject,debtProject,Land,Establishment,bxprozbgg,Tender,BidRecord,Bidding },
......@@ -81,25 +81,25 @@
key: 'Bidding',
status: false,
value: '招标计划',
},
{
key: 'bxprozbgg',
status: false,
value: '标讯pro',
},
{
key: 'Tender',
status: false,
value: '公招标讯',
},
{
key: 'BidRecord',
status: false,
value: '开标记录',
},
],
......@@ -122,7 +122,7 @@
</script>
<style lang="scss" scoped>
.app-container {
margin: 12px 24px;
padding: 0;
......@@ -130,7 +130,7 @@
.content{
padding: 0px 16px;
background: #FFFFFF;
}
.app-container .combined-title {
......@@ -262,4 +262,4 @@
border-bottom: 2px solid #0081FF;
font-weight: bold;
}
</style>
</style>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment