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/domain/vo/ProjectSearchVo.java

@@ -56,7 +56,7 @@ public class ProjectSearchVo {
     /**
      * 工程类别明细
      */
-    private String projectType;
+    private String projectType2;
 
     /**
      * 项目与咨询机构关系

dsk-module/dsk-biz-api/src/main/java/com/dsk/search/service/ExportService.java

@@ -47,13 +47,7 @@ public class ExportService {
     private String EXPORT_BACK_URL;
 
     public AjaxResult aptitudeFile(MultipartFile file) throws Exception {
-        int exportCount = 1;
-        if (RedisUtils.hasKey("aptitudeFileExportCount")){
-            exportCount = RedisUtils.getCacheObject("aptitudeFileExportCount");
-            if (exportCount>=3000){
-                return AjaxResult.error("每天最多导出3次");
-            }
-        }
+
 
         ComposeQueryDto composeQueryDto = new ComposeQueryDto();
         //识别Excel内容
@@ -64,7 +58,7 @@ public class ExportService {
         List<String> list = new ArrayList<>();
         for (int i = 0; i < companyNameList.size(); i++) {
             if (null==companyNameList.get(i)){
-                return AjaxResult.error("上传格式有误");
+                return AjaxResult.error("请使用正确的模板");
             }
             if (i<500){
                 list.add(companyNameList.get(i).getCompanyName());
@@ -87,8 +81,6 @@ public class ExportService {
         composeQueryDto.setExportBackUrl(EXPORT_BACK_URL);
         composeQueryDto.setExportExeclName(fileName);
         dskOpenApiUtil.requestBody("/operate/export/zjyj/aptitude", BeanUtil.beanToMap(composeQueryDto,false,false));
-        RedisUtils.setCacheObject("aptitudeFileExportCount",exportCount+1);
-        RedisUtils.expire("aptitudeFileExportCount", Duration.ofHours(24));
         return AjaxResult.success();
     }
 

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

@@ -12,7 +12,7 @@
                p.province_name,
                p.isinvestproject,
                p.project_type1,
-               p.project_type,
+               p.project_type2,
                p.contract_orig_value,
                p.owner_name,
                p.contract_org_name,

dsk-operate-ui/src/assets/json/certs.json

@@ -433,7 +433,7 @@
                     },
                     {
                         "name": "工程勘察劳务",
-                        "id": 267,
+                        "id": 1701,
                         "type": 2,
                         "parentId": 227
                     }

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>

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

@@ -30,9 +30,9 @@
                 <router-link  :to="`/monitoring/MonitoringReportDetails/${i.companyOrstaffId}`" tag="a" class="a-link companyName">{{i.companyOrstaffName}}</router-link>
               </p>
               <p class="card-right-p">
-                <span class="right-label">提示：</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.promptCount}}</span>-->
+                <!--<span class="right-label">正向：</span>-->
                 <span class="right-color color2">{{i.positiveCount}}</span>
                 <span class="right-label">低风险：</span>
                 <span class="right-color color3">{{i.lowRiskCount}}</span>

dsk-operate-ui/src/views/supplier/components/AptitudeStandard.vue

@@ -13,12 +13,20 @@
                     :value="item">
                     </el-option>
                 </el-select>
-                <el-select v-model="value1" @change="selectChange1" v-if="options.length>0" placeholder="请选择">
+                <el-select v-model="value1" value-key="id" @change="selectChange1" v-if="options.length>0" placeholder="请选择">
                     <el-option
                     v-for="item in options"
                     :key="item.name"
                     :label="item.name"
-                    :value="item.id">
+                    :value="item">
+                    </el-option>
+                </el-select>
+                <el-select v-model="value2" value-key="id" @change="selectChange2" v-if="options2.length>0" placeholder="请选择">
+                    <el-option
+                    v-for="item in options2"
+                    :key="item.name"
+                    :label="item.name"
+                    :value="item">
                     </el-option>
                 </el-select>
             </div>
@@ -61,8 +69,10 @@ export default {
             list,
             activeIndex:0,
             options: [],
+            options2: [],
             value: '',
             value1: '',
+            value2: '',
             info:"",
         }
     },
@@ -98,6 +108,7 @@ export default {
       }
     },
     selectChange(){
+        this.info = "";
         if(this.value.list&&this.value.list.length>0){
             this.options = this.value.list;
             this.value1 = ""
@@ -105,20 +116,36 @@ export default {
             this.options = []
             standard({id:this.value.id}).then(res=>{
                 this.info = res.data
-
             })
         }
+        this.value2 = "";
+        this.options2 = []
     },
     selectChange1(){
-        standard({id:this.value1}).then(res=>{
+        this.info = "";
+        if(this.value1.list&&this.value1.list.length>0){
+            this.options2 = this.value1.list;
+            this.value2 = ""
+        }else{
+            this.options2 = []
+            standard({id:this.value1.id}).then(res=>{
+                this.info = res.data
+            })
+        }
+    },
+    selectChange2(){
+        this.info = "";
+        standard({id:this.value2.id}).then(res=>{
             this.info = res.data
         })
     },
     changeActiveIndex(index){
+        this.info = "";
         this.activeIndex=index;
         this.value = '';
-        this.options = []
-
+        this.options = [];
+        this.value2 = "";
+        this.options2 = []
     },
    }
 }

dsk-operate-ui/src/views/supplier/components/BatchImport.vue

@@ -19,6 +19,7 @@
                     :on-change="handleFileListChange"
                     :headers="headers"
                     :on-remove="onRemove"
+                    :on-error="onError"
                     :on-success="onSuccess">
             <img class="up_img" src="@/assets/images/plus.png">
             <div class="up_text">点击选择文件或将文件拖拽至此导入企业名录</div>
@@ -102,6 +103,10 @@ import {importTemplate} from '@/api/supplier/assistant.js';
       onRemove(){
         this.isUpload = false
       },
+      onError(res, file, fileList){
+        this.$emit("loadingFn",false);
+          this.$message.error({ message: res.msg?res.msg:'服务器错误', showClose: true })
+      },
       onSuccess(res, file, fileList) {
         this.$refs["upload"].clearFiles()
           this.isUpload = false;
@@ -113,6 +118,7 @@ import {importTemplate} from '@/api/supplier/assistant.js';
           this.$emit("loadingFn",false);
           this.$message.error({ message: res.msg, showClose: true })
         }
+
       },
 
       downloadClick() {

dsk-operate-ui/src/views/supplier/components/SearchAptitude.vue

@@ -125,7 +125,7 @@
                     </div>
                 </div>
                 <div class="pagination clearfix" v-show="total>0">
-                    <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+                    <el-pagination background v-if="pageFlag" :page-size="pageSize" :current-page="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
                         :total="total">
                     </el-pagination>
                 </div>
@@ -256,6 +256,7 @@ export default {
             pageSize: 5,
             pageSize1: 5,
             dataEXCEL:{},
+            pageFlag:true,
             isSkeleton: false,
             exportData:{
                 title:'查城投平台',
@@ -376,11 +377,11 @@ export default {
         handleCurrentChange(pageNum) {
             if(pageNum*this.pageSize>10000){
                 this.$message.warning("数据达上限")
-                this.pageNum = 10000/this.pageSize
+                this.reloadPage();
             }else{
                 this.pageNum = pageNum;
-            }
                 this.search()
+            }
 
         },
         handleCurrentChange1(pageNum) {

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

@@ -186,13 +186,14 @@
         })
       },
       handleClick(item,key){
-        if(key === 1){
+        if(key === 0 || key === 1){
           this.status=item.status
           this.handleVisible=true
         }
         if(key === 2){
           this.handleVisible1=true
         }
+        console.log(this.status)
         this.id=item.id
       },
       // 开始时间改变