Skip to content

D
dsk-cr20g
Commit 19e5f1ca authored by yht15023815643's avatar yht15023815643
Browse files
Options

修改

parent 194d0a29
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 675 additions and 395 deletions
dsk-operate-ui/src/assets/styles/project.scss
View file @ 19e5f1ca
...@@ -1176,9 +1176,6 @@ ...@@ -1176,9 +1176,6 @@
} }
.none{display: none} .none{display: none}
.el-popper[x-placement^=bottom]{
margin-top: 0 !important;
}
.el-dialog__body{ .el-dialog__body{
padding-top: 14px; padding-top: 14px;
padding-bottom: 18px; padding-bottom: 18px;
......
dsk-operate-ui/src/assets/styles/public.css → dsk-operate-ui/src/assets/styles/public.scss
View file @ 19e5f1ca
...@@ -323,7 +323,7 @@ select { ...@@ -323,7 +323,7 @@ select {
} }
.el-dropdown-land .el-icon-caret-bottom { .el-dropdown-land .el-icon-caret-bottom {
color: #333333; color: #666666;
margin-left: 2px; margin-left: 2px;
} }
...@@ -397,6 +397,7 @@ select { ...@@ -397,6 +397,7 @@ select {
.content_item .search-new { .content_item .search-new {
width: 100%; width: 100%;
padding-bottom: 24px; padding-bottom: 24px;
font-size: 14px;
} }
.content_item .search-new span:last-child { .content_item .search-new span:last-child {
...@@ -406,7 +407,7 @@ select { ...@@ -406,7 +407,7 @@ select {
color: #5B5B5B; color: #5B5B5B;
line-height: 32px; line-height: 32px;
cursor: pointer; cursor: pointer;
border-radius: 2px 2px 2px 2px; border-radius: 4px;
border: 1px solid #D4D4D4; border: 1px solid #D4D4D4;
opacity: 1; opacity: 1;
} }
...@@ -420,7 +421,7 @@ select { ...@@ -420,7 +421,7 @@ select {
background: #0089ff; background: #0089ff;
color: #fff; color: #fff;
line-height: 34px; line-height: 34px;
border-radius: 2px 2px 2px 2px; border-radius: 4px;
opacity: 1; opacity: 1;
} }
...@@ -461,7 +462,7 @@ select { ...@@ -461,7 +462,7 @@ select {
.viewlist-el-popover .pup_list { .viewlist-el-popover .pup_list {
line-height: 36px; line-height: 36px;
text-align: left; text-align: left;
margin: 5px 0; margin: 4px 0;
cursor: pointer; cursor: pointer;
} }
...@@ -553,7 +554,7 @@ select { ...@@ -553,7 +554,7 @@ select {
} }
.content_item_ckquery .item_ckquery_btn:hover { .content_item_ckquery .item_ckquery_btn:hover {
background: #0074E5; background: #0080FF;
color: #fff; color: #fff;
} }
...@@ -1218,4 +1219,23 @@ select { ...@@ -1218,4 +1219,23 @@ select {
.enterprise_contatiner{ .enterprise_contatiner{
padding: 0; padding: 0;
padding-bottom: 16px; 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 @ 19e5f1ca
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}"> <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
<div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/> <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
<sidebar v-if="!sidebar.hide" class="sidebar-container" @handleBar="handleSideBar" id="sidebar"/> <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}"> <div :class="{'fixed-header':fixedHeader}">
<navbar :offsetWidth="offsetWidth"/> <navbar :offsetWidth="offsetWidth"/>
</div> </div>
...@@ -131,4 +131,7 @@ export default { ...@@ -131,4 +131,7 @@ export default {
.EnterpriseData{ .EnterpriseData{
min-width: 1710px; min-width: 1710px;
} }
.width1350{
min-width: 1350px;
}
</style> </style>
dsk-operate-ui/src/router/index.js
View file @ 19e5f1ca
...@@ -155,7 +155,7 @@ export const constantRoutes = [ ...@@ -155,7 +155,7 @@ export const constantRoutes = [
path: '/enterprise/:id', path: '/enterprise/:id',
component: () => import('@/views/detail/party-a/index'), component: () => import('@/views/detail/party-a/index'),
name: 'PartyA', name: 'PartyA',
meta: { title: '甲方详情', icon: 'enterprise', noCache: false }, meta: { title: '甲方详情', icon: 'enterpriseData', noCache: false },
} }
] ]
}, },
...@@ -319,6 +319,20 @@ export const constantRoutes = [ ...@@ -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', path: '/Bidding',
component: Layout, component: Layout,
......
dsk-operate-ui/src/views/detail/biddetail/index.vue
View file @ 19e5f1ca
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
</template> </template>
<script> <script>
import "@/assets/styles/public.css"; import "@/assets/styles/public.scss";
import {encodeStr} from "@/assets/js/common.js" import {encodeStr} from "@/assets/js/common.js"
import {getBiddetail} from '@/api/detail/party-a/biddetail.js'; import {getBiddetail} from '@/api/detail/party-a/biddetail.js';
export default { export default {
......
dsk-operate-ui/src/views/detail/party-a/mixins/mixin.js
View file @ 19e5f1ca
...@@ -27,7 +27,7 @@ export default { ...@@ -27,7 +27,7 @@ export default {
formParams(){ formParams(){
let condtion = {} let condtion = {}
let reqData = {} 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.value || (item.value && item.value.length) || item.value===0) {
if(item.fieldName == 'time') { if(item.fieldName == 'time') {
condtion[item.startTime] = item.value[0]; condtion[item.startTime] = item.value[0];
...@@ -76,7 +76,7 @@ export default { ...@@ -76,7 +76,7 @@ export default {
let params = this.formParams() let params = this.formParams()
params.pageNum = e params.pageNum = e
this.queryParams.pageNum = e this.queryParams.pageNum = e
this.handleQuery(params) this.handleQuery(params,1)
}, },
handleSizeChange(e){ handleSizeChange(e){
......
dsk-operate-ui/src/views/detail/party-a/overview/businfo.vue
View file @ 19e5f1ca
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="app-container detail-container" v-else> <div class="app-container detail-container" v-else>
<el-tabs v-model="activeName" @tab-click="handleClick" class="detail-tab"> <el-tabs v-model="activeName" @tab-click="handleClick" class="detail-tab">
<el-tab-pane label="工商信息" name="first"></el-tab-pane> <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> </el-tabs>
...@@ -31,7 +31,9 @@ ...@@ -31,7 +31,9 @@
<tables <tables
:tableLoading="tableLoading" :tableLoading="tableLoading"
:tableData="tableData" :tableData="tableData"
:tableDataTotal="tableDataTotal"
:forData="forData" :forData="forData"
@handle-current-change="handleCurrentChange"
:queryParams="queryParams" :queryParams="queryParams"
v-if="activeName=='second'" v-if="activeName=='second'"
/> />
...@@ -102,9 +104,16 @@ export default { ...@@ -102,9 +104,16 @@ export default {
}, },
methods: { methods: {
handleClick(){ 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.isSkeleton = true;
this.tableLoading = true this.tableLoading = true
let param = this.baseParams; let param = this.baseParams;
...@@ -115,8 +124,8 @@ export default { ...@@ -115,8 +124,8 @@ export default {
this.forInfo = res.data this.forInfo = res.data
} }
}, },
async handleQuery1() { async handleQuery1(params) {
let param = this.queryParams let param = params?params:this.queryParams
let res = await changeInfo(param) let res = await changeInfo(param)
if(res.code==200){ if(res.code==200){
this.tableData = res.rows; this.tableData = res.rows;
......
dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue
View file @ 19e5f1ca
...@@ -97,25 +97,24 @@ ...@@ -97,25 +97,24 @@
<div class="company-swiper"> <div class="company-swiper">
<div class="swiper-containers swiper-info" :style="graphList.length<=6?'margin-left:0px; width: 100%;':''"> <div class="swiper-containers swiper-info" :style="graphList.length<=6?'margin-left:0px; width: 100%;':''">
<ul class="swiper-wrapper"> <ul class="swiper-wrapper">
<li class="swiper-slide" v-if="statistic.combineMember">
<div class="flex-box" @click="linkTo(statistic.combineMember)"> <template v-for="(item, index) in graphList" >
<img src="@/assets/images/detail/overview/company_ssjt.png" alt="所属集团" title="所属集团" class="swiper-img"> <li class="swiper-slide" :key="index">
<div class="swiper-item"> <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"> <el-popover v-if="statistic.combineMember.companyName.length>9" trigger="hover" :content="'所属集团-'+statistic.combineMember.companyName">
<span class="swiper-name" slot="reference"> <span class="swiper-name" slot="reference">
所属集团-{{ statistic.combineMember.companyName }} 所属集团-{{ statistic.combineMember.companyName }}
</span> </span>
</el-popover> </el-popover>
<span v-else class="swiper-name">所属集团-{{statistic.combineMember.companyName}}</span> <span v-else class="swiper-name">所属集团-{{statistic.combineMember.companyName}}</span>
<div > <div >
<span >集团成员：</span><i class="num" >{{statistic.combineMember.memberNum}}</i> <span >集团成员：</span><i class="num" >{{statistic.combineMember.memberNum}}</i>
</div> </div>
</div> </div>
</div> </div>
</li> <div class="flex-box" v-else @click="handleGraph(item)">
<template v-for="(item, index) in graphList" >
<li class="swiper-slide" :key="index">
<div class="flex-box" @click="handleGraph(item)">
<img :src="`${item.ico}`" :alt="item.name" :title="item.name" class="swiper-img"> <img :src="`${item.ico}`" :alt="item.name" :title="item.name" class="swiper-img">
<div class="swiper-item"> <div class="swiper-item">
<span class="swiper-name"> <span class="swiper-name">
...@@ -217,6 +216,11 @@ export default { ...@@ -217,6 +216,11 @@ export default {
}, },
mounted() { mounted() {
this.handleWidth() //企业背景是否收起 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滚动板块 this.companySwiper() //swiper滚动板块
api.label({companyId:this.companyId}).then(res=>{ api.label({companyId:this.companyId}).then(res=>{
if(res.code==200){ if(res.code==200){
...@@ -320,6 +324,11 @@ export default { ...@@ -320,6 +324,11 @@ export default {
} }
}) })
this.graphList = this.graphList.filter(item => item.isShow) 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滚动板块 this.companySwiper() //swiper滚动板块
}, },
//获取认领状态 //获取认领状态
......
dsk-operate-ui/src/views/enterpriseData/components/Group/index.vue
View file @ 19e5f1ca
...@@ -150,7 +150,7 @@ ...@@ -150,7 +150,7 @@
<script> <script>
import api from '@/api/enterpriseData/enterpriseData.js'; import api from '@/api/enterpriseData/enterpriseData.js';
import skeleton from '@/views/project/projectList/component/skeleton' import skeleton from '@/views/project/projectList/component/skeleton'
import "@/assets/styles/public.css"; import "@/assets/styles/public.scss";
export default { export default {
name: 'Group', name: 'Group',
......
dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue
View file @ 19e5f1ca
...@@ -452,7 +452,7 @@ ...@@ -452,7 +452,7 @@
</div> </div>
</div> </div>
<div class="title-right"> <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> <p>
<img src="@/assets/images/EXCEL.png" alt=""> <img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span> <span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
...@@ -592,7 +592,7 @@ ...@@ -592,7 +592,7 @@
import api from '@/api/enterpriseData/enterpriseData.js'; import api from '@/api/enterpriseData/enterpriseData.js';
import {encodeStr} from "@/assets/js/common.js" import {encodeStr} from "@/assets/js/common.js"
import skeleton from '@/views/project/projectList/component/skeleton' import skeleton from '@/views/project/projectList/component/skeleton'
import "@/assets/styles/public.css"; import "@/assets/styles/public.scss";
export default { export default {
name: 'EnterpriseQuery', name: 'EnterpriseQuery',
......
dsk-operate-ui/src/views/enterpriseData/index.vue
View file @ 19e5f1ca
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
import Group from "./components/Group/index.vue"; import Group from "./components/Group/index.vue";
import "@/assets/styles/public.css"; import "@/assets/styles/public.scss";
export default { export default {
name: 'EnterpriseData', name: 'EnterpriseData',
components: { SearchEnterprise,Owner,Group }, components: { SearchEnterprise,Owner,Group },
......
dsk-operate-ui/src/views/index.vue
View file @ 19e5f1ca
...@@ -470,7 +470,7 @@ ...@@ -470,7 +470,7 @@
import * as echarts from 'echarts'; import * as echarts from 'echarts';
import {encodeStr} from "@/assets/js/common.js" import {encodeStr} from "@/assets/js/common.js"
import dataRegion from '@/assets/json/dataRegion' import dataRegion from '@/assets/json/dataRegion'
import "@/assets/styles/public.css"; import "@/assets/styles/public.scss";
import CustomTimeSelect from './component/CustomTimeSelect' import CustomTimeSelect from './component/CustomTimeSelect'
import CustomMoneySelect from './component/CustomMoneySelect' import CustomMoneySelect from './component/CustomMoneySelect'
import skeleton from './component/skeleton' import skeleton from './component/skeleton'
......
dsk-operate-ui/src/views/index_v2.vue
View file @ 19e5f1ca
...@@ -356,7 +356,7 @@ ...@@ -356,7 +356,7 @@
<script> <script>
import * as echarts from 'echarts'; import * as echarts from 'echarts';
import "@/assets/styles/public.css"; import "@/assets/styles/public.scss";
export default { export default {
name: "Index", name: "Index",
data() { data() {
......
dsk-operate-ui/src/views/project/projectList/component/gzdb.vue
View file @ 19e5f1ca
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<script> <script>
import "@/assets/styles/project.scss" import "@/assets/styles/project.scss"
import "@/assets/styles/public.css" import "@/assets/styles/public.scss"
import {addGZDB,getGZDB,editGZDB} from '@/api/project/project' import {addGZDB,getGZDB,editGZDB} from '@/api/project/project'
import skeleton from './skeleton' import skeleton from './skeleton'
......
dsk-operate-ui/src/views/project/projectList/detail.vue
View file @ 19e5f1ca
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<script> <script>
import "@/assets/styles/project.scss" import "@/assets/styles/project.scss"
import "@/assets/styles/public.css" import "@/assets/styles/public.scss"
import {getDictType,} from '@/api/main' import {getDictType,} from '@/api/main'
import xmsl from './component/xmsl.vue' import xmsl from './component/xmsl.vue'
import jsnr from './component/jsnr.vue' import jsnr from './component/jsnr.vue'
......
dsk-operate-ui/src/views/project/projectList/index.vue
View file @ 19e5f1ca
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
<script> <script>
import "@/assets/styles/project.scss" import "@/assets/styles/project.scss"
import "@/assets/styles/public.css" import "@/assets/styles/public.scss"
import prvinceTree from '@/assets/json/provinceTree' import prvinceTree from '@/assets/json/provinceTree'
import {getProjectlist,delProject} from '@/api/project/project' import {getProjectlist,delProject} from '@/api/project/project'
import {getDictType,} from '@/api/main' import {getDictType,} from '@/api/main'
......
dsk-operate-ui/src/views/radar/BidRecord/details.vue
View file @ 19e5f1ca
...@@ -7,16 +7,7 @@ ...@@ -7,16 +7,7 @@
{{textList.name}} {{textList.name}}
</p> </p>
<div class="content-label"> <div class="content-label">
<span class="list-label list-label-zb" v-if="textList.province||textList.city||textList.district"> <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>
{{textList.province}}
<template v-if="textList.city">
-{{textList.city}}
</template>
<template v-if="textList.district">
-{{textList.district}}
</template>
</span>
</div> </div>
<div class="list-content"> <div class="list-content">
...@@ -104,7 +95,7 @@ ...@@ -104,7 +95,7 @@
</template> </template>
<script> <script>
import "@/assets/styles/public.css"; import "@/assets/styles/public.scss";
import {encodeStr} from "@/assets/js/common.js" import {encodeStr} from "@/assets/js/common.js"
import api from '@/api/radar/radar.js'; import api from '@/api/radar/radar.js';
......
dsk-operate-ui/src/views/radar/Bidding/details.vue
View file @ 19e5f1ca
...@@ -7,16 +7,7 @@ ...@@ -7,16 +7,7 @@
<!-- <div v-else-if="item.projectName" ></div> --> <!-- <div v-else-if="item.projectName" ></div> -->
</p> </p>
<div class="content-label"> <div class="content-label">
<span class="list-label list-label-zb" v-if="textList.province||textList.city||textList.district"> <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>
{{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-lx" v-if="textList.objectType">{{textList.objectType}}</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> <span class="list-label list-label-lx" v-if="textList.buildingProjectType">{{textList.buildingProjectType}}</span>
...@@ -83,7 +74,7 @@ ...@@ -83,7 +74,7 @@
<script> <script>
import api from '@/api/radar/radar.js'; import api from '@/api/radar/radar.js';
import "@/assets/styles/public.css"; import "@/assets/styles/public.scss";
import {encodeStr} from "@/assets/js/common.js" import {encodeStr} from "@/assets/js/common.js"
export default { export default {
......
dsk-operate-ui/src/views/radar/Establishment/details.vue
View file @ 19e5f1ca
...@@ -9,16 +9,7 @@ ...@@ -9,16 +9,7 @@
</p> </p>
<div class="content-label"> <div class="content-label">
<span class="list-label list-label-lx" v-if="textList.projectCategories">{{textList.projectCategories}}</span> <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"> <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>
{{textList.province}}
<template v-if="textList.city">
-{{textList.city}}
</template>
<template v-if="textList.district">
-{{textList.district}}
</template>
</span>
</div> </div>
...@@ -63,15 +54,7 @@ ...@@ -63,15 +54,7 @@
<p> <p>
<label class="label">项目属地</label> <label class="label">项目属地</label>
<span> <span>{{textList.province}}<template v-if="textList.city">-{{textList.city}}</template><template v-if="textList.district">-{{textList.district}}</template></span>
{{textList.province}}
<template v-if="textList.city">
-{{textList.city}}
</template>
<template v-if="textList.district">
-{{textList.district}}
</template>
</span>
<label class="label">审批类型</label> <label class="label">审批类型</label>
<span>{{textList.projectType||'--'}}</span> <span>{{textList.projectType||'--'}}</span>
</p> </p>
......
dsk-operate-ui/src/views/radar/Land/details.vue
View file @ 19e5f1ca
...@@ -53,15 +53,7 @@ ...@@ -53,15 +53,7 @@
<div class="main3-box"> <div class="main3-box">
<p> <p>
<label class="label">行政区</label> <label class="label">行政区</label>
<span> <span>{{textList.province}}<template v-if="textList.city">-{{textList.city}}</template><template v-if="textList.area">-{{textList.area}}</template></span>
{{textList.province}}
<template v-if="textList.city">
-{{textList.city}}
</template>
<template v-if="textList.area">
-{{textList.area}}
</template>
</span>
<label class="label">电子监督号</label> <label class="label">电子监督号</label>
<span>{{textList.electronicNumber||"--"}}</span> <span>{{textList.electronicNumber||"--"}}</span>
</p> </p>
......
dsk-operate-ui/src/views/radar/Tender/details.vue
View file @ 19e5f1ca
...@@ -11,15 +11,7 @@ ...@@ -11,15 +11,7 @@
{{textList.tenderStage}} {{textList.tenderStage}}
</span> </span>
<span class="list-label" v-if="textList.province||textList.city||textList.area"> <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>
{{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"> <span class="list-label list-label-zb" v-if="textList.businessType">
{{textList.businessType}} {{textList.businessType}}
</span> </span>
...@@ -101,7 +93,7 @@ ...@@ -101,7 +93,7 @@
</template> </template>
<script> <script>
import "@/assets/styles/public.css"; import "@/assets/styles/public.scss";
import api from '@/api/radar/radar.js'; import api from '@/api/radar/radar.js';
import {encodeStr} from "@/assets/js/common.js" import {encodeStr} from "@/assets/js/common.js"
export default { export default {
......
dsk-operate-ui/src/views/radar/bxprozbgg/details.vue
View file @ 19e5f1ca
...@@ -102,15 +102,7 @@ ...@@ -102,15 +102,7 @@
</template> </template>
</span> </span>
<label class="label">项目属地</label> <label class="label">项目属地</label>
<span> <span>{{textList.province}}<template v-if="textList.city">-{{textList.city}}</template><template v-if="textList.area">-{{textList.area}}</template></span>
{{textList.province}}
<template v-if="textList.city">
-{{textList.city}}
</template>
<template v-if="textList.area">
-{{textList.area}}
</template>
</span>
</p> </p>
<p> <p>
<label class="label">发布时间</label> <label class="label">发布时间</label>
...@@ -212,7 +204,7 @@ ...@@ -212,7 +204,7 @@
</template> </template>
<script> <script>
import "@/assets/styles/public.css"; import "@/assets/styles/public.scss";
import api from '@/api/radar/radar.js'; import api from '@/api/radar/radar.js';
import {encodeStr} from "@/assets/js/common.js" import {encodeStr} from "@/assets/js/common.js"
export default { export default {
......
dsk-operate-ui/src/views/radar/components/BidRecord/index.vue
View file @ 19e5f1ca
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</p> </p>
</div> </div>
<div class="title-right"> <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> <p>
<img src="@/assets/images/EXCEL.png" alt=""> <img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span> <span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......
dsk-operate-ui/src/views/radar/components/Bidding/index.vue
View file @ 19e5f1ca
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
</p> </p>
</div> </div>
<div class="title-right"> <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> <p>
<img src="@/assets/images/EXCEL.png" alt=""> <img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span> <span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
...@@ -231,14 +231,7 @@ ...@@ -231,14 +231,7 @@
<!-- <div v-else-if="item.projectName" v-html="item.projectName"></div> --> <!-- <div v-else-if="item.projectName" v-html="item.projectName"></div> -->
</p> </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!='空白')"> <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"> <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>
{{item.province}}
<template v-if="item.city">
-{{item.city}}
</template>
<template v-if="item.area">
-{{item.area}}
</template>
</span> </span>
<span class="list-label list-label-wl" v-if="item.objectType">{{item.objectType}}</span> <span class="list-label list-label-wl" v-if="item.objectType">{{item.objectType}}</span>
<span class="list-label list-label-lx" v-if="item.projectType">{{item.projectType}}</span> <span class="list-label list-label-lx" v-if="item.projectType">{{item.projectType}}</span>
......
dsk-operate-ui/src/views/radar/components/Establishment/index.vue
View file @ 19e5f1ca
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
</p> </p>
</div> </div>
<div class="title-right"> <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> <p>
<img src="@/assets/images/EXCEL.png" alt=""> <img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span> <span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......
dsk-operate-ui/src/views/radar/components/Land/index.vue
View file @ 19e5f1ca
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
</el-popover> </el-popover>
</div> </div>
<div class="title-right"> <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> <p>
<img src="@/assets/images/EXCEL.png" alt=""> <img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span> <span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......
dsk-operate-ui/src/views/radar/components/MajorProject/index.vue
View file @ 19e5f1ca
...@@ -138,9 +138,9 @@ ...@@ -138,9 +138,9 @@
</div> </div>
</div> </div>
<div class="content_item content_item1"> <div class="content_item content_item1">
<div class="label">项目类型</div> <div class="label" style="float:left;">项目类型</div>
<div class="content_right"> <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"> <template v-for="(item,index) in projectTypeList">
<el-checkbox v-if="index<showNum" :label="item" :key="index">{{item}}</el-checkbox> <el-checkbox v-if="index<showNum" :label="item" :key="index">{{item}}</el-checkbox>
</template> </template>
...@@ -170,9 +170,19 @@ ...@@ -170,9 +170,19 @@
<p class="title-left"> <p class="title-left">
查询结果 查询结果
</p> </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>
<div class="title-right"> <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> <p>
<img src="@/assets/images/EXCEL.png" alt=""> <img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span> <span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
...@@ -189,33 +199,69 @@ ...@@ -189,33 +199,69 @@
<ul class="bottomlist-content" v-if="tableData.length>0&& !isSkeleton"> <ul class="bottomlist-content" v-if="tableData.length>0&& !isSkeleton">
<li class="bottomlist-list" v-for="item in tableData"> <li class="bottomlist-list" v-for="item in tableData">
<p class="list-titel"> <p class="list-titel">
<router-link :to="'/radar/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> </p>
<div class="content-label" v-if="item.domicile"> <div class="content-label" v-if="item.domicile">
<span class="list-label list-label-zb" v-if="item.domicile"> <span class="list-label list-label-zb" v-if="item.domicile">
{{item.domicile}} {{item.domicile}}
</span> </span>
<span class="list-label list-label-zb" v-if="item.domicile">
{{item.domicile}}
</span>
</div> </div>
<div class="list-content list-content1" v-if="item.tenderTime||item.source||item.punishDate"> <div class="list-content list-content1" v-if="item.tenderTime||item.source||item.punishDate">
<p class="list-content-text" v-if="item.tenderTime"> <p class="list-content-text" v-if="item.tenderTime">
<span>开标时间：</span> <span>项目年度：</span>
<span>{{item.tenderTime||'--'}}</span> <span>{{item.tenderTime||'--'}}</span>
</p> </p>
<p class="list-content-text" v-if="item.punishDate"> <p class="list-content-text" v-if="item.punishDate">
<span>发布时间：</span> <span>拟开工时间：</span>
<span>{{item.punishDate||'--'}}</span> <span>{{item.punishDate||'--'}}</span>
</p> </p>
<p class="list-content-text" v-if="item.punishDate">
<p class="list-content-text" v-if="item.source"> <span>拟建成时间：</span>
<span>来源网站：</span> <span>{{item.punishDate||'--'}}</span>
<span>{{item.source||'--'}}</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> </p>
</div> </div>
</li> </li>
</ul> </ul>
<div class="pagination clearfix" v-show="total>0"> <div class="pagination clearfix" v-show="total>0">
...@@ -243,6 +289,30 @@ export default { ...@@ -243,6 +289,30 @@ export default {
components:{skeleton}, components:{skeleton},
data() { data() {
return { 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, isSkeleton:true,
addressList: [], addressList: [],
addressType: [], addressType: [],
...@@ -266,7 +336,7 @@ export default { ...@@ -266,7 +336,7 @@ export default {
endTransactionPrice: "", endTransactionPrice: "",
transactionPriceShowPopper: false, transactionPriceShowPopper: false,
projectLevel:"", projectLevel:"",
projectType:"", projectType:[],
projectTypeList:['项目名称','项目法人','主管单位','建设规模','项目名称','项目法人','主管单位','建设规模','项目名称','项目法人','主管单位','建设规模','项目名称','项目法人','主管单位','建设规模'], projectTypeList:['项目名称','项目法人','主管单位','建设规模','项目名称','项目法人','主管单位','建设规模','项目名称','项目法人','主管单位','建设规模','项目名称','项目法人','主管单位','建设规模'],
transactionPriceOptions: [ transactionPriceOptions: [
{ {
...@@ -294,22 +364,6 @@ export default { ...@@ -294,22 +364,6 @@ export default {
keywordNot:"", keywordNot:"",
fieldshow: false,
fieldText: '默认排序',
field: '', //查询结果排序方式
fieldOptions: [
{
key: "",
value: "默认排序",
status: true,
},
{
key: "publishDate",
value: "发布日期从晚到早",
status: false,
},
],
punishDateOptions: [ punishDateOptions: [
{ {
label: "不限", label: "不限",
...@@ -1021,8 +1075,6 @@ export default { ...@@ -1021,8 +1075,6 @@ export default {
color: rgba(35,35,35,0.8); color: rgba(35,35,35,0.8);
} }
.content_right{ .content_right{
display: flex;
position: relative;
.ename_input{ .ename_input{
width: 240px; width: 240px;
margin-right: 20px; margin-right: 20px;
...@@ -1031,28 +1083,32 @@ export default { ...@@ -1031,28 +1083,32 @@ export default {
margin-top: 6px; margin-top: 6px;
} }
.el-checkbox-group{ .el-checkbox-group{
width: 1064px display: inline-block;
}
.checkbox_1122{
width: 1122px;
margin-right: 6px;
} }
.el-checkbox{ .el-checkbox{
margin-right: 24px; margin-right: 24px;
height: 22px;
line-height: 22px;
margin-bottom: 16px; margin-bottom: 16px;
::v-deep .el-checkbox__label{
padding-left: 8px;
}
} }
.more{ .more{
font-size: 12px; font-size: 12px;
cursor: pointer; cursor: pointer;
color: #0081FF; color: #0081FF;
position: absolute;
right: 0;
img{ img{
width: 12px; width: 8px;
height: 8px; height: 4px;
margin-left: 4px;
} }
} }
.more1{ .more1{
img{ img{
transform: rotate(180deg);
} }
} }
} }
......
dsk-operate-ui/src/views/radar/components/Tender/index.vue
View file @ 19e5f1ca
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
</p> </p>
</div> </div>
<div class="title-right"> <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> <p>
<img src="@/assets/images/EXCEL.png" alt=""> <img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span> <span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......
dsk-operate-ui/src/views/radar/components/bxprozbgg/index.vue
View file @ 19e5f1ca
...@@ -337,7 +337,7 @@ ...@@ -337,7 +337,7 @@
</p> </p>
</div> </div>
<div class="title-right"> <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> <p>
<img src="@/assets/images/EXCEL.png" alt=""> <img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span> <span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
...@@ -1722,6 +1722,9 @@ ...@@ -1722,6 +1722,9 @@
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
::v-deep .el-input-group__append{
border-color: #EFEFEF;
}
.content{ .content{
padding: 0px 16px; padding: 0px 16px;
border-radius: 4px 4px 4px 4px; border-radius: 4px 4px 4px 4px;
...@@ -1729,12 +1732,12 @@ ...@@ -1729,12 +1732,12 @@
.content_item{ .content_item{
padding-top: 12px; padding-top: 12px;
display: flex; display: flex;
font-size: 14px;
align-items: center; align-items: center;
.label{ .label{
width: 84px; width: 84px;
font-size: 14px; font-weight: 400;
font-weight: 400; color: rgba(35,35,35,0.8);
color: rgba(35,35,35,0.8);
} }
.content_right{ .content_right{
...@@ -1764,6 +1767,7 @@ ...@@ -1764,6 +1767,7 @@
display: inline-flex; display: inline-flex;
.bxpro_city_fex_nr{ .bxpro_city_fex_nr{
width: 1138px; width: 1138px;
font-size: 14px;
overflow: hidden; overflow: hidden;
} }
.bxpro_city_fex_click{ .bxpro_city_fex_click{
...@@ -1807,7 +1811,7 @@ ...@@ -1807,7 +1811,7 @@
display: inline-block; display: inline-block;
background: #F3F4F5; background: #F3F4F5;
color: #333; color: #333;
border: 1px solid #F3F4F5; border: 1px solid #EFEFEF;
border-right: none; border-right: none;
opacity: 1; opacity: 1;
width: 44px; width: 44px;
...@@ -1830,6 +1834,7 @@ ...@@ -1830,6 +1834,7 @@
.commonly-input { .commonly-input {
::v-deep .el-input__inner { ::v-deep .el-input__inner {
padding-right: 100px; padding-right: 100px;
border-color: #EFEFEF;
} }
} }
......
dsk-operate-ui/src/views/radar/components/debtProject/index.vue
View file @ 19e5f1ca
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
</p> </p>
</div> </div>
<div class="title-right"> <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> <p>
<img src="@/assets/images/EXCEL.png" alt=""> <img src="@/assets/images/EXCEL.png" alt="">
<span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span> <span class="excel" @click="$message({message: '功能正在开发中',type: 'warning'})">导出EXCEL</span>
......
dsk-operate-ui/src/views/radar/index.vue
View file @ 19e5f1ca
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
import Bidding from "./components/Bidding/index.vue"; import Bidding from "./components/Bidding/index.vue";
import MajorProject from "./components/MajorProject/index.vue"; import MajorProject from "./components/MajorProject/index.vue";
import "@/assets/styles/public.css"; import "@/assets/styles/public.scss";
export default { export default {
name: 'Radar', name: 'Radar',
components: { MajorProject,debtProject,Land,Establishment,bxprozbgg,Tender,BidRecord,Bidding }, components: { MajorProject,debtProject,Land,Establishment,bxprozbgg,Tender,BidRecord,Bidding },
...@@ -53,15 +53,15 @@ ...@@ -53,15 +53,15 @@
return { return {
// tablist // tablist
personnelList: [ personnelList: [
// { {
// key: 'MajorProject', key: 'MajorProject',
// status: true, status: true,
// value: '重点项目清单', value: '重点项目清单',
// }, },
{ {
key: 'debtProject', key: 'debtProject',
status: true, status: false,
value: '政府专项债项目', value: '政府专项债项目',
}, },
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
}, },
], ],
personnelHerf:'debtProject' personnelHerf:'MajorProject'
} }
}, },
created() { created() {
...@@ -129,8 +129,8 @@ ...@@ -129,8 +129,8 @@
} }
.content{ .content{
padding: 0px 16px; padding: 0px 16px;
background: #FFFFFF; background: #FFFFFF;
border-radius: 4px 4px 0 0;
} }
.app-container .combined-title { .app-container .combined-title {
......
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