Skip to content

D
dsk-operate-sys-cscec
Commit 3ff5b65c authored by danfuman's avatar danfuman
Browse files
Options

修改

parent 09dffec8
Hide whitespace changes
Inline Side-by-side
Showing with 227 additions and 153 deletions
dsk-operate-ui/src/api/monitoring/monitoring.js
View file @ 3ff5b65c
...@@ -42,6 +42,14 @@ export function companyAdd(data) { ...@@ -42,6 +42,14 @@ export function companyAdd(data) {
data: data data: data
}) })
} }
// 获取监控推荐企业
export function queryMonitorCompany(data) {
return request({
url: '/monitor/system/queryMonitorCompany',
method: 'post',
data: data
})
}
// 取消监控企业 // 取消监控企业
export function companyCancel(data) { export function companyCancel(data) {
return request({ return request({
......
dsk-operate-ui/src/views/monitoring/EnterpriseMonitoring.vue
View file @ 3ff5b65c
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<el-button type="primary" @click="handleConfirm">确定取消</el-button> <el-button type="primary" @click="handleConfirm">确定取消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="qyVisible" custom-class='dialog-claim' title="添加监控企业" width="480px" > <el-dialog :visible.sync="qyVisible" custom-class='dialog-claim dialogAdd' title="添加监控企业" width="480px" >
<div class="add-content"> <div class="add-content">
<div class="enterprise"> <div class="enterprise">
<div class="label">企业名称</div> <div class="label">企业名称</div>
...@@ -83,31 +83,24 @@ ...@@ -83,31 +83,24 @@
<el-button slot="append" @click="handleKeyword()">搜索</el-button> <el-button slot="append" @click="handleKeyword()">搜索</el-button>
</el-input> </el-input>
</div> </div>
<div class="companyList" v-if="dataList.length > 0"> <div class="companyList">
<div class="list"> <div class="list">
<div class="item" v-for="item in dataList"> <div class="item" v-for="item in dataList">
<div class="item-left"> <div class="item-left">
<img v-if="item.logoUrl" :src="item.logoUrl" :alt="item.name.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" /> <img v-if="item.logoUrl" :src="item.logoUrl" :alt="item.companyName.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" />
<img v-else src="@/assets/images/enterprise.png" :alt="item.name.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" /> <img v-else src="@/assets/images/enterprise.png" :alt="item.companyName.replace(/<font color='#FF204E'>/g,'').replace(/<\/font>/g,'')" />
</div> </div>
<div class="item-right"> <div class="item-right">
<p class="right-title" v-html="item.name"></p> <p class="right-title" v-html="item.companyName"></p>
<p class="right-tips">推荐监控</p> <p class="right-tips">推荐监控</p>
</div> </div>
<el-checkbox @change="changeCheckbox(item)"></el-checkbox> <el-checkbox @change="changeCheckbox(item)"></el-checkbox>
</div> </div>
</div> </div>
<p class="tips">前往企业查询寻找企业线索<i class="el-icon-arrow-right"></i></p>
<div class="btn">
<div>
<el-button @click="qyVisible===false">取消</el-button>
<el-button type="primary" @click="handleAdd">确定</el-button>
</div>
</div>
</div> </div>
</div> </div>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button>取消</el-button> <el-button @click="qyVisible=false">取消</el-button>
<el-button type="primary" @click="handleAdd">确定</el-button> <el-button type="primary" @click="handleAdd">确定</el-button>
</div> </div>
</el-dialog> </el-dialog>
...@@ -141,7 +134,7 @@ ...@@ -141,7 +134,7 @@
</template> </template>
<script> <script>
import { companyPage,companyList,companyAdd,companyCancel } from '@/api/monitoring/monitoring' import { companyPage,companyList,companyAdd,companyCancel,queryMonitorCompany } from '@/api/monitoring/monitoring'
import { getToken } from '@/utils/auth' import { getToken } from '@/utils/auth'
export default { export default {
name: 'EnterpriseMonitoring', name: 'EnterpriseMonitoring',
...@@ -150,6 +143,10 @@ ...@@ -150,6 +143,10 @@
radio:null, radio:null,
date:[], date:[],
radioList:[ radioList:[
{
type:null,
label:'全部'
},
{ {
type:1, type:1,
label:'今天' label:'今天'
...@@ -210,17 +207,7 @@ ...@@ -210,17 +207,7 @@
}) })
}, },
handleKeyword(){ handleKeyword(){
let data={ this.addEnterprise()
keyword:this.companyName,
page:{
"page": 1,
"limit": 50,
}
}
companyList(data).then(res => {
console.log(res.data.list)
this.dataList=res.data.list
})
}, },
changeCheckbox(item){ changeCheckbox(item){
console.log(item) console.log(item)
...@@ -239,6 +226,7 @@ ...@@ -239,6 +226,7 @@
this.$modal.success("新增成功"); this.$modal.success("新增成功");
this.querySubmit() this.querySubmit()
}) })
}, },
radioBtn(val){ radioBtn(val){
let endTime = new Date() let endTime = new Date()
...@@ -272,6 +260,9 @@ ...@@ -272,6 +260,9 @@
this.date=[] this.date=[]
break; break;
default: default:
this.queryParams.condition.beginTime =''
this.queryParams.condition.endTime =''
this.querySubmit()
break; break;
} }
}, },
...@@ -304,6 +295,16 @@ ...@@ -304,6 +295,16 @@
}, },
addEnterprise(){ addEnterprise(){
this.qyVisible=true; this.qyVisible=true;
let data={
pageNum:1,
pageSize:10
}
if (this.companyName){
data.companyName=this.companyName;
}
queryMonitorCompany(data).then(res => {
this.dataList=res.rows;
})
}, },
handleBatch(){ handleBatch(){
this.pldrVisible=true; this.pldrVisible=true;
...@@ -430,6 +431,68 @@ ...@@ -430,6 +431,68 @@
} }
} }
} }
::v-deep .dialogAdd{
.el-dialog__body{
padding: 24px 0 !important;
.companyList{
width: 100%;
margin-top: 5px;
background: #FFFFFF;
.list{
max-height:280px;
overflow: auto;
border-top: 1px solid #EEEEEE;
}
.item{
display: flex;
padding: 10px 16px 6px 16px;
position: relative;
border-bottom: 1px solid #EEEEEE;
.item-left{
margin-right: 12px;
img{
width: 40px;
height: 40px;
}
}
.item-right{
width: 360px;
margin-right: 10px;
p{
margin: 0;
padding: 0;
}
.right-title{
font-size: 14px;
color: #232323;
}
.right-tips{
color: rgba(35,35,35,0.4);
font-size: 12px;
}
}
}
.item:last-child{
border-bottom:0;
}
.tips{
border-top: 1px solid #EEEEEE;
border-bottom: 1px solid #EEEEEE;
height: 40px;
line-height: 40px;
color: #0081FF;
font-size: 12px;
padding: 0 0 0 12px;
margin: 0;
}
}
}
.el-dialog__footer{
border-top: 1px solid #EEEEEE;
}
}
::v-deep .dialog-claim{ ::v-deep .dialog-claim{
margin:0 !important; margin:0 !important;
position:absolute; position:absolute;
...@@ -472,8 +535,9 @@ ...@@ -472,8 +535,9 @@
} }
} }
.add-content{ .add-content{
height: 200px; height: 300px;
.enterprise{ .enterprise{
margin: 0 20px 10px;
display: -webkit-box; display: -webkit-box;
align-items: flex-start; align-items: flex-start;
line-height: 32px; line-height: 32px;
...@@ -495,58 +559,6 @@ ...@@ -495,58 +559,6 @@
color: #0081FF; color: #0081FF;
} }
} }
.companyList{
width: 372px;
margin-left: 68px;
margin-top: 5px;
background: #FFFFFF;
box-shadow: 0px 4px 8px 2px rgba(0,0,0,0.04), 0px 2px 6px 0px rgba(0,0,0,0.06), 0px 0px 4px 0px rgba(0,0,0,0.08);
border-radius: 4px;
position: absolute;
.list{
max-height:372px;
overflow: auto;
}
.item{
display: flex;
margin: 0 16px;
padding: 14px 0 10px 0;
position: relative;
border-bottom: 1px solid #EEEEEE;
.item-left{
margin-right: 12px;
img{
width: 40px;
height: 40px;
}
}
.item-right{
width: 250px;
p{
margin: 0;
padding: 0;
}
}
}
.item:last-child{
border-bottom: 0;
}
.tips{
border-top: 1px solid #EEEEEE;
border-bottom: 1px solid #EEEEEE;
height: 40px;
line-height: 40px;
color: #0081FF;
font-size: 12px;
padding: 0 0 0 12px;
margin: 0;
}
.btn{
padding: 16px 20px 24px 0;
display: block;
text-align: right;
}
}
} }
} }
.dialog-footer{ .dialog-footer{
......
dsk-operate-ui/src/views/monitoring/MonitorSettings.vue
View file @ 3ff5b65c
...@@ -9,18 +9,22 @@ ...@@ -9,18 +9,22 @@
<div class="main-right"> <div class="main-right">
<div class="select-popper"> <div class="select-popper">
<span :class="{ color_text: sffx.length }">司法风险{{sffx.length > 0 ? sffx.length:''}}<i class="el-icon-caret-bottom"></i></span> <span :class="{ color_text: sffx.length }">司法风险{{sffx.length > 0 ? sffx.length:''}}<i class="el-icon-caret-bottom"></i></span>
<el-select ref="tenderTypeSelect" v-model="sffx" class="select-multiple" collapse-tags @change="handleSelect" multiple placeholder="请选择"> <el-select ref="tenderTypeSelect" v-model="sffx" class="select-multiple" collapse-tags multiple @change="handleSelect" placeholder="请选择">
<el-option v-for="(i,index) in selectList" :key="index" :label="i.dimensionName" :value="i.dimensionName"> <el-checkbox-group v-model="sffx">
<el-checkbox style="width: 100%;" :label="i.dimensionName" @change="changeSffx(i)">{{i.dimensionName}}</el-checkbox> <el-option v-for="(i,index) in selectList" :key="index" :label="i.dimensionName" :value="i.dimensionName">
</el-option> <el-checkbox style="width: 100%;" :label="i.dimensionName" @change="changeSffx(i)">{{i.dimensionName}}</el-checkbox>
</el-option>
</el-checkbox-group>
</el-select> </el-select>
</div> </div>
<div class="select-popper"> <div class="select-popper">
<span :class="{ color_text: gsfx.length }">工商风险{{gsfx.length > 0 ? gsfx.length:''}}<i class="el-icon-caret-bottom"></i></span> <span :class="{ color_text: gsfx.length }">工商风险{{gsfx.length > 0 ? gsfx.length:''}}<i class="el-icon-caret-bottom"></i></span>
<el-select ref="tenderTypeSelect" v-model="gsfx" class="select-multiple" collapse-tags @change="handleSelect" multiple placeholder="请选择"> <el-select ref="tenderTypeSelect" v-model="gsfx" class="select-multiple" collapse-tags multiple placeholder="请选择">
<el-option v-for="(i,index) in selectList1" :key="index" :label="i.dimensionName" :value="i.dimensionName"> <el-checkbox-group v-model="gsfx">
<el-checkbox style="width: 100%;" :label="i.dimensionName" @change="changeGsfx(i)">{{i.dimensionName}}</el-checkbox> <el-option v-for="(i,index) in selectList1" :key="index" :label="i.dimensionName" @change="handleSelect1" :value="i.dimensionName">
</el-option> <el-checkbox style="width: 100%;" :label="i.dimensionName" @change="changeGsfx(i)">{{i.dimensionName}}</el-checkbox>
</el-option>
</el-checkbox-group>
</el-select> </el-select>
</div> </div>
</div> </div>
...@@ -36,17 +40,29 @@ ...@@ -36,17 +40,29 @@
</div> </div>
<div class="main-item" style="line-height: 32px;"> <div class="main-item" style="line-height: 32px;">
<div class="label">推送时段</div> <div class="label">推送时段</div>
<el-time-picker <el-time-select
is-range placeholder="起始时间"
class="timePicker" v-model="startTime"
v-model="time" @change="startChangeTime"
:picker-options="{ step: '01:00' }" :clearable="false"
@change="changeTime" :picker-options="{
range-separator="至" start: '00:00',
start-placeholder="开始时间" step: '01:00',
end-placeholder="结束时间" end: '22:00'
placeholder="选择时间范围"> }">
</el-time-picker> </el-time-select>
<span style="margin:0 8px;">至</span>
<el-time-select
placeholder="结束时间"
v-model="endTime"
:clearable="false"
:picker-options="{
start: '00:00',
step: '01:00',
end: '23:00',
minTime: startTime
}">
</el-time-select>
</div> </div>
</div> </div>
<div class="m-title">监控接收方式</div> <div class="m-title">监控接收方式</div>
...@@ -79,18 +95,19 @@ ...@@ -79,18 +95,19 @@
return { return {
selectList:[], selectList:[],
selectList1:[], selectList1:[],
arr:[],
sffx:[], sffx:[],
gsfx:[], gsfx:[],
checkFx: true, checkFx: true,
checkJkwd: true, checkJkwd: true,
queryParams:{ queryParams:{
fxType:[],
jkwdType:[],
pushFrequency:'0', pushFrequency:'0',
receiveMode:'0', receiveMode:'0',
phones:'' phones:''
}, },
time:'' startTime: '',
endTime: '',
detail:{}
} }
}, },
created() { created() {
...@@ -98,16 +115,35 @@ ...@@ -98,16 +115,35 @@
this.selectList=res.data; this.selectList=res.data;
for(let i in res.data){ for(let i in res.data){
if(res.data[i].dimensionName === '司法风险'){ if(res.data[i].dimensionName === '司法风险'){
this.selectList=res.data[i].children this.selectList=res.data[i].children;
for(let i=0; i<this.selectList.length; i++){
this.arr.push(this.selectList[i].dimensionName)
}
} }
if(res.data[i].dimensionName === '工商风险'){ if(res.data[i].dimensionName === '工商风险'){
this.selectList1=res.data[i].children this.selectList1=res.data[i].children
} }
} }
rulesDetail({}).then(res => {
console.log(res)
let dimension=res.data.dimension.split(',');
this.queryParams={
pushFrequency:res.data.pushFrequency.toString(),
receiveMode:res.data.receiveMode.toString(),
phones:res.data.phones
}
this.startTime =res.data.timePeriodStart
this.endTime = res.data.timePeriodEnd
for(let item in dimension){
if (this.arr.indexOf(dimension[item]) == -1) {
this.gsfx.push(dimension[item])
} else {
this.sffx.push(dimension[item])
}
}
})
}) })
rulesDetail({}).then(res => {
console.log(res)
})
}, },
methods: { methods: {
changeSffx(val) { changeSffx(val) {
...@@ -125,7 +161,14 @@ ...@@ -125,7 +161,14 @@
} }
}, },
handleSelect(val) { handleSelect(val) {
// console.log(val)
},
handleSelect1(val) {
},
// 开始时间改变
startChangeTime(value){
this.endTime = ""
}, },
handleAdd(){ handleAdd(){
let params={ let params={
...@@ -147,38 +190,20 @@ ...@@ -147,38 +190,20 @@
params.riskType='工商风险' params.riskType='工商风险'
params.dimension=this.gsfx.join() params.dimension=this.gsfx.join()
} }
if(this.time.length > 0){ if(this.startTime){
params.timePeriodStart=this.time[0] params.timePeriodStart=this.startTime
params.timePeriodEnd=this.time[1] }
if(this.endTime){
params.timePeriodEnd=this.endTime
} }
console.log(params) console.log(params)
insertOrUpdate(params).then(res => { insertOrUpdate(params).then(res => {
console.log(res) this.$modal.success(res.msg);
}) })
}, },
changeTime(val){ changeTime(val){
console.log(val) console.log(val)
}, },
checkFx1Btn(val){
console.log(val)
if (val.length > 0) {
this.checkFx = false;
} else if (val.length == 0) {
this.checkFx = true;
}
},
checkJkwdBtn(val) {
this.queryParams.jkwdType = [];
this.checkJkwd = true;
},
checkJkwd1Btn(val){
console.log(val)
if (val.length > 0) {
this.checkJkwd = false;
} else if (val.length == 0) {
this.checkJkwd = true;
}
},
} }
} }
</script> </script>
...@@ -265,9 +290,12 @@ ...@@ -265,9 +290,12 @@
} }
} }
} }
::v-deep .timePicker{ ::v-deep .el-date-editor.el-input{
width: 228px; width: 160px;
height: 32px; height: 32px;
.el-input__inner{
height: 32px;
}
.el-range__icon{ .el-range__icon{
line-height: 27px; line-height: 27px;
} }
......
dsk-operate-ui/src/views/monitoring/MonitoringDynamics.vue
View file @ 3ff5b65c
...@@ -157,9 +157,13 @@ ...@@ -157,9 +157,13 @@
data() { data() {
return { return {
changeTime, changeTime,
radio:1, radio:null,
date:'', date:'',
radioList:[ radioList:[
{
type:null,
label:'全部'
},
{ {
type:1, type:1,
label:'今天' label:'今天'
...@@ -423,6 +427,9 @@ ...@@ -423,6 +427,9 @@
this.date=[] this.date=[]
break; break;
default: default:
this.queryParams.condition.beginTime=''
this.queryParams.condition.endTime=''
this.querySubmit()
break; break;
} }
}, },
......
dsk-operate-ui/src/views/monitoring/MonitoringReport.vue
View file @ 3ff5b65c
...@@ -33,13 +33,13 @@ ...@@ -33,13 +33,13 @@
<span class="right-label">提示：</span> <span class="right-label">提示：</span>
<span class="right-color color1">{{i.promptCount}}</span> <span class="right-color color1">{{i.promptCount}}</span>
<span class="right-label">正向：</span> <span class="right-label">正向：</span>
<span class="right-color color1">{{i.positiveCount}}</span> <span class="right-color color2">{{i.positiveCount}}</span>
<span class="right-label">低风险：</span> <span class="right-label">低风险：</span>
<span class="right-color color1">{{i.lowRiskCount}}</span> <span class="right-color color3">{{i.lowRiskCount}}</span>
<span class="right-label">中风险：</span> <span class="right-label">中风险：</span>
<span class="right-color color1">{{i.middleRiskCount}}</span> <span class="right-color color4">{{i.middleRiskCount}}</span>
<span class="right-label">高风险：</span> <span class="right-label">高风险：</span>
<span class="right-color color1">{{i.highRiskCount}}</span> <span class="right-color color5">{{i.highRiskCount}}</span>
</p> </p>
<div class="tips">新增<span style="color:#0081FF;padding: 0 4px;">{{i.dynamicTotal}}</span>条动态信息</div> <div class="tips">新增<span style="color:#0081FF;padding: 0 4px;">{{i.dynamicTotal}}</span>条动态信息</div>
</div> </div>
......
dsk-operate-ui/src/views/system/supplierBad/index.vue
View file @ 3ff5b65c
...@@ -53,18 +53,31 @@ ...@@ -53,18 +53,31 @@
</div> </div>
<div class="main-item" style="line-height: 32px;"> <div class="main-item" style="line-height: 32px;">
<div class="label">推送时段</div> <div class="label">推送时段</div>
<el-time-picker <el-time-select
is-range placeholder="起始时间"
class="timePicker" v-model="startTime"
v-model="time" @change="startChangeTime"
value-format="HH:mm:ss" :clearable="false"
@change="changeTime" :picker-options="{
range-separator="至" start: '00:00',
start-placeholder="开始时间" step: '01:00',
end-placeholder="结束时间" end: '22:00'
placeholder="选择时间范围"> }">
</el-time-picker> </el-time-select>
<span style="margin:0 8px;">至</span>
<el-time-select
placeholder="结束时间"
v-model="endTime"
:clearable="false"
:picker-options="{
start: '00:00',
step: '01:00',
end: '23:00',
minTime: startTime
}">
</el-time-select>
</div> </div>
<el-button type="primary" @click="handleSave">保存</el-button>
</div> </div>
</div> </div>
<el-dialog :visible.sync="visible" custom-class='dialog-claim' title="新增推送人信息" width="480px" > <el-dialog :visible.sync="visible" custom-class='dialog-claim' title="新增推送人信息" width="480px" >
...@@ -127,7 +140,8 @@ ...@@ -127,7 +140,8 @@
tableData:[], tableData:[],
visible:false, visible:false,
radioTime:'0', radioTime:'0',
time:[], startTime: '',
endTime: '',
tableDataTotal:0, tableDataTotal:0,
pageSize:10, pageSize:10,
pageNum:1, pageNum:1,
...@@ -145,7 +159,9 @@ ...@@ -145,7 +159,9 @@
this.radioTime=response.data.configValue this.radioTime=response.data.configValue
}); });
configKey("customer-badness-time-frame").then(response => { configKey("customer-badness-time-frame").then(response => {
this.time=[this.converTime(response.data.configValue.split('-')[0]),this.converTime(response.data.configValue.split('-')[1])] let times = response.data.configValue.split("-");
this.startTime = times[0].length<2 ?'0'+times[0]+':00':times[0]
this.endTime = times[1].length<2 ?'0'+times[1]+':00':times[1]
}); });
this.getList() this.getList()
}, },
...@@ -178,6 +194,10 @@ ...@@ -178,6 +194,10 @@
} }
this.id=item.id this.id=item.id
}, },
// 开始时间改变
startChangeTime(value){
this.endTime = ""
},
handleAdd(){ handleAdd(){
let params={ let params={
pushTypeCode:'custoemr-badness', pushTypeCode:'custoemr-badness',
...@@ -214,9 +234,8 @@ ...@@ -214,9 +234,8 @@
this.getList() this.getList()
}) })
}, },
changeTime(val){ handleSave(){
console.log(val) let time=this.startTime.substring(0,2)+'-'+this.endTime.substring(0,2)
let time=val[0]+'-'+val[1]
configUpdate({configKey:'customer-badness-time-frame',configValue:time}).then(res => { configUpdate({configKey:'customer-badness-time-frame',configValue:time}).then(res => {
this.$modal.success(res.msg); this.$modal.success(res.msg);
}); });
......
dsk-operate-ui/vue.config.js
View file @ 3ff5b65c
...@@ -38,7 +38,7 @@ module.exports = { ...@@ -38,7 +38,7 @@ module.exports = {
// target: `http://47.104.91.229:9099/prod-api`,//测试-旧 // target: `http://47.104.91.229:9099/prod-api`,//测试-旧
target: `http://111.204.34.146:9099/prod-api`,//测试 target: `http://111.204.34.146:9099/prod-api`,//测试
// target: `http://192.168.60.5:9098`,//陈跃方 // target: `http://192.168.60.5:9098`,//陈跃方
// target: `http://192.168.60.27:9098`,//邓
// target: `http://122.9.160.122:9011`, //线上 // target: `http://122.9.160.122:9011`, //线上
// target: `http://192.168.0.165:9098`,//施-无线 // target: `http://192.168.0.165:9098`,//施-无线
// target: `http://192.168.60.46:9098`,//施-有线 // target: `http://192.168.60.46:9098`,//施-有线
......
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