修改

dsk-operate-ui/src/views/monitoring/MonitorSettings.vue

@@ -34,7 +34,7 @@
         <div class="m-main">
           <div class="main-item">
             <div class="label">推送频率</div>
-            <el-radio v-model="queryParams.pushFrequency" label="0">每小时</el-radio>
+            <!--<el-radio v-model="queryParams.pushFrequency" label="0">每小时</el-radio>-->
             <el-radio v-model="queryParams.pushFrequency" label="1">每天</el-radio>
             <el-radio v-model="queryParams.pushFrequency" label="2">工作日（排除节假日）</el-radio>
           </div>
@@ -101,7 +101,7 @@
         checkFx: true,
         checkJkwd: true,
         queryParams:{
-          pushFrequency:'0',
+          pushFrequency:'1',
           receiveMode:'0',
           phones:''
         },
@@ -198,7 +198,6 @@
         if(this.endTime){
           params.timePeriodEnd=this.endTime
         }
-        console.log(params)
         insertOrUpdate(params).then(res => {
           this.$message.success(res.msg);
         })
@@ -209,7 +208,7 @@
         this.startTime =''
         this.endTime = ''
         this.queryParams={
-          pushFrequency:'0',
+          pushFrequency:'1',
           receiveMode:'0',
           phones:''
         }

dsk-operate-ui/src/views/monitoring/MonitoringDynamics.vue

@@ -351,19 +351,22 @@
           params.condition.companyName=this.companyName
         }
         if(this.fxjbType.length > 0){
-          params.condition.fxjbType=this.fxjbType.join()
+          params.condition.riskLevel=this.fxjbType
+        }else {
+          delete params.condition.riskLevel
         }
         if(this.sffx.length > 0 && this.gsfx.length > 0){
-          params.riskType='司法风险,工商风险'
-          params.dimension=this.sffx.join()+','+this.gsfx.join()
+          params.condition.riskType='司法风险,工商风险'
+          params.condition.dimension=this.sffx.concat(this.gsfx)
+          console.log(this.sffx.concat(this.gsfx))
         }
         if(this.sffx.length > 0 && this.gsfx.length === 0){
-          params.riskType='司法风险'
-          params.dimension=this.sffx.join()
+          params.condition.riskType='司法风险'
+          params.condition.dimension=this.sffx
         }
         if(this.sffx.length === 0 && this.gsfx.length > 0){
-          params.riskType='工商风险'
-          params.dimension=this.gsfx.join()
+          params.condition.riskType='工商风险'
+          params.condition.dimension=this.gsfx
         }
         dynamicPage(params).then(res => {
           this.isSkeleton = false;
@@ -387,6 +390,7 @@
       getDetail(name,id) {
         companyDetail({dimensionName:name,sourceId:id}).then(res => {
           console.log(res)
+          this.dialogVisible=true;
           this.detail=res.data;
         })
       },
@@ -432,33 +436,32 @@
         switch (item.dimensionName) {
           case '新增开庭公告':
             this.title='开庭公告详情'
-            this.dialogVisible=true;
+            this.getDetail(item.dimensionName,item.sourceId)
             break;
           case '新增法院公告':
             this.title='法院公告详情'
-            this.dialogVisible=true;
+            this.getDetail(item.dimensionName,item.sourceId)
             break;
           case '新增裁判文书':
             this.title='裁判文书详情'
-            this.dialogVisible=true;
+            this.getDetail(item.dimensionName,item.sourceId)
             break;
           case '新增经营异常':
             this.title='经营异常详情'
-            this.dialogVisible=true;
+            this.getDetail(item.dimensionName,item.sourceId)
             break;
           case '新增失信被执行人':
             this.title='失信被执行人详情'
-            this.dialogVisible=true;
+            this.getDetail(item.dimensionName,item.sourceId)
             break;
           case '新增股权冻结':
             this.title='股权冻结详情'
-            this.dialogVisible=true;
+            this.getDetail(item.dimensionName,item.sourceId)
             break;
           default:
             this.$message.success("暂无详情");
             break;
         }
-        this.getDetail(item.dimensionName,item.sourceId)
       },
       handleKeyword(){
         this.queryParams.pageNum=1
@@ -649,7 +652,13 @@
     }
   }
 </script>
