Merge branch 'master' of http://192.168.60.201/root/dsk-operate-sys

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessBacklogController.java

 package com.dsk.web.controller.business;
 
-import java.util.List;
-import javax.annotation.PostConstruct;
-import javax.servlet.http.HttpServletResponse;
-
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.entity.BusinessBacklog;
-import com.dsk.common.utils.poi.ExcelUtil;
+import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.system.service.IBusinessBacklogService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.dsk.common.annotation.Log;
-import com.dsk.common.core.controller.BaseController;
-import com.dsk.common.core.domain.AjaxResult;
-import com.dsk.common.enums.BusinessType;
-import com.dsk.common.core.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 项目工作待办Controller

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessContactsController.java

 package com.dsk.web.controller.business;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.dsk.common.core.domain.entity.BusinessContacts;
-import com.dsk.common.utils.poi.ExcelUtil;
-import com.dsk.system.service.IBusinessContactsService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.dsk.common.annotation.Log;
 import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.AjaxResult;
-import com.dsk.common.enums.BusinessType;
+import com.dsk.common.core.domain.entity.BusinessContacts;
 import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.system.service.IBusinessContactsService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 项目联系人Controller

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessFileController.java

@@ -3,13 +3,17 @@ package com.dsk.web.controller.business;
 import com.dsk.common.config.RuoYiConfig;
 import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.common.utils.file.FileUploadUtils;
 import com.dsk.common.utils.file.FileUtils;
+import com.dsk.framework.config.ServerConfig;
+import com.dsk.system.domain.BusinessIdDto;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.util.List;
 
