修改

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

@@ -3,7 +3,7 @@
     <div class="app-container EnterpriseMonitoring">
       <div class="header">
         <div class="search">
-          <div class="label">监控维度</div>
+          <div class="label">风险动态时间</div>
           <div class="checkbox">
             <el-radio-group v-model="radio" @change="radioBtn">
               <el-radio v-for="item in radioList" :label="item.type">{{item.label}}</el-radio>
@@ -53,11 +53,11 @@
                   <span class="color5 span">正向 {{scope.row.positiveCount}}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="监控时间" width="240" align="left" prop="createTime"></el-table-column>
+              <el-table-column label="监控时间" width="200" align="left" prop="createTime"></el-table-column>
               <el-table-column
                 label="操作"
                 align="left"
-                width="180"
+                width="160"
                 class-name="small-padding fixed-width"
                 fixed="right"
               >
@@ -79,14 +79,14 @@
         </div>
       </div>
 
-      <el-dialog :visible.sync="jkVisible" custom-class='dialog-claim' title="提示" width="480px" >
+      <el-dialog :visible.sync="jkVisible" custom-class='dialog-claim' title="提示" width="480px" :close-on-click-modal="false">
         <div class="dialog-content"><i class="el-icon-warning"></i>取消后将错过企业最新动态</div>
         <div slot="footer" class="dialog-footer">
-          <el-button @click="jkVisible===false">我再想想</el-button>
+          <el-button @click="jkVisible=false">我再想想</el-button>
           <el-button type="primary" @click="handleConfirm">确定取消</el-button>
         </div>
       </el-dialog>
-      <el-dialog :visible.sync="qyVisible" custom-class='dialog-claim dialogAdd' title="添加监控企业" width="480px" >
+      <el-dialog :visible.sync="qyVisible" custom-class='dialog-claim dialogAdd' title="添加监控企业" width="480px" :close-on-click-modal="false">
         <div class="add-content">
           <div class="enterprise">
             <div class="label">企业名称</div>
@@ -115,7 +115,7 @@
           <el-button type="primary" @click="handleAdd">确定</el-button>
         </div>
       </el-dialog>
-      <el-dialog :visible.sync="pldrVisible" custom-class='dialog-claim' title="批量导入监控企业" width="480px" >
+      <el-dialog :visible.sync="pldrVisible" custom-class='dialog-claim' title="批量导入监控企业" width="480px" :close-on-click-modal="false">
         <div class="upload-content">
           <el-upload
             class="upload-demo"
@@ -137,7 +137,7 @@
         </div>
         <div slot="footer" class="dialog-footer">
           <el-button class="download" icon="el-icon-download">下载模版</el-button>
-          <el-button>取消</el-button>
+          <el-button @click="handleUploadCancel1">取消</el-button>
           <el-button type="primary" @click="submitUpload">确定</el-button>
         </div>
       </el-dialog>
@@ -244,13 +244,15 @@
         }
         companyAdd(data).then(res => {
           this.qyVisible=false;
-          this.$modal.success("新增成功");
+          this.$message.success("新增成功");
           this.querySubmit()
         })
 
       },
       radioBtn(val){
         let endTime = new Date()
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
         switch (val) {
           case 1:
             this.queryParams.condition.beginTime=this.formatDate(endTime)
@@ -322,7 +324,7 @@
       handleConfirm(){
         companyCancel({cid:[this.companyId]}).then(res => {
           this.jkVisible=false;
-          this.$modal.success("取消成功");
+          this.$message.success("取消成功");
           this.querySubmit()
         })
       },
@@ -361,6 +363,10 @@
         else
           this.$message.error({message:res.msg,showClose:true})
       },
+      handleUploadCancel1(){
+        this.fileList=[]
+        this.pldrVisible=false;
+      },
       submitUpload() {
         this.$refs.upload.submit();
       },
@@ -389,6 +395,9 @@
         align-items: flex-start;
         padding-left: 12px;
         position: relative;
+        ::v-deep .el-radio{
+          margin-right:16px;
+        }
         ::v-deep .el-date-editor{
           position: absolute;
           left: 602px;

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

@@ -80,7 +80,7 @@
         </div>
         <div class="search">
           <span class="btn1" @click="handleAdd">保存</span>
-          <span class="btn2">重置</span>
+          <span class="btn2" @click="handleResetting">重置</span>
         </div>
       </div>
 
@@ -203,6 +203,17 @@
           this.$modal.success(res.msg);
         })
       },