-
+<style lang="scss">
+  .el-select-dropdown__item.selected,
+  .el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after{
+    color: #3181fa;
+    font-size: 0;
+  }
+</style>
 <style lang="scss" scoped>
   .MonitoringDynamics{
     .search{

dsk-operate-ui/src/views/monitoring/MonitoringReportDetails.vue

@@ -352,19 +352,22 @@
           params.condition.companyName=this.companyName
         }
         if(this.fxjbType.length > 0){
-          params.condition.fxjbType=this.fxjbType.join()
+          params.condition.riskLevel=this.fxjbType
+        }else {
+          delete params.condition.riskLevel
         }
         if(this.sffx.length > 0 && this.gsfx.length > 0){
-          params.riskType='司法风险,工商风险'
-          params.dimension=this.sffx.join()+','+this.gsfx.join()
+          params.condition.riskType='司法风险,工商风险'
+          params.condition.dimension=this.sffx.concat(this.gsfx)
+          console.log(this.sffx.concat(this.gsfx))
         }
         if(this.sffx.length > 0 && this.gsfx.length === 0){
-          params.riskType='司法风险'
-          params.dimension=this.sffx.join()
+          params.condition.riskType='司法风险'
+          params.condition.dimension=this.sffx
         }
         if(this.sffx.length === 0 && this.gsfx.length > 0){
-          params.riskType='工商风险'
-          params.dimension=this.gsfx.join()
+          params.condition.riskType='工商风险'
+          params.condition.dimension=this.gsfx
         }
         dynamicPage(params).then(res => {
           this.isSkeleton = false;
@@ -387,7 +390,7 @@
       },
       getDetail(name,id) {
         companyDetail({dimensionName:name,sourceId:id}).then(res => {
-          console.log(res)
+          this.dialogVisible=true;
           this.detail=res.data;
         })
       },
@@ -413,33 +416,32 @@
         switch (item.dimensionName) {
           case '新增开庭公告':
             this.title='开庭公告详情'
-            this.dialogVisible=true;
+            this.getDetail(item.dimensionName,item.sourceId)
             break;
           case '新增法院公告':
             this.title='法院公告详情'
-            this.dialogVisible=true;
+            this.getDetail(item.dimensionName,item.sourceId)
             break;
           case '新增裁判文书':
             this.title='裁判文书详情'
-            this.dialogVisible=true;
+            this.getDetail(item.dimensionName,item.sourceId)
             break;
           case '新增经营异常':
             this.title='经营异常详情'
-            this.dialogVisible=true;
+            this.getDetail(item.dimensionName,item.sourceId)
             break;
           case '新增失信被执行人':
             this.title='失信被执行人详情'
-            this.dialogVisible=true;
+            this.getDetail(item.dimensionName,item.sourceId)
             break;
           case '新增股权冻结':
             this.title='股权冻结详情'
-            this.dialogVisible=true;
+            this.getDetail(item.dimensionName,item.sourceId)
             break;
           default:
             this.$message.success("暂无详情");
             break;
         }
-        this.getDetail(item.dimensionName,item.sourceId)
       },
       // 重置页数
       handleSizeChange(val) {
@@ -575,7 +577,13 @@
     }
   }
 </script>
-
+<style lang="scss">
+  .el-select-dropdown__item.selected,
+  .el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after{
+    color: #3181fa;
+    font-size: 0;
+  }
+</style>
 <style lang="scss" scoped>
   .MonitoringReportDetails{
     .search{

dsk-operate-ui/src/views/system/supplierBad/index.vue

@@ -5,7 +5,7 @@
       <div class="c-title">推送人信息</div>
       <div class="main">
         <div class="table-item" v-if="tableDataTotal > 0  && !isSkeleton">
-          <el-button class="btn" icon="el-icon-plus" type="primary">添加推送人</el-button>
+          <el-button class="btn" icon="el-icon-plus" type="primary" @click="visible=true">添加推送人</el-button>
           <el-table
             class="fixed-table"
             :data="tableData"