Skip to content

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

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

parents 2c86db36 bf8e7104
Hide whitespace changes
Inline Side-by-side
Showing with 269 additions and 153 deletions
dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessFileController.java
View file @ 29918822
......@@ -17,6 +17,7 @@ import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
import java.io.IOException;
import java.util.List;
import java.util.stream.Collectors;
......@@ -81,10 +82,18 @@ public class BusinessFileController extends BaseController {
try {
//获取文件名
String filename = file.getOriginalFilename();
//TODO 校验是否上传同名文件
String businessFileName = request.getHeader("FilePath");
// 上传文件路径
String filePath = RuoYiConfig.getUploadPath() + businessFileName + "/";
//校验是否上传同名文件
File newFile = new File(filePath);
// 获取当前目录下的文件和文件夹
File[] files = newFile.listFiles();
for (File allFile : files) {
if(filename.equals(allFile.getName())) return error("文件已存在");
}
// 上传并返回文件全路径
String fileName = FileUploadUtils.upload(filePath, file);
String url = serverConfig.getUrl() + fileName;
......
dsk-operate-ui/src/assets/styles/public.css
View file @ 29918822
......@@ -570,6 +570,10 @@ select {
height: 40px;
opacity: 0;
}
.el-select-dropdown.is-multiple .el-select-dropdown__item:hover {
color: #3181fa;
}
.select-list {
color: #666;
line-height: 24px;
......@@ -586,6 +590,31 @@ select {
background-color: #fff;
padding: 6px 0px;
}
.select-radio {
max-height: 400px;
background: #fff;
}
.select-radio[x-placement^=bottom] {
margin-top: 8px;
}
.select-radio .select-radio-list {
position: relative;
}
.select-radio .select-radio-icon {
position: absolute;
top: 8px;
right: 4px;
}
.select-radio .select-radio-picker {
opacity: 0;
position: absolute;
top: -6px;
left: 0;
width: 0px;
}
.select-radio::-webkit-scrollbar-thumb {
background-color: #b9b9b9 !important;
......@@ -681,8 +710,8 @@ select {
}
.select-list .el-radio .el-radio__label:hover {
/* color: #0381fa;
background: #f2f7ff; */
color: #0381fa;
background: #f2f7ff;
}
.select-list .el-radio__input.is-checked+.el-radio__label {
......@@ -1074,4 +1103,26 @@ select {
color: #B589DB;
}
.performance_other_select.el-select-dropdown.el-popper .el-select-dropdown__wrap.el-scrollbar__wrap {
max-height: 274px;
}
.performance_other_select .el-scrollbar {
display: block !important;
}
.performance_other_select .performance_source_name_ipt {
margin: 10px 20px;
width: 300px;
}
.performance_pagination_wrap {
border-top: 1px solid #EFEFEF;
padding-right: 6px;
padding-bottom: 16px;
margin-bottom: 24px;
}
.performance_pagination_wrap .common-pagination {
margin-top: 16px;
}
dsk-operate-ui/src/assets/styles/ruoyi.scss
View file @ 29918822
......@@ -252,6 +252,19 @@
height: 120px;
}
.userInfo-avatar {
display: inline-block;
cursor: pointer;
width: 120px;
height: 120px;
line-height: 120px;
text-align: center;
background: #E3EEF9;
font-size: 48px;
color: #0081FF;
border-radius: 50%;
}
.avatar-upload-preview {
position: relative;
top: 50%;
......
dsk-operate-ui/src/layout/components/Navbar.vue
View file @ 29918822
......@@ -8,8 +8,8 @@
<i class="menu-line" />
<el-dropdown class="avatar-container" trigger="hover">
<div class="flex-box avatar-wrapper">
<img v-if="avatar" class="pic-avatar" src="@/assets/images/avatar.png">
<span v-else class="user-avatar">{{ name&&name.slice(0, 1) }}</span>
<img v-if="avatar" class="pic-avatar" :src="avatar">
<span v-else class="user-avatar">{{ name&&name.slice(0, 1).toUpperCase() }}</span>
{{ name }}
</div>
<el-dropdown-menu slot="dropdown" class="user-dropdown">
......
dsk-operate-ui/src/store/modules/user.js
View file @ 29918822
......@@ -55,7 +55,7 @@ const user = {
return new Promise((resolve, reject) => {
getInfo().then(res => {
const user = res.user
const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
const avatar = user.avatar ? process.env.VUE_APP_BASE_API + user.avatar : '';
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions)
......
dsk-operate-ui/src/views/detail/party-a/financial/index.vue
View file @ 29918822
......@@ -34,7 +34,7 @@
<div class="flex-box zwqk-box">
<div class="zwqk-info">
<div class="zwqk-title">总负债</div>
<div class="zwqk-amount"><span>{{financialDetail.totalLiabilities?saveFixed(financialDetail.totalLiabilities):'0'}}</span>亿元</div>
<div class="zwqk-amount"><template v-if="financialDetail.totalLiabilities"><span>{{saveFixed(financialDetail.totalLiabilities)}}</span>亿元</template><template v-else><span>--</span></template></div>
<div class="zwqk-pro">资产负债率 {{financialDetail.tdr?saveFixed(financialDetail.tdr)+'%':'--'}}</div>
<img src="@/assets/images/detail/financial/zwqk_bg_ico.png">
</div>
......@@ -170,7 +170,6 @@ export default {
item.amount = zjqkObj[Object.keys(zjqkObj)[index]]
})
this.echartsData = [
{ value: res.data.uipInterestBearingDebt, name: '有息债务' },
{ value: res.data.econData_002, name: '有息债务/总债务' },
{ value: res.data.ofcb, name: '综合融资成本' },
{ value: res.data.ebitdaIcr, name: 'EBITDA保障倍数' }
......@@ -185,7 +184,11 @@ export default {
//配置图表
let option = {
tooltip: {
trigger: 'item'
trigger: 'item',
formatter: function (a, b) {
let radius = "<span style='display: inline-block; background: "+a.color+"; width:12px; height:12px; border-radius: 50%; margin-right: 6px;'></span>"
return radius+a.name +' '+ (a.percent).toFixed(2) + '%'
}
},
grid: {
left:"0",
......
dsk-operate-ui/src/views/detail/party-a/overview/component/busclue.vue
View file @ 29918822
......@@ -124,6 +124,8 @@ export default {
this.typeList.forEach((item, index) => {
item.count = this.statistic[item.category]?this.statistic[item.category][item.field]:0
})
this.typeList[2].count = 10 //写死代表有数据，英文统计里面没这项
this.typeList[3].count = 10 //写死代表有数据，英文统计里面没这项
},
handleType(it, idx){
if(it.count){
......
dsk-operate-ui/src/views/detail/party-a/overview/component/infoheader.vue
View file @ 29918822
......@@ -65,7 +65,7 @@
</div>
</div>
<div class="company-menu">
<el-button v-if="ifClaim==1" class="hasClaim" v-loading="claimLoading"><i class="el-ico-claim" alt="已认领" title="已认领"></i> 已认领</el-button>
<el-button v-if="ifClaim==1" class="hasClaim"><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>
......@@ -182,7 +182,7 @@ export default {
this.claimLoading = true
let param = {companyId:this.companyId, uipId:this.companyInfo.uipId, companyName:this.companyInfo.companyName}
let res = await claim(param)
this.tableLoading = false
this.claimLoading = false
if(res.code==200){
this.dialogVisible=true
this.ifClaim = 1
......
dsk-operate-ui/src/views/detail/party-a/overview/component/risk.vue
View file @ 29918822
......@@ -119,7 +119,8 @@ export default {
}).reduce((prev, cur) => prev + cur)
this.viewData = this.viewData.map(item => {
let number = this.statistic[item.category]&&this.statistic[item.category][item.field]?this.statistic[item.category][item.field]:0
let it = {name:item.name, value:number, tz: '', bl:parseFloat(Number(Number(number)/Number(totalVal)*100).toFixed(2))+'%'}
let bl = number ? parseFloat(Number(Number(number)/Number(totalVal)*100).toFixed(2)) : 0
let it = {name:item.name, value:number, tz: '', bl:bl+'%'}
return it
})
this.viewData.sort((a, b) => {
......@@ -141,7 +142,7 @@ export default {
if(params.data.tz){
result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;" >'+ params.data.tz +'亿元</p>'
}
result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;">'+ params.data.bl +'%</p>'
result+='<p style="color: rgba(35,35,35,0.8);padding: 0;margin: 0;">'+ params.data.bl+'</p>'
return result;
},
extraCssText:'width:150px!important;',
......
dsk-operate-ui/src/views/detail/party-a/overview/component/tender.vue
View file @ 29918822
......@@ -4,7 +4,7 @@
<div class="common-title">招标公告</div>
<template v-if="zbggList.length>0">
<div class="tender-item" v-for="(item, index) in zbggList" :key="index">
<div class="flex-box tender-title"><div class="text-cl1" :title="item.projectName"><router-link :to="'/radar/Bidding/details/'+item.bid" tag="a" class="a-link">{{item.projectName}}</router-link></div><span :class="item.tenderStage=='项目动态'?'style2':item.tag=='招投标'?'style4':'style1'">{{item.tenderStage}}</span></div>
<div class="flex-box tender-title"><div class="text-cl1" :title="item.projectName"><router-link :to="'/radar/Tender/details/'+item.bid" tag="a" class="a-link">{{item.projectName}}</router-link></div><span :class="item.projectCategory=='项目动态'?'style2':item.tag=='招投标'?'style4':'style1'">{{item.projectCategory}}</span></div>
<span class="tender-time">{{item.issueTime}}</span>
</div>
</template>
......
dsk-operate-ui/src/views/detail/party-b/index.vue
View file @ 29918822
......@@ -24,7 +24,6 @@ export default {
created() {
if (this.$route.params.id) { // 获取companyId
this.loading = true
// this.src = `https://pre-plug.jiansheku.com/enterprise/${this.$route.params.id}?ak=${this.ak}`
if(this.$route.name=='Company'){ //企业详情
this.src = `${this.domain}/enterprise/${this.$route.params.id}?ak=${this.ak}`
}
......@@ -60,6 +59,10 @@ export default {
if (data.clientHeight) {
window.scrollTo(sc, sc - 30)
}
// 点击下拉子标签动态设置滚动高度
if (data.initHeight || data.initHeight===0) {
window.scrollTo(sc, data.initHeight)
}
}
})
},
......
dsk-operate-ui/src/views/enterpriseData/components/Owner/index.vue
View file @ 29918822
......@@ -2,9 +2,8 @@
<div>
<div class="content">
<div class="content_item">
<div class="label">项目名称</div>
<div class="content_right item_ckquery_list">
<el-input class="ename_input" placeholder="请输入项目名称关键字" v-model="keys" >
<el-input class="ename_input" placeholder="请输入企业名称关键字" v-model="keys" >
<div slot="append" class="btn-search" @click="search">搜索</div>
</el-input>
......@@ -12,7 +11,7 @@
</div>
<div class="content_item">
<div class="label">基本信息</div>
<div class="label">企业地区</div>
<div class="content_right item_ckquery_list">
<div class="select-popper" >
<span :class="{color_text:jskBidQueryDto.provinceIds.length ||jskBidQueryDto.cityIds.length ||jskBidQueryDto.areaIds.length,}">
......@@ -111,7 +110,7 @@
<div class="bottomlist-title">
<div class="bottomlist-title-left" >
<p class="title-left">
项目明细
查询结果列表
</p>
<el-popover v-model="fieldshow" placement="bottom-start" trigger="click"
popper-class="viewlist-el-popover">
......@@ -145,7 +144,7 @@
<el-table :data="tableData" :header-cell-style="{ background:'#F0F3FA'}" element-loading-text="Loading" border highlight-current-row>
<el-table-column type="index" label="序号" width="60">
<template slot-scope="scope">
<span>{{(pageNum - 1) *10 + scope.$index + 1}}</span>
<span>{{(pageNum - 1) *20 + scope.$index + 1}}</span>
</template>
</el-table-column>
<el-table-column label="公司名称" width="430" >
......@@ -277,7 +276,12 @@
{{scope.row.accountsReceivable||"--"}}
</template>
</el-table-column>
<el-table-column label="公益性&准公益性主营占比" width="168" >
<el-table-column label="其他应收款（亿元）" width="132" >
<template slot-scope="scope">
{{scope.row.otherReceivable||"--"}}
</template>
</el-table-column>
<el-table-column label="公益性&准公益性主营占比(%)" width="188" >
<template slot-scope="scope">
{{scope.row.econData_001||"--"}}
</template>
......@@ -302,7 +306,7 @@
{{scope.row.belongNetProfit||"--"}}
</template>
</el-table-column>
<el-table-column label="净资产收益率" width="96" >
<el-table-column label="净资产收益率(%)" width="136" >
<template slot-scope="scope">
{{scope.row.roe||"--"}}
</template>
......@@ -332,27 +336,27 @@
{{scope.row.uipInterestBearingDebt||"--"}}
</template>
</el-table-column>
<el-table-column label="有息债务/总负债" width="114" >
<el-table-column label="有息债务/总负债(%)" width="134" >
<template slot-scope="scope">
{{scope.row.econData_002||"--"}}
</template>
</el-table-column>
<el-table-column label="综合融资成本" width="96" >
<el-table-column label="综合融资成本(%)" width="116" >
<template slot-scope="scope">
{{scope.row.ofcb||"--"}}
</template>
</el-table-column>
<el-table-column label="现金比率" width="72" >
<el-table-column label="现金比率(%)" width="92" >
<template slot-scope="scope">
{{scope.row.cashRatio||"--"}}
</template>
</el-table-column>
<el-table-column label="现金流量比率" width="96" >
<el-table-column label="现金流量比率(%)" width="116" >
<template slot-scope="scope">
{{scope.row.cashFlowRatio||"--"}}
</template>
</el-table-column>
<el-table-column label="现金到期债务比" width="112" >
<el-table-column label="现金到期债务比(%)" width="132" >
<template slot-scope="scope">
{{scope.row.cashDebtRatio||"--"}}
</template>
......@@ -362,7 +366,7 @@
{{scope.row.creditBalance||"--"}}
</template>
</el-table-column>
<el-table-column label="授信余额/全部债务" width="126" >
<el-table-column label="授信余额/全部债务(%)" width="146" >
<template slot-scope="scope">
{{scope.row.econData_003||"--"}}
</template>
......@@ -372,17 +376,17 @@
{{scope.row.ebitdaIcr||"--"}}
</template>
</el-table-column>
<el-table-column label="私募债余额占比" width="108" >
<el-table-column label="私募债余额占比(%)" width="128" >
<template slot-scope="scope">
{{scope.row.ppnBalanceProp||"--"}}
</template>
</el-table-column>
<el-table-column label="一年内到期债权占比" width="132" >
<el-table-column label="一年内到期债权占比(%)" width="152" >
<template slot-scope="scope">
{{scope.row.econData_004||"--"}}
</template>
</el-table-column>
<el-table-column label="债券余额/有息债务" width="132" >
<el-table-column label="债券余额/有息债务(%)" width="152" >
<template slot-scope="scope">
{{scope.row.econData_005||"--"}}
</template>
......@@ -392,7 +396,7 @@
{{scope.row.loan||"--"}}
</template>
</el-table-column>
<el-table-column label="借款/有息债务" width="102" >
<el-table-column label="借款/有息债务(%)" width="122" >
<template slot-scope="scope">
{{scope.row.econData_006||"--"}}
</template>
......@@ -402,7 +406,7 @@
{{scope.row.nonStandardBalance||"--"}}
</template>
</el-table-column>
<el-table-column label="非标余额/有息债务" width="132" >
<el-table-column label="非标余额/有息债务(%)" width="152" >
<template slot-scope="scope">
{{scope.row.nonStandardRatio||"--"}}
</template>
......@@ -412,9 +416,9 @@
{{scope.row.guaranteeAmount||"--"}}
</template>
</el-table-column>
<el-table-column label="对外担保比例" width="96" >
<el-table-column label="对外担保比例(%)" width="116" >
<template slot-scope="scope">
{{scope.row.guaranteeAmount||"--"}}
{{scope.row.guaranteeRatio||"--"}}
</template>
</el-table-column>
<el-table-column label="所属开发区" width="84" >
......@@ -610,11 +614,12 @@ export default {
this.domicile.push(arr[i].label);
}
}
var obj = JSON.parse(JSON.stringify(this.landMarketDto));
var obj = JSON.parse(JSON.stringify(this.jskBidQueryDto));
obj.provinceIds = provinceIds;
obj.cityIds = cityIds;
obj.areaIds = areaIds;
this.landMarketDto = obj;
this.jskBidQueryDto = obj;
this.search();
},
......@@ -677,16 +682,16 @@ export default {
},
checkuipExecutivebtn(val){
if(val){
this.uipExecutiveText =[];
}
this.uipExecutiveText =[];
this.checkuipExecutive=true;
this.search();
},
uipExecutiveLevelbtn(val){
if(val.length>0){
this.checkuipExecutive=false;
}else if(val.length==0){
this.checkuipExecutive=true;
this.checkuipExecutive==true;
}
this.search();
......@@ -947,8 +952,11 @@ export default {
margin-right: 20px;
::v-deep .el-input-group__append{
cursor: pointer;
padding: 0px;
.btn-search{
width: 70px;
color: #0081ff;
text-align: center;
}
}
}
......
dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue
View file @ 29918822
......@@ -4,7 +4,7 @@
<div class="content">
<div class="content_item">
<div class="content_right item_ckquery_list">
<el-input class="ename_input" placeholder="请输入项目名称关键字" v-model="ename" @input="projectNamebtn('ename',ename,'关键字:')">
<el-input class="ename_input" placeholder="请输入关键字，如企业名称、统一社会信用代码等" v-model="ename" @input="projectNamebtn('ename',ename,'关键字:')">
<div slot="append" class="btn-search" @click="submitbtn">搜索</div>
</el-input>
<template v-if="ename">
......@@ -48,9 +48,9 @@
</div>
</div>
<div class="content_item content_item1">
<div class="label">更多选项</div>
<div class="label">更多筛选</div>
<div class="content_right ">
<div class="select-popper">
<!-- <div class="select-popper">
<div class=" " :class="regionWeb.length>0?'select-active':''">
备案网站{{regionWeb.length>0?(regionWeb.length+'项'):''}}
<i class="el-icon-caret-bottom"></i>
......@@ -63,7 +63,7 @@
</el-option>
</el-select>
</div>
</div> -->
<div class="select-popper">
<el-dropdown trigger="click" placement='bottom-start' >
<div class="el-dropdown-link " :class="filePlaceCode?'select-active':''">
......@@ -136,7 +136,7 @@
</el-dropdown>
</div>
<div class="select-popper">
<!-- <div class="select-popper">
<el-dropdown trigger="click" placement='bottom-start'>
<div class="el-dropdown-link " :class="hasPhone?'select-active':''">
有无联系电话{{hasPhone?' 1项':''}}
......@@ -153,8 +153,8 @@
</el-dropdown-menu>
</el-dropdown>
</div>
<div class="select-popper">
</div> -->
<!-- <div class="select-popper">
<el-dropdown trigger="click" placement='bottom-start'>
<div class="el-dropdown-link " :class="hasLiceCert!=''?'select-active':''">
<span>建筑安许证{{hasLiceCert!=''?' 1项':''}}</span>
......@@ -170,7 +170,7 @@
</el-dropdown-menu>
</el-dropdown>
</div>
</div> -->
<div class="select-popper">
<div class=" " :class="systemValue.length>0?'select-active':''">
管理体系认证{{systemValue.length>0?(systemValue.length+'项'):''}}
......@@ -280,7 +280,7 @@
<el-dropdown-menu slot="dropdown" class="dropdown-list-radio">
<template v-for=" (item,i) in registeredAssets">
<el-dropdown-item v-if='item.value!="自定义"'
:class="item.value==registeredAssetsText?'colort_ext ':''"
:class="item.value==registeredAssetsText?'color_text ':''"
:command="{'value':item.value,'key':'注册资本','label':item.label}">
<p @click="registeredAssetsText=item.value">
{{item.value}}
......@@ -288,9 +288,9 @@
</el-dropdown-item>
<el-dropdown-item v-else command="自定义" style="padding: 0px;">
<div @mouseenter="showHandleNumber = true"
:class="registeredAssetsText=='自定义'?'colort_ext':''" style="padding: 0px 20px;"
:class="registeredAssetsText=='自定义'?'color_text':''" style="padding: 0px 20px;"
@mouseleave="showHandleNumber = false">
<span :class="registeredAssetsText=='自定义'?'colort_ext':''">
<span :class="registeredAssetsText=='自定义'?'color_text':''">
自定义<i class="el-icon-arrow-right" style="padding-left: 24px;"></i>
</span>
<div class="jabph_popper_box" style="position:absolute;left: 124px;"
......@@ -324,7 +324,7 @@
<el-dropdown-menu slot="dropdown" class="dropdown-list-radio">
<template v-for=" (item,i) in registeredAssets">
<el-dropdown-item v-if='item.value!="自定义"'
:class="item.value==actualCapi?'colort_ext ':''"
:class="item.value==actualCapi?'color_text ':''"
:command="{'value':item.value,'key':'实缴资本','label':item.label}">
<p @click="actualCapi=item.value">
{{item.value}}
......@@ -332,9 +332,9 @@
</el-dropdown-item>
<el-dropdown-item v-else command="自定义" style="padding: 0px;">
<div @mouseenter="showHandleNumber = true"
:class="actualCapi=='自定义'?'colort_ext':''" style="padding: 0px 20px;"
:class="actualCapi=='自定义'?'color_text':''" style="padding: 0px 20px;"
@mouseleave="showHandleNumber = false">
<span :class="actualCapi=='自定义'?'colort_ext':''">
<span :class="actualCapi=='自定义'?'color_text':''">
自定义<i class="el-icon-arrow-right" style="padding-left: 24px;"></i>
</span>
<div class="jabph_popper_box" style="position:absolute;left: 124px;"
......@@ -373,7 +373,7 @@
<el-dropdown-menu slot="dropdown" class="dropdown-list-radio">
<template v-for=" (item,i) in InsuredNumList">
<el-dropdown-item v-if='item.value!="自定义"'
:class="item.value==InsuredNumText?'colort_ext ':''"
:class="item.value==InsuredNumText?'color_text ':''"
:command="{'value':item.value,'key':'社保人数','label':item.label}">
<p @click="InsuredNumText=item.value">
{{item.value}}
......@@ -381,9 +381,9 @@
</el-dropdown-item>
<el-dropdown-item v-else command="自定义" style="padding: 0px;">
<div @mouseenter="showHandleNumber = true"
:class="InsuredNumText=='自定义'?'colort_ext':''" style="padding: 0px 20px;">
:class="InsuredNumText=='自定义'?'color_text':''" style="padding: 0px 20px;">
<!-- @mouseleave="showHandleNumber = false" -->
<span :class="InsuredNumText=='自定义'?'colort_ext':''">
<span :class="InsuredNumText=='自定义'?'color_text':''">
自定义<i class="el-icon-arrow-right" style="padding-left: 24px;"></i>
</span>
<div class="jabph_popper_box" style="position:absolute;left: 124px;"
......@@ -777,6 +777,10 @@
{
value: '1',
label: '是高新企业'
},
{
value: '0',
label: '不是高新企业'
}
],
......@@ -1407,7 +1411,7 @@
}).catch(error=>{
this.optionss = aptitudeCode;
});
this.getRegionWebList();
this.getaddressList();
this.submitbtn();
......@@ -1642,21 +1646,11 @@
getRegionWebList(){
api.searchDic().then(res=>{
if (res) {
this.regionWebList = res
} else {
api.regionWebList().then(res=>{
if (res) {
this.regionWebList = res
}
})
}
this.regionWebList = res.regionWeb;
}
}).catch(error=>{
　　 api.regionWebList().then(res=>{
if (res) {
this.regionWebList = res
}
})
});
});
},
// 工商注册地
......@@ -2597,18 +2591,18 @@
reset() {
Object.assign(this.$data, this.$options.data()) //重置data
this.$axios.get('https://files.jiansheku.com/file/json/common/aptitudeCode.json').then(res => {
if (res && res.status == 200) {
this.optionss = res.data;
} else {
this.optionss = aptitudeCode;
}
}).catch(error=>{
this.optionss = aptitudeCode;
　　
});
api.aptitudeCode().then(res=>{
if (res) {
this.optionss = res;
} else {
this.optionss = aptitudeCode;
}
}).catch(error=>{
this.optionss = aptitudeCode;
});
this.getaddressList();
this.getRegionWebList();
......
dsk-operate-ui/src/views/radar/components/BidRecord/index.vue
View file @ 29918822
......@@ -8,13 +8,13 @@
placeholder="请输入项目名称关键字" v-model="keyword" ></el-input>
</div>
</div>
<!-- <div class="content_item">
<div class="content_item">
<div class="label">参投单位</div>
<div class="content_right">
<el-input class="ename_input"
placeholder="请输入参投单位关键字" v-model="jskBidQueryDto.companyName" ></el-input>
</div>
</div> -->
</div>
<div class="content_item">
<div class="label">项目信息</div>
<div class="content_right">
......@@ -69,7 +69,7 @@
</div>
</el-dropdown>
<el-dropdown @command="tenderDatehandleCommand" trigger="click" ref="tenderDateShowPopper" :hide-on-click="false" >
<el-dropdown @command="tenderDatehandleCommand" class="el-dropdown-land" trigger="click" ref="tenderDateShowPopper" :hide-on-click="false" >
<span class="el-dropdown-link" :class="tenderDateValue ? 'color_text' : ''" >开标时间{{ tenderDateValue ? " 1项" : ""}}<i class="el-icon-caret-bottom"></i>
</span>
......@@ -134,24 +134,24 @@
<p class="list-titel">
<router-link :to="'/radar/BidRecord/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName"></router-link>
</p>
<div class="content-label">
<div class="content-label" v-if="item.domicile">
<span class="list-label list-label-zb" v-if="item.domicile">
{{item.domicile}}
</span>
</div>
<div class="list-content">
<div class="list-content" v-if="item.tenderTime||item.source||item.punishDate">
<p class="list-content-text">
<p class="list-content-text" v-if="item.tenderTime">
<span>开标时间：</span>
<span>{{item.tenderTime||'--'}}</span>
</p>
<p class="list-content-text">
<p class="list-content-text" v-if="item.punishDate">
<span>发布时间：</span>
<span>{{item.punishDate||'--'}}</span>
</p>
<p class="list-content-text">
<p class="list-content-text" v-if="item.source">
<span>来源网站：</span>
<span>{{item.source||'--'}}</span>
</p>
......
dsk-operate-ui/src/views/radar/components/Bidding/index.vue
View file @ 29918822
......@@ -12,7 +12,7 @@
<div class="label">招标单位</div>
<div class="content_right">
<el-input class="ename_input"
placeholder="请输入招标单位关键字" v-model="jskBidPlanDto.tenderee" ></el-input>
placeholder="请输入招标采购单位关键字" v-model="jskBidPlanDto.tenderee" ></el-input>
</div>
</div>
<div class="content_item">
......@@ -73,7 +73,7 @@
</div>
<el-dropdown @command="planTenderAmounthandleCommand" class="el-dropdown-land" trigger="click" ref="planTenderAmountShowPopper" :hide-on-click="false">
<span class="el-dropdown-link" :class="jskBidPlanDto.startPlanTenderAmount ||jskBidPlanDto.endPlanTenderAmount ? 'color_text': ''">
成交金额{{jskBidPlanDto.startPlanTenderAmount ||jskBidPlanDto.endPlanTenderAmount? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
合同预估金额{{jskBidPlanDto.startPlanTenderAmount ||jskBidPlanDto.endPlanTenderAmount? " 1项": ""}}<i class="el-icon-caret-bottom"></i>
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="(item, i) in planTenderAmount" :class="jskBidPlanDto.startPlanTenderAmount == item.value[0] &&jskBidPlanDto.endPlanTenderAmount == item.value[1] &&
......@@ -155,46 +155,55 @@
<router-link :to="'/radar/Bidding/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link>
<!-- <div v-else-if="item.projectName" v-html="item.projectName"></div> -->
</p>
<div class="content-label">
<span class="list-label" v-if="item.projectType">{{item.projectType}}</span>
<div class="content-label" v-if="(item.province||item.city||item.city)||(item.projectType&&item.projectType!='其他'&&item.projectType!='空白')||(item.objectType&&item.objectType!='其他'&&item.objectType!='空白')">
<span class="list-label" v-if="item.domicile">
{{item.province}}
<template v-if="item.city">
-{{item.city}}
</template>
<template v-if="item.city">
-{{item.city}}
</template>
</span>
<span class="list-label list-label-wl" v-if="item.objectType">{{item.objectType}}</span>
<span class="list-label list-label-lx" v-if="item.projectType">{{item.projectType}}</span>
</div>
<div class="list-content">
<p class="list-content-text">
<div class="list-content" v-if="item.tenderee||item.planTenderAmount||item.projectCapitalSource">
<p class="list-content-text" v-if="item.tenderee">
<span>招采单位：</span>
<router-link v-if="item.tendereeId" :to="'/company/' + encodeStr(item.tendereeId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.tenderee"></router-link>
<span v-else>{{item.tenderee||'--'}}</span>
</p>
<p class="list-content-text">
<p class="list-content-text" v-if="item.planTenderAmount">
<span>合同预估金额（万元）：</span>
<span>{{item.planTenderAmount||'--'}}</span>
</p>
<p class="list-content-text">
<p class="list-content-text" v-if="item.projectCapitalSource">
<span>资金来源：</span>
<span>{{item.projectCapitalSource||'--'}}</span>
</p>
</div>
<div class="list-content">
<p class="list-content-text">
<div class="list-content" v-if="item.issueTime||item.planTenderDateStart||item.sourceName">
<p class="list-content-text" v-if="item.issueTime">
<span>发布时间：</span>
<span >{{item.issueTimestamp||'--'}}</span>
<span >{{item.issueTime||'--'}}</span>
</p>
<p class="list-content-text">
<p class="list-content-text" v-if="item.planTenderDateStart">
<span>预计招标时间：</span>
<span>{{item.planTenderDateStart||'--'}}</span>
</p>
<p class="list-content-text">
<p class="list-content-text" v-if="item.sourceName">
<span>来源网站：</span>
<span >{{item.sourceName||'--'}}</span>
</p>
</div>
<div class="list-content list-addree">
<div class="list-content list-addree" v-if="item.projectScale">
<p class="list-content-text">
<span class="content-text-gc">工程规模：</span>
<span class="content-text-p">{{item.projectScale||'--'}}</span>
......@@ -789,7 +798,7 @@ export default {
width: auto;
background: #F3F4F5;
display: inline-flex;
margin-top: 7px;
margin-top: 12px;
.list-content-text{
margin-top: 0px;
span{
......
dsk-operate-ui/src/views/radar/components/Establishment/index.vue
View file @ 29918822
......@@ -190,52 +190,55 @@
<p class="list-titel">
<router-link :to="'/radar/Establishment/details/'+ item.id" tag="a" class="list-titel-a" v-html="item.projectName" ></router-link>
</p>
<div class="content-label" v-if="item.domicile||item.projectType&&item.projectType!='其他'&&item.projectType!='空白'||item.industry&&item.industry!='其他'&&item.industry!='空白'">
<span class="list-label " v-if="item.projectType&&item.projectType!='其他'&&item.projectType!='空白'">
{{item.projectType}}
</span>
<span class="list-label list-label-wl" v-if="item.industry&&item.industry!='其他'&&item.industry!='空白'">
{{item.industry}}
</span>
<span class="list-label list-label-lx" v-if="item.domicile">
{{item.domicile}}
</span>
</div>
<div class="list-content">
<p class="list-content-text"v-if="item.companyName">
<span>建设/申请单位：</span>
<span class="blue">{{item.companyName}}</span>
<p class="list-content-text" v-if="item.companyName">
<span>项目业主：</span>
<router-link :to="`/company/${encodeStr(item.companyId)}/`" tag="a" class="list-titel-a blue" v-html="item.companyName" ></router-link>
</p>
<p class="list-content-text"v-if="item.handleTime">
<span>发布日期：</span>
<span>{{item.handleTime}}</span>
<p class="list-content-text"v-if="item.money">
<span>总投资：</span>
<span v-html="item.money+'万元'"></span>
</p>
<p class="list-content-text"v-if="item.examineStatus">
<span>办件结果：</span>
<span>{{item.examineStatus}}</span>
<p class="list-content-text"v-if="item.planStartTime">
<span>计划开工日期：</span>
<span>{{item.planStartTime}}</span>
</p>
<p class="list-content-text"v-if="item.industry">
<span>行业分类：</span>
<span>{{item.industry}}</span>
<p class="list-content-text"v-if="item.planEndTime">
<span>计划完工日期：</span>
<span>{{item.planEndTime}}</span>
</p>
<p class="list-content-text"v-if="item.buildNature">
<span>建设性质：</span>
<span>{{item.buildNature}}</span>
<p class="list-content-text"v-if="item.isProject!=null">
<span>是否为民间推介项目：</span>
<span>{{item.isProject==0?'否':'是'}}</span>
</p>
</div>
<div class="list-content list-addree">
<template v-if="item.province||item.city||item.district">
<img src="@/assets/images/addree.png" alt="">
<p class="list-content-text">
<span>行政区划：</span>
<span >
{{item.province}}
<template v-if="item.city">
-{{item.city}}
</template>
<template v-if="item.district">
-{{item.district}}
</template>
</span>
</p>
</template>
<div class="list-content" v-if="item.buildScale">
<p class="list-content-text" >
<span>建设规模：</span>
<span>{{item.buildScale}}</span>
</p>
</div>
</li>
</ul>
<div class="pagination clearfix" v-show="total>0">
......@@ -557,8 +560,8 @@
methods: {
searchDic(){
api.searchDic().then(res=>{
this.projectTypeOptions = res.data.projectType;
this.industryOptions = res.data.establishmentIndustry
this.projectTypeOptions = res.projectType;
this.industryOptions = res.establishmentIndustry
}).catch(error=>{
});
......@@ -1260,7 +1263,7 @@
}
}
.content-label{
margin-top: 7px;
margin-top: 12px;
.list-label{
background: #F3F3FF;
color: #8491E8;
......@@ -1270,11 +1273,20 @@
font-size: 12px;
}
.list-label-wl{
background: #e8f7f0;
color: #38c8bf;
}
.list-label-lx{
background: #e4f3fd;
color: #41a1fd;
}
}
.list-content{
margin-top: 3px;
margin-top: 8px;
display: flex;
justify-content: start;
align-items: center;
......
dsk-operate-ui/src/views/radar/components/Tender/index.vue
View file @ 29918822
......@@ -208,12 +208,12 @@
<p class="list-content-text" v-if="item.companyName">
<span>招采单位：</span>
<router-link v-if="item.jskEid" :to="'/company/' + encodeStr(item.jskEid) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.companyName"></router-link>
<span v-else class="blue">{{item.companyName||'--'}}</span>
<span v-else class="blue" v-html="item.companyName"></span>
</p>
<p class="list-content-text" v-if="item.agency">
<span>代理单位：</span>
<router-link v-if="item.agencyId" :to="'/company/' + encodeStr(item.agencyId) + '/?index=true'" tag="a" class="list-titel-a blue" v-html="item.agency"></router-link>
<span v-else class="blue">{{item.agency||'--'}}</span>
<span v-else class="blue" v-html="item.agency"></span>
</p>
</div>
......@@ -222,9 +222,16 @@
<span>预算金款：</span>
<span>{{item.bidMoney||'--'}}万元</span>
</p>
<p class="list-content-text" v-if="item.contact">
<p class="list-content-text" v-if="item.contactTel || item.agencyContactTel">
<span>联系方式：</span>
<span >招采单位{{item.contact}}{{item.contactTel}} </span>
<span >
<template v-if="item.contactTel">
招采单位 {{ item.contact }} {{ item.contactTel}}{{item.contactTel && item.agencyContactTel ? ";" : ""}}
</template>
<template v-if="item.agencyContactTel">
代理单位 {{ item.agencyContact }} {{ item.agencyContactTel }}
</template>
</span>
</p>
</div>
......@@ -716,8 +723,8 @@
methods: {
searchDic(){
api.searchDic().then(res=>{
this.projectTypeOptions = res.data.projectType;
this.subjectMatterOptions = res.data.subjectMatter
this.projectTypeOptions = res.projectType;
this.subjectMatterOptions = res.subjectMatter
}).catch(error=>{
});
......
dsk-operate-ui/src/views/system/user/profile/userAvatar.vue
View file @ 29918822
<template>
<div>
<div class="user-info-head" @click="editCropper()"><img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" /></div>
<div class="user-info-head" @click="editCropper()">
<img v-bind:src="options.img" title="点击上传头像" class="img-circle img-lg" v-if="options.img" />
<span v-else class="userInfo-avatar" v-else>{{ options.name&&options.name.slice(0, 1).toUpperCase() }}</span>
</div>
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="modalOpened" @close="closeDialog">
<el-row>
<el-col :xs="24" :md="12" :style="{height: '350px'}">
......@@ -75,6 +78,7 @@ export default {
// 弹出层标题
title: "修改头像",
options: {
name: store.getters.name, //用户名称
img: store.getters.avatar, //裁剪图片的地址
autoCrop: true, // 是否默认生成截图框
autoCropWidth: 200, // 默认生成截图框宽度
......@@ -89,7 +93,7 @@ export default {
methods: {
// 编辑头像
editCropper() {
this.open = true;
// this.open = true;
},
// 打开弹出层结束时的回调
modalOpened() {
......@@ -167,7 +171,7 @@ export default {
height: 120px;
}
.user-info-head:hover:after {
/*.user-info-head:hover:after {
content: '+';
position: absolute;
left: 0;
......@@ -183,5 +187,5 @@ export default {
cursor: pointer;
line-height: 110px;
border-radius: 50%;
}
}*/
</style>
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