+      handleResetting(){
+        this.sffx=[];
+        this.gsfx=[];
+        this.startTime =''
+        this.endTime = ''
+        this.queryParams={
+          pushFrequency:'0',
+          receiveMode:'0',
+          phones:''
+        }
+      },
       changeTime(val){
         console.log(val)
       },

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

@@ -3,7 +3,7 @@
     <div class="app-container MonitoringDynamics">
       <div class="search">
         <div class="search-item" style="line-height: 32px;margin-top: 0;padding-bottom: 8px;">
-          <div class="label">监控维度</div>
+          <div class="label">监控动态</div>
           <el-input class="name" placeholder="请输入监控对象名称" v-model="companyName">
             <el-button slot="append" @click="handleKeyword()">搜索</el-button>
           </el-input>
@@ -100,7 +100,7 @@
                 fixed="right"
               >
                 <template slot-scope="scope">
-                  <span style="cursor: pointer;" @click="handleDetail">查看详情</span>
+                  <span style="cursor: pointer;" @click="handleDetail(scope.row)">查看详情</span>
                 </template>
               </el-table-column>
             </el-table>
@@ -116,7 +116,7 @@
           <el-pagination background :current-page="queryParams.pageNum" :page-size="queryParams.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
         </div>
       </div>
-      <el-dialog :visible.sync="dialogVisible" custom-class='dialog-claim' :title="title" width="720px" >
+      <el-dialog :visible.sync="dialogVisible" custom-class='dialog-claim' :title="title" width="720px" :close-on-click-modal="false">
         <div class="dialog-content">
           <template v-if="title=='开庭公告详情'">
             <info-table class="info-tab" :list="defaultList0" :obj="detail" :labelWidth="labelWidth">
