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-admin/src/main/java/com/dsk/web/controller/system/SysPushController.java

 package com.dsk.web.controller.system;
 
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.PageQuery;
@@ -11,6 +12,8 @@ import com.dsk.system.service.ISysPushService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * 系统推送(SysPush)表控制层
  *
@@ -39,6 +42,10 @@ public class SysPushController extends BaseController {
      */
     @PostMapping
     public R<Void> add(@RequestBody SysPush bean) {
+        List<SysPush> list = baseService.list(Wrappers.<SysPush>lambdaQuery().eq(SysPush::getContact, bean.getContact()));
+        if(CollectionUtils.isNotEmpty(list)){
+            return R.fail("当前推送电话已存在！");
+        }
         return toAjax(baseService.save(bean));
     }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/jsk/domain/EnterpriseCreditPageBody.java

@@ -26,6 +26,10 @@ public class EnterpriseCreditPageBody extends BasePage {
      * 截止时间（年月日）
      */
     private String dateTo;
+    /**
+     * 类型（是否历史 0：否 1：是）
+     */
+    private Integer type;
 
     public boolean isVaildCid() {
         return 0 == cid;

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

@@ -107,7 +107,8 @@
                   <p class="right-title" v-html="item.companyName"></p>
                   <p class="right-tips">推荐监控</p>
                 </div>
-                <el-checkbox @change="changeCheckbox(item)"></el-checkbox>
+                <span v-if="item.monitor" style="font-size: 12px;">已监控</span>
+                <el-checkbox v-else @change="changeCheckbox(item)" style="margin-left: 15px;"></el-checkbox>
               </div>
             </div>
           </div>
@@ -127,6 +128,7 @@
             accept=".excel,.xlsx"
             :headers="headers"
             :on-change="handleFileListChange"
+            :on-success="onSuccess"
             :auto-upload="false"
             ref="upload"
             multiple>
@@ -365,14 +367,10 @@
       },
       onSuccess(res, file, fileList) {
         if(res.code == 200 ){
-          this.$refs.upload.submit();
           let _this = this
-          setTimeout(function() {
-            // _this.getList()
-            _this.$message.success('上传成功！')
-            // _this.isupload = false
-          },3000)
-
+          _this.querySubmit()
+          _this.$message.success('上传成功！')
+          _this.pldrVisible = false
         }
         else
           this.$message.error({message:res.msg,showClose:true})
@@ -569,7 +567,7 @@
               }
             }
             .item-right{
-              width: 360px;
+              width: 344px;
               margin-right: 10px;
               p{
                 margin: 0;

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

@@ -75,7 +75,7 @@
           </div>
           <div class="main-item" style="line-height: 32px;">
             <div class="label">手机号码</div>
-            <el-input class="phone" v-model="queryParams.phones" placeholder="请输入手机号" oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+            <el-input class="phone" v-model="queryParams.phones" placeholder="请输入手机号" oninput="if(value.length>11)value=value.slice(0,11)" onkeyup="value = value.replace(/[^\d]/g,'');"></el-input>
           </div>
         </div>
         <div class="search">

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

@@ -86,7 +86,7 @@
         </div>
         <div class="input">
           <div class="label">推送电话号码</div>
-          <el-input class="name" placeholder="请输入推送人联系方式" v-model="contact"></el-input>
+          <el-input class="name" placeholder="请输入推送人联系方式" v-model="contact" oninput="if(value.length>11)value=value.slice(0,11)" onkeyup="value = value.replace(/[^\d]/g,'');"></el-input>
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -219,7 +219,7 @@
       handleUpdate(){
         let params={
           id:this.id,
-          status:'1',
+          status:this.status===1 ? 0:1,
         }
         updateStatus(params).then(res => {
           console.log(res)