Merge remote-tracking branch 'origin/master'

dsk-admin/src/main/java/com/dsk/web/controller/customer/CustomerController.java

 package com.dsk.web.controller.customer;
 
+import com.dsk.common.annotation.Log;
 import com.dsk.common.annotation.RepeatSubmit;
 import com.dsk.common.core.controller.BaseController;
 import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.core.domain.entity.SysRole;
 import com.dsk.common.core.page.TableDataInfo;
+import com.dsk.common.enums.BusinessType;
+import com.dsk.common.utils.poi.ExcelUtil;
 import com.dsk.system.domain.customer.Customer;
 import com.dsk.system.domain.customer.dto.CustomerBusinessSearchDto;
 import com.dsk.system.domain.customer.dto.CustomerSearchDto;
 import com.dsk.system.service.ICustomerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
 
 /**
  * 客户相关
@@ -30,7 +38,7 @@ public class CustomerController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('customer:list')")
     @GetMapping("/list")
-    public TableDataInfo selectPageList(CustomerSearchDto dto){
+    public TableDataInfo selectPageList(CustomerSearchDto dto) {
         startPage();
         return getDataTable(baseService.selectList(dto));
     }
@@ -40,7 +48,7 @@ public class CustomerController extends BaseController {
      */
     @PreAuthorize("@ss.hasPermi('customer:info')")
     @GetMapping("/{customerId}")