@@ -339,17 +339,34 @@
     methods: {
       async querySubmit() {
         let endTime = new Date()
+        let params={
+          pageNum:this.queryParams.pageNum,
+          pageSize:this.queryParams.pageSize,
+          condition:this.queryParams.condition
+        }
         if(this.radio ===  1){
-          this.queryParams.condition.beginTime=this.formatDate(endTime)
-          this.queryParams.condition.endTime=this.formatDate(endTime)
+          params.condition.beginTime=this.formatDate(endTime)
+          params.condition.endTime=this.formatDate(endTime)
         }
         if(this.companyName){
-          this.queryParams.condition.companyName=this.companyName
+          params.condition.companyName=this.companyName
         }
         if(this.fxjbType.length > 0){
-          this.queryParams.condition.fxjbType=this.riskLevel.join()
+          params.condition.fxjbType=this.fxjbType.join()
+        }
+        if(this.sffx.length > 0 && this.gsfx.length > 0){
+          params.riskType='司法风险,工商风险'
+          params.dimension=this.sffx.join()+','+this.gsfx.join()
+        }
+        if(this.sffx.length > 0 && this.gsfx.length === 0){
+          params.riskType='司法风险'
+          params.dimension=this.sffx.join()
+        }
+        if(this.sffx.length === 0 && this.gsfx.length > 0){
+          params.riskType='工商风险'
+          params.dimension=this.gsfx.join()
         }
-        dynamicPage(this.queryParams).then(res => {
+        dynamicPage(params).then(res => {
           this.isSkeleton = false;
           this.tableData=res.rows;
           this.tableDataTotal=res.total;
@@ -368,8 +385,8 @@
           console.log(this.tableData)
         })
       },
-      getDetail() {
-        companyDetail({dimensionName:'新增法院公告',sourceId:'0001c8e8-183f-48b5-a8ce-575b5c214b1a_65250c621707e177f7983cbf_'}).then(res => {
+      getDetail(name,id) {
+        companyDetail({dimensionName:name,sourceId:id}).then(res => {
           console.log(res)
           this.detail=res.data;
         })
@@ -380,6 +397,9 @@
         } else {
           this.sffx.splice(this.sffx.indexOf(val.dimensionName), 1)
         }
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
+        this.querySubmit()
       },
       changeGsfx(val) {
         if (this.gsfx.indexOf(val.dimensionName) == -1) {
@@ -387,10 +407,15 @@
         } else {
           this.gsfx.splice(this.gsfx.indexOf(val.dimensionName), 1)
         }
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
+        this.querySubmit()
       },
       checkFxjbBtn(val) {
         this.fxjbType = [];
         this.checkFx = true;
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
         this.querySubmit()
       },
       checkFxjb1Btn(val){
@@ -400,17 +425,50 @@
           this.checkFx = true;
           this.fxjbType = [];
         }
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
         this.querySubmit()
       },
-      handleDetail(){
+      handleDetail(item){
+        switch (item.dimensionName) {
+          case '新增开庭公告':
+            this.title='开庭公告详情'
+            this.dialogVisible=true;
+            break;
+          case '新增法院公告':
+            this.title='法院公告详情'
+            this.dialogVisible=true;
+            break;
+          case '新增裁判文书':
+            this.title='裁判文书详情'
             this.dialogVisible=true;
-        this.getDetail()
+            break;
+          case '新增经营异常':
+            this.title='经营异常详情'
+            this.dialogVisible=true;
+            break;
+          case '新增失信被执行人':
+            this.title='失信被执行人详情'
+            this.dialogVisible=true;
+            break;
+          case '新增股权冻结':
+            this.title='股权冻结详情'
+            this.dialogVisible=true;
+            break;
+          default:
+            break;
+        }
+        this.getDetail(item.dimensionName,item.sourceId)
       },
       handleKeyword(){
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
         this.querySubmit()
       },
       radioBtn(val){
         let endTime = new Date()
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
         switch (val) {
           case 1:
             this.queryParams.condition.beginTime=this.formatDate(endTime)
@@ -465,6 +523,8 @@
           this.queryParams.condition.beginTime = value[0]
           this.queryParams.condition.endTime = value[1]
         }
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
         this.querySubmit()
       },
       // 时间格式化
@@ -607,6 +667,9 @@
         font-size: 14px;
         color: rgba(35,35,35,0.8);
       }
+      .color_text {
+        color: #0081ff;
+      }
       ::v-deep .name{
         width: 405px;
         height: 32px;

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

@@ -96,7 +96,9 @@
         })
       },
       handleClick() {
-        this.queryParams.condition.reportType=Number(this.activeName)
+        this.queryParams.condition.reportType=Number(this.activeName);
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
         this.querySubmit()
       }
     }

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

@@ -123,7 +123,7 @@
           <el-pagination background :current-page="queryParams.pageNum" :page-size="queryParams.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
         </div>
       </div>
-      <el-dialog :visible.sync="dialogVisible" custom-class='dialog-claim' :title="title" width="720px" >
+      <el-dialog :visible.sync="dialogVisible" custom-class='dialog-claim' :title="title" width="720px" :close-on-click-modal="false">
         <div class="dialog-content">
           <template v-if="title=='开庭公告详情'">
             <info-table class="info-tab" :list="defaultList0" :obj="detail" :labelWidth="labelWidth"></info-table>
@@ -163,9 +163,13 @@
       return {
         changeTime,
         isSkeleton:true,
-        radio:0,
+        radio:null,
         date:'',
         radioList:[
+          {
+            type:null,
+            label:'全部'
+          },
           {
             type:1,
             label:'今天'
@@ -319,6 +323,9 @@
         } else {
           this.sffx.splice(this.sffx.indexOf(val.dimensionName), 1)
         }
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
+        this.querySubmit()
       },
       changeGsfx(val) {
         if (this.gsfx.indexOf(val.dimensionName) == -1) {
@@ -326,20 +333,40 @@
         } else {
           this.gsfx.splice(this.gsfx.indexOf(val.dimensionName), 1)
         }
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
+        this.querySubmit()
       },
       async querySubmit() {
         let endTime = new Date()
+        let params={
+          pageNum:this.queryParams.pageNum,
+          pageSize:this.queryParams.pageSize,
+          condition:this.queryParams.condition
+        }
         if(this.radio ===  1){
-          this.queryParams.condition.beginTime=this.formatDate(endTime)
-          this.queryParams.condition.endTime=this.formatDate(endTime)
+          params.condition.beginTime=this.formatDate(endTime)
+          params.condition.endTime=this.formatDate(endTime)
         }
         if(this.companyName){
-          this.queryParams.condition.companyName=this.companyName
+          params.condition.companyName=this.companyName
         }
         if(this.fxjbType.length > 0){
-          this.queryParams.condition.fxjbType=this.riskLevel.join()
+          params.condition.fxjbType=this.fxjbType.join()
+        }
+        if(this.sffx.length > 0 && this.gsfx.length > 0){
+          params.riskType='司法风险,工商风险'
+          params.dimension=this.sffx.join()+','+this.gsfx.join()
+        }
+        if(this.sffx.length > 0 && this.gsfx.length === 0){
+          params.riskType='司法风险'
+          params.dimension=this.sffx.join()
+        }
+        if(this.sffx.length === 0 && this.gsfx.length > 0){
+          params.riskType='工商风险'
+          params.dimension=this.gsfx.join()
         }
-        dynamicPage(this.queryParams).then(res => {
+        dynamicPage(params).then(res => {
           this.isSkeleton = false;
           this.object=res.object;
           this.tableData=res.rows;
@@ -358,8 +385,8 @@
           })
         })
       },
-      getDetail() {
-        companyDetail({dimensionName:'新增法院公告',sourceId:'0001c8e8-183f-48b5-a8ce-575b5c214b1a_65250c621707e177f7983cbf_'}).then(res => {
+      getDetail(name,id) {
+        companyDetail({dimensionName:name,sourceId:id}).then(res => {
           console.log(res)
           this.detail=res.data;
         })
@@ -367,9 +394,13 @@
       checkFxjbBtn(val) {
         this.fxjbType = [];
         this.checkFx = true;
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
         this.querySubmit()
       },
       checkFxjb1Btn(val){
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
         if (val.length > 0) {
           this.checkFx = false;
         } else if (val.length == 0) {
@@ -378,8 +409,36 @@
         }
         this.querySubmit()
       },
-      handleDetail(){
+      handleDetail(item){
+        switch (item.dimensionName) {
+          case '新增开庭公告':
+            this.title='开庭公告详情'
             this.dialogVisible=true;
+            break;
+          case '新增法院公告':
+            this.title='法院公告详情'
+            this.dialogVisible=true;
+            break;
+          case '新增裁判文书':
+            this.title='裁判文书详情'
+            this.dialogVisible=true;
+            break;
+          case '新增经营异常':
+            this.title='经营异常详情'
+            this.dialogVisible=true;
+            break;
+          case '新增失信被执行人':
+            this.title='失信被执行人详情'
+            this.dialogVisible=true;
+            break;
+          case '新增股权冻结':
+            this.title='股权冻结详情'
+            this.dialogVisible=true;
+            break;
+          default:
+            break;
+        }
+        this.getDetail(item.dimensionName,item.sourceId)
       },
       // 重置页数
       handleSizeChange(val) {
@@ -558,6 +617,9 @@
         font-size: 14px;
         color: rgba(35,35,35,0.8);
       }
+      .color_text {
+        color: #0081ff;
+      }
       .main-right {
         width: calc(100% - 112px);
         .select-popper {