@@ -23,8 +27,8 @@ import java.util.List;
 @RequestMapping("/business/file")
 public class BusinessFileController extends BaseController {
 
-    // 本地资源路径
-    public static final String LOCALPATH = RuoYiConfig.getProfile();
+    @Autowired
+    private ServerConfig serverConfig;
 
     /**
      * 新建文件夹
@@ -33,36 +37,63 @@ public class BusinessFileController extends BaseController {
 //    @Log(title = "项目资料文档", businessType = BusinessType.INSERT)
     @GetMapping("/new/{filePath}")
     public AjaxResult newFolder(@PathVariable String filePath) {
-        return FileUtils.newFolder(LOCALPATH + filePath) ? AjaxResult.success() : AjaxResult.error();
+        return FileUtils.newFolder(RuoYiConfig.getProfile() + filePath) ? AjaxResult.success() : AjaxResult.error();
     }
 
     /**
      * 删除某个文件或整个文件夹
      */
-    @GetMapping("/remove/{filePath}")
-    public AjaxResult removeFile(@PathVariable String filePath) {
-        boolean deleteFile = FileUtils.deleteFile(LOCALPATH + filePath);
-        return deleteFile ? AjaxResult.success() : AjaxResult.error();
+    @PostMapping("/remove")
+    public AjaxResult removeFile(@RequestBody(required=false) BusinessIdDto folderPath) {
+        return FileUtils.delFolder(RuoYiConfig.getProfile() + folderPath.getFolderPath()) ? AjaxResult.success() : AjaxResult.error();
     }
 
     /**
+     * 分页查询项目的所有文件
      * 获取文件夹中所有文件
      */
-    @GetMapping("/all/{folderPath}")
-    public AjaxResult getAllFiles(@PathVariable String folderPath) {
-        List<String> allFiles = FileUtils.getAllFiles(LOCALPATH + folderPath);
-        return AjaxResult.success(allFiles);
+    @GetMapping(value = "/list")
+    public TableDataInfo getAllFiles(@RequestBody(required=false) BusinessIdDto folderPath) {
+        startPage();
+        List<String> allFiles = FileUtils.getAllFiles(RuoYiConfig.getProfile() + folderPath.getFolderPath());
+        return getDataTable(allFiles);
     }
 
-    /**
+/*    *//**
      * 上传文件及文件夹
      * @param url
      * @param folderPath
      * @return
-     */
+     *//*
     @GetMapping("/upload/{url}/{folderPath}")
     public AjaxResult uploadFolder(@PathVariable("url") String url,@PathVariable("folderPath") String folderPath) throws IOException {
         return toAjax(FileUtils.uploadFolder(url, LOCALPATH + folderPath));
+    }*/
+
+    /**
+     * 上传文件及文件夹
+     * @param file 文件流
+     * @param request 请求头参数
+     * @return
+     */
+    @PostMapping("/upload/")
+    public AjaxResult uploadFolder(@RequestPart("file") MultipartFile file, HttpServletRequest request){
+        try {
+        String businessFileName = request.getParameter("filePath");
+        // 上传文件路径
+        String filePath = RuoYiConfig.getUploadPath()+businessFileName;
+        // 上传并返回新文件名称
+            String fileName = FileUploadUtils.upload(filePath, file);
+            String url = serverConfig.getUrl() + fileName;
+            AjaxResult ajax = AjaxResult.success();
+            ajax.put("url", url);
+            ajax.put("fileName", fileName);
+            ajax.put("newFileName", FileUtils.getName(fileName));
+            ajax.put("originalFilename", file.getOriginalFilename());
+            return ajax;
+        } catch (IOException e) {
+            return AjaxResult.error(e.getMessage());
+        }
     }
 
     /**

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessFollowRecordController.java

 package com.dsk.web.controller.business;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.entity.BusinessFollowRecord;
+import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.system.domain.BusinessIdDto;
 import com.dsk.system.service.IBusinessFollowRecordService;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.dsk.common.annotation.Log;
-import com.dsk.common.core.controller.BaseController;
-import com.dsk.common.core.domain.AjaxResult;
-import com.dsk.common.enums.BusinessType;
-import com.dsk.common.utils.poi.ExcelUtil;
-import com.dsk.common.core.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 项目跟进记录Controller

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessInfoController.java

 package com.dsk.web.controller.business;
 
-import java.util.List;
-
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.entity.BusinessInfo;
-import com.dsk.common.dtos.BusinessInfoDto;
-import com.dsk.common.exception.base.BaseException;
-import com.dsk.common.utils.CheckUtils;
+import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.system.domain.BusinessAddDto;
 import com.dsk.system.domain.BusinessListDto;
-import com.dsk.system.domain.vo.BusinessBrowseVo;
 import com.dsk.system.domain.vo.BusinessListVo;
 import com.dsk.system.service.IBusinessInfoService;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import com.dsk.common.annotation.Log;
-import com.dsk.common.core.controller.BaseController;
-import com.dsk.common.core.domain.AjaxResult;
-import com.dsk.common.enums.BusinessType;
-import com.dsk.common.core.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * 项目详情Controller

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessLabelController.java

 package com.dsk.web.controller.business;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.entity.BusinessLabel;
-import com.dsk.common.utils.poi.ExcelUtil;
 import com.dsk.system.domain.BusinessIdDto;
 import com.dsk.system.service.IBusinessLabelService;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import com.dsk.common.annotation.Log;
-import com.dsk.common.core.controller.BaseController;
-import com.dsk.common.core.domain.AjaxResult;
-import com.dsk.common.enums.BusinessType;
-import com.dsk.common.core.page.TableDataInfo;
 
 /**
  * 项目标签Controller

dsk-admin/src/main/java/com/dsk/web/controller/business/BusinessRelateCompanyController.java

 package com.dsk.web.controller.business;
 
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
+import com.dsk.common.core.controller.BaseController;
+import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.entity.BusinessRelateCompany;
-import com.dsk.common.utils.poi.ExcelUtil;
+import com.dsk.common.core.page.TableDataInfo;
 import com.dsk.system.domain.BusinessIdDto;
 import com.dsk.system.service.IBusinessRelateCompanyService;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.dsk.common.annotation.Log;
-import com.dsk.common.core.controller.BaseController;
-import com.dsk.common.core.domain.AjaxResult;
-import com.dsk.common.enums.BusinessType;
-import com.dsk.common.core.page.TableDataInfo;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
 
 /**
  * 项目关联单位Controller

dsk-admin/src/main/java/com/dsk/web/controller/search/controller/MarketAnalysisController.java

@@ -82,15 +82,15 @@ public class MarketAnalysisController {
      * 中标数量按省份分组
      */
     @RequestMapping("/countGroupByProvince")
-    public AjaxResult countGroupByProvince(@RequestBody ComposeQueryDto compose) {
-        return marketAnalysisService.countGroupByProvince(compose);
+    public AjaxResult countGroupByProvince(@RequestBody JSONObject object) {
+        return marketAnalysisService.countGroupByProvince(object);
     }
 
     /*
      * 中标数量按月份分组
      */
     @RequestMapping("/countGroupByMonth")
-    public AjaxResult countGroupByMonth(@RequestBody ComposeQueryDto compose) {
-        return marketAnalysisService.countGroupByMonth(compose);
+    public AjaxResult countGroupByMonth() {
+        return marketAnalysisService.countGroupByMonth();
     }
 }

dsk-admin/src/main/java/com/dsk/web/controller/search/service/MarketAnalysisService.java

@@ -17,9 +17,9 @@ public interface MarketAnalysisService {
 
     AjaxResult certGroupByMajorProvinceLevel();
 
-    AjaxResult countGroupByProvince(ComposeQueryDto compose);
+    AjaxResult countGroupByProvince(JSONObject object);
 
-    AjaxResult countGroupByMonth(ComposeQueryDto compose);
+    AjaxResult countGroupByMonth();
 
     AjaxResult bidMoneyGroupByProjectType(JSONObject object);
 

dsk-admin/src/main/java/com/dsk/web/controller/search/service/impl/MarketAnalysisServiceImpl.java

@@ -56,14 +56,14 @@ public class MarketAnalysisServiceImpl implements MarketAnalysisService {
     }
 
     @Override
-    public AjaxResult countGroupByProvince(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByProvince", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult countGroupByProvince(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByProvince", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
-    public AjaxResult countGroupByMonth(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByDate", BeanUtil.beanToMap(compose, false, false));
+    public AjaxResult countGroupByMonth() {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/marketAnalysis/countGroupByMonth", null);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 }

dsk-admin/src/main/resources/application-dev.yml

@@ -8,8 +8,9 @@ ruoyi:
   copyrightYear: 2023
   # 实例演示开关
   demoEnabled: true
-  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/dsk-operate-sys/uploadPath/
+  # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/server/dsk-operate-sys/uploadPath）
+#  profile: D:/dsk-operate-sys/uploadPath/
+  profile: /home/server/dsk-operate-sys/uploadPath/
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证

dsk-common/src/main/java/com/dsk/common/utils/file/FileUtils.java

 package com.dsk.common.utils.file;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.dsk.common.config.RuoYiConfig;
+import com.dsk.common.exception.base.BaseException;
 import com.dsk.common.utils.DateUtils;
 import com.dsk.common.utils.StringUtils;
+import com.dsk.common.utils.uuid.IdUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.ArrayUtils;
-import com.dsk.common.config.RuoYiConfig;
-import com.dsk.common.utils.uuid.IdUtils;
-import org.apache.commons.io.FilenameUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpPost;
@@ -35,6 +18,18 @@ import org.apache.http.entity.mime.content.FileBody;
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.*;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
 /**
  * 文件处理工具类
  *
@@ -46,6 +41,10 @@ public class FileUtils
     public static String FILENAME_PATTERN = "[a-zA-Z0-9_\\-\\|\\.\\u4e00-\\u9fa5]+";
 
 
+    public static void main(String[] args) {
+        System.out.println(RuoYiConfig.getProfile());
+    }
+
     /**
      * 检查目录是否存在，如果不存在，则创建目录，如果创建失败则返回false
      *
@@ -57,8 +56,10 @@ public class FileUtils
         if (!file.exists()) {
             boolean isSuccess = file.mkdir();
             if (!isSuccess)
+                if (!file.exists()) {
                     file.mkdirs();
-            return !isSuccess;
+                }
+            return isSuccess;
         } else {
             return true;
         }
@@ -160,12 +161,12 @@ public class FileUtils
         return FileUploadUtils.getPathFileName(uploadDir, pathName);
     }
 
-/*    *//**
+/**
      * 删除文件
      *
      * @param filePath 文件
      * @return
-     *//*
+     */
     public static boolean deleteFile(String filePath)
     {
         boolean flag = false;
@@ -176,22 +177,20 @@ public class FileUtils
             flag = file.delete();
         }
         return flag;
-    }*/
+    }
     /**
      * 删除整个文件夹或者文某个文件
      *
      * @param filePath 文件
      * @return
      */
-    public static boolean deleteFile(String filePath) {
+    public static boolean delFolder(String filePath) {
         try {
-            if(StringUtils.isNotEmpty(delAllFile(filePath))) return false;
+            delAllFile(filePath); // 删除里面的所有文件
             File file = new File(filePath);
-            return file.delete();
+             return file.delete(); // 删除空文件夹
         } catch (Exception e) {
-            log.info("删除文件失败");
-            e.printStackTrace();
-            return false;
+            throw new BaseException("删除文件夹失败",e.getMessage());
         }
     }
 
@@ -200,32 +199,50 @@ public class FileUtils
      *
      * @param path 文件夹路径
      */
-    public static String delAllFile(String path) {
+    public static void delAllFile(String path) {
         String hint = "这是一个根目录，请更换目录!";
         File file = new File(path);
         if (!file.exists()) {
-            return hint;
+            throw new BaseException("文件不存在");
         }
 //        if (!file.isDirectory()) {
 //            return false;
 //        }
         if (file.getAbsolutePath().equalsIgnoreCase("/")) {
-            return hint;
+            throw new BaseException(hint);
         }
         if (file.getAbsolutePath().equalsIgnoreCase("/root")) {
-            return hint;
+            throw new BaseException(hint);
         }
         if (file.getAbsolutePath().equalsIgnoreCase("/usr") || file.getAbsolutePath().equalsIgnoreCase("/opt")
                 || file.getAbsolutePath().equalsIgnoreCase("/bin") || file.getAbsolutePath().equalsIgnoreCase("/sbin")
                 || file.getAbsolutePath().equalsIgnoreCase("/etc") || file.getAbsolutePath().equalsIgnoreCase("/selinux")
                 || file.getAbsolutePath().equalsIgnoreCase("/sys") || file.getAbsolutePath().equalsIgnoreCase("/var")
                 || file.getAbsolutePath().equalsIgnoreCase("/home") || file.getAbsolutePath().equalsIgnoreCase("/net")) {
-            return hint;
+            throw new BaseException(hint);
         }
         if (file.getAbsolutePath().equalsIgnoreCase("C://") || file.getAbsolutePath().equalsIgnoreCase("C:\\\\")) {
-            return hint;
+            throw new BaseException(hint);
+        }
+        String[] tempList = file.list();
+        File temp;
+        if (tempList == null) {
+            return;
+        }
+        for (String aTempList : tempList) {
+            if (path.endsWith(File.separator)) {
+                temp = new File(path + aTempList);
+            } else {
+                temp = new File(path + File.separator + aTempList);
+            }
+            if (temp.isFile()) {
+                temp.delete();
+            }
+            if (temp.isDirectory()) {
+                delAllFile(path + "/" + aTempList);// 删除里面的所有文件
+                delFolder(path + "/" + aTempList);// 删除空文件夹
+            }
         }
-        return "";
     }
 
 

dsk-operate-ui/src/api/detail/party-a/urbanLnvestment.js

@@ -32,3 +32,11 @@ export function urbanInvestmentPage(data) {
     data
   })
 }
+// 同地区城投-查询选项
+export function uipGroupData(data) {
+  return request({
+    url: '/enterprise/uipGroupData',
+    method: 'post',
+    data
+  })
+}

dsk-operate-ui/src/views/detail/party-a/component/Tables.vue

@@ -28,7 +28,7 @@
             :min-width="item.minWidth"
             :align="item.align?item.align:'left'"
             :fixed="item.fixed"
-            :sortable="item.sortable"
+            :sortable="item.sortable ? 'custom' : false"
             :resizable="false">
               <template v-if="item.slotHeader" slot="header">
                 <slot :name="item.slotName"></slot>

dsk-operate-ui/src/views/detail/party-a/riskInformation/businessAnomaly.vue

@@ -60,8 +60,6 @@ export default {
       //列表
       tableLoading:false,
       tableData:[],
-      pageIndex:1,
-      pageSize:10,
       tableDataTotal:0,
     }
   },

dsk-operate-ui/src/views/detail/party-a/riskInformation/openacourtsessionNotice.vue

@@ -75,8 +75,6 @@ export default {
       //列表
       tableLoading:false,
       tableData:[],
-      pageIndex:1,
-      pageSize:10,
       tableDataTotal:0,
     }
   },

dsk-operate-ui/src/views/detail/party-a/urbanLnvestment/regionalEconomies.vue

@@ -4,6 +4,7 @@
       <div class="flex-box query-params">
         <span class="common-title">区域经济</span>
       </div>
+      <div class="params-dw"><img src="@/assets/images/addree.png" />广东省-广州市</div>
     </div>
     <div class="table-item">
       <el-table
@@ -253,6 +254,16 @@ export default {
   }
   .query-box{
     margin: 10px 0 20px;
+    .params-dw{
+      font-size: 14px;
+      font-weight: 400;
+      color: #0081FF;
+      img{
+        width: 14px;
+        height: 14px;
+        margin-right: 5px;
+      }
+    }
   }
 }
 

dsk-operate-ui/src/views/project/projectList/component/xgqy.vue

@@ -5,19 +5,19 @@
       <div class="cardtitles">相关企业</div>
       <div class="searchbtns">
         <el-select class="select" placeholder="企业类型">
-          <el-select  placeholder="请选择">
+          <el-select  placeholder="请选择" v-model="searchParam.companyType">
             <el-option v-for="(item,index) in companytype" :label="item.dictLabel" :value="item.dictValue"></el-option>
           </el-select>
         </el-select>
         <div class="searchInput">
-          <el-input type="text" placeholder="输入关键词查询"></el-input>
-          <div class="btn">搜索</div>
+          <el-input type="text" placeholder="输入关键词查询" v-model="searchParam.companyName"></el-input>
+          <div class="btn" @click="handleCurrentChange(1)">搜索</div>
         </div>
         <div class="btn btn_primary h32 b3" @click="opennew"><div class="img img1"></div>添加相关企业</div>
       </div>
       <div class="document">
         <el-table
-          :data="tableData"
+          :data="tableData.rows"
           style="width: 100%"
         >
           <template slot="empty">
@@ -29,26 +29,26 @@
             </div>
           </template>
           <el-table-column
-            prop="date"
+            prop="companyName"
             label="企业名称"
             >
             <template slot-scope="scope">
-              <div class="wordprimary">集团投标常用资料</div>
+              <div class="wordprimary">{{scope.row.companyName}}</div>
             </template>
           </el-table-column>
           <el-table-column
-            prop="name"
-            label="对接深度"
+            prop="depth"
+            label="对接深度/竞争力度"
             >
           </el-table-column>
           <el-table-column
-            prop="name"
+            prop="companyRole"
             label="企业角色"
             sortable
             width="">
           </el-table-column>
           <el-table-column
-            prop="name"
+            prop="responsiblePerson"
             label="负责人"
             width="">
           </el-table-column>
@@ -59,21 +59,21 @@
             width="">
             <template slot-scope="scope">
               <div class="hoverbtn">
-                <div class="sc">删除</div>
+                <div class="sc" @click="delQY(scope.row.id)">删除</div>
               </div>
             </template>
           </el-table-column>
         </el-table>
 
-        <div class="tables">
+        <div class="tables" v-if="tableData.total > searchParam.pageSize">
           <div class="bottems">
             <el-pagination
               background
-              :page-size="20"
-              :current-page="1"
+              :page-size="searchParam.pageSize"
+              :current-page="searchParam.pageNum"
               @current-change="handleCurrentChange"
               layout="prev, pager, next"
-              :total="1000">
+              :total="tableData.total">
             </el-pagination>
           </div>
         </div>
@@ -87,12 +87,12 @@
           <span>新建相关企业</span>
         </div>
         <div class="types">
-          <div v-for="(item,index) in companytype" :class="{'on':types==item.dictValue}" @click="types=item.dictLabel"><i></i>{{item.dictLabel}}</div>
+          <div v-for="(item,index) in companytype" :class="{'on':types==item.dictValue}" @click="totype(item.dictValue)"><i></i>{{item.dictLabel}}</div>
         </div>
         <div class="popform">
           <div class="popbot" style="padding-right: 0">
-            <div class="btn btn_cancel h32" @click="cancel">返回</div>
-            <div class="btn btn_primary h32" @click="hzhbVisible=true">下一步</div>
+            <div class="btn btn_cancel h32" @click="cancel(0)">返回</div>
+            <div class="btn btn_primary h32" @click="gettype">下一步</div>
           </div>
         </div>
       </el-dialog>
@@ -105,29 +105,23 @@
           <span>新建相关企业-{{types}}</span>
         </div>
         <el-form class="popform i" label-width="85px" :rules="rules" ref="ruleForm" >
-          <el-form-item label="企业名称：" prop="projectName" class="row">
-            <el-input type="text" placeholder="请输入"></el-input>
-          </el-form-item>
-          <el-form-item  v-if="types == companytype[0].dictValue" label="对接深度：" class="row">
-            <el-input type="text" placeholder="请输入"></el-input>
-          </el-form-item>
-          <el-form-item  v-if="types == companytype[1].dictValue" label="合作阶段：" class="row">
-            <el-input type="text" placeholder="请输入"></el-input>
+          <el-form-item label="企业名称：" prop="companyName" class="row">
+            <el-input type="text" v-model="queryParam.companyName" placeholder="请输入"></el-input>
           </el-form-item>
-          <el-form-item  v-if="types == companytype[2].dictValue" label="竞争力度：" class="row">
-            <el-input type="text" placeholder="请输入"></el-input>
+          <el-form-item :label="typename" class="row">
+            <el-input type="text" v-model="queryParam.depth" placeholder="请输入"></el-input>
           </el-form-item>
           <el-form-item  label="企业角色：" class="row">
-            <el-select  placeholder="请选择">
+            <el-select  placeholder="请选择" v-model="queryParam.companyRole">
               <el-option v-for="(item,index) in companyrole" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="负责人：" class="row">
-            <el-input type="text" placeholder="请输入"></el-input>
+            <el-input type="text" v-model="queryParam.responsiblePerson" placeholder="请输入"></el-input>
           </el-form-item>
           <div class="popbot">
-            <div class="btn btn_cancel h32" @click="cancel">返回</div>
-            <div class="btn btn_primary h32">添加</div>
+            <div class="btn btn_cancel h32" @click="cancel(1)">返回</div>
+            <div class="btn btn_primary h32" @click="addqy">添加</div>
           </div>
         </el-form>
       </el-dialog>
@@ -169,12 +163,29 @@
             address: '上海市普陀区金沙江路 1516 弄'
           }
         ],
-
+        typelist:['对接深度：','合作阶段：','竞争力度：'],
+        typename:"",
         rules:{
-          projectName:[{ required: true, message: '请输入非空格字符！', trigger: 'blur' },],
+          companyName:[{ required: true, message: '请输入非空格字符！', trigger: 'blur' },],
         },
         companytype:[],
         companyrole:[],
+        queryParam:{
+          businessId:this.$route.query.id,
+          companyId:'',
+          companyName:'',
+          companyRole:'',
+          companyType:'',
+          responsiblePerson:'',
+          depth:'',
+        },
+        searchParam:{
+          pageSize:20,
+          pageNum:1,
+          businessId:this.$route.query.id,
+          companyType:"",
+          companyName:'',
+        },
       }
     },
     created(){
@@ -189,16 +200,59 @@
       })
     },
     methods:{
+      delQY(id){
+
+      },
+      addqy(){
+        addXGQY(this.queryParam).then(res=>{
+          if(res.code == 200){
+            this.$message.success('添加成功！')
+            this.getlist()
+          }else {
+            this.$message.error(res.msg)
+          }
+        })
+      },
+      getlist(){
+        getXGQY(this.searchParam).then(result=>{
+          this.tableData = result.data
+        })
+      },
       //翻页
       handleCurrentChange(val) {
-        console.log(`当前页: ${val}`);
+        this.searchParam.pageNum = val
+        this.getlist()
       },
-      cancel(){
+      cancel(type){
+        if(type == 0)
           this.dialogVisible = false
+        else
+          this.hzhbVisible =  false
+      },
+      totype(value){
+        this.types = value
+      },
+      gettype(){
+        this.queryParam.companyType = this.types
+        this.companytype.forEach((item,index)=>{
+          if(item.dictValue == this.types){
+            this.typename = this.typelist[index]
+          }
+        })
+        this.hzhbVisible=true
       },
       //打开新建窗口
       opennew(){
         this.dialogVisible = true
+        this.queryParam={
+          businessId:this.$route.query.id,
+          companyId:'',
+          companyName:'',
+          companyRole:'',
+          companyType:'',
+          responsiblePerson:'',
+          depth:'',
+        }
       },
     }
   }

dsk-operate-ui/src/views/project/projectList/component/xmsl.vue

@@ -26,7 +26,7 @@
                 {{xmjd}}
                 <i class="el-icon-caret-bottom"></i>
               </span>
-              <el-select v-model="xmjd" class="select-multiple" placeholder="请选择" @click="editXMSL({projectStage:xmjd})">
+              <el-select v-model="xmjd" class="select-multiple" placeholder="请选择" @change="editXMSL({projectStage:xmjd})">
                 <el-option v-for="(item,index) in projectStage" :key="index" :label="item.dictLabel" :value="item.dictValue"></el-option>
               </el-select>
             </div>

dsk-operate-ui/vue.config.js

@@ -35,6 +35,8 @@ module.exports = {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
         target: `http://122.9.160.122:9011`,
+        // target: `http://192.168.60.126:9011`,
+        // target: `http://192.168.60.27:8766`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''

dsk-system/src/main/java/com/dsk/system/domain/BusinessIdDto.java

@@ -19,4 +19,9 @@ public class BusinessIdDto {
      * 项目标签名称
      */
     private String label;
+
+    /**
+     * 文件路径
+     */
+    private String folderPath;
 }