-    public AjaxResult info(@PathVariable("customerId") String customerId){
+    public AjaxResult info(@PathVariable("customerId") String customerId) {
         return AjaxResult.success(baseService.info(customerId));
     }
 
@@ -50,7 +58,7 @@ public class CustomerController extends BaseController {
     @PreAuthorize("@ss.hasPermi('customer:add')")
     @PostMapping()
     @RepeatSubmit
-    public AjaxResult add(@RequestBody Customer customer){
+    public AjaxResult add(@RequestBody Customer customer) {
         return AjaxResult.success(baseService.add(customer));
     }
 
@@ -60,7 +68,7 @@ public class CustomerController extends BaseController {
     @PreAuthorize("@ss.hasPermi('customer:edit')")
     @PutMapping()
     @RepeatSubmit
-    public AjaxResult edit(@RequestBody Customer customer){
+    public AjaxResult edit(@RequestBody Customer customer) {
         return AjaxResult.success(baseService.edit(customer));
     }
 
@@ -68,7 +76,7 @@ public class CustomerController extends BaseController {
      * 获取个人客户列表
      */
     @GetMapping("/user/list")
-    public AjaxResult userList(){
+    public AjaxResult userList() {
         return AjaxResult.success(baseService.selectUserList());
     }
 
@@ -77,9 +85,15 @@ public class CustomerController extends BaseController {
      */
 //    @PreAuthorize("@ss.hasPermi('customer:business:list')")
     @GetMapping("/business/list")
-    public TableDataInfo businessList(CustomerBusinessSearchDto dto){
+    public TableDataInfo businessList(CustomerBusinessSearchDto dto) {
         startPage();
         return getDataTable(baseService.selectBusinessList(dto));
     }
 
+    @Log(title = "客户数据导入", businessType = BusinessType.IMPORT)
+    //@PreAuthorize("@ss.hasPermi('customer:importData')")
+    @PostMapping("/importData")
+    public AjaxResult importData(@RequestPart("file") MultipartFile file) throws Exception {
+        return AjaxResult.success(baseService.importData(new ExcelUtil<>(Customer.class).importExcel(file.getInputStream(), 3)));
+    }
 }

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

+package com.dsk.web.controller.search.controller;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
+import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
+import com.dsk.web.controller.search.service.MarketAnalysisService;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+
+/**
+ * 商机雷达 查询接口
+ * @author Administrator
+ *
+ */
+@RequestMapping("/radar")
+@RestController
+public class BusinessOpportunityRadarController {
+
+
+    @Resource
+    BusinessOpportunityRadarService opportunityRadarService;
+
+    /*
+     * 土地交易
+     */
+    @RequestMapping("/landMarketPage")
+    public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.landMarketPage(compose);
+    }
+
+    /*
+     * 拟建项目
+     */
+    @RequestMapping("/establishmentPage")
+    public AjaxResult establishmentPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.establishmentPage(compose);
+    }
+
+    /*
+     * 开标记录
+     */
+    @RequestMapping("/jskBidTenderPage")
+    public AjaxResult jskBidTenderPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.jskBidTenderPage(compose);
+    }
+
+
+    /*
+     * 标讯pro
+     */
+    @RequestMapping("/jskBidNewsPage")
+    public AjaxResult jskBidNewsPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.jskBidNewsPage(compose);
+    }
+
+
+    /*
+     * 专项债查询
+     */
+    @RequestMapping("/bondProjectPage")
+    public AjaxResult bondProjectPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.bondProjectPage(compose);
+    }
+
+    /*
+     * 投标计划查询
+     */
+    @RequestMapping("/jskBidPlanPage")
+    public AjaxResult jskBidPlanPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.jskBidPlanPage(compose);
+    }
+}

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

+package com.dsk.web.controller.search.controller;
+
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
+import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+
+/**
+ * 查企业
+ * @author Administrator
+ *
+ */
+@RequestMapping("/enterprise")
+@RestController
+public class CompanySearchController {
+
+
+    @Resource
+    BusinessOpportunityRadarService opportunityRadarService;
+
+    /*
+     * 模糊查询企业名称
+     */
+    @RequestMapping("/index")
+    public AjaxResult landMarketPage(@RequestBody ComposeQueryDto compose) {
+        return opportunityRadarService.enterprisePage(compose);
+    }
+
+    /*
+     * 完全匹配企业名称
+     */
+    @GetMapping("/findByName/{keyword}")
+    public AjaxResult findByName(@PathVariable String keyword) {
+        return opportunityRadarService.enterpriseByName(keyword);
+    }
+}

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

-package com.dsk.web.controller.search;
+package com.dsk.web.controller.search.controller;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.ComposeQueryDto;
 import com.dsk.web.controller.search.service.MarketAnalysisService;
@@ -51,6 +52,32 @@ public class MarketAnalysisController {
         return marketAnalysisService.certGroupByMajorProvinceLevel();
     }
 
+
+
+    /*
+     * 产业结构-按年份选择  各个项目类型项目总数
+     */
+    @RequestMapping("/bidGroupCountByProjectType")
+    public AjaxResult bidGroupCountByProjectType(@RequestBody JSONObject object) {
+        return marketAnalysisService.bidGroupCountByProjectType(object);
+    }
+    /*
+     * 产业结构-近两年各个项目类型项目总数及金额占比
+     */
+    @RequestMapping("/bidMoneyGroupByProjectType")
+    public AjaxResult bidMoneyGroupByProjectType(@RequestBody JSONObject object) {
+        return marketAnalysisService.bidMoneyGroupByProjectType(object);
+    }
+
+
+
+
+
+
+
+
+
+
     /*
      * 中标数量按省份分组
      */

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

+package com.dsk.web.controller.search.service;
+
+import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
+
+/**
+ * @Author liujie
+ * @ClassName MarketAnalysisService
+ * @Date 2023/5/15 16:39
+ **/
+public interface BusinessOpportunityRadarService {
+
+
+    AjaxResult jskBidNewsPage(ComposeQueryDto compose);
+    AjaxResult jskBidTenderPage(ComposeQueryDto compose);
+
+    AjaxResult landMarketPage(ComposeQueryDto compose);
+    AjaxResult establishmentPage(ComposeQueryDto compose);
+
+    AjaxResult enterprisePage(ComposeQueryDto compose);
+
+    AjaxResult enterpriseByName(String keyword);
+
+    AjaxResult bondProjectPage(ComposeQueryDto compose);
+
+    AjaxResult jskBidPlanPage(ComposeQueryDto compose);
+}

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

 package com.dsk.web.controller.search.service;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.ComposeQueryDto;
 
@@ -19,4 +20,8 @@ public interface MarketAnalysisService {
     AjaxResult countGroupByProvince(ComposeQueryDto compose);
 
     AjaxResult countGroupByMonth(ComposeQueryDto compose);
+
+    AjaxResult bidMoneyGroupByProjectType(JSONObject object);
+
+    AjaxResult bidGroupCountByProjectType(JSONObject object);
 }

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

+package com.dsk.web.controller.search.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson2.JSONObject;
+import com.dsk.common.core.domain.AjaxResult;
+import com.dsk.common.dtos.ComposeQueryDto;
+import com.dsk.common.utils.DskOpenApiUtil;
+import com.dsk.web.controller.search.service.BusinessOpportunityRadarService;
+import com.dsk.web.controller.search.service.MarketAnalysisService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @Author liujie
+ * @ClassName MarketAnalysisServiceImpl
+ * @Date 2023/5/15 16:40
+ **/
+@Service
+public class BusinessOpportunityRadarServiceImpl implements BusinessOpportunityRadarService {
+
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
+
+
+    @Override
+    public AjaxResult jskBidNewsPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/jskBid/news/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+
+    @Override
+    public AjaxResult jskBidTenderPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/jskBidTender/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult establishmentPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/establishment/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult landMarketPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/landMarket/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult enterprisePage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/index", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult enterpriseByName(String keyword){
+        Map<String,Object> params = new HashMap<>();
+        params.put("keyword",keyword);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/nationzj/enterprice/findByName", params);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult bondProjectPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/bondProject/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult jskBidPlanPage(ComposeQueryDto compose) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/jskBidPlan/page", BeanUtil.beanToMap(compose, false, false));
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+}

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

 package com.dsk.web.controller.search.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.alibaba.fastjson2.JSONObject;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.core.domain.R;
 import com.dsk.common.dtos.ComposeQueryDto;
@@ -24,33 +25,45 @@ public class MarketAnalysisServiceImpl implements MarketAnalysisService {
     private DskOpenApiUtil dskOpenApiUtil;
     @Override
     public AjaxResult areaGroupByProvince() {
-
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/areaGroupByProvince", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/areaGroupByProvince", null);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult certGroupByMajorAndLevel() {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/certGroupByMajorAndLevel", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/certGroupByMajorAndLevel", null);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
 
     @Override
     public AjaxResult certGroupByMajorProvinceLevel()  {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/certGroupByMajorProvinceLevel", null);
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/certGroupByMajorProvinceLevel", null);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+
+    @Override
+    public AjaxResult bidMoneyGroupByProjectType(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/bidMoneyGroupByProjectType", object);
+        return BeanUtil.toBean(map, AjaxResult.class);
+    }
+
+    @Override
+    public AjaxResult bidGroupCountByProjectType(JSONObject object) {
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/bidGroupCountByProjectType", object);
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult countGroupByProvince(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/countGroupByProvince", BeanUtil.beanToMap(compose, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/countGroupByProvince", BeanUtil.beanToMap(compose, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 
     @Override
     public AjaxResult countGroupByMonth(ComposeQueryDto compose) {
-        Map<String, Object> map = dskOpenApiUtil.requestBody("/marketAnalysis/countGroupByDate", BeanUtil.beanToMap(compose, false, false));
+        Map<String, Object> map = dskOpenApiUtil.requestBody("/api/nationzj/marketAnalysis/countGroupByDate", BeanUtil.beanToMap(compose, false, false));
         return BeanUtil.toBean(map, AjaxResult.class);
     }
 }

dsk-common/src/main/java/com/dsk/common/dtos/ComposeQueryDto.java

@@ -58,6 +58,10 @@ public class ComposeQueryDto {
 	JskBidCandidateDto jskBidCandidateDto;
 	//中标公示
 	JskBidWinListDto jskBidWinListDto;
+	//专项债项目
+	SpecialBondProjectDto specialBondProjectDto;
+	//投标计划
+	JskBidPlanDto jskBidPlanDto;
 
 	String achievementQueryType;
 

dsk-common/src/main/java/com/dsk/common/dtos/JskBidPlanDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+/**
+ * 组合查询参数
+ * @author Administrator
+ *
+ */
+@Data
+public class JskBidPlanDto {
+
+
+	String id;
+
+	String uuid;
+
+	String title;
+
+	String projectName;
+
+	String projectNumber;
+	//招标人
+	String tenderee;
+
+	String tendereeId;
+
+	String projectScale;
+
+	String province;
+
+	String city;
+
+	String area;
+
+	String domicile;
+	//标的物类型
+	String objectType;
+	//项目类型
+	String projectType;
+	//招标方式
+	String tenderWay;
+	//合同预估金额
+	Double planTenderAmount;
+	Double startPlanTenderAmount;
+	Double endPlanTenderAmount;
+	//资金来源
+	String projecetCapitalSource;
+	//发布时间
+	String issueTime;
+	//来源网站
+	String sourceName;
+
+	/**
+	 * 修改时间
+	 */
+	String updateTime;
+}

dsk-common/src/main/java/com/dsk/common/dtos/SpecialBondProjectDto.java

+package com.dsk.common.dtos;
+
+import lombok.Data;
+
+/**
+ * 组合查询参数
+ * @author Administrator
+ *
+ */
+@Data
+public class SpecialBondProjectDto {
+
+
+	Long id;
+
+	String uuid;
+
+	String projectName;
+
+	String projectType;
+	//项目总投资
+	String projectTotalInvestment;
+	//项目资本金
+	String projectCapital;
+	//专项债金额
+	String specialCapital;
+	//项目主体
+	String projectEntity;
+	//项目主体id
+	Long projectEntityId;
+	//主管部门
+	String chargeDepartment;
+	//实施单位
+	String piu;
+
+	Long piuId;
+
+	String domicile;
+
+	String province;
+
+	String city;
+
+	String area;
+
+}

dsk-operate-ui/package.json

@@ -40,7 +40,7 @@
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "3.25.3",
-    "echarts": "5.4.0",
+    "echarts": "^5.4.0",
     "element-resize-detector": "^1.2.4",
     "element-ui": "2.15.12",
     "file-saver": "2.0.5",

dsk-operate-ui/src/assets/lib/swiper/swiper-bundle.css

+/**
+ * Swiper 7.2.0
+ * Most modern mobile touch slider and framework with hardware accelerated transitions
+ * https://swiperjs.com
+ *
+ * Copyright 2014-2021 Vladimir Kharlampidi
+ *
+ * Released under the MIT License
+ *
+ * Released on: October 27, 2021
+ */
+
+@font-face {
+  font-family: 'swiper-icons';
+  src: url('data:application/font-woff;charset=utf-8;base64, d09GRgABAAAAAAZgABAAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAAGRAAAABoAAAAci6qHkUdERUYAAAWgAAAAIwAAACQAYABXR1BPUwAABhQAAAAuAAAANuAY7+xHU1VCAAAFxAAAAFAAAABm2fPczU9TLzIAAAHcAAAASgAAAGBP9V5RY21hcAAAAkQAAACIAAABYt6F0cBjdnQgAAACzAAAAAQAAAAEABEBRGdhc3AAAAWYAAAACAAAAAj//wADZ2x5ZgAAAywAAADMAAAD2MHtryVoZWFkAAABbAAAADAAAAA2E2+eoWhoZWEAAAGcAAAAHwAAACQC9gDzaG10eAAAAigAAAAZAAAArgJkABFsb2NhAAAC0AAAAFoAAABaFQAUGG1heHAAAAG8AAAAHwAAACAAcABAbmFtZQAAA/gAAAE5AAACXvFdBwlwb3N0AAAFNAAAAGIAAACE5s74hXjaY2BkYGAAYpf5Hu/j+W2+MnAzMYDAzaX6QjD6/4//Bxj5GA8AuRwMYGkAPywL13jaY2BkYGA88P8Agx4j+/8fQDYfA1AEBWgDAIB2BOoAeNpjYGRgYNBh4GdgYgABEMnIABJzYNADCQAACWgAsQB42mNgYfzCOIGBlYGB0YcxjYGBwR1Kf2WQZGhhYGBiYGVmgAFGBiQQkOaawtDAoMBQxXjg/wEGPcYDDA4wNUA2CCgwsAAAO4EL6gAAeNpj2M0gyAACqxgGNWBkZ2D4/wMA+xkDdgAAAHjaY2BgYGaAYBkGRgYQiAHyGMF8FgYHIM3DwMHABGQrMOgyWDLEM1T9/w8UBfEMgLzE////P/5//f/V/xv+r4eaAAeMbAxwIUYmIMHEgKYAYjUcsDAwsLKxc3BycfPw8jEQA/gZBASFhEVExcQlJKWkZWTl5BUUlZRVVNXUNTQZBgMAAMR+E+gAEQFEAAAAKgAqACoANAA+AEgAUgBcAGYAcAB6AIQAjgCYAKIArAC2AMAAygDUAN4A6ADyAPwBBgEQARoBJAEuATgBQgFMAVYBYAFqAXQBfgGIAZIBnAGmAbIBzgHsAAB42u2NMQ6CUAyGW568x9AneYYgm4MJbhKFaExIOAVX8ApewSt4Bic4AfeAid3VOBixDxfPYEza5O+Xfi04YADggiUIULCuEJK8VhO4bSvpdnktHI5QCYtdi2sl8ZnXaHlqUrNKzdKcT8cjlq+rwZSvIVczNiezsfnP/uznmfPFBNODM2K7MTQ45YEAZqGP81AmGGcF3iPqOop0r1SPTaTbVkfUe4HXj97wYE+yNwWYxwWu4v1ugWHgo3S1XdZEVqWM7ET0cfnLGxWfkgR42o2PvWrDMBSFj/IHLaF0zKjRgdiVMwScNRAoWUoH78Y2icB/yIY09An6AH2Bdu/UB+yxopYshQiEvnvu0dURgDt8QeC8PDw7Fpji3fEA4z/PEJ6YOB5hKh4dj3EvXhxPqH/SKUY3rJ7srZ4FZnh1PMAtPhwP6fl2PMJMPDgeQ4rY8YT6Gzao0eAEA409DuggmTnFnOcSCiEiLMgxCiTI6Cq5DZUd3Qmp10vO0LaLTd2cjN4fOumlc7lUYbSQcZFkutRG7g6JKZKy0RmdLY680CDnEJ+UMkpFFe1RN7nxdVpXrC4aTtnaurOnYercZg2YVmLN/d/gczfEimrE/fs/bOuq29Zmn8tloORaXgZgGa78yO9/cnXm2BpaGvq25Dv9S4E9+5SIc9PqupJKhYFSSl47+Qcr1mYNAAAAeNptw0cKwkAAAMDZJA8Q7OUJvkLsPfZ6zFVERPy8qHh2YER+3i/BP83vIBLLySsoKimrqKqpa2hp6+jq6RsYGhmbmJqZSy0sraxtbO3sHRydnEMU4uR6yx7JJXveP7WrDycAAAAAAAH//wACeNpjYGRgYOABYhkgZgJCZgZNBkYGLQZtIJsFLMYAAAw3ALgAeNolizEKgDAQBCchRbC2sFER0YD6qVQiBCv/H9ezGI6Z5XBAw8CBK/m5iQQVauVbXLnOrMZv2oLdKFa8Pjuru2hJzGabmOSLzNMzvutpB3N42mNgZGBg4GKQYzBhYMxJLMlj4GBgAYow/P/PAJJhLM6sSoWKfWCAAwDAjgbRAAB42mNgYGBkAIIbCZo5IPrmUn0hGA0AO8EFTQAA');
+  font-weight: 400;
+  font-style: normal;
+}
+:root {
+  --swiper-theme-color: #007aff;
+}
+.swiper {
+  margin-left: auto;
+  margin-right: auto;
+  position: relative;
+  overflow: hidden;
+  list-style: none;
+  padding: 0;
+  /* Fix of Webkit flickering */
+  z-index: 1;
+}
+.swiper-vertical > .swiper-wrapper {
+  flex-direction: column;
+}
+.swiper-wrapper {
+  position: relative;
+  width: 100%;
+  height: 100%;
+  z-index: 1;
+  display: flex;
+  transition-property: transform;
+  box-sizing: content-box;
+}
+.swiper-android .swiper-slide,
+.swiper-wrapper {
+  transform: translate3d(0px, 0, 0);
+}
+.swiper-pointer-events {
+  touch-action: pan-y;
+}
+.swiper-pointer-events.swiper-vertical {
+  touch-action: pan-x;
+}
+.swiper-slide {
+  flex-shrink: 0;
+  width: 100%;
+  height: 100%;
+  position: relative;
+  transition-property: transform;
+}
+.swiper-slide-invisible-blank {
+  visibility: hidden;
+}
+/* Auto Height */
+.swiper-autoheight,
+.swiper-autoheight .swiper-slide {
+  height: auto;
+}
+.swiper-autoheight .swiper-wrapper {
+  align-items: flex-start;
+  transition-property: transform, height;
+}
+/* 3D Effects */
+.swiper-3d,
+.swiper-3d.swiper-css-mode .swiper-wrapper {
+  perspective: 1200px;
+}
+.swiper-3d .swiper-wrapper,
+.swiper-3d .swiper-slide,
+.swiper-3d .swiper-slide-shadow,
+.swiper-3d .swiper-slide-shadow-left,
+.swiper-3d .swiper-slide-shadow-right,
+.swiper-3d .swiper-slide-shadow-top,
+.swiper-3d .swiper-slide-shadow-bottom,
+.swiper-3d .swiper-cube-shadow {
+  transform-style: preserve-3d;
+}
+.swiper-3d .swiper-slide-shadow,
+.swiper-3d .swiper-slide-shadow-left,
+.swiper-3d .swiper-slide-shadow-right,
+.swiper-3d .swiper-slide-shadow-top,
+.swiper-3d .swiper-slide-shadow-bottom {
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
+  z-index: 10;
+}
+.swiper-3d .swiper-slide-shadow {
+  background: rgba(0, 0, 0, 0.15);
+}
+.swiper-3d .swiper-slide-shadow-left {
+  background-image: linear-gradient(to left, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
+}
+.swiper-3d .swiper-slide-shadow-right {
+  background-image: linear-gradient(to right, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
+}
+.swiper-3d .swiper-slide-shadow-top {
+  background-image: linear-gradient(to top, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
+}
+.swiper-3d .swiper-slide-shadow-bottom {
+  background-image: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), rgba(0, 0, 0, 0));
+}
+/* CSS Mode */
+.swiper-css-mode > .swiper-wrapper {
+  overflow: auto;
+  scrollbar-width: none;
+  /* For Firefox */
+  -ms-overflow-style: none;
+  /* For Internet Explorer and Edge */
+}
+.swiper-css-mode > .swiper-wrapper::-webkit-scrollbar {
+  display: none;
+}
+.swiper-css-mode > .swiper-wrapper > .swiper-slide {
+  scroll-snap-align: start start;
+}
+.swiper-horizontal.swiper-css-mode > .swiper-wrapper {
+  scroll-snap-type: x mandatory;
+}
+.swiper-vertical.swiper-css-mode > .swiper-wrapper {
+  scroll-snap-type: y mandatory;
+}
+.swiper-centered > .swiper-wrapper::before {
+  content: '';
+  flex-shrink: 0;
+  order: 9999;
+}
+.swiper-centered.swiper-horizontal > .swiper-wrapper > .swiper-slide:first-child {
+  margin-inline-start: var(--swiper-centered-offset-before);
+}
+.swiper-centered.swiper-horizontal > .swiper-wrapper::before {
+  height: 100%;
+  min-height: 1px;
+  width: var(--swiper-centered-offset-after);
+}
+.swiper-centered.swiper-vertical > .swiper-wrapper > .swiper-slide:first-child {
+  margin-block-start: var(--swiper-centered-offset-before);
+}
+.swiper-centered.swiper-vertical > .swiper-wrapper::before {
+  width: 100%;
+  min-width: 1px;
+  height: var(--swiper-centered-offset-after);
+}
+.swiper-centered > .swiper-wrapper > .swiper-slide {
+  scroll-snap-align: center center;
+}
+.swiper-virtual.swiper-css-mode .swiper-wrapper::after {
+  content: '';
+  position: absolute;
+  left: 0;
+  top: 0;
+  pointer-events: none;
+}
+.swiper-virtual.swiper-css-mode.swiper-horizontal .swiper-wrapper::after {
+  height: 1px;
+  width: var(--swiper-virtual-size);
+}
+.swiper-virtual.swiper-css-mode.swiper-vertical .swiper-wrapper::after {
+  width: 1px;
+  height: var(--swiper-virtual-size);
+}
+:root {
+  --swiper-navigation-size: 44px;
+  /*
+  --swiper-navigation-color: var(--swiper-theme-color);
+  */
+}
+.swiper-button-prev,
+.swiper-button-next {
+  position: absolute;
+  top: 50%;
+  width: calc(var(--swiper-navigation-size) / 44 * 27);
+  height: var(--swiper-navigation-size);
+  margin-top: calc(0px - (var(--swiper-navigation-size) / 2));
+  z-index: 10;
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  color: var(--swiper-navigation-color, var(--swiper-theme-color));
+}
+.swiper-button-prev.swiper-button-disabled,
+.swiper-button-next.swiper-button-disabled {
+  opacity: 0.35;
+  cursor: auto;
+  pointer-events: none;
+}
+.swiper-button-prev:after,
+.swiper-button-next:after {
+  font-family: swiper-icons;
+  font-size: var(--swiper-navigation-size);
+  text-transform: none !important;
+  letter-spacing: 0;
+  text-transform: none;
+  font-variant: initial;
+  line-height: 1;
+}
+.swiper-button-prev,
+.swiper-rtl .swiper-button-next {
+  left: 10px;
+  right: auto;
+}
+.swiper-button-prev:after,
+.swiper-rtl .swiper-button-next:after {
+  content: 'prev';
+}
+.swiper-button-next,
+.swiper-rtl .swiper-button-prev {
+  right: 10px;
+  left: auto;
+}
+.swiper-button-next:after,
+.swiper-rtl .swiper-button-prev:after {
+  content: 'next';
+}
+.swiper-button-lock {
+  display: none;
+}
+:root {
+  /*
+  --swiper-pagination-color: var(--swiper-theme-color);
+  --swiper-pagination-bullet-size: 8px;
+  --swiper-pagination-bullet-width: 8px;
+  --swiper-pagination-bullet-height: 8px;
+  --swiper-pagination-bullet-inactive-color: #000;
+  --swiper-pagination-bullet-inactive-opacity: 0.2;
+  --swiper-pagination-bullet-opacity: 1;
+  --swiper-pagination-bullet-horizontal-gap: 4px;
+  --swiper-pagination-bullet-vertical-gap: 6px;
+  */
+}
+.swiper-pagination {
+  position: absolute;
+  text-align: center;
+  transition: 300ms opacity;
+  transform: translate3d(0, 0, 0);
+  z-index: 10;
+}
+.swiper-pagination.swiper-pagination-hidden {
+  opacity: 0;
+}
+/* Common Styles */
+.swiper-pagination-fraction,
+.swiper-pagination-custom,
+.swiper-horizontal > .swiper-pagination-bullets,
+.swiper-pagination-bullets.swiper-pagination-horizontal {
+  bottom: 10px;
+  left: 0;
+  width: 100%;
+}
+/* Bullets */
+.swiper-pagination-bullets-dynamic {
+  overflow: hidden;
+  font-size: 0;
+}
+.swiper-pagination-bullets-dynamic .swiper-pagination-bullet {
+  transform: scale(0.33);
+  position: relative;
+}
+.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active {
+  transform: scale(1);
+}
+.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-main {
+  transform: scale(1);
+}
+.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-prev {
+  transform: scale(0.66);
+}
+.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-prev-prev {
+  transform: scale(0.33);
+}
+.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-next {
+  transform: scale(0.66);
+}
+.swiper-pagination-bullets-dynamic .swiper-pagination-bullet-active-next-next {
+  transform: scale(0.33);
+}
+.swiper-pagination-bullet {
+  width: var(--swiper-pagination-bullet-width, var(--swiper-pagination-bullet-size, 8px));
+  height: var(--swiper-pagination-bullet-height, var(--swiper-pagination-bullet-size, 8px));
+  display: inline-block;
+  border-radius: 50%;
+  background: var(--swiper-pagination-bullet-inactive-color, #000);
+  opacity: var(--swiper-pagination-bullet-inactive-opacity, 0.2);
+}
+button.swiper-pagination-bullet {
+  border: none;
+  margin: 0;
+  padding: 0;
+  box-shadow: none;
+  -webkit-appearance: none;
+          appearance: none;
+}
+.swiper-pagination-clickable .swiper-pagination-bullet {
+  cursor: pointer;
+}
+.swiper-pagination-bullet:only-child {
+  display: none !important;
+}
+.swiper-pagination-bullet-active {
+  opacity: var(--swiper-pagination-bullet-opacity, 1);
+  background: var(--swiper-pagination-color, var(--swiper-theme-color));
+}
+.swiper-vertical > .swiper-pagination-bullets,
+.swiper-pagination-vertical.swiper-pagination-bullets {
+  right: 10px;
+  top: 50%;
+  transform: translate3d(0px, -50%, 0);
+}
+.swiper-vertical > .swiper-pagination-bullets .swiper-pagination-bullet,
+.swiper-pagination-vertical.swiper-pagination-bullets .swiper-pagination-bullet {
+  margin: var(--swiper-pagination-bullet-vertical-gap, 6px) 0;
+  display: block;
+}
+.swiper-vertical > .swiper-pagination-bullets.swiper-pagination-bullets-dynamic,
+.swiper-pagination-vertical.swiper-pagination-bullets.swiper-pagination-bullets-dynamic {
+  top: 50%;
+  transform: translateY(-50%);
+  width: 8px;
+}
+.swiper-vertical > .swiper-pagination-bullets.swiper-pagination-bullets-dynamic .swiper-pagination-bullet,
+.swiper-pagination-vertical.swiper-pagination-bullets.swiper-pagination-bullets-dynamic .swiper-pagination-bullet {
+  display: inline-block;
+  transition: 200ms transform, 200ms top;
+}
+.swiper-horizontal > .swiper-pagination-bullets .swiper-pagination-bullet,
+.swiper-pagination-horizontal.swiper-pagination-bullets .swiper-pagination-bullet {
+  margin: 0 var(--swiper-pagination-bullet-horizontal-gap, 4px);
+}
+.swiper-horizontal > .swiper-pagination-bullets.swiper-pagination-bullets-dynamic,
+.swiper-pagination-horizontal.swiper-pagination-bullets.swiper-pagination-bullets-dynamic {
+  left: 50%;
+  transform: translateX(-50%);
+  white-space: nowrap;
+}
+.swiper-horizontal > .swiper-pagination-bullets.swiper-pagination-bullets-dynamic .swiper-pagination-bullet,
+.swiper-pagination-horizontal.swiper-pagination-bullets.swiper-pagination-bullets-dynamic .swiper-pagination-bullet {
+  transition: 200ms transform, 200ms left;
+}
+.swiper-horizontal.swiper-rtl > .swiper-pagination-bullets-dynamic .swiper-pagination-bullet {
+  transition: 200ms transform, 200ms right;
+}
+/* Progress */
+.swiper-pagination-progressbar {
+  background: rgba(0, 0, 0, 0.25);
+  position: absolute;
+}
+.swiper-pagination-progressbar .swiper-pagination-progressbar-fill {
+  background: var(--swiper-pagination-color, var(--swiper-theme-color));
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  transform: scale(0);
+  transform-origin: left top;
+}
+.swiper-rtl .swiper-pagination-progressbar .swiper-pagination-progressbar-fill {
+  transform-origin: right top;
+}
+.swiper-horizontal > .swiper-pagination-progressbar,
+.swiper-pagination-progressbar.swiper-pagination-horizontal,
+.swiper-vertical > .swiper-pagination-progressbar.swiper-pagination-progressbar-opposite,
+.swiper-pagination-progressbar.swiper-pagination-vertical.swiper-pagination-progressbar-opposite {
+  width: 100%;
+  height: 4px;
+  left: 0;
+  top: 0;
+}
+.swiper-vertical > .swiper-pagination-progressbar,
+.swiper-pagination-progressbar.swiper-pagination-vertical,
+.swiper-horizontal > .swiper-pagination-progressbar.swiper-pagination-progressbar-opposite,
+.swiper-pagination-progressbar.swiper-pagination-horizontal.swiper-pagination-progressbar-opposite {
+  width: 4px;
+  height: 100%;
+  left: 0;
+  top: 0;
+}
+.swiper-pagination-lock {
+  display: none;
+}
+/* Scrollbar */
+.swiper-scrollbar {
+  border-radius: 10px;
+  position: relative;
+  -ms-touch-action: none;
+  background: rgba(0, 0, 0, 0.1);
+}
+.swiper-horizontal > .swiper-scrollbar {
+  position: absolute;
+  left: 1%;
+  bottom: 3px;
+  z-index: 50;
+  height: 5px;
+  width: 98%;
+}
+.swiper-vertical > .swiper-scrollbar {
+  position: absolute;
+  right: 3px;
+  top: 1%;
+  z-index: 50;
+  width: 5px;
+  height: 98%;
+}
+.swiper-scrollbar-drag {
+  height: 100%;
+  width: 100%;
+  position: relative;
+  background: rgba(0, 0, 0, 0.5);
+  border-radius: 10px;
+  left: 0;
+  top: 0;
+}
+.swiper-scrollbar-cursor-drag {
+  cursor: move;
+}
+.swiper-scrollbar-lock {
+  display: none;
+}
+.swiper-zoom-container {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  text-align: center;
+}
+.swiper-zoom-container > img,
+.swiper-zoom-container > svg,
+.swiper-zoom-container > canvas {
+  max-width: 100%;
+  max-height: 100%;
+  object-fit: contain;
+}
+.swiper-slide-zoomed {
+  cursor: move;
+}
+/* Preloader */
+:root {
+  /*
+  --swiper-preloader-color: var(--swiper-theme-color);
+  */
+}
+.swiper-lazy-preloader {
+  width: 42px;
+  height: 42px;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  margin-left: -21px;
+  margin-top: -21px;
+  z-index: 10;
+  transform-origin: 50%;
+  animation: swiper-preloader-spin 1s infinite linear;
+  box-sizing: border-box;
+  border: 4px solid var(--swiper-preloader-color, var(--swiper-theme-color));
+  border-radius: 50%;
+  border-top-color: transparent;
+}
+.swiper-lazy-preloader-white {
+  --swiper-preloader-color: #fff;
+}
+.swiper-lazy-preloader-black {
+  --swiper-preloader-color: #000;
+}
+@keyframes swiper-preloader-spin {
+  100% {
+    transform: rotate(360deg);
+  }
+}
+/* a11y */
+.swiper .swiper-notification {
+  position: absolute;
+  left: 0;
+  top: 0;
+  pointer-events: none;
+  opacity: 0;
+  z-index: -1000;
+}
+.swiper-free-mode > .swiper-wrapper {
+  transition-timing-function: ease-out;
+  margin: 0 auto;
+}
+.swiper-grid > .swiper-wrapper {
+  flex-wrap: wrap;
+}
+.swiper-grid-column > .swiper-wrapper {
+  flex-wrap: wrap;
+  flex-direction: column;
+}
+.swiper-fade.swiper-free-mode .swiper-slide {
+  transition-timing-function: ease-out;
+}
+.swiper-fade .swiper-slide {
+  pointer-events: none;
+  transition-property: opacity;
+}
+.swiper-fade .swiper-slide .swiper-slide {
+  pointer-events: none;
+}
+.swiper-fade .swiper-slide-active,
+.swiper-fade .swiper-slide-active .swiper-slide-active {
+  pointer-events: auto;
+}
+.swiper-cube {
+  overflow: visible;
+}
+.swiper-cube .swiper-slide {
+  pointer-events: none;
+  -webkit-backface-visibility: hidden;
+          backface-visibility: hidden;
+  z-index: 1;
+  visibility: hidden;
+  transform-origin: 0 0;
+  width: 100%;
+  height: 100%;
+}
+.swiper-cube .swiper-slide .swiper-slide {
+  pointer-events: none;
+}
+.swiper-cube.swiper-rtl .swiper-slide {
+  transform-origin: 100% 0;
+}
+.swiper-cube .swiper-slide-active,
+.swiper-cube .swiper-slide-active .swiper-slide-active {
+  pointer-events: auto;
+}
+.swiper-cube .swiper-slide-active,
+.swiper-cube .swiper-slide-next,
+.swiper-cube .swiper-slide-prev,
+.swiper-cube .swiper-slide-next + .swiper-slide {
+  pointer-events: auto;
+  visibility: visible;
+}
+.swiper-cube .swiper-slide-shadow-top,
+.swiper-cube .swiper-slide-shadow-bottom,
+.swiper-cube .swiper-slide-shadow-left,
+.swiper-cube .swiper-slide-shadow-right {
+  z-index: 0;
+  -webkit-backface-visibility: hidden;
+          backface-visibility: hidden;
+}
+.swiper-cube .swiper-cube-shadow {
+  position: absolute;
+  left: 0;
+  bottom: 0px;
+  width: 100%;
+  height: 100%;
+  opacity: 0.6;
+  z-index: 0;
+}
+.swiper-cube .swiper-cube-shadow:before {
+  content: '';
+  background: #000;
+  position: absolute;
+  left: 0;
+  top: 0;
+  bottom: 0;
+  right: 0;
+  filter: blur(50px);
+}
+.swiper-flip {
+  overflow: visible;
+}
+.swiper-flip .swiper-slide {
+  pointer-events: none;
+  -webkit-backface-visibility: hidden;
+          backface-visibility: hidden;
+  z-index: 1;
+}
+.swiper-flip .swiper-slide .swiper-slide {
+  pointer-events: none;
+}
+.swiper-flip .swiper-slide-active,
+.swiper-flip .swiper-slide-active .swiper-slide-active {
+  pointer-events: auto;
+}
+.swiper-flip .swiper-slide-shadow-top,
+.swiper-flip .swiper-slide-shadow-bottom,
+.swiper-flip .swiper-slide-shadow-left,
+.swiper-flip .swiper-slide-shadow-right {
+  z-index: 0;
+  -webkit-backface-visibility: hidden;
+          backface-visibility: hidden;
+}
+.swiper-creative .swiper-slide {
+  -webkit-backface-visibility: hidden;
+          backface-visibility: hidden;
+  overflow: hidden;
+  transition-property: transform, opacity, height;
+}
+.swiper-cards {
+  overflow: visible;
+}
+.swiper-cards .swiper-slide {
+  transform-origin: center bottom;
+  -webkit-backface-visibility: hidden;
+          backface-visibility: hidden;
+  overflow: hidden;
+}

dsk-operate-ui/src/assets/styles/project.scss

+
+.app-container{
+  padding: 0;
+}
 //小导航
 .miantitle{
   color: #232323;
@@ -791,3 +795,23 @@
 .p10{
   padding: 0 10px;
 }
+
+.tips{
+  display: inline-block;
+  padding: 4px 8px;
+  border-radius: 2px;
+  font-size: 12px;
+  margin-right: 8px;
+  &.tip1{
+    background-color: #E4F3FD;
+    color: #41A1FD;
+  }
+  &.tip2{
+    background-color: #F3F3FF;
+    color: #8491E8;
+  }
+  &.tip3{
+    background-color: #DEF6F0;
+    color: #0BAE8D;
+  }
+}

dsk-operate-ui/src/assets/styles/public.css

+* {
+	padding: 0;
+	margin: 0;
+}
+
+
+
+
+div,
+dl,
+dt,
+dd,
+form,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+img,
+ol,
+ul,
+li,
+table,
+th,
+td,
+p,
+span,
+a {
+	border: 0;
+}
+
+img,
+input {
+	border: none;
+	vertical-align: middle;
+	background: none;
+	outline: none;
+}
+html {
+  height: 100%;
+  box-sizing: border-box;
+}
+
+body {
+  height: 100%;
+  -moz-osx-font-smoothing: grayscale;
+  -webkit-font-smoothing: antialiased;
+  text-rendering: optimizeLegibility;
+  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
+}
+
+ul,
+ol {
+	list-style-type: none;
+}
+
+th,
+td,
+input {
+	font-size: 12px;
+}
+
+h3 {
+	font-size: 14px;
+}
+
+s,
+i,
+em {
+	font-style: normal;
+	text-decoration: none;
+}
+
+button {
+	border: none;
+	cursor: pointer;
+	font-size: 12px;
+	background-color: transparent;
+}
+
+select {
+	border-width: 1px;
+	_zoom: 1;
+	border-style: solid;
+	padding-top: 2px;
+	font-size: 12px;
+}
+
+.clear {
+	clear: both;
+	font-size: 1px;
+	height: 0;
+	visibility: hidden;
+	line-height: 0;
+}
+
+.clearfix:after {
+	content: "";
+	display: block;
+	clear: both;
+}
+
+.clearfix {
+	zoom: 1;
+}
+
+.float_left {
+	float: left;
+}
+
+.float_right {
+	float: right;
+}
+.el-input {
+	width: 100%;
+}
+
+.el-input .el-input__inner {
+	width: 100%;
+	height: 34px;
+	line-height: 34px;
+	background: #ffffff;
+	border: 1px solid #e0e0e0;
+	border-radius: 2px;
+	box-sizing: border-box;
+}
+
+.el-input__icon {
+	line-height: 34px;
+}
+
+.el-dropdown-link .el-input {
+	width: 100%;
+}
+
+.el-dropdown-link .el-input__inner {
+	width: 100%;
+}
+
+.el-input--suffix .el-input__inner {
+	padding-right: 15px;
+}
+.el-select .el-input.is-focus .el-input__inner,
+.el-input.is-active .el-input__inner,
+.el-input__inner:focus,
+.el-select .el-input__inner:focus,
+.el-range-editor.is-active:focus-within {
+	border-color: #3181fa;
+}
+.el-popper[x-placement^=top] {
+    margin-bottom: 12px;
+}
+.el-select-dropdown .popper__arrow {
+	display: none;
+}
+
+.el-popper .popper__arrow {
+	display: none;
+}
+.select-popper {
+	text-align: center;
+	display: inline-block;
+	position: relative;
+	color: #333333;
+	font-size: 14px;
+	cursor: pointer;
+	margin-right: 24px;
+}
+
+.select-popper .select-popper-img {
+	width: 24px;
+	height: 12px;
+	position: absolute;
+	top: -10px;
+	right: 2px;
+}
+
+
+.select-popper .el-select__tags,
+.select-popper .el-cascader__tags,
+.select-popper .el-input__suffix {
+	display: none;
+}
+
+
+.select-popper:hover {
+	color: #0381fa;
+}
+
+.select-popper-active {
+	color: #0381fa;
+}
+
+.select-popper-title {
+	padding: 4px 6px;
+}
+
+.select-popper-title .colorhover {
+	color: #0381fa;
+}
+
+.select-popper::-webkit-scrollbar-thumb {
+	background-color: #a1a3a9;
+	border-radius: 6px;
+}
+
+.select-popper::-webkit-scrollbar {
+	width: 6px;
+	height: 6px;
+}
+
+.select-popper::-webkit-scrollbar-track {
+	background: #fff;
+}
+
+.select-popper::-webkit-scrollbar-corner {
+	background: #fff;
+}
+.select-popper .el-select {
+	width: 100%;
+}
+
+.cascader-region {
+	position: absolute;
+	left: 0;
+	top: 0px;
+	opacity: 0;
+	line-height: 16px;
+}
+
+.cascader-region .el-input {
+	width: 100%;
+	line-height: 16px;
+}
+
+.cascader-region .el-input .el-input__inner {
+	width: 100%;
+	height: 16px !important;
+}
+
+
+.content_item .select-caret {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	font-size: 14px;
+	line-height: 16px;
+	font-weight: 400;
+	color: #333333;
+	cursor: pointer;
+	position: relative;
+}
+
+.content_item .select-popper:hover .select-caret {
+	color: #0074E5;
+}
+.content_item .select-caret:focus {
+	border: none;
+	outline: none;
+}
+.content_item  .geduan{
+	width: 100%;
+	height: 0px;
+	opacity: 1;
+	border: 1px solid #EFEFEF;
+	margin: 16px 0px;
+}
+
+.content_item .search-new {
+	width: 100%;
+	padding-bottom: 16px;
+}
+
+.content_item .search-new span:last-child {
+	display: inline-block;
+	width: 80px;
+	text-align: center;
+	color: #5B5B5B;
+	line-height: 32px;
+	cursor: pointer;
+	border-radius: 2px 2px 2px 2px;
+	border: 1px solid #D4D4D4;
+	opacity: 1;
+}
+
+.content_item .search-new span:first-child {
+	margin-right: 12px;
+	display: inline-block;
+	width: 80px;
+	text-align: center;
+	cursor: pointer;
+	background: #0089ff;
+	color: #fff;
+	line-height: 34px;
+	border-radius: 2px 2px 2px 2px;
+	opacity: 1;
+}
+
+.content_item .search-new span:first-child:hover {
+	background: #0080FF;
+}
+
+.content_item .search-new span:last-child:hover {
+	background: #f5faff;
+	color: #0081FF;
+	border-color: #0081FF;
+}

dsk-operate-ui/src/assets/styles/public.scss

-* {
-	padding: 0;
-	margin: 0;
-}
-
-
-
-
-div,
-dl,
-dt,
-dd,
-form,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-img,
-ol,
-ul,
-li,
-table,
-th,
-td,
-p,
-span,
-a {
-	border: 0;
-}
-
-img,
-input {
-	border: none;
-	vertical-align: middle;
-	background: none;
-	outline: none;
-}
-html {
-  height: 100%;
-  box-sizing: border-box;
-}
-
-body {
-  height: 100%;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-font-smoothing: antialiased;
-  text-rendering: optimizeLegibility;
-  font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, Arial, sans-serif;
-}
-
-ul,
-ol {
-	list-style-type: none;
-}
-
-th,
-td,
-input {
-	font-size: 12px;
-}
-
-h3 {
-	font-size: 14px;
-}
-
-s,
-i,
-em {
-	font-style: normal;
-	text-decoration: none;
-}
-
-button {
-	border: none;
-	cursor: pointer;
-	font-size: 12px;
-	background-color: transparent;
-}
-
-select {
-	border-width: 1px;
-	_zoom: 1;
-	border-style: solid;
-	padding-top: 2px;
-	font-size: 12px;
-}
-
-.clear {
-	clear: both;
-	font-size: 1px;
-	height: 0;
-	visibility: hidden;
-	line-height: 0;
-}
-
-.clearfix:after {
-	content: "";
-	display: block;
-	clear: both;
-}
-
-.clearfix {
-	zoom: 1;
-}
-
-.float_left {
-	float: left;
-}
-
-.float_right {
-	float: right;
-}

dsk-operate-ui/src/views/custom/customList/index.vue

@@ -228,7 +228,6 @@ export default {
 
 <style lang="scss" scoped>
   .app-container{
-    padding: 0;
     height: calc(100vh - 134px)
   }
 .box-card{

dsk-operate-ui/src/views/custom/overview/index.vue

 <template>
-  <div class="app-container">
-    客户概览
+  <div>
+    <div class="miantitle">
+      <span>客户管理</span>
+      <span> / 客户概览</span>
+    </div>
+    <div class="app-container">
+      <div class="topions">
+        <div class="icons">
+          <div class="name">客户总数</div>
+          <div class="count">120</div>
+          <img class="icon_img" src="@/assets/images/project/icon_1.png">
+        </div>
+        <div class="icons">
+          <div class="name">已合作客户</div>
+          <div class="count">56</div>
+          <img class="icon_img" src="@/assets/images/project/icon_2.png">
+        </div>
+        <div class="icons">
+          <div class="name">局级大客户</div>
+          <div class="count">50</div>
+          <img class="icon_img" src="@/assets/images/project/icon_3.png">
+        </div>
+        <div class="icons">
+          <div class="name">今日紧进客户</div>
+          <div class="count">30</div>
+          <img class="icon_img" src="@/assets/images/project/icon_4.png">
+        </div>
+        <div class="icons">
+          <div class="name">储备项目数</div>
+          <div class="count">33</div>
+          <img class="icon_img" src="@/assets/images/project/icon_5.png">
+        </div>
+      </div>
+      <div class="flex">
+        <el-card class="box-card noborder left" style="position: relative">
+          <div class="cardtitles">客户级别</div>
+          <div class="chartsum">
+            <div class="sum">23家</div>
+            <div>11%</div>
+            <div>有息债务/总负债</div>
+          </div>
+          <div class="flex">
+            <div id="khjb" class="chart1"></div>
+            <div class="tables">
+            <el-table
+              :data="tableData"
+              stripe border
+              style="width: 100%"
+              :default-sort = "{prop: 'date', order: 'descending'}"
+            >
+              <el-table-column
+                prop="name"
+                label="名称">
+              </el-table-column>
+              <el-table-column
+                prop="name"
+                label="数量（家）">
+              </el-table-column>
+              <el-table-column
+                prop="point"
+                label="占比">
+              </el-table-column>
+            </el-table>
+          </div>
+          </div>
+
+        </el-card>
+
+        <el-card class="box-card noborder right">
+          <div class="cardtitles">客户跟进动态
+            <div class="labels">
+              <div :class="{'on':datatype==1}" @click="getDT(1)">周</div>
+              <div :class="{'on':datatype==2}" @click="getDT(2)">月</div>
+              <div :class="{'on':datatype==3}" @click="getDT(3)">年</div>
+            </div>
+          </div>
+          <div id="khgjdt" class="chart2"></div>
+        </el-card>
+      </div>
+      <div class="flex">
+        <el-card class="box-card noborder left">
+          <div class="cardtitles">客户性质分析</div>
+          <div class="chart2" id="khxz"></div>
+        </el-card>
+
+        <el-card class="box-card noborder right">
+          <div class="cardtitles">客户资信评级</div>
+          <div class="chart2" id="khzxpj"></div>
+        </el-card>
+      </div>
+
+      <el-card class="box-card noborder">
+        <div class="cardtitles">客户动态</div>
+        <div class="trendslist">
+          <div class="trends" v-for="item in datalist">
+            <div class="names">{{item.name}}</div>
+            <div class="trendtips"><div class="tips tip3">{{item.tip1}}</div><div class="tips tip2">{{item.tip2}}</div></div>
+            <div class="trendcon">{{item.text}}</div>
+            <div class="time">{{item.time}}</div>
+          </div>
+          <div class="tables" style="width: 100%">
+            <div class="bottems">
+              <el-pagination
+                background
+                :page-size="10"
+                :current-page="1"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="datalist.length">
+              </el-pagination>
+            </div>
+          </div>
+        </div>
+      </el-card>
+    </div>
   </div>
 </template>
 
 <script>
+import "@/assets/styles/project.scss"
+import * as echarts from 'echarts'
 export default {
   name: 'Overview',
   data() {
     return {
+      //客户级别
+      chartDom: '',
+      myChart: '',
+      option: '',
+      //客户跟进
+      chartDom1: '',
+      myChart1: '',
+      option1: '',
+      //客户性质
+      chartDom2: '',
+      myChart2: '',
+      option2: '',
+      // 客户资信
+      chartDom3: '',
+      myChart3: '',
+      option3: '',
+      //表格数据
+      tableData:[
+        {name:'集团总部',sum:'23',point:'11%'},
+        {name:'一级单位',sum:'61',point:'29%'},
+        {name:'二级单位',sum:'60',point:'29%'},
+        {name:'三级单位',sum:'21',point:'10%'},
+        {name:'其他单位',sum:'44',point:'21%'},
+      ],
+      datatype:'1',//切换类型
+      dtdata:[],//数据
+      dttime:[],//坐标
+      datalist:[
+        {name:'重庆市江北区国有资本投资运营管理集团有限公司',time:'2023-05-30',text:'新增招标公告：【江北房地产综合开发公司名下不动产鲤鱼池片区资产评估项目】 公开选取【资产评估】机构的公告',tip1:'正向',tip2:'招标公告'},
+        {name:'上海城投（集团）有限公司',time:'2023-05-29',text:'新增招标公告：北横通道新建工程——机电、装饰工程Ⅱ标段',tip1:'正向',tip2:'招标公告'},
+        {name:'上海申迪（集团）有限公司',time:'2023-5-27',text:'新增招标公告：上海国际旅游度假区核心区3.1平方公里绿地公园配套停车场项目',tip1:'正向',tip2:'招标公告'},
+        {name:'上海浦东建设股份有限公司',time:'2023-5-25',text:'新增招标公告：张村地块基础设施建设及上汽地块配套道路桥梁项目道路照明工程二标段',tip1:'正向',tip2:'招标公告'},
+        {name:'上海浦东建设股份有限公司',time:'2023-5-24',text:'新增供应商：江苏安神交通工程有限公司',tip1:'提示',tip2:'新增供应商'},
+      ],
     }
   },
   created() {
   },
+  mounted(){
+    this.$nextTick(()=>{
+      this.chartDom = document.getElementById("khjb")
+      this.myChart = echarts.init(this.chartDom)
+      this.chartDom2 = document.getElementById("khxz")
+      this.myChart2 = echarts.init(this.chartDom2)
+      this.chartDom3 = document.getElementById("khzxpj")
+      this.myChart3 = echarts.init(this.chartDom3)
+      this.initChart()
+      this.getDT(1)
+    })
+  },
   methods: {
+    initChart(){
+      //客户级别
+      this.option = {
+
+        tooltip: {
+          trigger: 'item'
+        },
+        color:['#8A82F3','#5B9CF7','#8DCF96','#FFDC6B','#FE9C77'],//修改配色
+        series: [
+          {
+            name: '',
+            type: 'pie',
+            radius: ['50%','70%'],
+            data: [
+              { value: 23, name: '集团总部：11%' },
+              { value: 61, name: '一级单位：29%' },
+              { value: 60, name: '二级单位：29%' },
+              { value: 21, name: '三级单位：10%' },
+              { value: 44, name: '其他单位: 21%' }
+            ],
+            emphasis: {
+              itemStyle: {
+                shadowBlur: 10,
+                shadowOffsetX: 0,
+                shadowColor: 'rgba(0, 0, 0, 0.5)'
+              }
+            }
+          }
+        ]
+      }
+      this.option && this.myChart.setOption(this.option)
+      //客户性质分析
+      this.option2 = {
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow'
+          }
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: [
+          {
+            type: 'category',
+            data: ['地方单位', '事业单位', '政府机关', '中央企业', '上市公司', '军队', '民营企业','其他'],
+            axisTick: {
+              alignWithLabel: true
+            }
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value'
+          }
+        ],
+        series: [
+          {
+            name: '',
+            type: 'bar',
+            barWidth: '20%',
+            data: [100, 152, 200, 334, 390, 330, 220,256,178],
+            itemStyle:{
+              normal: {
+                barBorderRadius: [4, 4, 0, 0],
+                color: '#165DFF'
+              }
+            }
+          }
+        ]
+      }
+      this.option2 && this.myChart2.setOption(this.option2)
+      //客户资质分析
+      this.option3 = {
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow'
+          }
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '3%',
+          containLabel: true
+        },
+        xAxis: [
+          {
+            type: 'category',
+            data: ['AA', 'AA+', 'AA-', 'A', 'A+', 'A', 'A-','其他'],
+            axisTick: {
+              alignWithLabel: true
+            }
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value'
+          }
+        ],
+        series: [
+          {
+            name: '',
+            type: 'bar',
+            barWidth: '20%',
+            data: [110, 112, 190, 234, 310, 350, 220,276,198],
+            itemStyle:{
+              normal:{
+                barBorderRadius:[4,4,0,0],
+                color:'#14C9C9'
+              },
+            }
+          }
+        ]
+      }
+      this.option3 && this.myChart3.setOption(this.option3)
+
+    },
+    initDT(datas,labels){
+      this.chartDom1 = document.getElementById("khgjdt")
+      this.myChart1 = echarts.init(this.chartDom1)
+      //客户跟进动态
+      this.option1 = {
+        xAxis: {
+          type: 'category',
+          data: labels
+        },
+        yAxis: {
+          type: 'value'
+        },
+        grid:{
+          left:'8%',
+          top:'8%',
+          right:'5%',
+          bottom:'10%',
+        },
+        tooltip:{
+          axisPointer:{ //悬浮于圆点展示标签
+            type:'axis'
+          },
+          // trigger: 'axis'
+        },
+        series: [
+          {
+            name: '总跟进',
+            data: datas,
+            type: 'line',
+            smooth: true,
+            itemStyle: {
+              normal:{
+                color:'#0081FF'
+              }
+            },
+            label:{
+              normal:{
+                show:false
+              }
+            },
+            areaStyle: {
+              color: {
+                type: 'linear',
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [{
+                  offset: 0, color: 'rgba(0, 129, 255, 0.5)'
+                }, {
+                  offset: 1, color: 'rgba(0, 129, 255, 0)'
+                } ],
+                global: false
+              }
+            },
+          }
+        ]
+      }
+      this.option1 && this.myChart1.setOption(this.option1)
+    },
+    getDT(type){
+      this.datatype = type
+      let time = new Date()
+      let week = ['周一','周二','周三','周四','周五','周六','周日']
+      let weekdata = [200,150,300,240,400,380,460]
+      let monthdata = [400,200,350,170,190,280,260,308,406,387,458,695,125,360,512,546,298,365,458,536,345,200,150,300,240,400,380,460,472,365,547]
+      let yeardata = [1908,1500,2300,1456,2354,2564,1254,1236,4561,4521,1236,4561,3521]
+      let datas = []
+      let labels = []
+      switch (type) {
+        case 1:
+          time = time.getDay()
+          // week.length = time
+          weekdata.length = time
+          for(var i=0;i<7;i++){
+            if(i > time){
+              weekdata.push('')
+            }
+          }
+          labels = week
+          datas = weekdata
+          break;
+        case 2:
+          let days = new Date(time.getFullYear(),time.getMonth()+1,0).getDate()//获取到本月天数
+          time = time.getDate()
+          monthdata.length = time
+          for(var i=1;i<days;i++){
+            labels.push(i+'日')
+            if(i > time){
+              monthdata.push("")
+            }
+          }
+          datas = monthdata
+          break;
+        case 3:
+          time = time.getMonth()+1
+          yeardata.length = time
+          for(var i=1;i<12;i++){
+            labels.push(i+'月')
+            if(i>time){
+              yeardata.push('')
+            }
+          }
+          datas = yeardata
+          break;
+        default:
+          break;
+      }
+      this.dtdata = datas
+      this.dttime = labels
+      this.initDT(datas,labels)
+    },
+    handleCurrentChange(val) {
+      console.log(`当前页: ${val}`);
+    },
   }
 }
 </script>
 
 <style lang="scss" scoped>
-
+  .box-card{
+    margin: 12px 0 0;
+    padding-bottom: 24px;
+    &.left{
+      width: calc(62% - 16px);
+      margin-right: 14px;
+    }
+    &.right{
+      width: 40%;
+    }
+  }
+  .topions{
+    width: 100%;
+    display: flex;
+    .icons{
+      width: calc(20%);
+      margin-right: 16px;
+      height: 96px;
+      background: url("../../../assets/images/project/beijing.png") top center no-repeat;
+      background-size: 100% 100%;
+      position: relative;
+      padding: 24px;
+      &:last-child{
+        margin-right: 0;
+      }
+      .name{
+        font-size: 14px;
+        color: #3D3D3D;
+        line-height: 14px;
+      }
+      .count{
+        font-size: 26px;
+        font-weight: 700;
+        color: #0081FF;
+        padding-top: 14px;
+        line-height: 26px;
+      }
+      .icon_img{
+        width: 70px;
+        position: absolute;
+        right: 0;
+        bottom: 0;
+      }
+    }
+  }
+  .chart1{
+    width: 428px;
+    height: 240px;
+  }
+  .tables{
+    width: calc(100% - 428px);
+  }
+  .chartsum{
+    position: absolute;
+    color: #3D3D3D;
+    text-align: center;
+    top: 155px;
+    left: 168px;
+    >div{
+      font-size: 10px;
+      line-height: 18px;
+      padding: 0 2px;
+      &.sum{
+        font-size: 18px;
+        padding-bottom: 4px;
+      }
+    }
+  }
+  .chart2{
+    width: 100%;
+    height: 265px;
+  }
+  .cardtitles{
+    position: relative;
+    .labels{
+      width: 120px;
+      height: 22px;
+      position: absolute;
+      border-radius: 2px;
+      right: 24px;
+      top: 24px;
+      >div{
+        width: 40px;
+        height: 100%;
+        text-align: center;
+        line-height: 22px;
+        float: left;
+        opacity: 1;
+        border: 1px solid #EFEFEF;
+        margin-left: -1px;
+        font-weight: 400;
+        font-size: 12px;
+        color: rgba(35, 35, 35, 0.80);
+        cursor: pointer;
+        &.on{
+          background: #0081FF;
+          color: #FFFFFF;
+        }
+        &:first-child{
+          border-radius: 2px 0px 0px 2px;
+        }
+        &:last-child{
+          border-radius: 0px 2px 2px 0px;
+        }
+      }
+    }
+  }
+  .trendslist{
+    border-top: 1px solid #EFEFEF;
+    .trends{
+      position: relative;
+      padding: 16px 16px 0;
+      &:hover{
+        background: #F6F9FC;
+      }
+      .names{
+        width: calc(100% - 92px);
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        height: 23px;
+        font-size: 16px;
+        font-family: Source Han Sans CN-Bold, Source Han Sans CN;
+        font-weight: 700;
+        color: #3D3D3D;
+        line-height: 23px;
+      }
+      .trendtips{
+        padding: 8px 0 12px;
+      }
+      .trendcon{
+        border-bottom: 1px solid #EFEFEF;
+        font-size: 14px;
+        font-family: MicrosoftYaHei-Regular, MicrosoftYaHei;
+        font-weight: 400;
+        color: rgba(35,35,35,0.8);
+        line-height: 18px;
+        padding-bottom: 16px;
+      }
+      .time{
+        position: absolute;
+        right: 16px;
+        top: 26px;
+        font-size: 14px;
+        opacity: 0.4;
+      }
+    }
+  }
 </style>

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

@@ -37,12 +37,12 @@ export default {
       searchText: '',
       sideRoute: [
         {title: '企业概要', pathName: '', children: [
-          {title: '企业速览', pathName: ''},
-          {title: '工商信息', pathName: ''},
-          {title: '股东信息', pathName: ''},
-          {title: '高管信息', pathName: ''},
-          {title: '对外投资', pathName: ''},
-          {title: '分支机构', pathName: ''}
+          {title: '企业速览', pathName: 'overview'},
+          {title: '工商信息', pathName: 'businfo'},
+          {title: '股东信息', pathName: 'holderinfo'},
+          {title: '高管信息', pathName: 'execuinfo'},
+          {title: '对外投资', pathName: 'overseas'},
+          {title: '分支机构', pathName: 'branch'}
         ]},
         {title: '财务简析', pathName: 'financial'},
         {title: '项目商机', pathName: '', children: [
@@ -112,62 +112,66 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-  .detail-container{
-    width: 144px;
-    min-height: calc(100vh - 170px);
-    padding-bottom: 20px;
-    background: #FFFFFF;
-    .side-input{
-      width: 128px;
-      margin-top: 16px;
-      margin-left: 8px;
-      border: 0;
-      ::v-deep .el-input__inner{
-        height: 32px;
-        background: #F3F3F4;
-        border-radius: 20px;
+  #app{
+    .detail-container{
+      width: 144px;
+      min-height: calc(100vh - 170px);
+      padding-bottom: 20px;
+      background: #FFFFFF;
+      .side-input{
+        width: 128px;
+        margin-top: 16px;
+        margin-left: 8px;
         border: 0;
-        &::placeholder {
-          color: #3D3D3D;
+        ::v-deep .el-input__inner{
+          height: 32px;
+          background: #F3F3F4;
+          border-radius: 20px;
+          border: 0;
+          &::placeholder {
+            color: #3D3D3D;
+          }
         }
-      }
-      .el-icon-search{
-        color: #0081FF;
-        cursor: pointer;
-      }
-    }
-    .detail-menu{
-      margin-top: 20px;
-      border-right: 0;
-      ::v-deep .el-menu-item, ::v-deep .el-submenu__title{
-        height: 30px;
-        line-height: 30px;
-        font-size: 14px;
-        color: #232323;
-        &:hover, &:focus{
-          background: linear-gradient(91deg, rgba(0,129,255,0.1) 0%, rgba(0,129,255,0) 100%);;
+        .el-icon-search{
+          color: #0081FF;
+          cursor: pointer;
         }
-        .el-submenu__icon-arrow{
+      }
+      .detail-menu{
+        margin-top: 20px;
+        border-right: 0;
+        ::v-deep .el-menu-item, ::v-deep .el-submenu__title{
+          height: 30px;
+          line-height: 30px;
+          font-size: 14px;
           color: #232323;
-          right: 48px;
-          margin-top: -5px;
+          padding: 0 0 0 16px !important;
+          text-align: initial !important;
+          &:hover, &:focus, &.is-active{
+            background: linear-gradient(91deg, rgba(0,129,255,0.1) 0%, rgba(0,129,255,0) 100%);;
+          }
+          .el-submenu__icon-arrow{
+            color: #232323;
+            right: 48px;
+            margin-top: -5px;
+          }
         }
-      }
-      ::v-deep .el-submenu .el-menu-item{
-        font-size: 12px;
-        color: rgba(35,35,35,0.8);
-        padding: 0 0 0 27px !important;
-        min-width: 144px !important;
-        position: relative;
-        &:before {
-          content: "";
-          position: absolute;
-          top: 14px;
-          left: 21px;
-          width: 2px;
-          height: 2px;
-          background: rgba(35,35,35,0.8);
-          border-radius: 50%;
+        ::v-deep .el-submenu .el-menu-item{
+          font-size: 12px;
+          color: rgba(35,35,35,0.8);
+          padding: 0 0 0 27px !important;
+          min-width: 144px !important;
+          position: relative;
+          &:before {
+            content: "";
+            position: absolute;
+            top: 14px;
+            left: 21px;
+            width: 2px;
+            height: 2px;
+            background: rgba(35,35,35,0.8);
+            border-radius: 50%;
+          }
         }
       }
     }

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

@@ -7,6 +7,12 @@
       </div>
       <div class="part-right">
         <div id="partBox">
+          <Overview v-if="currentPath.pathName=='overview'" />
+          <Businfo v-if="currentPath.pathName=='businfo'" />
+          <Holderinfo v-if="currentPath.pathName=='holderinfo'" />
+          <Execuinfo v-if="currentPath.pathName=='execuinfo'" />
+          <Overseas v-if="currentPath.pathName=='overseas'" />
+          <Branch v-if="currentPath.pathName=='branch'" />
           <Financial v-if="currentPath.pathName=='financial'" />
           <Business v-if="currentPath.pathName=='business'" />
         </div>
@@ -19,20 +25,32 @@
 import elementResizeDetectorMaker from "element-resize-detector"
 import Header from "./component/Header"
 import SideBar from "./component/Sidebar"
-import Financial from "./financial"
-import Business from "./business"
+import Overview from "./overview/overview"  //企业概览-企业速览
+import Businfo from "./overview/businfo"   //企业概览-工商信息
+import Holderinfo from "./overview/holderinfo"   //企业概览-股东信息
+import Execuinfo from "./overview/execuinfo"   //企业概览-高管信息
+import Overseas from "./overview/overseas"   //企业概览-对外投资
+import Branch from "./overview/branch"   //企业概览-分支机构
+import Financial from "./financial" //财务简析
+import Business from "./business" //商务信息
 export default {
   name: 'PartyA',
   components: {
     Header,
     SideBar,
+    Overview,
+    Businfo,
+    Holderinfo,
+    Execuinfo,
+    Overseas,
+    Branch,
     Financial,
     Business
   },
   data() {
     return {
       currentPath: {
-        pathName: 'financial'  //默认展示页
+        pathName: 'overview'  //默认展示页
       },
       partBoxHeight: null
     }

dsk-operate-ui/src/views/detail/party-a/overview/branch.vue

+<template>
+  <div class="app-container part-container">
+    企业速览
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Overview',
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .part-container{
+    margin: 0;
+    padding: 0;
+  }
+</style>

dsk-operate-ui/src/views/detail/party-a/overview/businfo.vue

+<template>
+  <div class="app-container part-container">
+    企业速览
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Overview',
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .part-container{
+    margin: 0;
+    padding: 0;
+  }
+</style>

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

+<template>
+  <div class="app-container operations-container">
+    <div class="common-title">公司经营</div>
+    <div class="part-swiper">
+      <div class="swiper-containers">
+        <ul class="swiper-wrapper">
+          <li class="swiper-slide" v-for="(item, index) in operList" :key="index">
+            <div class="swiper-div">
+              <div class="operations-title">{{item.range}}-<span>{{item.year}}</span></div>
+              <div class="flex-box text-cl1 operations-info">
+                {{item.name}}
+                <span><img src="@/assets/images/detail/overview/oper_source.png">{{item.name}}</span>
+              </div>
+            </div>
+          </li>
+        </ul>
+      </div>
+      <div class="swiper-button-prev" slot="button-prev" style="left: 0;"><i class="el-icon-arrow-left"></i></div>
+      <div class="swiper-button-next" slot="button-next" style="right: 0"><i class="el-icon-arrow-right"></i></div>
+    </div>
+    <div class="flex-box operations-list">
+      <div class="list-item" v-for="(item, index) in gsjyList" :key="index">
+        <div class="flex-box list-item-all"><img :src="item.ico">{{item.name}}</div>
+        <div class="list-item-amount">{{item.amount}}</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+var Swiper = require('@/assets/lib/swiper/swiper-bundle.min.js')
+import "@/assets/lib/swiper/swiper-bundle.css"
+export default {
+  name: 'Overview',
+  data() {
+    return {
+      operList: [
+        {name:'债务信用评级', rate:'中国标普信用', range:'AA', year:'2021'},
+        {name:'债务信用评级', rate:'中国标普信用', range:'AA', year:'2021'},
+        {name:'债务信用评级', rate:'中国标普信用', range:'AA', year:'2021'},
+        {name:'债务信用评级', rate:'中国标普信用', range:'AA', year:'2021'},
+        {name:'债务信用评级', rate:'中国标普信用', range:'AA', year:'2021'}
+      ],
+      gsjyList: [
+        { name: '总资产', ico: require('@/assets/images/detail/overview/gsjy_ico1.png'), amount: '1699.7'},
+        { name: '净资产', ico: require('@/assets/images/detail/overview/gsjy_ico2.png'), amount: '1699.7'},
+        { name: '授信余额', ico: require('@/assets/images/detail/overview/gsjy_ico3.png'), amount: '1699.7'},
+        { name: '营业收入', ico: require('@/assets/images/detail/overview/gsjy_ico4.png'), amount: '1699.7'},
+        { name: '总负债', ico: require('@/assets/images/detail/overview/gsjy_ico5.png'), amount: '1699.7'}
+      ],
+    }
+  },
+  created() {
+  },
+  mounted() {
+    this.companySwiper()
+  },
+  methods: {
+    companySwiper(){
+      new Swiper('.swiper-containers', {
+        slidesPerView: 4,
+        // 设置点击箭头
+        navigation: {
+          nextEl: '.swiper-button-next',
+          prevEl: '.swiper-button-prev',
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .operations-container{
+    margin: 0;
+    padding: 24px 16px;
+    background: #FFFFFF;
+    .part-swiper{
+      position: relative;
+      margin-top: 16px;
+      .swiper-containers{
+        width: calc(100% - 38px);
+        height: 96px;
+        margin-top: 8px;
+        margin-left: 25px;
+        overflow: hidden;
+        .swiper-slide{
+          .swiper-div{
+            width: calc(100% - 12px);
+            height: 96px;
+            background: url("~@/assets/images/detail/overview/swiper_bg.png") no-repeat;
+            background-size: 100% 100%;
+            .operations-title{
+              margin-right: 22px;
+              font-weight: bold;
+              font-size: 20px;
+              color: #0081FF;
+              padding: 24px 16px 0 16px;
+              span{
+                font-size: 16px;
+              }
+            }
+            .operations-info{
+              padding: 14px 16px 10px 16px;
+              justify-content: space-between;
+              font-size: 14px;
+              color: #416587;
+              span{
+                font-size: 12px;
+                img{
+                  width: 10px;
+                  height: 10px;
+                  margin-right: 3px;
+                }
+              }
+            }
+          }
+        }
+      }
+      .swiper-button-prev, .swiper-button-next{
+        width: 16px;
+        height: 96px;
+        background: #F0F5FC;
+        top: 0;
+        margin-top: 0;
+        &.swiper-button-disabled{
+          opacity: 1;
+          color:#AAAAAA;
+          background: #F5F5F5;
+        }
+        i{
+          color: #AAAAAA;
+        }
+        &:hover i{
+          color:#667199;
+        }
+        &:after{
+          content: "";
+        }
+      }
+    }
+    .operations-list{
+      flex-wrap: wrap;
+      justify-content: space-between;
+      .list-item{
+        width: calc(20% - 12px);
+        height: 88px;
+        padding: 18px;
+        margin-top: 14px;
+        font-size: 14px;
+        color: #232323;
+        border: 1px solid #E2E7EE;
+        text-align: center;
+        .list-item-all{
+          justify-content: center;
+          img{
+            width: 24px;
+            height: 24px;
+            margin-right: 4px;
+          }
+        }
+        .list-item-amount{
+          padding-top: 6px;
+          font-weight: bold;
+        }
+      }
+    }
+  }
+</style>

dsk-operate-ui/src/views/detail/party-a/overview/execuinfo.vue

+<template>
+  <div class="app-container part-container">
+    企业速览
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Overview',
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .part-container{
+    margin: 0;
+    padding: 0;
+  }
+</style>

dsk-operate-ui/src/views/detail/party-a/overview/holderinfo.vue

+<template>
+  <div class="app-container part-container">
+    企业速览
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Overview',
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .part-container{
+    margin: 0;
+    padding: 0;
+  }
+</style>

dsk-operate-ui/src/views/detail/party-a/overview/overseas.vue

+<template>
+  <div class="app-container part-container">
+    企业速览
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Overview',
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .part-container{
+    margin: 0;
+    padding: 0;
+  }
+</style>

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

+<template>
+  <div class="app-container part-container">
+    企业速览
+    <div class="gsjy">
+      <Operations />
+    </div>
+  </div>
+</template>
+
+<script>
+import Operations from "./component/operations";
+export default {
+  name: 'Overview',
+  components: {
+    Operations
+  },
+  data() {
+    return {
+    }
+  },
+  created() {
+  },
+  methods: {
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .part-container{
+    margin: 0;
+    padding: 0;
+    .gsjy{
+      margin-top: 12px;
+    }
+  }
+</style>

dsk-operate-ui/src/views/project/projectList/detail.vue

@@ -132,9 +132,6 @@
 </script>
 
 <style lang="scss" scoped>
-  .app-container{
-    padding: 0;
-  }
   .head{
     .titles{
       line-height: 31px;

dsk-operate-ui/src/views/project/projectList/index.vue

@@ -331,10 +331,6 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-  .app-container{
-    padding: 0;
-  }
-
   .noborder{
     position: relative;
   }
@@ -484,21 +480,6 @@ export default {
       }
       .det-tips{
         padding: 8px 0 ;
-        .tips{
-          display: inline-block;
-          padding: 4px 8px;
-          border-radius: 2px;
-          font-size: 12px;
-          margin-right: 8px;
-          &.tip1{
-            background-color: #E4F3FD;
-            color: #41A1FD;
-          }
-          &.tip2{
-            background-color: #F3F3FF;
-            color: #8491E8;
-          }
-        }
       }
       .det-contets{
         padding: 4px 0 16px;

dsk-operate-ui/src/views/radar/components/debtProject/index.vue

 <template>
 	<div class="content">
-		
+		<div class="content_item">
+		    <div class="label">项目名称</div>
+		    <div class="content_right">
+		        <el-input class="ename_input" 
+				placeholder="请输入项目名称关键字" v-model="ename" @input="enamebtn('ename',ename)"></el-input>
+		        <template v-if="ename">
+		            <span v-for=" (item,k)  in enameQueryTypeList" :key="k">
+		                <el-radio v-model="enameQueryType" :label="item.key">{{item.value}}</el-radio>
+		            </span>
+		        </template>
+		    </div>
+		</div>
+		<div class="content_item">
+		    <div class="label">项目主体</div>
+		    <div class="content_right">
+		        <div class="item_ckquery_list" >
+		        	<div class="ckquery_list_right">
+		        		<el-input  @input="registerIpt(registerCount)" ref="inp"
+		        			v-model="registerCount" autocomplete="off" type="text"
+		        			class="register_count_ipt" placeholder="请输入企业名称">
+		        			<el-dropdown trigger="click" slot="prepend" style="cursor:pointer;"
+		        				@command="changeCommand">
+		        				<span class="el-dropdown-link">
+		        					{{countType.value}}<i class="el-icon-caret-bottom"></i>
+		        				</span>
+		        				<el-dropdown-menu class="default_header_dropdown" slot="dropdown">
+		        					<el-dropdown-item v-for="(item,k) in countTypelist" :key="k" :command="item">{{item.value}}</el-dropdown-item>
+		        				</el-dropdown-menu>
+		        			</el-dropdown>
+		        		</el-input>
+		        	</div>
+		        </div>
+		    </div>
+		</div>
+		<div class="content_item">
+		    <div class="label">项目地区</div>
+		    <div class="content_right">
+		       <div class="select-popper">
+		       	<div class=" select-caret" :class="addressType.length>0?'select-active':''">
+				    <span>
+						项目地区{{addressType.length>0?(addressType.length+'项'):''}}
+					</span>
+					
+		       		<i class="el-icon-caret-bottom"></i>
+		       	</div>
+		       	<el-cascader ref="address"   class="cascader-region select-location" @input="addressListbtn" v-model="addressType"
+		       		:options="addressList" :props="props" collapse-tags></el-cascader>
+		       </div>
+		    </div>
+		</div>
+		<div class="content_item">
+		    <div class="label">项目类型</div>
+		    <div class="content_right">
+				<div class="content-projecttype">
+					<template  v-for="(item,i) in projectTypeList">
+						<span class="projecttype" :class="item.status?'activetype':''">
+								{{item.value}}	   
+						</span>
+					</template>
+				</div>
+		       
+		    </div>
+		</div>
+		<div class="content_item content_item_padding0">
+		    <div class="geduan">
+		       
+		    </div>
+		</div>
+		<div class="content_item content_item_padding0">
+			
+			<div class="search-new">
+				<span>查询</span>
+				<span>重置</span>
+			</div>
+		</div>
        
 	</div>
 </template>
 
 <script>
+	import jsk_data from '../../../../../public/jsk.json';
 	export default {
 		name: 'debtProject',
 		data() {
 			return {
-				
+				ename:'',
+				enameQueryTypeList: [{
+				        key: 'and',
+				        status: false,
+				        value: '模糊搜索',
+				        keyid: 'businessScope'
+				    },
+				    {
+				        key: 'or',
+				        status: true,
+				        value: '精准匹配',
+				        keyid: 'businessScope'
+				    },
+				],
+				enameQueryType: 'or',
+				registerCount:'',
+				countTypelist: [{
+						key: '1',
+						value: '项目主体'
+					},
+					{
+						key: '2',
+						value: '主管部门'
+					},
+					{
+						key: '3',
+						value: '实施单位'
+					}
+				],
+				countType: {
+					key: '3',
+					value: '实施单位'
+				},
+				addressList: [],
+				addressType: [],
+				props: {
+					multiple: true,
+					expandTrigger: "hover",
+					value: 'id'
+				},
+				projectTypeList: [
+				  {
+						status: true,
+						value: '不限',
+						keyid: 'projectType',
+						key: '不限'
+					},
+					{
+						value: '房屋建筑工程',
+						status: false,
+						keyid: 'projectType',
+						key: '房屋建筑工程'
+					},
+					{
+						value: '市政基础设施工程',
+						status: false,
+						keyid: 'projectType',
+						key: '市政基础设施工程'
+					},
+					{
+						value: '其他',
+						status: false,
+						keyid: 'projectType',
+						key: '其他'
+					},
+					{
+						value: '空白',
+						status: false,
+						keyid: 'projectType',
+						key: '空白'
+					},
+				],
+				projectTypeText: ['不限'],
+				arrList:[]
 				
 			}
 		},
-		created() {},
+		created() {
+			this.addressListfn();
+		},
 		methods: {
+			// 经营范围
+			enamebtn(key, text) {
+				var arr = this.ename.trim().split(' ')
+				for (var i = 0; i < arr.length; i++) {
+					if (!arr[i]) {
+						arr.splice(i, 1)
+						i--
+					}
+				}
+				var data = {
+					title:'项目名称：',
+					key: arr,
+					value: arr,
+					keyid: key
+				}
+				if (text.trim()) {
+					var n = -1;
+					for (let x = 0; x < this.arrList.length; x++) {
+						if (this.arrList[x].keyid == data.keyid) {
+							n = x;
+						}
+					}
+					if (n == -1) {
+						this.arrList.push(data)
+					} else {
+						this.arrList[n] = data;
+					}
+			
+				} else {
+					for (let x = 0; x < this.arrList.length; x++) {
+						if (this.arrList[x].keyid == data.keyid) {
+							this.arrList.splice(x, 1);
+							x--;
+						}
+					}
+				}
+			},
+			registerIpt(registerCount){
+				
+			},
+			changeCommand(str) {
+				this.countType=str;
+			},
+			addressListfn() {
+				var searchid;
+				if(this.$route.name=='search-combinedYN'){
+					searchid='530000'
+				}else{
+					searchid=''
+				}
+			
+				var str = [];
+				for (let x = 0; x < 3; x++) {
+					for (let i = 0; i < jsk_data.length; i++) {
+						if (jsk_data[i].regionLevel == x + 1 && x + 1 == 1) {
+							if(searchid){
+								if (jsk_data[i].id == searchid) {
+									str.push({
+										id: jsk_data[i].id,
+										label: jsk_data[i].regionName,
+										short: jsk_data[i].short,
+										value: jsk_data[i].parentId,
+										children: jsk_data[i].id == 900000 ? undefined : [],
+									});
+								}
+							}else{
+									str.push({
+										id: jsk_data[i].id,
+										label: jsk_data[i].regionName,
+										short: jsk_data[i].short,
+										value: jsk_data[i].parentId,
+										children: jsk_data[i].id == 900000 ? undefined : [],
+									});
+							}
+			
+			
+			
+						} else if (jsk_data[i].regionLevel == x + 1 && x + 1 == 2 && str) {
+							for (let j = 0; j < str.length; j++) {
+								if (str[j].id == jsk_data[i].parentId) {
+									str[j].children.push({
+										id: jsk_data[i].id,
+										label: jsk_data[i].regionName,
+										short: jsk_data[i].short,
+										value: jsk_data[i].parentId,
+										children: [],
+									});
+								}
+							}
+						} else if (jsk_data[i].regionLevel == x + 1 && x + 1 == 3) {
+							for (let j = 0; j < str.length; j++) {
+								if (str[j].children) {
+									for (let k = 0; k < str[j].children.length; k++) {
+										if (str[j].children[k].id == jsk_data[i].parentId) {
+											str[j].children[k].children.push({
+												id: jsk_data[i].id,
+												label: jsk_data[i].regionName,
+												short: jsk_data[i].short,
+												value: jsk_data[i].parentId,
+											});
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			
+				this.addressList = str;
+			},
+			// 项目属地
+			addressListbtn() {
+				for (let i = 0; i < this.arrList.length; i++) {
+					if (this.arrList[i].keyid == 'address') {
+						this.arrList.splice(i, 1);
+						i--;
+					}
+				}
+				let arr = (this.$refs.address.getCheckedNodes())
+				let provinceCode = [],
+					cityCode = [],
+					countyCode = [];
+				let province = [],
+					city = [],
+					county = [];
+			
+				for (var i in arr) {
+					if (arr[i].parent) {
+						if (!arr[i].parent.checked) {
+							arr[i].hasChildren && cityCode.push(arr[i].value);
+							!arr[i].hasChildren && countyCode.push(arr[i].value);
+						}
+					} else {
+						provinceCode.push(arr[i].value)
+					}
+				}
+			
+			
+				for (let j = 0; j < jsk_data.length; j++) {
+					if (provinceCode.length > 0) {
+						for (let i = 0; i < provinceCode.length; i++) {
+							if (provinceCode[i] == jsk_data[j].id) {
+								province.push({
+									value: jsk_data[j].regionName,
+									key: provinceCode[i]
+								})
+							}
+			
+						}
+			
+					}
+					if (cityCode.length > 0) {
+						for (let i = 0; i < cityCode.length; i++) {
+							if (cityCode[i] == jsk_data[j].id) {
+								city.push({
+									value: jsk_data[j].regionName,
+									key: cityCode[i]
+								})
+							}
+			
+						}
+					}
+					if (countyCode.length > 0) {
+						for (let i = 0; i < countyCode.length; i++) {
+							if (countyCode[i] == jsk_data[j].id) {
+								county.push({
+									value: jsk_data[j].regionName,
+									key: countyCode[i]
+								})
+							}
 			
+						}
+					}
+			
+				}
+				if (province.length > 0 || city.length > 0 || county.length > 0) {
+					let arrlist = [];
+					if (province.length > 0) {
+						for (let i in province) {
+							arrlist.push(province[i].value)
+						}
+					}
+					if (city.length > 0) {
+						for (let i in city) {
+							arrlist.push(city[i].value)
+						}
+					}
+					if (county.length > 0) {
+						for (let i in county) {
+							arrlist.push(county[i].value)
+						}
+					}
+					console.log(this.addressType);
+					this.arrList.push({
+						value: arrlist,
+						keyid: 'address',
+						provinceCode: provinceCode,
+						cityCode: cityCode,
+						countyCode: countyCode,
+						title: '项目属地：',
+						key: '',
+						addressType:this.addressType
+					})
+				}
+				// this.landMarketDto = obj
+			},
 		}
 	}
 </script>
@@ -25,6 +380,80 @@
 	.content{
 	  padding: 0px 16px;
 	   background: #FFFFFF;
+	   .content_item{
+		   padding-top: 12px;
+		   display: flex;
+		   align-items: center;
+	       .label{
+	           width: 84px;
+			   font-size: 14px;
+			   font-weight: 400;
+			   color: rgba(35,35,35,0.8);
+	       }
+	       .content_right{
+	           
+	           .ename_input{
+	               width: 640px;
+	              
+	               margin-right: 20px;
+	               
+	           }
+	       }
+		   
+		 .item_ckquery_list {
+			display: flex;
+		
+		}
+		
+		 .item_ckquery_list .el-input__icon {
+			position: relative;
+			top: 1px;
+		}
+		.ckquery_list_right {
+			width: 640px;
+		}
+		.register_count_ipt{
+			margin-left: 0px;
+			
+		}
+		.register_count_ipt .el-input__inner{
+			width: 174px;
+		}
+		::v-deep .el-input-group__prepend{
+			padding: 0 8px;
+		}
+		.content-projecttype{
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			.projecttype{
+				font-weight: 400;
+				color: #232323;
+				padding: 1px 5px;
+				margin-right: 4px;
+				cursor: pointer;
+				border-radius: 3px 3px 3px 3px;
+				font-size: 14px;
+			}
+			.projecttype:first-child{
+				padding-left: 0px;
+			}
+			.projecttype:hover{
+				background: #F3F4F5;
+				padding: 1px 5px;
+			}
+			.activetype{
+				background: #F3F4F5;
+				padding: 1px 5px !important;
+			}
+		}
+		
+		
+	   
+	   }
+	   .content_item_padding0{
+		   padding: 0;
+	   }
 		
 	}
 	

dsk-operate-ui/src/views/radar/index.vue

@@ -20,6 +20,7 @@
 </template>
 <script>
 	import debtProject from "./components/debtProject/index.vue";
+	import "@/assets/styles/public.css";
 	export default {
 		name: 'radar',
 		components: { debtProject },
@@ -87,7 +88,7 @@
 </script>
 
 <style lang="scss" scoped>
-	@import "~@/assets/styles/public.scss";
+	
 	.app-container {
 		margin: 12px 24px;
 		padding: 0;
@@ -116,7 +117,7 @@
 
 	.app-container .combined-title .title-right {
 		display: flex;
-		width: 1044px;
+		width: 100%;
 		position: relative;
 		height: 40px;
 	}
@@ -150,7 +151,7 @@
 		height: 1px;
 		background-color: #EEEEEE;
 		position: absolute;
-		bottom: 0px;
+		bottom: -1px;
 		left: 0;
 		z-index: 1;
 	}
@@ -168,7 +169,7 @@
 	.tab div {
 		cursor: pointer;
 		color: #666666;
-		font-size: 14px;
+		font-size: 16px;
 		text-align: center;
 		margin-right: 32px;
 		line-height: 40px;

dsk-system/src/main/java/com/dsk/system/domain/customer/Customer.java

 package com.dsk.system.domain.customer;
 
 import com.baomidou.mybatisplus.annotation.*;
+import com.dsk.common.annotation.Excel;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.experimental.Accessors;
+import org.springframework.context.annotation.Import;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -30,6 +32,7 @@ public class Customer implements Serializable {
     /**
      * 客户名称（企业名称）
      */
+    @Excel(name = "企业名称")
     private String companyName;
     /**
      * 法定代表人

dsk-system/src/main/java/com/dsk/system/service/ICustomerService.java

@@ -29,4 +29,6 @@ public interface ICustomerService {
 
     List<CustomerBusinessListVo> selectBusinessList(CustomerBusinessSearchDto dto);
 
+    List<String> importData(List<Customer> customerList);
+
 }

dsk-system/src/main/java/com/dsk/system/service/impl/CustomerServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanException;
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.dsk.common.exception.ServiceException;
+import com.dsk.common.utils.DskOpenApiUtil;
 import com.dsk.common.utils.SecurityUtils;
 import com.dsk.system.domain.customer.Customer;
 import com.dsk.system.domain.customer.CustomerUser;
@@ -16,12 +17,14 @@ import com.dsk.system.mapper.CustomerMapper;
 import com.dsk.system.mapper.CustomerUserMapper;
 import com.dsk.system.service.IBusinessInfoService;
 import com.dsk.system.service.ICustomerService;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -30,6 +33,7 @@ import java.util.List;
  * @author makejava
  * @since 2023-05-16 09:27:57
  */
+@Slf4j
 @Service
 public class CustomerServiceImpl implements ICustomerService {
 
@@ -39,6 +43,8 @@ public class CustomerServiceImpl implements ICustomerService {
     private CustomerUserMapper customerUserMapper;
     @Autowired
     private IBusinessInfoService businessInfoService;
+    @Autowired
+    private DskOpenApiUtil dskOpenApiUtil;
 
     @Override
     public List<CustomerListVo> selectList(CustomerSearchDto dto) {
@@ -108,4 +114,22 @@ public class CustomerServiceImpl implements ICustomerService {
         dto.setUserId(SecurityUtils.getUserId());
         return businessInfoService.selectCustomerBusinessList(dto);
     }
+
+    @Override
+    public List<String> importData(List<Customer> customerList) {
+        List<String> resultList = new ArrayList<>();
+        for (Customer customer : customerList) {
+            if (ObjectUtils.isEmpty(customer.getCompanyName())) {
+                continue;
+            }
+            try {
+                //TODO 名称查询企业信息
+
+                this.add(customer);
+            } catch (Exception e) {
+                resultList.add(customer.getCompanyName().concat(e.getMessage()));
+            }
+        }
+        return resultList;
+    }
 }