Skip to content

D
dsk-operate-sys-cscec
Commit ef02fe46 authored by liuChang's avatar liuChang
Browse files
Options

Merge branch 'V20231129-中建一局二公司' of 192.168.60.201:root/dsk-operate-sys into V20231129-中建一局二公司

parents a060c43a 4be6ff2a
Hide whitespace changes
Inline Side-by-side
Showing with 133 additions and 45 deletions
dsk-operate-ui/.env.development
View file @ ef02fe46
......@@ -12,8 +12,8 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = true
# 子系统地址
# VUE_APP_SUB_SYSTEM_ADDRESS = "https://pre-plug.jiansheku.com"
VUE_APP_SUB_SYSTEM_ADDRESS = "http://192.168.60.210:3400"
VUE_APP_SUB_SYSTEM_ADDRESS = "https://pre-plug.jiansheku.com"
# VUE_APP_SUB_SYSTEM_ADDRESS = "http://192.168.60.210:3400"
# Bi大屏系统地址
VUE_APP_BI_SYSTEM_ADDRESS = "https://192.168.60.104:8001"
dsk-operate-ui/src/views/bigDataSearch/advisoryOrgan.vue
View file @ ef02fe46
......@@ -25,8 +25,8 @@ export default {
navigation: { isFixed: true, fixedHeight: 56, totalHeight: 68 }, // iframe之外页面顶部对象，ifFixed:是否浮动；fixedHeight：浮动对象高度；totalHeight：顶部整体高度
src: '', //iframe嵌套页面地址
// domain: 'https://plug.jiansheku.com', // 插件地址
// domain: 'https://pre-plug.jiansheku.com', // 插件地址测试
domain: 'http://192.168.60.210:3400',
domain: 'https://pre-plug.jiansheku.com', // 插件地址测试
// domain: 'http://192.168.60.210:3400',
ak: 'aec7b3ff2y2q8x6t49a7e2c463ce21912', // 需要携带的sdkId
timelongs: 7200,//刷新token时间
tokentimer: null,
......
dsk-operate-ui/src/views/detail/party-a/credit/credit.vue
View file @ ef02fe46
......@@ -108,19 +108,19 @@
{ name: '评价年度', prop: 'apprYear', style: true},
],
defaultList3: [
{ name: '失信被执行人姓名/名称', prop: 'projectName'},
{ name: '身份证号码/组织机构代码', prop: 'areaName' },
{ name: '执行法院', prop: 'projectAddress' },
{ name: '立案时间', prop: 'status' },
{ name: '案号', prop: 'projectType1' },
{ name: '做出执行依据单位', prop: 'registCapi' },
{ name: '生效法律文书确定的义务', prop: 'actualCapi'},
{ name: '被执行人的履行情况', prop: 'checkDate' },
{ name: '失信被执行人行为具体情形', prop: 'orgNo' },
{ name: '发布时间', prop: 'designOrgName' },
{ name: '已履行部分', prop: 'creditNo' },
{ name: '未履行部分', prop: 'supervisorOrgName' },
{ name: '数据来源', prop: 'scope', style: true},
{ name: '失信被执行人姓名/名称', prop: 'iname'},
{ name: '身份证号码/组织机构代码', prop: 'cardnumber' },
{ name: '执行法院', prop: 'court_name' },
{ name: '立案时间', prop: 'reg_date' },
{ name: '案号', prop: 'case_code' },
{ name: '做出执行依据单位', prop: 'gist_unit' },
{ name: '生效法律文书确定的义务', prop: 'duty'},
{ name: '被执行人的履行情况', prop: 'performance' },
{ name: '失信被执行人行为具体情形', prop: 'disreput_type_name' },
{ name: '发布时间', prop: 'publish_date' },
{ name: '已履行部分', prop: 'performed_part' },
{ name: '未履行部分', prop: 'unperform_part' },
{ name: '数据来源', prop: 'dataSource', style: true},
],
defaultList4: [
{ name: '案号', prop: 'caseNo'},
......@@ -181,8 +181,8 @@
},
async getSelectChinaYzsxztmdPage(){
let params = {
// cid: this.companyId,
cid: 6109993,
cid: this.companyId,
// cid: 6109993,
};
let res = await selectChinaYzsxztmdPage(params);
if (res.code == 200) {
......@@ -192,8 +192,8 @@
},
async getSelectChinaJyycPage(){
let params = {
// cid: this.companyId,
cid: 6109993,
cid: this.companyId,
// cid: 6109993,
};
let res = await selectChinaJyycPage(params);
if (res.code == 200) {
......
dsk-operate-ui/src/views/monitoring/EnterpriseMonitoring.vue
View file @ ef02fe46
......@@ -79,7 +79,8 @@
<skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
<div class="empty" v-if="tableDataTotal === 0 && !isSkeleton">
<img class="img" src="@/assets/images/project/empty.png">
<div class="p1">您还未添加监控企业</div>
<div class="p1" v-if="radio === null">您还未添加监控企业</div>
<div class="p1" v-else>暂无风险动态</div>
<!--<div class="p2">建议调整关键词或筛选条件，重新搜索</div>-->
<div class="empty-btn">
<span class="add" @click="addEnterprise">添加企业</span>
......
dsk-operate-ui/src/views/monitoring/MonitorSettings.vue
View file @ ef02fe46
......@@ -31,7 +31,7 @@
<span :class="{ color_text: jyfx.length }">经营风险{{jyfx.length > 0 ? jyfx.length:''}}<i class="el-icon-caret-bottom"></i></span>
<el-select ref="tenderTypeSelect" v-model="jyfx" class="select-multiple" collapse-tags multiple placeholder="请选择">
<el-checkbox-group v-model="jyfx">
<el-option v-for="(i,index) in selectList1" :key="index" :label="i.dimensionName" @change="handleSelect2" :value="i.dimensionName">
<el-option v-for="(i,index) in selectList2" :key="index" :label="i.dimensionName" @change="handleSelect2" :value="i.dimensionName">
<el-checkbox style="width: 100%;" :label="i.dimensionName" @change="changeJyfx(i)">{{i.dimensionName}}</el-checkbox>
</el-option>
</el-checkbox-group>
......@@ -105,6 +105,7 @@
return {
selectList:[],
selectList1:[],
selectList2:[],
arr:[],
sffx:[],
gsfx:[],
......@@ -134,6 +135,9 @@
if(res.data[i].dimensionName === '工商风险'){
this.selectList1=res.data[i].children
}
if(res.data[i].dimensionName === '经营风险'){
this.selectList2=res.data[i].children
}
}
rulesDetail({}).then(res => {
console.log(res)
......
dsk-operate-ui/src/views/supplier/supplierOverview/index.vue
View file @ ef02fe46
......@@ -61,7 +61,8 @@
<div class="cont_title">
风险类型分布
<div class="select">
<el-select v-model="value1" filterable class="form-content-width same-select-com" placeholder="供应商类型" :class="[`select-adaptive-${inputID1}`]" :popper-append-to-body='false'>
<el-select v-model="value1" filterable class="form-content-width same-select-com" placeholder="供应商类型" @change="iptAdaptive(inputID1,'','fxfb')"
:class="[`select-adaptive-${inputID1}`]" :popper-append-to-body='false'>
<el-option v-for="(item, index) in gyslxList" :key="index" :label="item.label" :value="item.value" />
</el-select>
<custom-time-select :timeList="timeList" v-model="time" :class="[`select-adaptive-${inputID}`]" timeValue=""
......@@ -96,8 +97,9 @@
<div class="cont_title">
风险类型趋势
<div class="select">
<el-select v-model="value2" filterable class="form-content-width same-select-com" placeholder="供应商类型" :class="[`select-adaptive-${inputID1}`]" :popper-append-to-body='false'>
<el-option v-for="(item, index) in gyslxList" :key="index" :label="item.label" :value="item.value" />
<el-select v-model="value2" filterable class="form-content-width same-select-com" placeholder="供应商类型" @change="iptAdaptive(inputID1,'','fxlxqs')"
:class="[`select-adaptive-${inputID1}`]" :popper-append-to-body='false'>
<el-option v-for="(item, index) in fxlxList" :key="index" :label="item.label" :value="item.value" />
</el-select>
<!--<el-select v-model="value3" filterable class="form-content-width same-select-com" placeholder="展示方式" :class="[`select-adaptive-${inputID1}`]" :popper-append-to-body='false'>-->
<!--<el-option v-for="(item, index) in gyslxList" :key="index" :label="item.label" :value="item.value" />-->
......@@ -132,11 +134,12 @@
<div class="cont_title">
供应商风险列表
<div class="select">
<el-select v-model="value4" filterable class="form-content-width same-select-com" placeholder="供应商类型" :class="[`select-adaptive-${inputID1}`]" :popper-append-to-body='false'>
<el-select v-model="value4" filterable class="form-content-width same-select-com" placeholder="供应商类型"
@change="iptAdaptive(inputID1,'','gysfx')" :class="[`select-adaptive-${inputID1}`]" :popper-append-to-body='false'>
<el-option v-for="(item, index) in gyslxList" :key="index" :label="item.label" :value="item.value" />
</el-select>
<custom-time-select :timeList="timeList" v-model="time1" :class="[`select-adaptive-${inputID}`]" timeValue=""
placeholder="动态时间" @handle-search="iptAdaptive(inputID,'','changeSelect')" />
placeholder="动态时间" @handle-search="iptAdaptive(inputID,'','gysfx')" />
</div>
</div>
</div>
......@@ -155,7 +158,14 @@
<span>{{ pageIndex * pageSize - pageSize + scope.$index + 1 }}</span>
</template>
</el-table-column>
<el-table-column label="供应商名称" min-width="350" prop="customerName"></el-table-column>
<el-table-column label="供应商名称" min-width="350" prop="customerName">
<template slot-scope="scope">
<div v-if="scope.row.companyId">
<router-link :to="`/monitoring/MonitoringReportDetails/${scope.row.companyId}`" tag="a" class="a-link companyName">{{scope.row.customerName}}</router-link>
</div>
<div v-else>{{scope.row.companyName}}</div>
</template>
</el-table-column>
<el-table-column label="风险总数" prop="riskTotal">
<template slot-scope="scope">
<span v-if="scope.row.riskTotal > 0" style="color:red;">{{scope.row.riskTotal}}</span>
......@@ -503,10 +513,6 @@
label:'专业分包',
value:'专业分包'
},
{
label:'专业服务',
value:'专业服务'
},
{
label:'物资设备',
value:'分供'
......@@ -520,6 +526,20 @@
value:'劳务分包队伍'
},
],
fxlxList:[
{
label:'司法风险',
value:'司法风险'
},
{
label:'经营风险',
value:'经营风险'
},
{
label:'工商风险',
value:'工商风险'
},
],
value1:'',
value2:'',
value3:'',
......@@ -840,14 +860,23 @@
})
},
getRiskType(){
const today = new Date();
const yesterday = new Date(today);
yesterday.setDate(yesterday.getDate() - 1);
const year = yesterday.getFullYear();
const month = ('0' + (yesterday.getMonth() + 1)).slice(-2); // 月份是从0开始的
const day = ('0' + yesterday.getDate()).slice(-2);
console.log(`${year}-${month}-${day}`)
let params={
"beginTime": "2024-04-01",
"endTime": "2024-05-01"
"beginTime": `${year}-${month}-${day}`,
"endTime": `${year}-${month}-${day}`
}
if(this.time.length > 1){
params.beginTime=this.time[0]
params.endTime=this.time[1]
}
// if(this.time.length > 1){
// params.beginTime=this.time[0]
// params.endTime=this.time[1]
// }
riskType(params).then(res => {
if(res.code === 200){
this.fxList=res.data
......@@ -880,14 +909,18 @@
pageNum:this.pageIndex,
pageSize:this.pageSize,
province:[],
times:[]
}
if(this.value4){
params.customerClass=this.value4
params.customerClass.push(this.value4)
}else {
params.customerClass=[]
}
if(this.time.length > 1){
if(this.time1.length > 1){
params.approveDateBegion=this.time1[0]
params.approveDateEnd=this.time1[1]
}else {
params.approveDateBegion = ''
params.approveDateEnd = ''
}
searchList(params).then(res => {
if(res.code === 200){
......@@ -915,7 +948,14 @@
},
handleSearch(name){
if(name === 'fxfb'){
this.getRiskType()
}
if(name === 'fxlxqs'){
this.getRiskChange();
}
if(name === 'gysfx'){
this.pageIndex = 1
this.getSearchList();
}
},
initChart(data) {
......@@ -1535,8 +1575,51 @@
}
},
async multipleAdaptiveHandle(){
async multipleAdaptiveHandle(uid, name){
try {
await this.$nextTick();
const dom = document.querySelector(`.select-adaptive-${uid}`);
const iptChild = dom.querySelector(".el-input__inner");
if (dom) {
const textContainer = document.createElement("span");
const textName = `text-${uid}`;
textContainer.classList.add(textName);
const selectChildren = dom.querySelectorAll(".el-tag");
if (selectChildren.length) {
let width = 0;
selectChildren.forEach(item => {
const text = item.textContent;
const itemInfo = window.getComputedStyle(item);
textContainer.style.setProperty("visibility", "hidden");
textContainer.style.setProperty("display", "inline-block");
textContainer.style.setProperty("font-size", "14px");
textContainer.style.setProperty("padding", itemInfo.padding);
textContainer.style.setProperty("box-sizing", "border-box");
textContainer.textContent = text;
document.body.append(textContainer);
width += textContainer.offsetWidth + parseInt(itemInfo.marginLeft) + parseInt(itemInfo.marginRight);
textContainer.remove();
});
dom.style.setProperty("width", `${width + 50}px`);
this.handleSearch(name);
return;
}
textContainer.style.setProperty("visibility", "hidden");
textContainer.style.setProperty("display", "inline-block");
textContainer.style.setProperty("font-size", "14px");
textContainer.style.setProperty("padding", "0px 8px");
textContainer.style.setProperty("box-sizing", "border-box");
textContainer.textContent = iptChild.getAttribute("placeholder");
document.body.append(textContainer);
let containerWidth = textContainer.offsetWidth + 30;
textContainer.remove();
dom.style.setProperty("width", `${containerWidth}px`);
this.handleSearch(name);
}
} catch (error) {
console.log(error);
}
},
}
}
......@@ -1554,7 +1637,7 @@
display: flex;
}
.custom-time-select1 {
width: 110px !important;
width: 110px;
::v-deep .el-input__inner{
border: 0;
&::placeholder {
......
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