Skip to content

D
dsk-cr20g
Commit 80e04bf0 authored by liuChang's avatar liuChang
Browse files
Options

Merge branch 'master' of 192.168.60.201:root/dsk-operate-sys

parents fc482eeb 72e53319
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1526 additions and 1425 deletions
dsk-admin/src/main/java/com/dsk/web/controller/search/controller/CompanySearchController.java
View file @ 80e04bf0
......@@ -42,6 +42,8 @@ public class CompanySearchController {
*/
@PostMapping("/page")
public AjaxResult page(@RequestBody ComposeQueryDto compose) {
compose.getPage().setPage(compose.getPageNum());
compose.getPage().setLimit(compose.getPageSize());
return opportunityRadarService.enterprisePage(compose);
}
}
dsk-common/src/main/java/com/dsk/common/constant/CacheConstants.java
View file @ 80e04bf0
......@@ -41,4 +41,9 @@ public class CacheConstants
* 登录账户密码错误次数 redis key
*/
public static final String PWD_ERR_CNT_KEY = "pwd_err_cnt:";
/**
* 查甲方 菜单选线
*/
public static final String DATA_UIPGROUPDATA = "data:uipGroupData";
}
dsk-common/src/main/java/com/dsk/common/core/domain/entity/BusinessFollowRecord.java
View file @ 80e04bf0
......@@ -70,8 +70,8 @@ public class BusinessFollowRecord extends BaseEntity
private String visitWay;
/** 创建时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm")
private Date creatTime;
public String getProjectName() {
......
dsk-common/src/main/java/com/dsk/common/dtos/ComposeQueryDto.java
View file @ 80e04bf0
package com.dsk.common.dtos;
import com.dsk.common.core.domain.model.BasePage;
import lombok.Data;
import java.util.List;
......@@ -10,7 +11,7 @@ import java.util.List;
*
*/
@Data
public class ComposeQueryDto {
public class ComposeQueryDto extends BasePage {
String region;
......
dsk-operate-ui/src/api/common.js
View file @ 80e04bf0
......@@ -8,3 +8,12 @@ export const idRemark = (data) => {
data: data
})
}
// 认领用户
export const claim= function claim(param) {
return request({
url: '/customer/claim',
method: 'post',
data: param
})
}
dsk-operate-ui/src/api/radar/radar.js
View file @ 80e04bf0
import request from '@/utils/request'
// 导入客户列表
let importData= function importData(param) {
let importData = function importData(param) {
return request({
url: '/customer/importData',
method: 'POST',
......@@ -8,7 +8,7 @@ let importData= function importData(param) {
})
}
// 查询条件字段
let searchDic= function searchDic(param) {
let searchDic = function searchDic(param) {
return request({
url: 'https://files.jiansheku.com/file/json/common/searchDic.json',
method: 'get',
......@@ -16,7 +16,7 @@ let searchDic= function searchDic(param) {
})
}
// 专项债项目查询
let bondProjectPage= function bondProjectPage(param) {
let bondProjectPage = function bondProjectPage(param) {
return request({
url: '/radar/bondProjectPage',
method: 'post',
......@@ -24,7 +24,7 @@ let bondProjectPage= function bondProjectPage(param) {
})
}
// 专项债项目详情查询
let specialDebtProjectDetail= function specialDebtProjectDetail(param) {
let specialDebtProjectDetail = function specialDebtProjectDetail(param) {
return request({
url: '/enterpriseProject/specialDebtProjectDetail',
method: 'post',
......@@ -32,14 +32,123 @@ let specialDebtProjectDetail= function specialDebtProjectDetail(param) {
})
}
// 专项债项目详情查询
let specialDebtPage= function specialDebtPage(param) {
let specialDebtPage = function specialDebtPage(param) {
return request({
url: '/enterpriseProject/specialDebtPage',
method: 'post',
data: param
})
}
// 土地交易查询
let landMarketPage = function landMarketPage(param) {
return request({
url: '/radar/landMarketPage',
method: 'post',
data: param
})
}
// 土地交易详情查询
let landDetail = function landDetail(param) {
return request({
url: '/enterpriseProject/landDetail',
method: 'post',
data: param
})
}
// 拟建查询
let establishmentPage = function establishmentPage(param) {
return request({
url: '/radar/establishmentPage',
method: 'post',
data: param
})
}
// 拟建详情查询
let approvalInfoDetail = function approvalInfoDetail(param) {
return request({
url: '/enterpriseProject/approvalInfoDetail',
method: 'post',
data: param
})
}
// 拟建详情立项审批列表查询
let approvalExaminePage = function approvalExaminePage(param) {
return request({
url: '/enterpriseProject/approvalExaminePage',
method: 'post',
data: param
})
}
// 拟建详情民间推介列表查询
let approvalMarketingPage = function approvalMarketingPage(param) {
return request({
url: '/enterpriseProject/approvalMarketingPage',
method: 'post',
data: param
})
}
// 招标计划查询
let jskBidPlanPage = function jskBidPlanPage(param) {
return request({
url: '/radar/jskBidPlanPage',
method: 'post',
data: param
})
}
// 招标计划资金来源下拉
let getCapitalSourceSelect = function getCapitalSourceSelect(param) {
return request({
url: '/radar/jskBidPlan/getCapitalSourceSelect',
method: 'post',
data: param
})
}
// 招标计划详情
let bidPlanDetail = function bidPlanDetail(param) {
return request({
url: '/enterpriseProject/bidPlanDetail',
method: 'post',
data: param
})
}
// 标讯pro
let jskBidNewsPage = function jskBidNewsPage(param) {
return request({
url: '/radar/jskBidNewsPage',
method: 'post',
data: param
})
}
// 标讯pro详情
export default {importData,searchDic,bondProjectPage,specialDebtProjectDetail,specialDebtPage}
\ No newline at end of file
let bidNoticeProDetail = function bidNoticeProDetail(param) {
return request({
url: '/enterpriseProject/bidNoticeProDetail',
method: 'post',
data: param
})
}
export default {
importData,
searchDic,
bondProjectPage,
specialDebtProjectDetail,
specialDebtPage,
landMarketPage,
landDetail,
establishmentPage,
approvalInfoDetail,
approvalExaminePage,
approvalMarketingPage,
jskBidPlanPage,
getCapitalSourceSelect,
bidPlanDetail,
jskBidNewsPage,
bidNoticeProDetail
}
\ No newline at end of file
dsk-operate-ui/src/assets/styles/project.scss
View file @ 80e04bf0
......@@ -686,6 +686,7 @@
>img{
margin-left: 16px;
cursor: pointer;
width: 20px;
}
}
}
......@@ -1050,7 +1051,7 @@
transform: rotateX(180deg);
width: 9px;
height: 11px;
margin: 4px 2px 0 10px;
margin: 6px 2px 0 10px;
}
}
}
......@@ -1125,3 +1126,7 @@
.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
View file @ 80e04bf0
......@@ -182,6 +182,9 @@ select {
cursor: pointer;
margin-right: 24px;
}
.select-popper .color_text{
color: #0381fa;
}
.select-popper .select-popper-img {
width: 24px;
......@@ -303,6 +306,14 @@ select {
.el-dropdown-land {
margin-right: 24px;
}
.el-dropdown-land .color_text{
color: #1890ff;
background-color: #FFFFFF;
}
.el-dropdown-menu .color_text{
color: #1890ff;
background-color: #FFFFFF;
}
.el-dropdown-land .el-icon-caret-bottom {
color: #333333;
......
dsk-operate-ui/src/views/custom/overview/index.vue
View file @ 80e04bf0
......@@ -171,8 +171,24 @@ export default {
this.initChart()
this.getDT(1)
})
window.addEventListener("resize", this.resizeEcharts);
},
beforeDestroy(){
window.removeEventListener("resize", this. resizeEcharts);
},
activated() {
this.resizeEcharts()
},
methods: {
resizeEcharts (){
const self = this
setTimeout(function(){ //图表跟随页面大小变化宽度
self.myChart.resize()
self.myChart1.resize()
self.myChart2.resize()
self.myChart3.resize()
}, 10)
},
initChart(){
//客户级别
this.option = {
......
dsk-operate-ui/src/views/detail/party-a/component/HeadForm.vue
View file @ 80e04bf0
......@@ -35,7 +35,7 @@
<!-- 输入框 -->
<template v-if="form.type==3">
<div class="cooperate-name">
<el-input clearable @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input>
<el-input clearable @clear="changeSelect" @focus="clickFocus('focus'+i)" @blur="clickFocus('focus'+i)" v-model="form.value" :placeholder="form.placeholder"></el-input>
<span :id="'focus'+i" @click="changeSelect">搜索</span>
</div>
</template>
......@@ -171,9 +171,10 @@ export default {
margin-right: 19px;
}
::v-deep .el-input__inner{
border: 1px solid #EFEFEF;
border: 1px solid #D9D9D9;
height: 32px;
line-height: 32px;
padding-right: 27px;
}
::v-deep .el-form-item{
margin-right: 8px !important;
......@@ -227,9 +228,10 @@ export default {
flex: 1;
}
::v-deep .el-input__inner {
border-right: 0;
border-radius: 2px 0 2px 0;
width: 180px;
border: 1px solid #D9D9D9;
border-right: 0;
}
}
.fromTime{
......@@ -260,7 +262,7 @@ export default {
::v-deep .el-select__tags{
.el-tag{
&:first-child{
width: 100%;
//width: 100%;
}
}
}
......
dsk-operate-ui/src/views/detail/party-a/decisionMaking/index.vue
View file @ 80e04bf0
......@@ -39,9 +39,9 @@
width="464px">
<div class="poptitle">
<img src="@/assets/images/economies/icon.png">
<span>重庆市轨道交通3号线二期工程4标段施工总承包</span>
<span>{{ companyInfo.companyName }}</span>
</div>
<el-form :model="addRorm" :rules="addRules" ref="addRorm" class="popform" label-width="75px">
<el-form :model="addRorm" :rules="addRules" ref="addRorm" class="popform" label-width="90px">
<el-form-item label="姓名：" prop="name">
<el-input v-model="addRorm.name" placeholder="请输入"></el-input>
</el-form-item>
......@@ -81,7 +81,7 @@ export default {
components: {
Tables
},
props: ['customerIds'],
props: ['customerIds','companyInfo'],
data() {
return {
ifEmpty:false,
......@@ -100,7 +100,7 @@ export default {
{label: '备注', prop: 'remark'},
],
addRorm: {
customerId:'f25219e73249eea0d9fddc5c7f04f97f',
customerId:this.customerIds,
name:'',
role:'',
workUnit:'',
......
dsk-operate-ui/src/views/detail/party-a/index.vue
View file @ 80e04bf0
......@@ -48,7 +48,7 @@
<!-- 合作情况 -->
<Cooperate v-if="currentPath.pathName=='cooperate'" :customer-ids="customerId" />
<!-- 决策链条 -->
<DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" />
<DecisionMaking v-if="currentPath.pathName=='decisionMaking'" :customer-ids="customerId" :companyInfo="companyInfo" />
<!-- 跟进记录 -->
<Gjjl v-if="currentPath.pathName=='gjjl'" types="gjdt" :customer-ids="customerId" />
</template>
......
dsk-operate-ui/src/views/detail/party-a/opport/administrative.vue
View file @ 80e04bf0
......@@ -17,11 +17,14 @@
:queryParams="queryParams"
@handle-current-change="handleCurrentChange"
>
<template slot="deciWritName" slot-scope="scope">
<div v-html="scope.row.deciWritName"></div>
</template>
<template slot="content" slot-scope="scope">
<span :class="[isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.content)?'cell-span':'']" :style="{'-webkit-line-clamp': 2}">
{{ scope.row.content }}
<div :class="[isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.content)?'cell-span':'']" :style="{'-webkit-line-clamp': 2}">
<div v-html="scope.row.content"></div>
<span v-if="isOverHiddenFlag(scope.data.width, showList, scope.index, 0, scope.row.content)" @click="changeShowAll(scope.index, 0)">...<span style="color: #0081FF;">展开</span></span>
</span>
</div>
</template>
</tables>
......@@ -48,13 +51,13 @@ export default {
{label: '许可决定日期', prop: 'deciTime', width: '100'},
{label: '决定文书号', prop: 'deciWritNo', width: '200'},
{label: '许可编号', prop: 'permitNo', width: '100'},
{label: '决定文书名称', prop: 'deciWritName', width: '190'},
{label: '决定文书名称', prop: 'deciWritName', width: '190', slot: true},
{label: '许可内容', prop: 'content', width: '300', slot: true},
{label: '有效期自', prop: 'valiBegin', width: '100'},
{label: '有效期至', prop: 'valiEnd', width: '100'},
{label: '行政许可类别', prop: 'permitType', width: '100'},
{label: '许可机关', prop: 'office', width: '180'},
{label: '行政许可机关统一社会信用代码', prop: 'xxx', width: '200'},
{label: '行政许可机关统一社会信用代码', prop: 'officeCreditCode', width: '200'},
{label: '数据来源单位', prop: 'dataSourceOffice', width: '110'},
{label: '数据来源单位统一社会信用代码', prop: 'dataSourceOfficeCreditCode', width: '200'},
{label: '来源', prop: 'dataSource', width: '80'}
......@@ -81,7 +84,12 @@ export default {
let res = await creditXzxkPage(param)
this.tableLoading = false
if(res.code==200){
this.tableData = res.rows
if(res.rows&&res.rows.length>0){
this.tableData = res.rows.map(item => {
item.smallContent = item.content.replace(/<.*?>/ig,"")
return item
})
}
}
this.tableDataTotal = res.total
},
......@@ -92,14 +100,29 @@ export default {
})
},
isOverHiddenFlag(data, showList, row, column, value) {
if(value && String(value).length > this.getLenth(data)) {
if(value && this.getByteLen(value) > 88) {
return !showList.some(item => item.row==row&&item.column==column)
}else {
return false
}
},
getLenth(data) {
return Math.floor(data / 12) * 5
/*getLenth(data) {
return Math.floor(data / 6) * 2 //宽度（300） / 一个字符的宽度（6） * 行数（2）
},*/
getByteLen(val) {
var len = 0
for (var i = 0; i < val.length; i++) {
var a = val.charAt(i)
if (a.match(/[^\x00-\xff]/ig) != null){
len += 2
}else{
len += 1
}
}
/*if(val.match(/ /g)){
len =len+Math.floor(val.match(/ /g).length/2)
}*/
return len
}
}
}
......
dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue
View file @ 80e04bf0
......@@ -65,7 +65,7 @@
</div>
</div>
<div class="company-menu">
<el-button @click="handleClaim" v-if="ifClaim" class="hasClaim" v-loading="claimLoading"><i class="el-ico-claim" alt="已认领" title="已认领"></i> 已认领</el-button>
<el-button @click="handleClaim" v-if="ifClaim==1" class="hasClaim" v-loading="claimLoading"><i class="el-ico-claim" alt="已认领" title="已认领"></i> 已认领</el-button>
<el-button @click="handleClaim" v-else class="claim" v-loading="claimLoading"><i class="el-ico-claim" alt="认领客户" title="认领客户"></i> 认领客户</el-button>
</div>
......@@ -121,6 +121,19 @@
</div>
<!-- 分条件：滚动与不滚动 -->
</div>
<el-dialog
title=""
:visible.sync="dialogVisible"
:modal="false"
custom-class='dialog-renlin'
:show-close="false"
width="244px">
<span>认领成功，是否完善客户信息？</span>
<div slot="footer" class="dialog-footer">
<span class="dialog-footer-btn1" type="primary" @click="renlin()">立即完善</span>
<span class="dialog-footer-btn2" @click="renHide()">稍后</span>
</div>
</el-dialog>
</div>
</template>
......@@ -128,6 +141,7 @@
import { changePath } from '@/assets/js/common'
var Swiper = require('@/assets/lib/swiper/swiper-bundle.min.js')
import "@/assets/lib/swiper/swiper-bundle.css"
import { claim } from "@/api/common"
export default {
name: 'Infoheader',
props: ['companyId', 'companyInfo', 'statistic'],
......@@ -136,7 +150,7 @@ export default {
newStatic: null,
labelList: [], //企业标签
claimLoading: false,
ifClaim: false, //是否认领
ifClaim: 0, //是否认领
showMore: false,
showState: false,
graphList: [
......@@ -151,6 +165,7 @@ export default {
//风险扫描
labelArr:['失信联合惩戒企业','司法纠纷','注销'], //负向经营状态
enterpriseLabel:[],//企业标签
dialogVisible: false
}
},
created() {
......@@ -163,16 +178,18 @@ export default {
methods: {
//认领
async handleClaim(){
let _this = this
_this.claimLoading = true
setTimeout(function (){
_this.claimLoading = false
_this.$confirm(`认领成功，是否完善客户信息`, '提示', {
type: 'warning'
}).then(async () => {
console.log('操作跳转！')
})
}, 1000)
if(this.companyInfo.uipId){
this.claimLoading = true
let param = {companyId:this.companyId, uipId:this.companyInfo.uipId, companyName:this.companyInfo.companyName}
let res = await claim(param)
this.tableLoading = false
if(res.code==200){
this.dialogVisible=true
this.ifClaim = true
}
}else{
this.$message.warning('对不起，当前不能认领')
}
},
companySwiper(){
new Swiper('.swiper-info', {
......@@ -208,8 +225,8 @@ export default {
this.companySwiper() //swiper滚动板块
},
//获取认领状态
async getClaimStatus(){
this.ifClaim = false
getClaimStatus(){
this.ifClaim = this.companyInfo.regCapital
},
handleWidth(){
if(this.companyInfo.introduction){
......@@ -261,6 +278,14 @@ export default {
if(it.id==302 && it.val){
changePath(this, 'administrative')
}
},
renlin(){
this.dialogVisible=false;
// this.$router.push({path:'/home',query: {id:'1'}})
// 跳转地址
},
renHide(){
this.dialogVisible=false;
}
},
watch: {
......@@ -619,4 +644,47 @@ export default {
margin-left: 4px;
}
}
::v-deep .dialog-renlin{
margin-top:40vh !important;
.el-dialog__body{
padding: 0;
text-align: center;
padding-bottom: 24px;
}
.el-dialog__footer{
padding: 0px;
padding-bottom: 24px;
.dialog-footer{
display: inline-flex;
align-items: center;
justify-content: center;
width: 100%;
.dialog-footer-btn1{
cursor: pointer;
width: 72px;
height: 28px;
background: #0081FF;
border-radius: 2px 2px 2px 2px;
font-size: 12px;
font-weight: 400;
color: #FFFFFF;
line-height: 28px;
text-align: center;
margin-right: 8px;
}
.dialog-footer-btn2{
cursor: pointer;
width: 72px;
height: 28px;
border-radius: 2px 2px 2px 2px;
border: 1px solid #CCCCCC;
line-height: 28px;
text-align: center;
font-size: 12px;
font-weight: 400;
color: rgba(35,35,35,0.8);
}
}
}
}
</style>
dsk-operate-ui/src/views/detail/party-a/riskInformation/punish.vue
View file @ 80e04bf0
......@@ -51,9 +51,9 @@ export default {
},
forData: [
{label: '处罚原因', prop: 'punishReason', width: '508', slot: true, fixed: true},
{label: '决定日期', prop: 'punishBegin', width: '95'},
{label: '决定日期', prop: 'punishBegin', width: '105'},
{label: '处罚结果', prop: 'punishResult', width: '264'},
{label: '处罚文书号', prop: 'fileNum', width: '200'},
{label: '处罚文书号', prop: 'fileNum', width: '240'},
{label: '处罚机关', prop: 'office', width: '264'},
{label: '处罚结束日期', prop: 'punishEnd', width: '100'},
],
......
dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/sameRegion.vue
View file @ 80e04bf0
......@@ -123,8 +123,8 @@ export default {
data() {
return {
queryParams: {
provinceId: '',
cityId: '',
provinceIds: [],
cityIds: [],
uipExecutiveLevel: '',
uipBusinessType: [],
bratingSubjectLevel: [],
......@@ -192,10 +192,23 @@ export default {
tableDataTotal:0,
}
},
watch:{
searchState:{
handler(newVal, olVal) {
if (newVal) {
setTimeout(() => {
document.addEventListener('click', this.handleSearch1);
}, 0);
} else {
document.removeEventListener('click', this.handleSearch1);
}
}
}
},
created() {
if(this.companyInfo){
this.queryParams.provinceId = this.companyInfo.provinceId
this.queryParams.cityId = this.companyInfo.cityId
this.queryParams.provinceIds.push(this.companyInfo.provinceId)
this.queryParams.cityIds.push(this.companyInfo.cityId)
this.handleQuery()
this.getScreen()
}
......
dsk-operate-ui/src/views/detail/party-b/index.vue
View file @ 80e04bf0
......@@ -22,7 +22,7 @@ export default {
if (this.$route.params.id) { // 获取companyId
this.loading = true
// this.src = `https://pre-plug.jiansheku.com/enterprise/${this.$route.params.id}?secretId=${this.secretId}`
this.src = `http://192.168.60.30:3300/enterprise/${this.$route.params.id}?secretId=${this.secretId}`
this.src = `http://192.168.60.30:3300/enterprise/${this.$route.params.id}`
}
},
mounted() {
......
dsk-operate-ui/src/views/macro/urban/index.vue
View file @ 80e04bf0
......@@ -355,6 +355,9 @@ export default {
if(this.queryParams.order){
params.order=this.queryParams.order
}
if(this.queryParams.keyword){
params.keyword=this.queryParams.keyword
}
urbanInvestmentPage(params).then(res => {
this.tableLoading = false
......
dsk-operate-ui/src/views/project/overview/index.vue
View file @ 80e04bf0
......@@ -30,7 +30,7 @@
</div>
</div>
</el-card>
<el-card class="box-card noborder">
<el-card class="box-card noborder" id="charts">
<div class="cardtitles i">项目经营分析
<div class="labels">
<div :class="{'on':datatype==1}" @click="getDT(1)">周</div>
......@@ -222,6 +222,13 @@ export default {
item.createTime = this.gettime(item.createTime)
item.nextVisitTime = this.gettime(item.nextVisitTime)
})
window.addEventListener("resize", this.resizeEcharts);
},
beforeDestroy(){
window.removeEventListener("resize", this. resizeEcharts);
},
activated() {
this.resizeEcharts()
},
methods: {
getDT(type){
......@@ -298,6 +305,12 @@ export default {
}
this.initDT(datas,labels)
},
resizeEcharts (){
const self = this
setTimeout(function(){
self.myChart.resize()
}, 10)
},
initDT(datas,labels){
this.chartDom = document.getElementById("xmjyfx")
this.myChart = echarts.init(this.chartDom)
......@@ -436,6 +449,11 @@ export default {
]
}
this.option && this.myChart.setOption(this.option)
let _this = this
// document.getElementById('charts').onresize = function () {
// _this.myChart.resize() ; // 如果有多个图标变动，可写多个
//
// }
},
gettime(time){
if(time == null || time == "")
......
dsk-operate-ui/src/views/project/projectList/component/gjjl.vue
View file @ 80e04bf0
......@@ -56,6 +56,13 @@
</div>
<div class="recordlist" v-if="showtype=='gjdt'">
<div class="rec_detail" v-for="(item,index) in recordlist.rows">
<div class="delform" v-if="isdel && delID == item.id">
<div class="words">是否删除该条记录</div>
<div>
<div class="btnsmall btn_primary h28" @click="delele">确定</div>
<div class="btnsmall btn_cancel h28" @click="isdel=false">取消</div>
</div>
</div>
<div class="rec_time">
<i class="el-icon-time"></i>
......@@ -114,14 +121,6 @@
</div>
</div>
</div>
<div class="delform" v-if="isdel">
<div class="words">是否删除该条记录</div>
<div>
<div class="btnsmall btn_primary h28" @click="delele">确定</div>
<div class="btnsmall btn_cancel h28" @click="isdel=false">取消</div>
</div>
</div>
</el-card>
</div>
</template>
......@@ -362,13 +361,21 @@
</script>
<style lang="scss" scoped>
.el-card{
overflow: initial;
}
.rec_detail{
position: relative;
}
.wc{
position: absolute;
right: 0;
bottom: 0;
}
.delform{
position: fixed; left:50%; top:50%; transform:translate(-50%,-50%)
right: 0;
top: -122px;
position: absolute;
}
.tables{
margin-top: -26px;
......
dsk-operate-ui/src/views/radar/Bidding/details.vue
View file @ 80e04bf0
......@@ -3,52 +3,51 @@
<div class="bottomlist">
<ul class="bottomlist-content">
<li class="bottomlist-list" >
<p class="list-titel">
绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司)
<!-- <div v-else-if="item.projectName" v-html="item.projectName"></div> -->
<p class="list-titel" v-html="textList.projectName">
<!-- <div v-else-if="item.projectName" ></div> -->
</p>
<div class="content-label">
<span class="list-label">市政工程</span>
</div>
<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-lx" v-if="textList.objectType">{{textList.objectType}}</span>
<span class="list-label list-label-lx" v-if="textList.buildingProjectType">{{textList.buildingProjectType}}</span>
</div>
<div class="list-content">
<p class="list-content-text">
<span>招采单位：</span>
<span class="blue">江西合胜合招标咨询有限公司</span>
<span>{{textList.Name||'--'}}万元</span>
</p>
<p class="list-content-text">
<span>代理单位：</span>
<span class="blue">江西合胜合招标咨询有限公司</span>
</p>
</div>
<div class="list-content">
<p class="list-content-text">
<span>预算金款：</span>
<span>123,456,78万元</span>
<span>{{textList.planTenderAmount||'--'}}万元</span>
</p>
<p class="list-content-text">
<span>联系方式：</span>
<span >招采单位 张工 123456789</span>
<span>资金来源：</span>
<span >{{textList.projecetCapitalSource||'--'}}</span>
</p>
</div>
<div class="list-content">
<p class="list-content-text">
<span>发布时间：</span>
<span >今日</span>
</p>
<p class="list-content-text">
<span>报名截止日期：</span>
<span >2022-04-21</span>
<span >{{textList.issueTime||'--'}}</span>
</p>
<p class="list-content-text">
<span>开标时间：</span>
<span >2022-04-21</span>
<span>预计招标时间：</span>
<span >{{textList.planTenderDateStart||'--'}}</span>
</p>
<p class="list-content-text">
<span>来源网站：</span>
<span >赤峰市阿鲁科尔沁旗人民政府</span>
<span >{{textList.sourceName||'--'}}</span>
</p>
</div>
......@@ -62,9 +61,11 @@
<div class="list-content-img" @mouseenter="showimg=false" @mouseleave="showimg=true">
<img v-if="showimg" src="@/assets/images/bxpro/original1.png">
<img v-else src="@/assets/images/bxpro/original.png">
<span>原文链接</span>
<span>
<a :href="textList.url">原文链接</a>
</span>
</div>
<div class="main3-box">
<div class="main3-box" v-html="textList.content">
......@@ -76,6 +77,7 @@
</template>
<script>
import api from '@/api/radar/radar.js';
import "@/assets/styles/public.css";
export default {
......@@ -83,21 +85,25 @@
data() {
return {
id: '',
tableData: [{
id: 0,
name: '20重庆债14(2005938)',
time: '2020-09-18',
gm: '285.24',
zj: '否',
}],
textList: {},
showimg:true
}
},
created() {
console.log(this.$route.params)
this.id = this.$route.params.id
this.id = this.$route.params.id;
this.bidPlanDetail();
},
methods: {
bidPlanDetail() {
api.bidPlanDetail({
id: this.id
}).then(res => {
// console.log(res);
this.textList = res.data;
}).catch(error => {
});
},
}
}
......@@ -186,11 +192,21 @@
padding: 3px 7px;
font-size: 12px;
}
.list-label {
background: #F3F3FF;
color: #8491E8;
border-radius: 1px 1px 1px 1px;
padding: 3px 7px;
font-size: 12px;
margin-right: 12px;
font-weight: 400;
}
.list-label-zb{
font-weight: 400;
color: #5A88F9;
background: #E7EDFC;
color: #8491E8;
background: #F3F3FF;
}
.list-label-lx{
font-weight: 400;
......
dsk-operate-ui/src/views/radar/Establishment/details.vue
View file @ 80e04bf0
......@@ -4,25 +4,36 @@
<ul class="bottomlist-content">
<li class="bottomlist-list" >
<p class="list-titel">
绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司)
{{textList.projectName}}
<!-- <div v-else-if="item.projectName" v-html="item.projectName"></div> -->
</p>
<div class="content-label">
<span class="list-label">市政工程</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">
{{textList.province}}
<template v-if="textList.city">
-{{textList.city}}
</template>
<template v-if="textList.district">
-{{textList.district}}
</template>
</span>
</div>
<div class="list-content">
<p class="list-content-text">
<p class="list-content-text" v-if="textList.examineStatus">
<span>办件结果：</span>
<span >芜湖旭日机械制造有限公司</span>
<span >{{textList.examineStatus}}</span>
</p>
<p class="list-content-text">
<p class="list-content-text"v-if="textList.money">
<span>总投资：</span>
<span>芜湖旭日</span>
<span>{{textList.money}}万</span>
</p>
<p class="list-content-text">
<p class="list-content-text"v-if="textList.handleTime">
<span>审批日期：</span>
<span>12345.62万</span>
<span>{{textList.handleTime}}</span>
</p>
</div>
......@@ -37,43 +48,51 @@
<div class="main3-box">
<p>
<label class="label">项目法人</label>
<span>序号</span>
<span>{{textList.companyName||'--'}}</span>
<label class="label">总投资（万元）</label>
<span>序号</span>
<span>{{textList.money||'--'}}</span>
</p>
<p>
<label class="label">项目类型</label>
<span class="span-one">序号</span>
<span class="span-one">{{textList.projectCategories||'--'}}</span>
</p>
<p>
<label class="label">项目属地</label>
<span>序号</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>序号</span>
<span>{{textList.projectType||'--'}}</span>
</p>
<p>
<label class="label">建设规模</label>
<span>序号</span>
<span>{{textList.buildScale||'--'}}</span>
</p>
<p>
<label class="label">计划开工日期</label>
<span>序号</span>
<span>{{textList.planStartTime||'--'}}</span>
<label class="label">计划完成日期</label>
<span>序号</span>
<span>{{textList.planEndTime||'--'}}</span>
</p>
<p>
<label class="label">项目联系方式</label>
<span>序号</span>
<span>{{textList.money||'--'}}</span>
<label class="label">行业分类</label>
<span>序号</span>
<span>{{textList.projectIndustry||'--'}}</span>
</p>
<p>
<label class="label">项目详情地址</label>
<span>序号</span>
<span>{{textList.buildAddre||'--'}}</span>
<label class="label">项目代码</label>
<span>序号</span>
<span>{{textList.projectCode||'--'}}</span>
</p>
......@@ -84,7 +103,7 @@
<div class="common-title">立项审批</div>
<div class="table-item">
<el-table
:data="tableData"
:data="tableData1"
element-loading-text="Loading"
border
fit
......@@ -92,33 +111,39 @@
>
<el-table-column label="审批事项" width="270">
<template slot-scope="scope">
企业投资项目备案
{{ scope.row.examineContent||'--'}}
</template>
</el-table-column>
<el-table-column label="审批结果" width="187" >
<template slot-scope="scope">
通过
{{ scope.row.examineStatus||'--'}}
</template>
</el-table-column>
<el-table-column label="审批部门" >
<template slot-scope="scope">
老河口市发展和改革局
{{ scope.row.examineOffice||'--'}}
</template>
</el-table-column>
<el-table-column label="审批问号" width="328" >
<el-table-column label="审批文号" width="328" >
<template slot-scope="scope">
--
{{ scope.row.licenseNum||'--'}}
</template>
</el-table-column>
<el-table-column prop="zj" label="审批日期" width="240" >
<template slot-scope="scope">
2022-08-28
{{ scope.row.handleTime||'--'}}
</template>
</el-table-column>
</el-table>
<div class="pagination clearfix" v-show="total1>10">
<el-pagination background :page-size="pageSize1" :current-page="pageNum1"
@current-change="handleCurrentChange1" layout="prev, pager, next" :total="total1">
</el-pagination>
</div>
</div>
</div>
......@@ -126,41 +151,51 @@
<div class="common-title">立项推介</div>
<div class="table-item">
<el-table
:data="tableData"
:data="tableData2"
element-loading-text="Loading"
border
fit
highlight-current-row
>
<el-table-column label="立项推介" >
<el-table-column label="民间资本名称" >
<template slot-scope="scope">
-
{{ scope.row.companyName||'--'}}
</template>
</el-table-column>
<el-table-column label="引入资本规模（万元）" width="232" >
<template slot-scope="scope">
--
{{ scope.row.introduceMoney||'--'}}
</template>
</el-table-column>
<el-table-column label="引入资本时间" width="243" >
<template slot-scope="scope">
2019-12-24
{{ scope.row.introduceMoneyTime||'--'}}
</template>
</el-table-column>
<el-table-column label="推介时间" width="243" >
<template slot-scope="scope">
2019-12-24
{{ scope.row.recommendTime||'--'}}
</template>
</el-table-column>
<el-table-column prop="zj" label="是否完成推介" width="243" >
<template slot-scope="scope">
否
<template v-if="scope.row.isRecommend!=''&&scope.row.isRecommend!=null">
{{ scope.row.isRecommend?'是':'否'}}
</template>
<template v-else>
--
</template>
</template>
</el-table-column>
</el-table>
<div class="pagination clearfix" v-show="total2>10">`
<el-pagination background :page-size="pageSize2" :current-page="pageNum2"
@current-change="handleCurrentChange2" layout="prev, pager, next" :total="total2">
</el-pagination>
</div>
</div>
</div>
......@@ -169,27 +204,92 @@
</template>
<script>
import "@/assets/styles/public.css";
import api from '@/api/radar/radar.js';
export default {
name: 'EstablishmentDetails',
data() {
return {
id: '',
tableData: [{
id: 0,
name: '20重庆债14(2005938)',
time: '2020-09-18',
gm: '285.24',
zj: '否',
}]
textList: {},
pageNum1:1,
pageSize1:10,
tableData1:[],
total1:0,
pageNum2:1,
pageSize2:10,
tableData2:[],
total2:0,
}
},
created() {
console.log(this.$route.params)
this.id = this.$route.params.id
this.id = this.$route.params.id;
this.approvalInfoDetail();
this.approvalExaminePage();
this.approvalMarketingPage();
},
methods: {
approvalInfoDetail() {
api.approvalInfoDetail({
id: this.id
}).then(res => {
// console.log(res);
this.textList = res.data;
}).catch(error => {
});
},
handleCurrentChange1(pageNum1) {
this.pageNum1 = pageNum1;
this.search(pageNum1, this.pageSize1);
},
approvalExaminePage(pageNum1, pageSize1) {
if (!pageNum1) {
this.pageNum1 = 1;
}
if (!pageSize1) {
this.pageSize1 = 20;
}
var data = {
id: this.id,
pageNum: this.pageNum1,
pageSize: this.pageSize1
}
api.approvalExaminePage(data).then(res => {
// console.log(res);
this.tableData1 = res.rows;
}).catch(error => {
});
},
handleCurrentChange2(pageNum2) {
this.pageNum2 = pageNum2;
this.search(pageNum2, this.pageSize2);
},
approvalMarketingPage(pageNum2, pageSize2) {
if (!pageNum2) {
this.pageNum2 = 1;
}
if (!pageSize2) {
this.pageSize2 = 20;
}
var data = {
id: this.id,
pageNum: this.pageNum2,
pageSize: this.pageSize2
}
api.approvalMarketingPage(data).then(res => {
// console.log(res);
this.tableData2 = res.rows;
}).catch(error => {
});
}
}
}
......@@ -268,17 +368,28 @@
}
.content-label {
margin-top: 7px;
margin-top: 12px;
margin-bottom: 8px;
.list-label {
background: #F3F3FF;
color: #8491E8;
border-radius: 1px 1px 1px 1px;
padding: 3px 7px;
font-size: 12px;
margin-right: 12px;
}
.list-label-zb{
font-weight: 400;
color: #8491E8;
background: #F3F3FF;
}
.list-label-lx{
font-weight: 400;
color: #41A1FD;
background: #E4F3FD;
}
}
......@@ -552,6 +663,14 @@
.main5 {
.table-item {
margin-top: 22px;
.pagination {
padding: 14px;
.el-pagination {
float: right;
}
}
}
}
}
......
dsk-operate-ui/src/views/radar/Land/details.vue
View file @ 80e04bf0
......@@ -4,35 +4,35 @@
<ul class="bottomlist-content">
<li class="bottomlist-list">
<p class="list-titel">
绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司)
{{textList.projectName}}
</p>
<div class="list-content">
<p class="list-content-text">
<span>受让人：</span>
<span class="blue">芜湖旭日机械制造有限公司</span>
<span class="blue">{{textList.company||"--"}}</span>
</p>
<p class="list-content-text">
<span>成交金额：</span>
<span>12345.62万元</span>
<span>{{textList.transactionPrice||"--"}}</span>
</p>
<p class="list-content-text">
<span>总面积：</span>
<span>12345.62万</span>
<span>{{textList.acreage||"--"}}</span>
</p>
<p class="list-content-text">
<span>合同签订：</span>
<span>2014-05-12</span>
<span>{{textList.contractSignTime||"--"}}</span>
</p>
</div>
<div class="list-content">
<p class="list-content-text">
<span>土地用途：</span>
<span>城镇村道路用地</span>
<span>{{textList.landUse||"--"}}</span>
</p>
<p class="list-content-text">
<span>供应方式：</span>
<span>挂牌出让</span>
<span>{{textList.supplyLandWay||"--"}}</span>
</p>
</div>
......@@ -46,71 +46,79 @@
<div class="main3-box">
<p>
<label class="label">行政区</label>
<span>1.36倍</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>1.36倍</span>
<span>{{textList.electronicNumber||"--"}}</span>
</p>
<p>
<label class="label">项目名称</label>
<span class="span-one">1.36倍</span>
<span class="span-one">{{textList.projectName||"--"}}</span>
</p>
<p>
<label class="label">项目位置</label>
<span class="span-one">1.36倍</span>
<span class="span-one">{{textList.landAddr||"--"}}</span>
</p>
<p>
<label class="label">面积</label>
<span>1.36倍</span>
<span>{{textList.buildArea||"--"}}</span>
<label class="label">土地来源</label>
<span>1.36倍</span>
<span>{{textList.landSource||"--"}}</span>
</p>
<p>
<label class="label">土地用途</label>
<span>1.36倍</span>
<span>{{textList.landUse||"--"}}</span>
<label class="label">供地方式</label>
<span>1.36倍</span>
<span>{{textList.supplyLandWay||"--"}}</span>
</p>
<p>
<label class="label">土地使用年限</label>
<span>1.36倍</span>
<span>{{textList.landUseYear||"--"}}</span>
<label class="label">行业分类</label>
<span>1.36倍</span>
<span>{{textList.industry||"--"}}</span>
</p>
<p>
<label class="label">土地级别</label>
<span>1.36倍</span>
<span>{{textList.landLevel||"--"}}</span>
<label class="label">成交价格（万元）</label>
<span>1.36倍</span>
<span>{{textList.transactionPrice||"--"}}</span>
</p>
<p>
<label class="label">土地使用权人</label>
<span class="span-one">1.36倍</span>
<span class="span-one">{{textList.landUseCompany||"--"}}</span>
</p>
<p>
<label class="label">约定容积率</label>
<span>1.36倍</span>
<span>{{textList.volumeRate||"--"}}</span>
<label class="label">批准单位</label>
<span>1.36倍</span>
<span>{{textList.authority||"--"}}</span>
</p>
<p>
<label class="label">约定交地日起</label>
<span>1.36倍</span>
<span>{{textList.conventionLandTime||"--"}}</span>
<label class="label">合同签订日期</label>
<span>1.36倍</span>
<span>{{textList.contractSignTime||"--"}}</span>
</p>
<p>
<label class="label">约定开工时间</label>
<span>1.36倍</span>
<span>{{textList.conventionBeginTime||"--"}}</span>
<label class="label">约定竣工时间</label>
<span>1.36倍</span>
<span>{{textList.conventionEndTime||"--"}}</span>
</p>
<p>
<label class="label">实际开工时间</label>
<span>1.36倍</span>
<span>{{textList.realBeginTime||"--"}}</span>
<label class="label">实际峻工时间</label>
<span>1.36倍</span>
<span>{{textList.realEndTime||"--"}}</span>
</p>
</div>
</div>
......@@ -119,21 +127,21 @@
<div class="main3-box">
<p>
<label class="label">地块名称</label>
<span>1.36倍</span>
<span>{{textList.landName||"--"}}</span>
<label class="label">建筑面积</label>
<span>1.36倍</span>
<span>{{textList.buildArea||"--"}}</span>
</p>
<p>
<label class="label">容积率</label>
<span>1.36倍</span>
<span>{{textList.volumeRate||"--"}}</span>
<label class="label">绿化率</label>
<span>1.36倍</span>
<span>{{textList.greeningRate||"--"}}</span>
</p>
<p>
<label class="label">建筑密度</label>
<span>1.36倍</span>
<span>{{textList.buildingDensity||"--"}}</span>
<label class="label">建筑限高</label>
<span>1.36倍</span>
<span>{{textList.buildingHeight||"--"}}</span>
</p>
</div>
</div>
......@@ -142,39 +150,39 @@
<div class="main3-box">
<p>
<label class="label">招拍挂起始时间</label>
<span>1.36倍</span>
<span>{{textList.projectName||"--"}}</span>
<label class="label">招拍挂截止时间</label>
<span>1.36倍</span>
<span>{{textList.projectName||"--"}}</span>
</p>
<p>
<label class="label">报名起始时间</label>
<span>1.36倍</span>
<span>{{textList.auctionBeginTime||"--"}}</span>
<label class="label">报名截止日期</label>
<span>1.36倍</span>
<span>{{textList.auctionEndTime||"--"}}</span>
</p>
<p>
<label class="label">起始价</label>
<span>1.36倍</span>
<span>{{textList.moneyBegin||"--"}}</span>
<label class="label">竞买保证金</label>
<span>1.36倍</span>
<span>{{textList.bondmoney||"--"}}</span>
</p>
<p>
<label class="label">加价幅度</label>
<span>1.36倍</span>
<span>{{textList.addMoneyRange||"--"}}</span>
<label class="label">投资强度</label>
<span>1.36倍</span>
<span>{{textList.investmentIntensity||"--"}}</span>
</p>
<p>
<label class="label">成交价</label>
<span>1.36倍</span>
<span>{{textList.transactionPrice||"--"}}</span>
<label class="label">受让人</label>
<span>1.36倍</span>
<span>{{textList.company||"--"}}</span>
</p>
<p>
<label class="label">成交公示日期</label>
<span>1.36倍</span>
<span>{{textList.transactionPublicityTime||"--"}}</span>
<label class="label">合同编号</label>
<span>1.36倍</span>
<span>{{textList.contractNum||"--"}}</span>
</p>
</div>
</div>
......@@ -183,27 +191,34 @@
</template>
<script>
import "@/assets/styles/public.css";
import api from '@/api/radar/radar.js';
export default {
name: 'LandDetails',
data() {
return {
id: '',
tableData: [{
id: 0,
name: '20重庆债14(2005938)',
time: '2020-09-18',
gm: '285.24',
zj: '否',
}]
textList: {}
}
},
created() {
console.log(this.$route.params)
this.id = this.$route.params.id
this.id = this.$route.params.id;
this.landDetail();
},
methods: {
landDetail() {
api.landDetail({
id: this.id
}).then(res => {
// console.log(res);
this.textList = res.data;
console.log(this.textList);
}).catch(error => {
});
},
}
}
......
dsk-operate-ui/src/views/radar/bxprozbgg/details.vue
View file @ 80e04bf0
......@@ -4,24 +4,26 @@
<ul class="bottomlist-content">
<li class="bottomlist-list">
<p class="list-titel">
绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司)
{{textList.projectName}}
</p>
<div class="list-content">
<p class="list-content-text">
<span>发布日期：</span>
<span>2014-05-12</span>
<span>{{textList.pubdate||'--'}}</span>
</p>
<p class="list-content-text">
<span>开标时间：</span>
<span class='text-red'>2014-05-12 9:00</span>
<span class='text-red'>{{textList.endTimeDate||'--'}}</span>
</p>
</div>
<div class="list-content-img" @mouseenter="showimg=false" @mouseleave="showimg=true">
<img v-if="showimg" src="@/assets/images/bxpro/original1.png">
<img v-else src="@/assets/images/bxpro/original.png">
<span>原文链接</span>
<span>
<a :href="textList.url">原文链接</a>
</span>
</div>
</li>
......@@ -59,80 +61,93 @@
<div class="main3-box">
<p>
<label class="label">工程类型</label>
<span>1.36倍</span>
<span>{{textList.projectType||'--'}}</span>
<label class="label">工程类别</label>
<span>1.36倍</span>
<span>{{textList.projectPurposes||'--'}}</span>
</p>
<p>
<label class="label">项目投资额(万元)</label>
<span >1.36倍</span>
<span >{{textList.projectInvestmentAmount||'--'}}</span>
<label class="label">招标控制价/合同 估算价(万元)</label>
<span>1.36倍</span>
<span>{{textList.projectContractAmount||'--'}}</span>
</p>
<p>
<label class="label">建安费暂估(万元)</label>
<span >1.36倍</span>
<span >{{textList.projectSafeAmount||'--'}}</span>
<label class="label">勘察费暂估(万元)</label>
<span>1.36倍</span>
<span>{{textList.projectSurveyAmount||'--'}}</span>
</p>
<p>
<label class="label">设计费暂估(万元)</label>
<span>1.36倍</span>
<span>{{textList.projectDesignAmount||'--'}}</span>
<label class="label">投标保证金(万元)</label>
<span>1.36倍</span>
<span>{{textList.projectEnsureAmount||'--'}}</span>
</p>
<p>
<label class="label">计划工期</label>
<span>1.36倍</span>
<span>{{textList.projectDuration||'--'}}</span>
<label class="label">项目属地</label>
<span>1.36倍</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>
<span>1.36倍</span>
<span>{{textList.pubdate||'--'}}</span>
<label class="label">开标时间</label>
<span class="color1">1.36倍</span>
<span class="color1">{{textList.endTimeDate||'--'}}</span>
</p>
<p>
<label class="label">评标办法</label>
<span>1.36倍</span>
<span>{{textList.bidAssessmentWay||'--'}}</span>
<label class="label">项目级别</label>
<span>1.36倍</span>
<span>{{textList.projectLevel||'--'}}</span>
</p>
<p>
<label class="label">建设规模</label>
<span class="span-one">1.36倍</span>
<span class="span-one">{{textList.bulidRange||'--'}}</span>
</p>
<p>
<label class="label">招标范围</label>
<span class="span-one">1.36倍</span>
<span class="span-one">{{textList.bidRange||'--'}}</span>
</p>
<p>
<label class="label">保证金缴纳方式</label>
<span>1.36倍</span>
<span>{{textList.projectEnsureAmountPayType||'--'}}</span>
<label class="label">开标地点</label>
<span>1.36倍</span>
<span>{{textList.projectOpenAddr||'--'}}</span>
</p>
<p>
<label class="label">建设地点</label>
<span>1.36倍</span>
<span>{{textList.projectAddr||'--'}}</span>
<label class="label">资金来源</label>
<span>1.36倍</span>
<span>{{textList.capitalSource||'--'}}</span>
</p>
<p>
<label class="label">评标委员会</label>
<span class="span-one">1.36倍</span>
<span class="span-one">
<template v-if="textList.bidMettingHasProjectUnit=0">未知</template>
<template v-else-if="textList.bidMettingHasProjectUnit=1">无</template>
<template v-else-if="textList.bidMettingHasProjectUnit=2">有</template>
<template v-else>--</template>
</span>
</p>
<p>
<label class="label">履约保证金 (形式 及金额)</label>
<span class="span-one">1.36倍</span>
<span class="span-one">{{textList.prformanceWayAndMoney||'--'}}</span>
</p>
</div>
</div>
......@@ -141,15 +156,15 @@
<div class="main3-box">
<p>
<label class="label">资质要求</label>
<span class="span-one">1.36倍</span>
<span class="span-one">{{textList.qualiLimit||'--'}}</span>
</p>
<p>
<label class="label">业绩要求</label>
<span class="span-one">1.36倍</span>
<span class="span-one">{{textList.projectLimit||'--'}}</span>
</p>
<p>
<label class="label">项目负责人要求</label>
<span class="span-one">1.36倍</span>
<span class="span-one">{{textList.personLimit||'--'}}</span>
</p>
</div>
</div>
......@@ -158,21 +173,21 @@
<div class="main3-box">
<p>
<label class="label">招标人</label>
<span class="color2">1.36倍</span>
<span class="color2">{{textList.tenderee||'--'}}</span>
<label class="label">代理机构</label>
<span class="color2">1.36倍</span>
<span class="color2">{{textList.agency||'--'}}</span>
</p>
<p>
<label class="label">招标人联系方式</label>
<span>1.36倍</span>
<span>{{textList.tendereeTel||'--'}}</span>
<label class="label">招标人联系地址</label>
<span>1.36倍</span>
<span>{{textList.tendereeAddress||'--'}}</span>
</p>
<p>
<label class="label">代理机构联系方式</label>
<span>1.36倍</span>
<span>{{textList.agencyTel||'--'}}</span>
<label class="label">代理机构联系地址</label>
<span>1.36倍</span>
<span>{{textList.agencyAddress||'--'}}</span>
</p>
</div>
......@@ -183,27 +198,33 @@
<script>
import "@/assets/styles/public.css";
import api from '@/api/radar/radar.js';
export default {
name: 'bxprozbggDetails',
data() {
return {
id: '',
tableData: [{
id: 0,
name: '20重庆债14(2005938)',
time: '2020-09-18',
gm: '285.24',
zj: '否',
}],
textList: {},
showimg:true,
}
},
created() {
console.log(this.$route.params)
this.id = this.$route.params.id
this.id = this.$route.params.id;
this.bidNoticeProDetail();
},
methods: {
bidNoticeProDetail() {
api.bidNoticeProDetail({
id: this.id
}).then(res => {
// console.log(res);
this.textList = res.data;
}).catch(error => {
});
},
}
}
......
dsk-operate-ui/src/views/radar/components/Land/index.vue
View file @ 80e04bf0
......@@ -224,49 +224,58 @@
</div>
</div>
<ul class="bottomlist-content">
<li class="bottomlist-list">
<ul class="bottomlist-content" v-if="tableData.length>0">
<li class="bottomlist-list" v-for="item in tableData">
<p class="list-titel">
<router-link :to="'/radar/Land/details/'+ 1" tag="a" class="list-titel-a">绿色节能型压缩机基础件、汽车零配件新建项目 (芜湖旭日机械制造有限公司)</router-link>
<router-link :to="'/radar/Land/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"></router-link>
</p>
<div class="list-content">
<p class="list-content-text">
<span>受让人：</span>
<span class="blue">芜湖旭日机械制造有限公司</span>
<span class="blue">{{item.companyName||'--'}}</span>
</p>
<p class="list-content-text">
<span>成交金额：</span>
<span>12345.62万元</span>
<span>{{item.transactionPrice||'--'}}</span>
</p>
<p class="list-content-text">
<span>总面积：</span>
<span>12345.62万</span>
<span>{{item.acreage||'--'}}</span>
</p>
<p class="list-content-text">
<span>合同签订：</span>
<span>2014-05-12</span>
<span>{{item.contractSignTime||'--'}}</span>
</p>
</div>
<div class="list-content">
<p class="list-content-text">
<span>土地用途：</span>
<span >城镇村道路用地</span>
<span >{{item.landUse||'--'}}</span>
</p>
<p class="list-content-text">
<span>供应方式：</span>
<span >挂牌出让</span>
<span >{{item.supplyLandWay||'--'}}</span>
</p>
</div>
<div class="list-content list-addree">
<img src="@/assets/images/addree.png" alt="">
<p class="list-content-text">
<span>土地用途：</span>
<span >城镇村道路用地</span>
<span>行政区划：</span>
<span >
{{item.province}}
<template v-if="item.city">
-{{item.city}}
</template>
<template v-if="item.area">
-{{item.area}}
</template>
</span>
</p>
<p class="list-content-text">
<span>土地坐落：</span>
<span >锡山区云林街道春雷路东南、许巷路西</span>
<span >{{item.landAddr||'--'}}</span>
</p>
</div>
</li>
......@@ -288,11 +297,14 @@
</template>
<script>
import {encodeStr} from "@/assets/js/common.js"
import api from '@/api/radar/radar.js';
import jsk_data from '../../../../../public/jsk.json';
export default {
name: 'Land',
data() {
return {
encodeStr,
conditionTitles: {
keyword: "关键词:",
landAddr: "土地坐落:",
......@@ -544,45 +556,18 @@
},
},
mounted() {
if (this.$route.query.keyword) {
var obj = JSON.parse(JSON.stringify(this.landMarketDto));
obj.keyword = this.$route.query.keyword;
this.landMarketDto = obj;
}
this.addressListfn();
// this.$axios.get('https://files.jiansheku.com/file/json/common/searchDic.json').then(res => {
// if (res && res.status == 200) {
// this.landMarketIndustryList = res.data.landMarketIndustry;
// this.landUseOptions = res.data.landUse
// }
// }).catch(error => {
// });
// if (this.landUseOptions.length == 0 || this.landMarketIndustryList.length == 0) {
// this.$axios.post("/nationzj/project/recently/typeList", {
// timeout: "49999",
// headers: {
// "Content-Type": "application/json;charset=UTF-8",
// },
// })
// .then((res) => {
// if (res.data.code == 200) {
// this.landUseOptions = res.data.data.landUseList;
// this.landMarketIndustryList = res.data.data.landMarketIndustryList;
// }
// })
// .catch((err) => {});
// }
this.init();
},
methods: {
searchDic(){
api.searchDic().then(res=>{
this.landMarketIndustryList = res.landMarketIndustry;
this.landUseOptions = res.data.landUse
}).catch(error=>{
});
},
refresh(value) {
if (value) {
this.$router.go(0)
......@@ -613,7 +598,15 @@
},
landMarketDto: data,
};
this.$emit("search", params)
api.landMarketPage(params).then(res=>{
if (res.code==200) {
this.tableData=res.data.list;
this.total=res.data.total;
}
}).catch(error=>{
});
},
//关闭支付弹窗
......@@ -918,30 +911,7 @@
init() {
this.search();
this.addressListfn();
this.$axios.get('https://files.jiansheku.com/file/json/common/searchDic.json').then(res => {
if (res && res.status == 200) {
this.landMarketIndustryList = res.data.landMarketIndustry;
this.landUseOptions = res.data.landUse
}
}).catch(error => {
});
if (this.landUseOptions.length == 0 || this.landMarketIndustryList.length == 0) {
this.$axios.post("/nationzj/project/recently/typeList", {
timeout: "49999",
headers: {
"Content-Type": "application/json;charset=UTF-8",
},
})
.then((res) => {
if (res.data.code == 200) {
this.landUseOptions = res.data.data.landUseList;
this.landMarketIndustryList = res.data.data.landMarketIndustryList;
}
})
.catch((err) => {});
}
this.searchDic();
},
},
};
......
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java
View file @ 80e04bf0
......@@ -5,9 +5,11 @@ import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONUtil;
import com.dsk.acc.openapi.client.util.CommonUtils;
import com.dsk.common.constant.CacheConstants;
import com.dsk.common.core.domain.R;
import com.dsk.common.core.domain.model.*;
import com.dsk.common.core.page.TableDataInfo;
import com.dsk.common.core.redis.RedisCache;
import com.dsk.common.utils.DskOpenApiUtil;
import com.dsk.common.utils.EncodeIdUtil;
import com.dsk.system.domain.customer.vo.CustomerStatusListVo;
......@@ -23,6 +25,7 @@ import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
/**
* @ClassName enterpriseService
......@@ -42,12 +45,16 @@ public class EnterpriseService {
@Autowired
ICustomerService iCustomerService;
@Autowired
private RedisCache redisCache;
public R infoHeader(EnterpriseInfoHeaderBody body) throws Exception {
Map<String, Object> companyMap = dskOpenApiUtil.requestBody("/api/jsk/enterprise/infoHeader", BeanUtil.beanToMap(body, false, false));
Integer companyCode = MapUtils.getInteger(companyMap, "code", 300);
if (200 != companyCode) throw new RuntimeException();
Map companyData = MapUtils.getMap(companyMap, "data", null);
companyData.put("claimStatus", 0);
companyData.put("uipId", null);
Map<String, Object> uipMap = dskOpenApiUtil.requestBody("/operate/enterprise/financial", BeanUtil.beanToMap(body, false, false));
Integer uipCode = MapUtils.getInteger(uipMap, "code", 300);
......@@ -55,10 +62,12 @@ public class EnterpriseService {
Map uipData = MapUtils.getMap(uipMap, "data", new HashMap<>());
String uipId = MapUtils.getString(uipData, "uipId", null);
if (ObjectUtil.isEmpty(uipId)) {
return R.ok(companyData);
}
companyData.put("uipId", uipId);
ArrayList<String> uipIds = new ArrayList<>();
uipIds.add(uipId);
List<CustomerStatusListVo> claimStatusList = iCustomerService.selectStatusList(uipIds);
......@@ -80,13 +89,6 @@ public class EnterpriseService {
return BeanUtil.toBean(map, R.class);
}
public R supplierPage(EnterpriseSupplierPageBody body) throws Exception {
Map<String, String> headerMap = new HashMap<>();
headerMap.put("Api-Version", "1.0");
Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/selectPageSupplierInfo", BeanUtil.beanToMap(body, false, false), headerMap);
return BeanUtil.toBean(map, R.class);
}
public R projectTenderDataGroup(EnterpriseProjectTenderDataGroupBody body) throws Exception {
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/projectTenderDataGroup", BeanUtil.beanToMap(body, false, false));
return BeanUtil.toBean(map, R.class);
......@@ -108,34 +110,6 @@ public class EnterpriseService {
return dskOpenApiUtil.responsePage(map);
}
public R bidNoticePage(EnterpriseBidNoticePageBody body) throws Exception {
Map<String, String> headerMap = new HashMap<>();
headerMap.put("Api-Version", "1.0");
Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/selectPageBidNoticeInfo", BeanUtil.beanToMap(body, false, false), headerMap);
return BeanUtil.toBean(map, R.class);
}
public R bidNoticeProvince(EnterpriseBidNoticePageBody body) throws Exception {
Map<String, String> headerMap = new HashMap<>();
headerMap.put("Api-Version", "1.0");
Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/selectBidProvinceByCompanyId", BeanUtil.beanToMap(body, false, false), headerMap);
return BeanUtil.toBean(map, R.class);
}
public R bidNoticeTenderStage(EnterpriseBidNoticePageBody body) throws Exception {
Map<String, String> headerMap = new HashMap<>();
headerMap.put("Api-Version", "1.0");
Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/selectTenderStageByCompanyId", BeanUtil.beanToMap(body, false, false), headerMap);
return BeanUtil.toBean(map, R.class);
}
public R bidNoticeDeatil(EnterpriseBidNoticeDetailBody body) throws Exception {
Map<String, String> headerMap = new HashMap<>();
headerMap.put("Api-Version", "1.0");
Map<String, Object> map = dskOpenApiUtil.requestBodyWithHeader("/api/jsk/enterpriseBusiness/bid/detail", BeanUtil.beanToMap(body, false, false), headerMap);
return BeanUtil.toBean(map, R.class);
}
public TableDataInfo dynamicPage(EnterpriseDynamicPageBody body) throws Exception {
Map<String, Object> map = dskOpenApiUtil.requestBody("/api/jsk/enterprise/dynamic", BeanUtil.beanToMap(body, false, false));
return dskOpenApiUtil.responsePage(map);
......@@ -210,7 +184,21 @@ public class EnterpriseService {
}
public R uipGroupData() throws Exception {
String redisKey = CacheConstants.DATA_UIPGROUPDATA;
Map<String, Object> cacheMap = redisCache.getCacheMap(redisKey);
if (MapUtils.isNotEmpty(cacheMap)) {
return R.ok(cacheMap);
}
Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/enterprise/uipGroupData", new HashMap<>());
Integer code = MapUtils.getInteger(map, "code", 300);
if (200 != code) throw new RuntimeException();
Map data = MapUtils.getMap(map, "data", null);
redisCache.setCacheMap(redisKey, data);
redisCache.expire(redisKey, 24, TimeUnit.HOURS);
return BeanUtil.toBean(map, R.class);
}
......
dsk-system/src/main/resources/mapper/business/BusinessInfoMapper.xml
View file @ 80e04bf0
......@@ -266,6 +266,7 @@
<if test="createTime != null">create_time,</if>
<if test="updateTime != null">update_time,</if>
<if test="status != null">status,</if>
<if test="customerId != null">customer_id,</if>
<if test="evaluationBidWay != null">evaluation_bid_way,</if>
<if test="bidOpenTime != null">bid_open_time,</if>
<if test="bidOpenPlace != null">bid_open_place,</if>
......
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