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

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

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/DimAreaController.java

@@ -4,7 +4,6 @@ package com.dsk.cscec.controller;
 import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.R;
 import com.dsk.cscec.domain.vo.RegionVo;
-import com.dsk.cscec.domain.vo.RegionWithLevelVo;
 import com.dsk.cscec.service.IDimAreaService;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -40,7 +39,7 @@ public class DimAreaController extends BaseController {
      * 获取地区树(不含区域)
      */
     @GetMapping("/all/withoutRegion")
-    public R<List<RegionWithLevelVo>> allAreaWithoutRegion(){
+    public R<List<RegionVo>> allAreaWithoutRegion(){
         return R.ok(baseService.allAreaWithoutRegion());
     }
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/AdvisoryBodyBo.java

@@ -39,6 +39,10 @@ public class AdvisoryBodyBo extends BaseEntity {
      * 项目承接单位
      */
     private String contractOrgName;
+    /**
+     * 区域
+     */
+    private List<String> area;
     /**
      * 省份
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/AdvisoryBodyVo.java

@@ -112,8 +112,8 @@ public class AdvisoryBodyVo {
     private String contractOrgName;
 
     /**
-     * 创建时间
+     * 创建时间/合同生效(盖章)日期
      */
     @ExcelProperty(value = "创建时间", index = 13)
-    private Date loadTime;
+    private Date contractSignDate;
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/RegionVo.java

@@ -15,4 +15,6 @@ public class RegionVo {
 
     List<RegionVo> children;
 
+    Integer childrenLength;
+
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/RegionWithLevelVo.java

-package com.dsk.cscec.domain.vo;
-
-import lombok.Data;
-
-import java.util.List;
-
-/**
- * @Author sxk
- * @Data 2023/12/13 14:14
- */
-@Data
-public class RegionWithLevelVo {
-    String level;
-    String value;
-    List<RegionWithLevelVo> children;
-    Integer childrenLength;
-}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/entity/AdvisoryBodyCustomForm.java

+package com.dsk.cscec.entity;
+
+import com.dsk.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * 咨询机构自定义表单(AdvisoryBodyCustomForm)实体类
+ *
+ * @author sxk
+ * @since 2023-12-20 16:39:43
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class AdvisoryBodyCustomForm extends BaseEntity implements Serializable {
+    private static final long serialVersionUID = 385050456847400745L;
+    /**
+     * 项目主键
+     */
+    private Long projectKey;
+    /**
+     * 咨询机构ID
+     */
+    private Long advisoryBodyId;
+    /**
+     * json数据
+     */
+    private String jsonData;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/AdvisoryBodyCustomFormMapper.java

+package com.dsk.cscec.mapper;
+
+import com.dsk.cscec.entity.AdvisoryBodyCustomForm;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.data.domain.Pageable;
+import java.util.List;
+
+/**
+ * 咨询机构自定义表单(AdvisoryBodyCustomForm)表数据库访问层
+ *
+ * @author sxk
+ * @since 2023-12-20 16:39:37
+ */
+public interface AdvisoryBodyCustomFormMapper {
+
+}
+

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/AdvisoryBodyCustomFormService.java

+package com.dsk.cscec.service;
+
+import com.dsk.cscec.entity.AdvisoryBodyCustomForm;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+
+/**
+ * 咨询机构自定义表单(AdvisoryBodyCustomForm)表服务接口
+ *
+ * @author sxk
+ * @since 2023-12-20 16:39:44
+ */
+public interface AdvisoryBodyCustomFormService {
+
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/IDimAreaService.java

@@ -3,7 +3,6 @@ package com.dsk.cscec.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.dsk.cscec.domain.DimArea;
 import com.dsk.cscec.domain.vo.RegionVo;
-import com.dsk.cscec.domain.vo.RegionWithLevelVo;
 
 import java.util.List;
 
@@ -18,7 +17,7 @@ public interface IDimAreaService extends IService<DimArea> {
 
     List<RegionVo> allArea();
 
-    List<RegionWithLevelVo> allAreaWithoutRegion();
+    List<RegionVo> allAreaWithoutRegion();
 
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/AdvisoryBodyCustomFormServiceImpl.java

+package com.dsk.cscec.service.impl;
+
+import com.dsk.cscec.entity.AdvisoryBodyCustomForm;
+import com.dsk.cscec.mapper.AdvisoryBodyCustomFormMapper;
+import com.dsk.cscec.service.AdvisoryBodyCustomFormService;
+import org.springframework.stereotype.Service;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageImpl;
+import org.springframework.data.domain.PageRequest;
+
+import javax.annotation.Resource;
+
+/**
+ * 咨询机构自定义表单(AdvisoryBodyCustomForm)表服务实现类
+ *
+ * @author sxk
+ * @since 2023-12-20 16:39:44
+ */
+@Service("advisoryBodyCustomFormService")
+public class AdvisoryBodyCustomFormServiceImpl implements AdvisoryBodyCustomFormService {
+    @Resource
+    private AdvisoryBodyCustomFormMapper advisoryBodyCustomFormMapper;
+
+
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/DimAreaServiceImpl.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsk.common.core.domain.entity.SysDictData;
 import com.dsk.cscec.domain.DimArea;
 import com.dsk.cscec.domain.vo.RegionVo;
-import com.dsk.cscec.domain.vo.RegionWithLevelVo;
 import com.dsk.cscec.mapper.DimAreaMapper;
 import com.dsk.cscec.service.IDimAreaService;
 import com.dsk.system.service.ISysDictTypeService;
@@ -67,6 +66,7 @@ public class DimAreaServiceImpl extends ServiceImpl<DimAreaMapper, DimArea> impl
                             }
                         }
                         provinceVo.setChildren(cityVos);
+                        provinceVo.setChildrenLength(provinceVo.getChildren().size());
                         provinceVos.add(provinceVo);
                     }
                 }
@@ -78,8 +78,8 @@ public class DimAreaServiceImpl extends ServiceImpl<DimAreaMapper, DimArea> impl
     }
 
     @Override
-    public List<RegionWithLevelVo> allAreaWithoutRegion() {
-        List<RegionWithLevelVo> vos = new ArrayList<>();
+    public List<RegionVo> allAreaWithoutRegion() {
+        List<RegionVo> vos = new ArrayList<>();
         //区域
         List<SysDictData> sysDictData = sysDictTypeService.selectDictDataByType(AREA_TYPE);
         if(CollectionUtils.isNotEmpty(sysDictData)){
@@ -93,10 +93,9 @@ public class DimAreaServiceImpl extends ServiceImpl<DimAreaMapper, DimArea> impl
 
                 if(CollectionUtils.isNotEmpty(provinces)){
                     for (Object province : provinces) {
-                        RegionWithLevelVo provinceVo = new RegionWithLevelVo();
+                        RegionVo provinceVo = new RegionVo();
                         provinceVo.setValue(String.valueOf(province));
-                        provinceVo.setLevel("1");
-                        List<RegionWithLevelVo> cityVos = new ArrayList<>();
+                        List<RegionVo> cityVos = new ArrayList<>();
                         //市
                         List<Object> citys = baseMapper.selectObjs(Wrappers.<DimArea>lambdaQuery()
                                 .select(DimArea::getAreaName3)
@@ -105,9 +104,8 @@ public class DimAreaServiceImpl extends ServiceImpl<DimAreaMapper, DimArea> impl
                                 .groupBy(DimArea::getAreaName3));
                         if(CollectionUtils.isNotEmpty(citys)){
                             for (Object city : citys) {
-                                RegionWithLevelVo cityVo = new RegionWithLevelVo();
+                                RegionVo cityVo = new RegionVo();
                                 cityVo.setValue(String.valueOf(city));
-                                cityVo.setLevel("2");
                                 cityVos.add(cityVo);
                             }
                         }

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/controller/CompanyRelationTableV1Controller.java

 package com.dsk.jsk.controller;
 
+import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.jsk.domain.JskCompanyRelationTableV1Dto;
 import com.dsk.jsk.service.CompanyRelationTableV1Service;
@@ -48,4 +49,16 @@ public class CompanyRelationTableV1Controller {
     public TableDataInfo detailPage(@RequestBody JskCompanyRelationTableV1Dto dto) throws Exception{
         return relationTableV1Service.detailPage(dto);
     }
+
+    /***
+     *@Description: -分页列表-下拉
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    @PostMapping("/pageSelect")
+    public R pageSelect(@RequestBody JskCompanyRelationTableV1Dto dto) throws Exception{
+        return relationTableV1Service.pageSelect(dto);
+    }
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/service/CompanyRelationTableV1Service.java

 package com.dsk.jsk.service;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.dsk.common.core.domain.R;
 import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.jsk.domain.*;
 import com.dsk.system.utils.DskOpenApiUtil;
@@ -32,4 +33,16 @@ public class CompanyRelationTableV1Service {
         Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/consultancy/detailPage", BeanUtil.beanToMap(dto, false, false));
         return dskOpenApiUtil.responsePage(map);
     }
+
+    /***
+     *@Description: -分页列表-下拉
+     *@Param:
+     *@return: com.dsk.common.core.domain.AjaxResult
+     *@Author: Dgm
+     *@date: 2023/5/18 10:29
+     */
+    public R pageSelect(JskCompanyRelationTableV1Dto dto) throws Exception{
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/operate/consultancy/pageSelect", BeanUtil.beanToMap(dto, false, false));
+        return BeanUtil.toBean(map, R.class);
+    }
 }

dsk-module/dsk-biz-api/src/main/resources/mapper/AdvisoryBodyCustomFormMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.dsk.cscec.mapper.AdvisoryBodyCustomFormMapper">
+
+
+</mapper>
+

dsk-module/dsk-biz-api/src/main/resources/mapper/cscec/AdvisoryBodyMapper.xml

@@ -14,7 +14,7 @@
         abp.project_leader_phone,
         ab.advisory_body_name,
         dp.project_name,dp.project_code,dp.province_name,dp.city_name,dp.isinvestproject,dp.project_type1,
-        dp.project_type,dp.contract_orig_value,dp.owner_name,dp.contract_org_name,dp.load_time
+        dp.project_type,dp.contract_orig_value,dp.owner_name,dp.contract_org_name,dp.contract_sign_date
         from advisory_body_project abp
         left join advisory_body ab on ab.advisory_body_id = abp.advisory_body_id
         left join d_project dp on dp.project_key = abp.project_key
@@ -34,32 +34,31 @@
             <if test="bo.contractOrgName != null and bo.contractOrgName != ''">
                 and dp.contract_org_name = #{bo.contractOrgName}
             </if>
-            <if test="bo.province != null and bo.province.size > 0 and (bo.city == null or bo.city.size==0)">
-                and dp.province_name in
-                <foreach collection="bo.province" item="province" separator="," open="(" close=")">
-                    #{province}
-                </foreach>
-            </if>
-            <if test="(bo.province == null or bo.province.size==0) and bo.city != null and bo.city.size > 0 ">
-                and dp.city_name in
-                <foreach collection="bo.city" item="city" separator="," open="(" close=")">
-                    #{city}
-                </foreach>
-            </if>
-            <if test="bo.province != null and bo.province.size > 0  and bo.city != null  and bo.city.size > 0 ">
-                and (
-                dp.province_name in
-                <foreach collection="bo.province" item="province" separator="," open="(" close=")">
-                    #{province}
-                </foreach>
-                or dp.city_name in
-                <foreach collection="bo.city" item="city" separator="," open="(" close=")">
-                    #{city}
-                </foreach>
-                )
+            <if test="bo.area != null and bo.area.size > 0 or (bo.province != null and bo.province.size > 0) or (bo.city != null and bo.city.size > 0)">
+                and
+                <trim prefix="(" suffix=")" prefixOverrides="or">
+                    <if test="bo.area != null and bo.area.size > 0 ">
+                        or dp.area_name in
+                        <foreach collection="bo.area" item="areaName" open="(" close=")" separator=",">
+                            #{areaName}
+                        </foreach>
+                    </if>
+                    <if test="bo.province != null and bo.province.size > 0 ">
+                        or dp.province_name in
+                        <foreach collection="bo.province" item="provinceName" open="(" close=")" separator=",">
+                            #{provinceName}
+                        </foreach>
+                    </if>
+                    <if test="bo.city != null and bo.city.size > 0 ">
+                        or dp.city_name in
+                        <foreach collection="bo.city" item="cityName" open="(" close=")" separator=",">
+                            #{cityName}
+                        </foreach>
+                    </if>
+                </trim>
             </if>
         </where>
-        order by dp.load_time desc
+        order by dp.contract_sign_date desc
     </select>
 
     <select id="selectAdvisoryBodyCidsByName" resultType="java.lang.Long">

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>
 
@@ -126,19 +126,21 @@
         }
         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])
+          if(res.data){
+            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])
+              }
             }
           }
         })
@@ -201,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(){
-        this.dialogVisible=true;
-        this.getDetail()
+      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)
       },
       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()
         }
-        dynamicPage(this.queryParams).then(res => {
+        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(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(){
-        this.dialogVisible=true;
+      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 {