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

dsk-admin/pom.xml

@@ -78,7 +78,7 @@
                 </configuration>
            </plugin>
         </plugins>
-        <finalName>${project.artifactId}</finalName>
+        <finalName>dsk-operate-sys</finalName>
     </build>
 
 </project>

dsk-admin/src/main/java/com/dsk/web/controller/common/CaptchaController.java

 package com.dsk.web.controller.common;
 
+import java.awt.*;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
@@ -72,7 +73,8 @@ public class CaptchaController
         else if ("char".equals(captchaType))
         {
             capStr = code = captchaProducer.createText();
-            image = captchaProducer.createImage(capStr);
+//            image = captchaProducer.createImage(capStr);
+            image = captchaImage(capStr);
         }
 
         redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
@@ -91,4 +93,47 @@ public class CaptchaController
         ajax.put("img", Base64.encode(os.toByteArray()));
         return ajax;
     }
+
+    private static final int WIDTH = 120; // 图片宽度
+    private static final int HEIGHT = 40; // 图片高度
+    private static final int CODE_LENGTH = 4; // 验证码长度
+
+    private BufferedImage captchaImage(String capStr) {
+        // 创建图片缓冲区
+        BufferedImage image = new BufferedImage(WIDTH, HEIGHT, BufferedImage.TYPE_INT_RGB);
+
+        // 获取画笔
+        Graphics graphics = image.getGraphics();
+
+        // 绘制背景
+        graphics.setColor(Color.WHITE);
+        graphics.fillRect(0, 0, WIDTH, HEIGHT);
+
+        // 绘制验证码
+        graphics.setFont(new Font("Arial", Font.BOLD, 28));
+        for (int i = 0; i < capStr.length(); i++) {
+            graphics.setColor(getRandomColor());
+            graphics.drawString(String.valueOf(capStr.charAt(i)), (i + 1) * (WIDTH / (CODE_LENGTH + 1)), 30);
+        }
+
+        // 添加干扰线
+        for (int i = 0; i < 3; i++) {
+            graphics.setColor(getRandomColor());
+            graphics.drawLine((int) (Math.random() * WIDTH), (int) (Math.random() * HEIGHT),
+                    (int) (Math.random() * WIDTH), (int) (Math.random() * HEIGHT));
+        }
+
+        // 释放资源
+        graphics.dispose();
+        return image;
+    }
+
+
+    // 获取随机颜色
+    private static Color getRandomColor() {
+        int r = (int) (Math.random() * 256);
+        int g = (int) (Math.random() * 256);
+        int b = (int) (Math.random() * 256);
+        return new Color(r, g, b);
+    }
 }

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

@@ -125,6 +125,8 @@ public class CustomerController extends BaseController {
         }
     }
 
+
+
     /**
      * 编辑客户
      */
@@ -190,4 +192,31 @@ public class CustomerController extends BaseController {
         success.put("successCount", successCount);
         return success;
     }
+
+    /**
+     * 客户状态
+     */
+    @GetMapping("/status/{companyName}")
+    public AjaxResult status(@PathVariable String companyName) {
+        return AjaxResult.success(baseService.status(companyName));
+    }
+
+
+    /**
+     * 取消认领
+     */
+    @PutMapping("/cancelClaim/{companyName}")
+    @RepeatSubmit
+    public AjaxResult cancelClaim(@PathVariable String companyName) {
+        return toAjax(baseService.cancelClaim(companyName));
+    }
+
+    /**
+     * 历史认领
+     */
+    @PutMapping("/historyClaim/{companyName}")
+    @RepeatSubmit
+    public AjaxResult historyClaim(@PathVariable String companyName) {
+        return toAjax(baseService.historyClaim(companyName));
+    }
 }

dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseController.java

@@ -136,4 +136,10 @@ public class EnterpriseController {
         return enterpriseService.getUipIdByCid(vo);
     }
 
+    @ApiOperation(value = "企业-财务数据")
+    @PostMapping(value = "financialData")
+    public R financialData(@RequestBody EnterpriseFinancialDataBody vo) throws Exception {
+        return enterpriseService.financialData(vo);
+    }
+
 }

dsk-admin/src/main/java/com/dsk/web/controller/dsk/EnterpriseProjectController.java

@@ -119,6 +119,13 @@ public class EnterpriseProjectController {
         return enterpriseProjectService.bidPlanPage(body);
     }
 
+    @ApiOperation(value = "招标计划项目类型（openApi）")
+    @RequestMapping(value = "/bidPlanProjectType",method = RequestMethod.POST)
+    public R bidPlanProjectType(@RequestBody @Valid EnterpriseProjectBidPlanProjectTypeBody body) throws Exception {
+        return enterpriseProjectService.bidPlanProjectType(body);
+    }
+
+
     @ApiOperation(value = "招标计划详情（openApi）")
     @RequestMapping(value = "/bidPlanDetail", method = RequestMethod.POST)
     public R bidPlanDetail(@RequestBody @Valid EnterpriseProjectBidPlanDetailBody body) throws Exception {

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

@@ -3,6 +3,7 @@ package com.dsk.web.controller.search.macroMarket;
 import com.dsk.common.core.domain.AjaxResult;
 import com.dsk.common.dtos.*;
 import com.dsk.system.service.EconomicService;
+import com.dsk.web.controller.tool.IpUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

dsk-admin/src/main/java/com/dsk/web/controller/search/macroMarket/BizConstant.java → dsk-admin/src/main/java/com/dsk/web/controller/tool/BizConstant.java

 /**
  * 
  */
-package com.dsk.web.controller.search.macroMarket;
+package com.dsk.web.controller.tool;
 
 import java.util.Arrays;
 import java.util.List;

dsk-admin/src/main/java/com/dsk/web/controller/search/macroMarket/IpUtil.java → dsk-admin/src/main/java/com/dsk/web/controller/tool/IpUtil.java

-package com.dsk.web.controller.search.macroMarket;
+package com.dsk.web.controller.tool;
 
 
 import org.apache.commons.lang3.StringUtils;

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

@@ -14,7 +14,7 @@ ruoyi:
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数组计算 char 字符验证
-  captchaType: math
+  captchaType: char
 
 # 开发环境配置
 server:

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

+# 项目相关配置
+ruoyi:
+  # 名称
+  name: RuoYi
+  # 版本
+  version: 3.8.5
+  # 版权年份
+  copyrightYear: 2023
+  # 实例演示开关
+  demoEnabled: true
+  # 文件路径 示例（ 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 字符验证
+  captchaType: math
+
+# 开发环境配置
+server:
+  # 服务器的HTTP端口，默认为8080
+  port: 9098
+  servlet:
+    # 应用的访问路径
+    context-path: /
+  tomcat:
+    # tomcat的URI编码
+    uri-encoding: UTF-8
+    # 连接数满后的排队数，默认为100
+    accept-count: 1000
+    threads:
+      # tomcat最大线程数，默认为200
+      max: 800
+      # Tomcat启动初始化的线程数，默认值10
+      min-spare: 100
+
+# 日志配置
+logging:
+  level:
+    com.ruoyi: debug
+    org.springframework: warn
+
+# 用户配置
+user:
+  password:
+    # 密码最大错误次数
+    maxRetryCount: 5
+    # 密码锁定时间（默认10分钟）
+    lockTime: 10
+
+# Spring配置
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    druid:
+      # 主库数据源
+      master:
+        url: jdbc:mysql://47.104.91.229:3306/dsk-operate-sys?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: dev
+        password: zfTFIJjaN#6xB83r
+      # 从库数据源
+      #            slave:
+      #                # 从数据源开关/默认关闭
+      #                enabled: false
+      #                url:
+      #                username:
+      #                password:
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置连接超时时间
+      connectTimeout: 30000
+      # 配置网络超时时间
+      socketTimeout: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: ruoyi
+        login-password: 123456
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
+  # 资源信息
+  messages:
+    # 国际化资源文件路径
+    basename: i18n/messages
+#  profiles:
+#    active: druid
+  # 文件上传
+  servlet:
+     multipart:
+       # 单个文件大小
+       max-file-size:  10MB
+       # 设置总上传的文件大小
+       max-request-size:  20MB
+  # 服务模块
+  devtools:
+    restart:
+      # 热部署开关
+      enabled: true
+  # redis 配置
+  redis:
+    # 地址
+    host: 47.104.91.229
+    # 端口，默认为6379
+    port: 6379
+    # 数据库索引
+    database: 6
+    # 密码
+    password: zfTFIJjaN#6xB83r
+    # 连接超时时间
+    timeout: 10s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
+
+# token配置
+token:
+    # 令牌自定义标识
+    header: Authorization
+    # 令牌密钥
+    secret: abcdefghijklmnopqrstuvwxyz
+    # 令牌有效期（默认30分钟）
+    expireTime: 240
+
+
+#mybatis:
+#    # 搜索指定包别名
+#    typeAliasesPackage: com.dsk.**.domain
+#    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+#    mapperLocations: classpath*:mapper/**/*Mapper.xml
+#    # 加载全局的配置文件
+#    configLocation: classpath:mybatis/mybatis-config.xml
+
+
+
+# PageHelper分页插件
+pagehelper:
+  helperDialect: mysql
+  supportMethodsArguments: true
+  params: count=countSql
+
+# Swagger配置
+swagger:
+  # 是否开启swagger
+  enabled: true
+  # 请求前缀
+  pathMapping: /
+
+# 防止XSS攻击
+xss:
+  # 过滤开关
+  enabled: true
+  # 排除链接（多个用逗号分隔）
+  excludes: /system/notice
+  # 匹配链接
+  urlPatterns: /system/*,/monitor/*,/tool/*
+
+dsk:
+  open:
+#    endPoint: 120.27.13.145:8865
+#    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
+#    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
+#    protocol: http
+    endPoint: openapi.jiansheku.com
+    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
+    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
+    protocol: https

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

+# 项目相关配置
+ruoyi:
+  # 名称
+  name: RuoYi
+  # 版本
+  version: 3.8.5
+  # 版权年份
+  copyrightYear: 2023
+  # 实例演示开关
+  demoEnabled: true
+  # 文件路径 示例（ 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 字符验证
+  captchaType: math
+
+# 开发环境配置
+server:
+  # 服务器的HTTP端口，默认为8080
+  port: 9011
+  servlet:
+    # 应用的访问路径
+    context-path: /
+  tomcat:
+    # tomcat的URI编码
+    uri-encoding: UTF-8
+    # 连接数满后的排队数，默认为100
+    accept-count: 1000
+    threads:
+      # tomcat最大线程数，默认为200
+      max: 800
+      # Tomcat启动初始化的线程数，默认值10
+      min-spare: 100
+
+# 日志配置
+logging:
+  level:
+    com.ruoyi: debug
+    org.springframework: warn
+
+# 用户配置
+user:
+  password:
+    # 密码最大错误次数
+    maxRetryCount: 5
+    # 密码锁定时间（默认10分钟）
+    lockTime: 10
+
+# Spring配置
+spring:
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    driverClassName: com.mysql.cj.jdbc.Driver
+    druid:
+      # 主库数据源
+      master:
+        url: jdbc:mysql://47.104.91.229:3306/dsk-operate-sys?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        username: dev
+        password: zfTFIJjaN#6xB83r
+      # 从库数据源
+      #            slave:
+      #                # 从数据源开关/默认关闭
+      #                enabled: false
+      #                url:
+      #                username:
+      #                password:
+      # 初始连接数
+      initialSize: 5
+      # 最小连接池数量
+      minIdle: 10
+      # 最大连接池数量
+      maxActive: 20
+      # 配置获取连接等待超时的时间
+      maxWait: 60000
+      # 配置连接超时时间
+      connectTimeout: 30000
+      # 配置网络超时时间
+      socketTimeout: 60000
+      # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+      timeBetweenEvictionRunsMillis: 60000
+      # 配置一个连接在池中最小生存的时间，单位是毫秒
+      minEvictableIdleTimeMillis: 300000
+      # 配置一个连接在池中最大生存的时间，单位是毫秒
+      maxEvictableIdleTimeMillis: 900000
+      # 配置检测连接是否有效
+      validationQuery: SELECT 1 FROM DUAL
+      testWhileIdle: true
+      testOnBorrow: false
+      testOnReturn: false
+      webStatFilter:
+        enabled: true
+      statViewServlet:
+        enabled: true
+        # 设置白名单，不填则允许所有访问
+        allow:
+        url-pattern: /druid/*
+        # 控制台管理用户名和密码
+        login-username: ruoyi
+        login-password: 123456
+      filter:
+        stat:
+          enabled: true
+          # 慢SQL记录
+          log-slow-sql: true
+          slow-sql-millis: 1000
+          merge-sql: true
+        wall:
+          config:
+            multi-statement-allow: true
+  # 资源信息
+  messages:
+    # 国际化资源文件路径
+    basename: i18n/messages
+#  profiles:
+#    active: druid
+  # 文件上传
+  servlet:
+     multipart:
+       # 单个文件大小
+       max-file-size:  10MB
+       # 设置总上传的文件大小
+       max-request-size:  20MB
+  # 服务模块
+  devtools:
+    restart:
+      # 热部署开关
+      enabled: true
+  # redis 配置
+  redis:
+    # 地址
+    host: 47.104.91.229
+    # 端口，默认为6379
+    port: 6379
+    # 数据库索引
+    database: 15
+    # 密码
+    password: zfTFIJjaN#6xB83r
+    # 连接超时时间
+    timeout: 10s
+    lettuce:
+      pool:
+        # 连接池中的最小空闲连接
+        min-idle: 0
+        # 连接池中的最大空闲连接
+        max-idle: 8
+        # 连接池的最大数据库连接数
+        max-active: 8
+        # #连接池最大阻塞等待时间（使用负值表示没有限制）
+        max-wait: -1ms
+
+# token配置
+token:
+    # 令牌自定义标识
+    header: Authorization
+    # 令牌密钥
+    secret: abcdefghijklmnopqrstuvwxyz
+    # 令牌有效期（默认30分钟）
+    expireTime: 240
+
+
+#mybatis:
+#    # 搜索指定包别名
+#    typeAliasesPackage: com.dsk.**.domain
+#    # 配置mapper的扫描，找到所有的mapper.xml映射文件
+#    mapperLocations: classpath*:mapper/**/*Mapper.xml
+#    # 加载全局的配置文件
+#    configLocation: classpath:mybatis/mybatis-config.xml
+
+
+
+# PageHelper分页插件
+pagehelper:
+  helperDialect: mysql
+  supportMethodsArguments: true
+  params: count=countSql
+
+# Swagger配置
+swagger:
+  # 是否开启swagger
+  enabled: true
+  # 请求前缀
+  pathMapping: /
+
+# 防止XSS攻击
+xss:
+  # 过滤开关
+  enabled: true
+  # 排除链接（多个用逗号分隔）
+  excludes: /system/notice
+  # 匹配链接
+  urlPatterns: /system/*,/monitor/*,/tool/*
+
+dsk:
+  open:
+#    endPoint: 120.27.13.145:8865
+#    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
+#    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
+#    protocol: http
+    endPoint: openapi.jiansheku.com
+    accessKeyId: aec7b3ff2y2q8x6t49a7e2c463ce21912
+    accessKeySecret: ee8a53c7ea04eb3ac311406c8f56f95b
+    protocol: https

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

 spring:
   profiles:
-    active: dev
+    active: pre
 
 # MyBatisPlus配置
 # https://baomidou.com/config/

dsk-admin/src/main/resources/banner.txt

 Application Version: ${ruoyi.version}
 Spring Boot Version: ${spring-boot.version}
-////////////////////////////////////////////////////////////////////
-//                          _ooOoo_                               //
-//                         o8888888o                              //
-//                         88" . "88                              //
-//                         (| ^_^ |)                              //
-//                         O\  =  /O                              //
-//                      ____/`---'\____                           //
-//                    .'  \\|     |//  `.                         //
-//                   /  \\|||  :  |||//  \                        //
-//                  /  _||||| -:- |||||-  \                       //
-//                  |   | \\\  -  /// |   |                       //
-//                  | \_|  ''\---/''  |   |                       //
-//                  \  .-\__  `-`  ___/-. /                       //
-//                ___`. .'  /--.--\  `. . ___                     //
-//              ."" '<  `.___\_<|>_/___.'  >'"".                  //
-//            | | :  `- \`.;`\ _ /`;.`/ - ` : | |                 //
-//            \  \ `-.   \_ __\ /__ _/   .-` /  /                 //
-//      ========`-.____`-.___\_____/___.-`____.-'========         //
-//                           `=---='                              //
-//      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^        //
-//             佛祖保佑       永不宕机      永无BUG               //
-////////////////////////////////////////////////////////////////////
\ No newline at end of file

dsk-common/src/main/java/com/dsk/common/constant/CacheConstants.java

@@ -46,4 +46,17 @@ public class CacheConstants
      * 查甲方 菜单选线
      */
     public static final String DATA_UIPGROUPDATA = "data:uipGroupData";
+
+    /**
+     * 查甲方 菜单选线
+     */
+    public static final String PERSONAL_LOCATION = "personal:location";
+
+    /**
+     * 查甲方 财务数据
+     */
+    public static final String DATA_FINANCIAL = "data:financial";
+
+
+
 }

dsk-common/src/main/java/com/dsk/common/core/domain/model/BasePage.java

@@ -34,7 +34,10 @@ public class BasePage {
 	 */
 	private Integer pageMaxSize;
 
-	private String field;
+	/**
+	 * 总中标金额
+	 */
+	private String field = "bidSumAmount";
 
 	private String order;
 

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseFinancialDataBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseFinancialDataBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    public boolean isValidateCid() {
+        return 0 == cid;
+    }
+
+}

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidPlanPageBody.java

@@ -25,6 +25,11 @@ public class EnterpriseProjectBidPlanPageBody extends BasePage {
      */
     private String keys;
 
+    /**
+     * 项目类型
+     */
+    private String buildingProjectType;
+
     /*
      * 排序字段：1金额倒序，2金额正序，3发布时间倒序，4发布时间正序，15预计招标时间倒序，16预计招标时间正序
      */

dsk-common/src/main/java/com/dsk/common/core/domain/model/EnterpriseProjectBidPlanProjectTypeBody.java

+package com.dsk.common.core.domain.model;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @ClassName EnterpriseProjectBidPlanProjectTypeBody
+ * @Description
+ * @Author Dgm
+ * @Date 2023/7/13 9:37
+ * @Version
+ */
+
+@Data
+@ToString
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = false)
+public class EnterpriseProjectBidPlanProjectTypeBody {
+    /**
+     * 企业id
+     */
+    @NotNull(message = "企业id不能为空")
+    private Integer cid;
+
+    public boolean isVaildCid() {
+        return 0 == cid;
+    }
+}

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

@@ -14,6 +14,12 @@ import javax.validation.constraints.NotNull;
 @Data
 public class OpRegionalEconomicDataRegionalListDto {
 
+    /**
+     * id
+     */
+    @NotNull(message = "id 不能为空")
+    private Integer id;
+
     /**
      * 省Id
      */

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

@@ -16,5 +16,16 @@ public class OpRegionalLocalDto {
      */
     private Integer provinceId;
 
+    /**
+     * 市Id
+     */
+    private Integer cityId;
+
+    /**
+     * 区 Id
+     */
+    private Integer areaId;
+
+
     private String ip;
 }

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

@@ -17,6 +17,17 @@ public class SpecialPurposeBondsDto {
      */
     private Integer provinceId;
 
+    /**
+     * 市Id
+     */
+    private Integer cityId;
+
+    /**
+     * 区Id
+     */
+    private Integer areaId;
+
+
     /**
      * 项目类型
      */

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

@@ -16,6 +16,15 @@ public class SpecialPurposeBondsPageDto extends BasePage {
      * 省Id
      */
     private Integer provinceId;
+    /**
+     * 市Id
+     */
+    private Integer cityId;
+
+    /**
+     * 区Id
+     */
+    private Integer areaId;
 
     /**
      * 排序字段 默认-投资金额

dsk-operate-ui/.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = 数字化经营履约全生命链路管理系统
 ENV = 'development'
 
 # 数字化经营履约全生命链路管理系统/开发环境
-VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = '/prod-api'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

dsk-operate-ui/src/api/common.js

@@ -17,3 +17,10 @@ export const claim= function claim(param) {
     data: param
   })
 }
+// 历史客户认领
+export const historyClaim= function historyClaim(name) {
+  return request({
+    url: '/customer/historyClaim/'+name,
+    method: 'Put',
+  })
+}

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

@@ -8,3 +8,11 @@ export function infoHeader(data) {
     data: data
   })
 }
+//企业数据统计
+export function statistic(data) {
+  return request({
+    url: '/enterprise/statistic',
+    method: 'post',
+    data: data
+  })
+}

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

@@ -116,3 +116,11 @@ export function bidPlanPage(data) {
     data: data
   })
 }
+// 招标计划项目类型
+export function bidPlanProjectType(data) {
+  return request({
+    url: '/enterpriseProject/bidPlanProjectType',
+    method: 'post',
+    data: data
+  })
+}

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

@@ -44,6 +44,14 @@ export function projectTenderDataGroup(data) {
     data: data
   })
 }
+// 财务数据
+export function financialData(data) {
+  return request({
+    url: '/enterprise/financialData',
+    method: 'post',
+    data: data
+  })
+}
 
 // 招标公告
 export function bidNoticePage(data) {

dsk-operate-ui/src/api/enterpriseData/enterpriseData.js

@@ -51,6 +51,30 @@ let claim= function claim(param) {
 	data: param
   })
 }
+// 取消认领用户
+let cancelClaim= function cancelClaim(data) {
+  return request({
+    url: '/customer/cancelClaim/'+data,
+    method: 'put',
+	  // data: data
+  })
+}
+// 历史认领用户
+let historyClaim= function historyClaim(data) {
+  return request({
+    url: '/customer/historyClaim/'+data,
+    method: 'put',
+	  // data: data
+  })
+}
+// 客户状态
+let customerStatus= function customerStatus(data) {
+  return request({
+    url: '/customer/status/'+data,
+    method: 'get',
+	  // data: data
+  })
+}
 // 查建筑企业
 
 let enterprisePage= function enterprisePage(param) {
@@ -72,4 +96,4 @@ let infoHeader= function infoHeader(param) {
 
 
 
-export default {aptitudeCode,personCert,searchDic,regionWebList,uipGroupData,uipSerach,claim,enterprisePage,infoHeader}
+export default {aptitudeCode,personCert,searchDic,regionWebList,uipGroupData,uipSerach,claim,cancelClaim,enterprisePage,infoHeader,historyClaim,customerStatus}
\ No newline at end of file

dsk-operate-ui/src/api/macro/macro.js

@@ -215,6 +215,28 @@ export function claim(param) {
     data: param
   })
 }
+//客户状态
+export function customerStatus(name) {
+  return request({
+    url:`/customer/status/`+name,
+    method: 'get',
+  })
+}
+//历史客户认领
+export function historyClaim(name) {
+  return request({
+    url:`/customer/historyClaim/`+name,
+    method: 'put',
+  })
+}
+//批量获取城投企业id
+export function getUipIdByCid(param) {
+  return request({
+    url: '/enterprise/getUipIdByCid',
+    method: 'POST',
+    data: param
+  })
+}
 
 
 

dsk-operate-ui/src/assets/js/jskplug.js

@@ -3,27 +3,30 @@
 * 1、url地址，如企业详情：https://pre-plug.jiansheku.com/enterprise?ak=aec7b3ff2y2q8x6t49a7e2c463ce21912&uid=a704fb35bca54707b9b5f8c9bba57815（ak：平台唯一标识；uid：用户标识）
 *
 * */
-const steerScroll = function (iframeId, navHeight, state, parentId){  //state:监听or移除监听；navHeight:页面排除iframe后剩下高度；iframeId: iframe的id
+const steerScroll = function(iframeId, navigation, state, parentId) { // state:监听or移除监听；navigation:页面排除iframe后剩下高度；iframeId: iframe的id
   let dom = window
-  if(parentId){// 默认页面可以滚动
+  if (parentId) { // 默认页面可以滚动
     dom = document.getElementById(parentId)
+    if (!dom) {
+      return
+    }
     dom.style.overflow = 'auto'
-    navHeight = 0
-  }else{
+  } else {
     document.body.style.overflow = 'visible'
   }
-  if(state){
+  if (state) {
     window.addEventListener('message', function(e) {
       const data = e.data
       const sct = parentId ? dom.scrollTop : document && document.documentElement.scrollTop || document && document.body.scrollTop
       if (data && typeof data === 'object') {
         // 动态设置iFrame高度
         if (data.height) {
-          document.getElementById(iframeId).style.height = data.height+'px'
-          scrolling(iframeId, navHeight, parentId) // 初始加载获取滚动条距离顶部高度
+          document.getElementById(iframeId).style.height = data.height + 'px'
+          scrolling(iframeId, navigation, parentId) // 初始加载获取滚动条距离顶部高度
         }
         // 点击企业详情页 栏目名动态设置滚动高度
         if (data.scrollHeight) {
+          const navHeight = navigation.isFixed && !parentId ? navigation.totalHeight - navigation.fixedHeight : !parentId ? navigation.totalHeight : 0
           dom.scrollTo(sct, parseInt(data.scrollHeight) + navHeight)
         }
         // 点击企业详情页 栏目下拉子标签动态设置滚动高度
@@ -31,34 +34,37 @@ const steerScroll = function (iframeId, navHeight, state, parentId){  //state:
           dom.scrollTo(sct, sct - parseInt(data.clientHeight))
         }
         // 点击下拉子标签动态设置滚动高度
-        if (data.initHeight>=0) {
+        if (data.initHeight >= 0) {
           dom.scrollTo(sct, data.initHeight)
         }
         // 根据子页面弹窗显示隐藏控制当前页面是否固定不可滚动
-        if (data.scrollDisabled||data.scrollDisabled==false) {
-          if(parentId){
-            dom.style.overflow = data.scrollDisabled?'hidden':'auto'
-          }else{
-            document.body.style.overflow = data.scrollDisabled?'hidden':'visible'
+        if (data.scrollDisabled || data.scrollDisabled === false) {
+          if (parentId) {
+            dom.style.overflow = data.scrollDisabled ? 'hidden' : 'auto'
+          } else {
+            document.body.style.overflow = data.scrollDisabled ? 'hidden' : 'visible'
           }
         }
       }
     })
-    dom.addEventListener('scroll', scrolling(iframeId, navHeight, parentId))
-  }else{
-    dom.removeEventListener('scroll', scrolling(iframeId, navHeight, parentId))
+    dom.addEventListener('scroll', (event) => {
+      scrolling(iframeId, navigation, parentId)
+    })
+  } else {
+    dom.removeEventListener('scroll', (event) => {
+      scrolling(iframeId, navigation, parentId)
+    })
   }
 }
 
-const scrolling = function (iframeId, navHeight, parentId){
+const scrolling = function(iframeId, navigation, parentId) {
   // 滚动条距文档顶部的距离
   let scrollTop = parentId ? document.getElementById(parentId).scrollTop : window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
   // 将滚动距离传入子组件
   const ifa = document.getElementById(iframeId)
-  if(scrollTop<navHeight){
-    scrollTop = scrollTop+navHeight
-  }
-  ifa.contentWindow.postMessage({ 'scrollTop': scrollTop }, '*')
+  scrollTop = scrollTop + navigation.totalHeight
+  const bodyHeight = document.body.clientHeight - navigation.totalHeight
+  ifa.contentWindow.postMessage({ 'scrollTop': scrollTop, 'navHeight': navigation.totalHeight, 'bodyHeight': bodyHeight }, '*')
 }
 
 export {

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

@@ -122,6 +122,7 @@ aside {
 //main-container全局样式
 .app-container {
   padding: 16px;
+  //margin-top: 56px;
 }
 
 .components-container {
@@ -201,6 +202,14 @@ aside {
   white-space: nowrap;
   overflow: hidden;
 }
+.text-cl2{
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+	line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
 
 ul, li {
   list-style: none;
@@ -313,7 +322,7 @@ ul, li {
     .is-scrolling-left+.el-table__fixed,.is-scrolling-middle+.el-table__fixed,.is-scrolling-right+.el-table__fixed{
       box-shadow:none;
       height: auto !important;
-      bottom: 16px;
+      bottom: 16px !important;
     }
     .el-table__body tr.current-row > td.el-table__cell{
       background: none;
@@ -355,6 +364,7 @@ ul, li {
       background: #DCEBFF;
     }
     .el-table__fixed{
+      bottom:0 !important;
       tr:nth-child(2n){
         background-color: #F8FBFF;
       }
@@ -514,6 +524,10 @@ ul, li {
     line-height: 50px;
     height: 50px;
   }
+  .el-tabs__item.is-disabled {
+    color: #C0C4CC;
+    cursor: not-allowed;
+  }
   .is-active{
     color: #0081FF;
     font-weight: bold;
@@ -642,6 +656,9 @@ ul, li {
       height: 32px;
       border: 0;
     }
+    .el-input__suffix{
+      margin-top: -1px;
+    }
   }
   .btn{
     background: #F5F5F5;
@@ -701,3 +718,8 @@ ul, li {
   border-radius: 0;
   padding: 10px;
 }
+//固定列的阴影问题
+.el-table__fixed {
+  box-shadow: 4px 0 9px -5px rgba(0, 0, 0, 0.12);
+  -webkit-box-shadow: 4px 0 9px -5px rgba(0, 0, 0, 0.12);
+}

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

-
+.el-card{
+  overflow: initial;
+}
 .app-container{
   padding: 0;
 }
@@ -576,6 +578,9 @@
       padding: 16px;
       border-radius: 6px;
       border: 1px solid #68AEFF;
+      &.w836{
+        width: 836px;
+      }
       .wri_top{
         >img{
           float: left;
@@ -662,6 +667,11 @@
             width: 128px;
           }
         }
+        .w120{
+          .el-input__inner{
+            width: 120px;
+          }
+        }
       }
     }
   }
@@ -819,10 +829,22 @@
   right: 16px;
   top: 17px;
   .searchInput{
-    width: 178px;
-    border: 1px solid #D9D9D9;
-    .el-input--medium .el-input__inner{
-      font-size: 12px;
+    &.small{
+      border: 1px solid #d9d9d9;
+      width: 240px;
+      .el-input{
+        width: 180px;
+      }
+      .el-input__inner{
+        padding-right: 32px;
+      }
+      .el-input__prefix{
+        left: 8px;
+        top: -3px;
+        img{
+          width: 16px;
+        }
+      }
     }
   }
   .b2{
@@ -1172,3 +1194,39 @@
   //top: 10px !important;
   line-height: 34px !important;
 }
+
+.el-table__fixed {
+  height: auto !important;
+  bottom: 17px !important;
+  //box-shadow: 4px 0 9px -5px rgba(0, 0, 0, 0.12);
+  //-webkit-box-shadow: 4px 0 9px -5px rgba(0, 0, 0, 0.12);
+}
+.el-select .el-input__inner{
+  padding-left: 16px;
+}
+.el-tooltip__popper.is-dark {
+  opacity: 0.5;
+  //background: rgba(0, 0, 0, 0.5);
+  //.el-tooltip__popper[x-placement^=top] .popper__arrow {
+  //  border-top-color:rgba(0, 0, 0, 0.5);
+  //}
+}
+
+.fixed-table {
+  overflow: visible;
+
+  .el-table__header-wrapper {
+    position: sticky;
+    top: 56px;
+    z-index: 9;
+  }
+  .el-table__fixed-header-wrapper{
+    position: sticky;
+    z-index: 9;
+    top: 56px;
+  }
+  .el-table__fixed{
+    overflow-x: clip;
+    overflow-y: clip;
+  }
+}

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

@@ -5,6 +5,7 @@
     transition: margin-left .28s;
     margin-left: $base-sidebar-width;
     position: relative;
+    background: #F5F5F5;
   }
 
   .sidebarHide {
@@ -37,12 +38,12 @@
       animation-fill-mode: forwards;
 	  z-index: 1002;
     }
-    
+
     @keyframes left-right{
       0%{right: 0;}
       100%{right: -21px;}
     }
-	
+
     // reset element-ui css
     .horizontal-collapse-transition {
       transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
@@ -58,10 +59,10 @@
 
     .el-scrollbar {
       height: 100%;
-	 
-	 
+
+
     }
-	
+
 
     &.has-logo {
       .el-scrollbar {
@@ -138,8 +139,8 @@
 				  background: #fff!important;
 			  }
 		    }
-		 
-		 
+
+
 		// menu hover
 		.submenu-title-noDropdown, .el-submenu__title {
 			 color: #fff!important;
@@ -150,9 +151,9 @@
 				border: 1px solid #2b3f69;
 		      }
 		}
-		
 
-    
+
+
   }
   .sidebar-container .el-submenu .el-menu-item:hover,.sidebar-container .nest-menu .el-submenu>.el-submenu__title:hover {
       background-color: #1e2c4c!important;
@@ -160,7 +161,7 @@
       border-radius: 10px;
       border: 1px solid #2b3f69;
   }
-   
+
    .sidebar-container .el-submenu .el-menu-item:before,  .sidebar-container .nest-menu .el-submenu>.el-submenu__title:before {
       position: absolute;
       width: 2px;
@@ -210,7 +211,7 @@
 			    vertical-align: -0.15em;
 			    fill: currentColor;
 			    overflow: hidden;
-          
+
         }
       }
     }
@@ -405,4 +406,4 @@
     padding-top: 6px;
     padding-bottom: 10px;
   }
-}
+}
\ No newline at end of file

dsk-operate-ui/src/components/SvgIcon/index.vue

@@ -46,9 +46,9 @@ export default {
 
 <style scoped>
 .svg-icon {
-  width: 1em;
-  height: 1em;
-  vertical-align: -0.15em;
+  width: 1.29em;
+  height: 1.29em;
+  /*vertical-align: -0.22em;*/
   fill: currentColor;
   overflow: hidden;
 }

dsk-operate-ui/src/layout/components/AppMain.vue

@@ -45,12 +45,18 @@ export default {
     min-height: calc(100vh - 56px);
 	min-width:1440px;
     background: #F5F5F5;
+    overflow: initial;
   }
 
   .fixed-header + .app-main {
     padding-top: 84px;
   }
 }
+.EnterpriseData{
+  .app-main {
+    overflow: initial;
+  }
+}
 </style>
 
 <style lang="scss">

dsk-operate-ui/src/layout/components/Navbar.vue

 <template>
-  <div id="navBar" class="navbar">
-    <div class="left-menu" :style="{width: scrollerWidth}">
-      <tags-view />
-    </div>
-    <div ref="rightMenu" class="flex-box right-menu">
-<!--      <div class="menu-bells"><img src="@/assets/images/message.png"><i /></div>-->
-<!--      <i class="menu-line" />-->
-      <el-dropdown class="avatar-container" trigger="hover">
-        <div class="flex-box avatar-wrapper">
-          <img v-if="avatar" class="pic-avatar" :src="avatar">
-          <span v-else class="user-avatar">{{ name&&name.slice(0, 1).toUpperCase() }}</span>
-          {{ name }}
-        </div>
-        <el-dropdown-menu slot="dropdown" class="user-dropdown">
-          <router-link to="/user/profile">
-            <el-dropdown-item>用户中心</el-dropdown-item>
-          </router-link>
-          <el-dropdown-item divided @click.native="logout">
-            <span>退出</span>
-          </el-dropdown-item>
-        </el-dropdown-menu>
-      </el-dropdown>
+  <div ref="navbarWidth" style="width: 100%;background: #ffffff;height: 56px;" >
+    <div id="navBar" class="navbar" :style="{width: navbarWidth}">
+      <div class="left-menu" :style="{width: scrollerWidth}">
+        <tags-view />
+      </div>
+      <div ref="rightMenu" class="flex-box right-menu">
+        <!--      <div class="menu-bells"><img src="@/assets/images/message.png"><i /></div>-->
+        <!--      <i class="menu-line" />-->
+        <el-dropdown class="avatar-container" trigger="hover">
+          <div class="flex-box avatar-wrapper">
+            <img v-if="avatar" class="pic-avatar" :src="avatar">
+            <span v-else class="user-avatar">{{ name&&name.slice(0, 1).toUpperCase() }}</span>
+            {{ name }}
+          </div>
+          <el-dropdown-menu slot="dropdown" class="user-dropdown">
+            <router-link to="/user/profile">
+              <el-dropdown-item>用户中心</el-dropdown-item>
+            </router-link>
+            <el-dropdown-item divided @click.native="logout">
+              <span>退出</span>
+            </el-dropdown-item>
+          </el-dropdown-menu>
+        </el-dropdown>
+      </div>
     </div>
   </div>
+
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
 import elementResizeDetectorMaker from "element-resize-detector"
 import TagsView from './TagsView'
-
 export default {
+  props:['offsetWidth'],
   components: {
     TagsView
   },
   data() {
     return {
-      scrollerWidth: null
+      scrollerWidth: null,
+      navbarWidth: null
     }
   },
   computed: {
@@ -46,6 +50,11 @@ export default {
       'name'
     ])
   },
+  watch: {
+    offsetWidth(newValue, oldValue){
+      this.navbarWidth=`calc(100% - ${newValue}px)`
+    }
+  },
   mounted() {
     const _this = this, erd = elementResizeDetectorMaker(), navBar = document.getElementById("navBar")
     erd.listenTo(navBar, element => {
@@ -55,6 +64,7 @@ export default {
         this.scrollerWidth = (nvWidth - rtWidth - 100)+'px' || '800px'
       })
     })
+    this.navbarWidth=`calc(100% - ${this.offsetWidth}px)`
   },
   methods: {
     async logout() {
@@ -67,7 +77,7 @@ export default {
           location.href = '/index';
         })
       }).catch(() => {});
-    }
+    },
   }
 }
 </script>
@@ -76,9 +86,12 @@ export default {
 .navbar {
   height: 56px;
   overflow: inherit;
-  position: relative;
+  /*position: relative;*/
   background: #fff;
   box-shadow: 0 1px 4px rgba(0,21,41,.08);
+  position: fixed;
+  top:0;
+  z-index: 999;
 
   .left-menu{
     float: left;
@@ -134,9 +147,9 @@ export default {
         .user-avatar {
           display: inline-block;
           cursor: pointer;
-          width: 20px;
-          height: 20px;
-          line-height: 20px;
+          width: 24px;
+          height: 24px;
+          line-height: 24px;
           text-align: center;
           background: #E3EEF9;
           color: #0081FF;

dsk-operate-ui/src/layout/components/TagsView/ScrollPane.vue

@@ -90,6 +90,7 @@ export default {
       height: 100%;
       padding-top: 24px;
       margin-bottom: 0 !important;
+      overflow: hidden;
     }
     .is-horizontal{
       width: 0;

dsk-operate-ui/src/layout/components/TagsView/index.vue

@@ -28,6 +28,34 @@
       <li v-if="!isLastView()" @click="closeRightTags"><i class="el-icon-right"></i> 关闭右侧</li>
       <li @click="closeAllTags(selectedTag)"><i class="el-icon-circle-close"></i> 全部关闭</li>
     </ul>
+    <div class="alltags" v-if="visitedViews.length > 0">
+      <div class="" @click="closeall"><i class="el-icon-arrow-down" v-if="!showall"></i> <i class="el-icon-arrow-up" v-if="showall"></i></div>
+      <div class="tagslist" v-if="showall">
+        <!--<div v-for="(tag, index) in visitedViews"-->
+             <!--:key="tag.path"-->
+             <!--:class="isActive(tag)?'active':''"-->
+        <!--&gt;-->
+          <!--<i class="el-icon-check"></i>-->
+
+        <!--</div>-->
+        <router-link
+          v-for="(tag, index) in visitedViews"
+          ref="tag"
+          :key="tag.path"
+          :class="isActive(tag)?'active':''"
+          :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
+          tag="span"
+          class="tags-view-item"
+          @contextmenu.prevent.native="openMenu(tag,$event)"
+        >
+          <div @click="changetags">
+          <i class="el-icon-check"></i>
+          <span :id="isActive(tag)?'tagTitle':''">{{ tag.title }}</span>
+          </div>
+        </router-link>
+        <div class="clasall"  @click="closeAllTag(selectedTag)">关闭全部标签</div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -43,7 +71,8 @@ export default {
       top: 0,
       left: 0,
       selectedTag: {},
-      affixTags: []
+      affixTags: [],
+      showall:false,
     }
   },
   computed: {
@@ -83,13 +112,24 @@ export default {
       } else {
         document.body.removeEventListener('click', this.closeMenu)
       }
-    }
+    },
   },
   mounted() {
     this.initTags()
     this.addTags()
   },
   methods: {
+    changetags(){
+      console.log(88)
+      this.showall = false
+    },
+    closeall(){
+      if(this.showall == true){
+        this.showall = false
+      }else{
+        this.showall = true
+      }
+    },
     isActive(route) {
       return route.path === this.$route.path
     },
@@ -202,6 +242,12 @@ export default {
         this.moveToCurrentTag()
       })
     },
+    closeAllTag(view){
+      this.$nextTick(()=>{
+        this.showall = false
+        this.closeAllTags(view)
+      })
+    },
     closeAllTags(view) {
       this.$tab.closeAllPage().then(({ visitedViews }) => {
         if (this.affixTags.some(tag => tag.path === this.$route.path)) {
@@ -257,6 +303,7 @@ export default {
   height: 56px;
   width: 100%;
   background: #fff;
+  position: relative;
   .tags-view-wrapper {
     .tags-view-item {
       display: inline-block;
@@ -336,6 +383,68 @@ export default {
       }
     }
   }
+  .alltags{
+    position: absolute;
+    align-items: center;
+    border-radius: 9px;
+    height: 17px;
+    justify-content: center;
+    width: 36px;
+    right: -46px;
+    bottom: 10px;
+    cursor: pointer;
+    text-align: center;
+    &:hover{
+      background: #EFEFEF;
+    }
+    .tagslist{
+      position: absolute;
+      right: 0;
+      top: 20px;
+      background-color: #fcfcfc;
+      color: #141414;
+      font-size: 13px;
+      line-height: 1em;
+      margin-bottom: 0;
+      max-height: 450px;
+      overflow-y: auto;
+      overflow-y: overlay;
+      padding: 20px 0 10px;
+      width: 325px;
+      text-align: left;
+      box-shadow: 0 2px 9px 2px rgba(0,0,0,.09), 0 1px 2px -2px rgba(0,0,0,.16);
+      .tags-view-item{
+        display: block;
+        position: relative;
+        >div{
+          padding: 8px 24px;
+        }
+        &:hover{
+          color: #0081FF;
+        }
+        .el-icon-check{
+          display: none;
+          position: absolute;
+          left: 5px;
+          width: 13px;
+        }
+        &.active{
+          color: #0081FF;
+          .el-icon-check{
+            display: block;
+          }
+        }
+      }
+      .clasall{
+        border-top: 1px solid #EFEFEF;
+        padding: 10px 24px 0;
+        margin-top: 10px;
+        &:hover{
+          color: #0081FF;
+        }
+      }
+    }
+  }
 }
 </style>
 

dsk-operate-ui/src/layout/index.vue

 <template>
   <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
     <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside"/>
-    <sidebar v-if="!sidebar.hide" class="sidebar-container" @handleBar="handleSideBar"/>
-    <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide}" class="main-container">
+    <sidebar v-if="!sidebar.hide" class="sidebar-container" @handleBar="handleSideBar" id="sidebar"/>
+    <div :class="{hasTagsView:needTagsView,sidebarHide:sidebar.hide,EnterpriseData:$route.name=='EnterpriseData'}" class="main-container">
       <div :class="{'fixed-header':fixedHeader}">
-        <navbar :is-side-bar="isSideBar"/>
-   
+        <navbar :offsetWidth="offsetWidth"/>
       </div>
       <app-main/>
       <right-panel>
@@ -21,7 +20,7 @@ import { AppMain, Navbar, Settings, Sidebar, TagsView } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
 import { mapState } from 'vuex'
 import variables from '@/assets/styles/variables.scss'
-
+import elementResizeDetectorMaker from "element-resize-detector"
 export default {
   name: 'Layout',
   components: {
@@ -35,7 +34,8 @@ export default {
   mixins: [ResizeMixin],
   data() {
     return {
-      isSideBar: ''
+      isSideBar: '',
+      offsetWidth:null,
     }
   },
   computed: {
@@ -59,13 +59,25 @@ export default {
       return variables;
     }
   },
+  mounted(){
+    this.$nextTick(() => {
+      this.listenSider()
+    })
+  },
   methods: {
     handleClickOutside() {
       this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })
     },
-	handleSideBar(val) {
-	  this.isSideBar = val
-	}
+    handleSideBar(val) {
+      this.isSideBar = val
+      this.listenSider()
+    },
+    listenSider(){
+      const _this = this, erd = elementResizeDetectorMaker(), partBox = document.getElementById("sidebar")
+      erd.listenTo(partBox, element => {
+        this.offsetWidth=partBox.offsetWidth;
+      })
+    },
   }
 }
 </script>

dsk-operate-ui/src/router/index.js

@@ -169,7 +169,7 @@ export const constantRoutes = [
 	      path: '/radar/debtProject/details/:id',
 	      component: () => import('@/views/radar/debtProject/details'),
 	      name: 'debtProjectDetails',
-	      meta: { title: '企业专项债详情', icon: 'radar' }
+	      meta: { title: '政府专项债项目详情', icon: 'radar' }
 	    }
 	  ]
 	},

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

@@ -7,7 +7,7 @@
     <div class="app-container">
       <el-card class="box-card noborder">
         <div class="tables">
-          <div class="empty" v-if="tableData.total==0">
+          <div class="empty" v-if="tableData.total==0 && !isSkeleton">
             <img src="@/assets/images/project/empty.png">
             <div class="p1">抱歉，没找到相关数据</div>
             <div class="p2">建议调整关键词或筛选条件，重新搜索</div>
@@ -25,8 +25,9 @@
               <div class="btn btn_primary h32 p10" @click="opennew"><div class="img img1"></div>添加客户</div>
             </div>
           </div>
-          <el-table v-if="tableData.total > 0"
-            :data="tableData.rows"
+          <skeleton v-if="isSkeleton"></skeleton>
+          <el-table v-if="!isSkeleton&&tableData.total > 0" class="fixed-table"
+                    :data="tableData.rows"
             stripe border
             style="width: 100%">
             <el-table-column
@@ -42,13 +43,17 @@
               prop="date"
               label="企业名称"
               fixed="left"
-              width="441">
+              width="316">
             <template slot-scope="scope">
               <div class="ps1">
                 <div class="wordprimary ps2" @click="toDetail(scope.row,'')">{{scope.row.companyName}}</div>
                 <div class="ps3">
-                  <div  @click="toDetail(scope.row,'gjjl')">写跟进<img src="@/assets/images/project/edit_1.png"></div>
-                  <div  @click="toDetail(scope.row,'business')">编辑信息<img src="@/assets/images/project/edit_2.png"></div>
+                  <el-tooltip class="item" effect="dark" content="写跟进" placement="top">
+                    <div  @click="toDetail(scope.row,'gjjl')"><img class="i" src="@/assets/images/project/edit_1.png"><img class="o" src="@/assets/images/project/edit_11.png"></div>
+                  </el-tooltip>
+                  <el-tooltip class="item" effect="dark" content="编辑信息" placement="top">
+                    <div  @click="toDetail(scope.row,'business')"><img class="i" src="@/assets/images/project/edit_2.png"><img class="o" src="@/assets/images/project/edit_22.png"></div>
+                  </el-tooltip>
                 </div>
               </div>
             </template>
@@ -159,8 +164,11 @@
               label="主营业务" width="400">
               <template slot-scope="scope">
                 <div v-if="scope.row.mainBusiness == null || scope.row.mainBusiness == ''">--</div>
-                <div class="box"  v-else-if="scope.row.sq1==true">{{scope.row.mainBusiness1}}...<span @click="sq1(scope.row,false)">更多</span></div>
-                <div class="box"  v-else>{{scope.row.mainBusiness}}<span @click="sq1(scope.row,true)">收起</span></div>
+                <div v-if="scope.row.mainBusiness1">
+                  <div class="box"  v-if="scope.row.sq1==true">{{scope.row.mainBusiness1}}...<span @click="sq1(scope.row,false)">更多</span></div>
+                  <div class="box"  v-else>{{scope.row.mainBusiness}}<span @click="sq1(scope.row,true)">收起</span></div>
+                </div>
+                <div v-else>{{scope.row.mainBusiness}}</div>
               </template>
             </el-table-column>
             <el-table-column
@@ -168,8 +176,11 @@
               label="发包属性" width="400">
               <template slot-scope="scope">
                 <div v-if="scope.row.companyAttribute == null || scope.row.companyAttribute == ''">--</div>
-                <div class="box"  v-else-if="scope.row.sq2==true">{{scope.row.companyAttribute1}}...<span @click="sq2(scope.row,false)">更多</span></div>
-                <div class="box"  v-else>{{scope.row.companyAttribute}}<span @click="sq2(scope.row,true)">收起</span></div>
+                <div v-if="scope.row.companyAttribute1">
+                  <div class="box"  v-if="scope.row.sq2==true">{{scope.row.companyAttribute1}}...<span @click="sq2(scope.row,false)">更多</span></div>
+                  <div class="box"  v-else>{{scope.row.companyAttribute}}<span @click="sq2(scope.row,true)">收起</span></div>
+                </div>
+                <div v-else>{{scope.row.companyAttribute}}</div>
               </template>
             </el-table-column>
             <el-table-column
@@ -239,17 +250,18 @@
 </template>
 
 <script>
-  import { getToken } from "@/utils/auth";
-  import "@/assets/styles/project.scss"
-  import {getCustomerList,importData,addCustomer} from '@/api/custom/custom'
-  import {getEnterprise,getDictType,} from '@/api/main'
+  import { getToken } from '@/utils/auth'
+  import '@/assets/styles/project.scss'
+  import { addCustomer, getCustomerList, importData } from '@/api/custom/custom'
+  import { getDictType, getEnterprise } from '@/api/main'
   import prvinceTree from '@/assets/json/provinceTree'
   import batchimport from '../../project/projectList/component/batchImport'
-  import axios from 'axios'
-  import {encodeStr} from "@/assets/js/common"
-export default {
+  import skeleton from '../../project/projectList/component/skeleton'
+  import { encodeStr } from '@/assets/js/common'
+
+  export default {
   name: 'CustomList',
-  components:{batchimport},
+  components:{batchimport,skeleton},
   data() {
     return{
       encodeStr,
@@ -297,6 +309,7 @@ export default {
       // isNew:true,
       showlist:false,
       keys:1,
+      isSkeleton:true,
     }
   },
   created() {
@@ -343,6 +356,7 @@ export default {
     //获取客户列表
     getCustomerList(){
       getCustomerList(this.searchParam).then(result=>{
+        this.isSkeleton = false
         this.tableData = result
         this.tableData.rows.forEach(item=>{
           item.registerCapital = item.registerCapital == null?null: item.registerCapital.replace(/^\D*(\d*(?:\.\d{0,6})?).*$/g, '$1')
@@ -358,6 +372,7 @@ export default {
           }else{
             item.sq2 = false
           }
+          // console.log(item)
       })
       })
     },
@@ -378,6 +393,7 @@ export default {
     },
     //翻页
     handleCurrentChange(val) {
+      this.isSkeleton = true
       this.pldr=false
       // this.isNew = false
       this.searchParam.pageNum=val
@@ -584,8 +600,8 @@ export default {
   }
   .tables{
     position: relative;
-    height: calc(100vh - 134px);
-    overflow: auto;
+    min-height: calc(100vh - 134px);
+    /*overflow: auto;*/
     .empty{
       position: absolute;
       top: 50%;
@@ -601,23 +617,34 @@ export default {
     display: flex;
     justify-content: space-between;
     .ps2{
-      width: 270px;
+      width: 350px;
     }
     .ps3{
-      width: 155px;
+      width: 60px;
       display: flex;
       justify-content: right;
       >div{
         margin-left: 12px;
-        &:hover{
-          color: #0CBC6D;
-          cursor: pointer;
-        }
         >img{
           float: right;
           margin: 3px 0 0 4px;
           width: 14px;
         }
+        .i{
+          display: inline-block;
+        }
+        .o{
+          display: none;
+        }
+        &:hover{
+          cursor: pointer;
+          .i{
+            display: none;
+          }
+          .o{
+            display: inline-block;
+          }
+        }
       }
     }
   }

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

@@ -118,9 +118,10 @@
 </template>
 
 <script>
-import "@/assets/styles/project.scss"
-import * as echarts from 'echarts'
-export default {
+  import '@/assets/styles/project.scss'
+  import * as echarts from 'echarts'
+
+  export default {
   name: 'Overview',
   data() {
     return {
@@ -192,9 +193,9 @@ export default {
     initChart(){
       //客户级别
       this.option = {
-
         tooltip: {
-          trigger: 'item'
+          trigger: 'item',
+          extraCssText: 'border:0',
         },
         color:['#8A82F3','#5B9CF7','#8DCF96','#FFDC6B','#FE9C77'],//修改配色
         series: [
@@ -203,17 +204,17 @@ export default {
             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%' }
+              { value: 23, name: '集团总部：11%',borderWidth:0  },
+              { value: 61, name: '一级单位：29%',borderWidth:0  },
+              { value: 60, name: '二级单位：29%',borderWidth:0 },
+              { value: 21, name: '三级单位：10%',borderWidth:0  },
+              { value: 44, name: '其他单位: 21%',borderWidth:0  }
             ],
             emphasis: {
               itemStyle: {
                 shadowBlur: 10,
                 shadowOffsetX: 0,
-                shadowColor: 'rgba(0, 0, 0, 0.5)'
+                shadowColor: 'rgba(0, 0, 0, 0)'
               }
             }
           }
@@ -267,7 +268,14 @@ export default {
               }
             }
           }
-        ]
+        ],
+
+        emphasis: {
+          itemStyle: {
+            // 高亮时点的颜色。
+            color: 'rgb(90,146,247)'
+          },
+        }
       }
       this.option2 && this.myChart2.setOption(this.option2)
       //客户资质分析
@@ -317,7 +325,14 @@ export default {
               },
             }
           }
-        ]
+        ],
+
+        emphasis: {
+          itemStyle: {
+            // 高亮时点的颜色。
+            color: 'rgb(134,231,231)'
+          },
+        }
       }
       this.option3 && this.myChart3.setOption(this.option3)
 
@@ -358,6 +373,7 @@ export default {
           axisPointer:{ //悬浮于圆点展示标签
             type:'axis'
           },
+          extraCssText: 'border:0',
           // trigger: 'axis'
         },
         series: [

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

@@ -169,7 +169,7 @@ export default {
 .headForm{
   margin-bottom: 14px;
   .common-title{
-    margin-right: 19px;
+    margin-right: 24px;
   }
   ::v-deep .el-input__inner{
     border: 1px solid #D9D9D9;
@@ -210,10 +210,12 @@ export default {
         display: flex;
         border-radius: 2px 0px 0px 2px;
         border: 1px solid #D9D9D9;
+        line-height: 32px;
+        height: 32px;
         span {
           width: 60px;
-          height: 32px;
-          line-height: 32px;
+          height: 30px;
+          line-height: 28px;
           font-size: 14px;
           background: #F5F5F5;
           text-align: center;
@@ -234,9 +236,12 @@ export default {
           flex: 1;
         }
         ::v-deep .el-input__inner {
-          border-radius: 2px 0 2px 0;
           border: 0;
-          border-right: 0;
+          line-height: 30px;
+          height: 30px;
+          position: absolute;
+          top: 0;
+          padding-right: 32px;
         }
       }
       .fromTime{
@@ -251,6 +256,11 @@ export default {
       .fromTime-icon {
         display: none;
       }
+      .el-select{
+        .el-input__suffix{
+          right: 10px;
+        }
+      }
     }
     ::v-deep .form-content-width{
       width: 170px;

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

@@ -31,6 +31,7 @@
 </template>
 
 <script>
+
 export default {
   name: 'Sidebar',
   props: {
@@ -50,6 +51,10 @@ export default {
       type: Boolean,
       default: true
     },
+    statisticObj:{
+      type:Object,
+      default: {}
+    },
     isCustomer: {
       type: Boolean,
       default: false
@@ -142,6 +147,141 @@ export default {
   },
   created() {
     this.defaultRoute = JSON.parse(JSON.stringify(this.sideRoute))
+
+  },
+  watch:{
+    statisticObj:{
+      handler(val) {
+        let arr = JSON.parse(JSON.stringify(val))
+        for(var i in arr){
+          for(var j in arr[i]){
+            switch (j) {
+              case 'ownershipStructure':
+                if(arr[i][j]<1){
+                  this.sideRoute[0].children[2].disabled = true;
+                }
+                break;
+                case 'leadingMember':
+                  if(arr[i][j]<1){
+                    this.sideRoute[0].children[3].disabled = true;
+                  }
+                  break;
+                case 'outboundInvestment':
+                  if(arr[i][j]<1){
+                    this.sideRoute[0].children[4].disabled = true;
+                  }
+                  break;
+                case 'branch':
+                  if(arr[i][j]<1){
+                    this.sideRoute[0].children[5].disabled = true;
+                  }
+                  break;
+                case 'landInfo':
+                  if(arr[i][j]<1){
+                    this.sideRoute[2].children[0].disabled = true;
+                    this.sideRoute[4].children[1].disabled = true;
+                  }
+                  break;
+                case 'busProposedProjectV1':
+                  if(arr[i][j]<1){
+                    this.sideRoute[2].children[1].disabled = true;
+                  }
+                  break;
+                case 'specialDebt':
+                if(arr[i][j]<1){
+                  this.sideRoute[2].children[2].disabled = true;
+                }
+                break;
+                case 'bidPlan':
+                if(arr[i][j]<1){
+                  this.sideRoute[2].children[3].disabled = true;
+                }
+                break;
+                case 'biddingAnnouncement':
+                if(arr[i][j]<1){
+                  this.sideRoute[2].children[4].disabled = true;
+                }
+                break;
+                case 'proBiddingAnnouncement':
+                if(arr[i][j]<1){
+                  this.sideRoute[2].children[5].disabled = true;
+                }
+                break;
+                case 'adminLicensing':
+                if(arr[i][j]<1){
+                  this.sideRoute[2].children[6].disabled = true;
+                }
+                break;
+                case 'customer':
+                if(arr[i][j]<1){
+                  this.sideRoute[3].children[0].disabled = true;
+                }
+                break;
+
+                case 'supplier':
+                if(arr[i][j]<1){
+                  this.sideRoute[3].children[1].disabled = true;
+                }
+                break;
+                case 'coopBiddingAgency':
+                if(arr[i][j]<1){
+                  this.sideRoute[3].children[2].disabled = true;
+                }
+                break;
+
+                case 'historySend':
+                if(arr[i][j]<1){
+                  this.sideRoute[3].children[3].disabled = true;
+                }
+                break;
+
+                case 'tenderRecordV1':
+                if(arr[i][j]<1){
+                  this.sideRoute[3].children[4].disabled = true;
+                }
+                break;
+                case 'adminSanction':
+                if(arr[i][j]<1){
+                  this.sideRoute[5].children[0].disabled = true;
+                }
+                break;
+                case 'abnormalOperation':
+                if(arr[i][j]<1){
+                  this.sideRoute[5].children[1].disabled = true;
+                }
+                break;
+                case 'dishonestExecutee':
+                if(arr[i][j]<1){
+                  this.sideRoute[5].children[2].disabled = true;
+                }
+                break;
+                case 'dishonestExecutor':
+                if(arr[i][j]<1){
+                  this.sideRoute[5].children[3].disabled = true;
+                }
+                break;
+                case 'adjudicativeDoc':
+                if(arr[i][j]<1){
+                  this.sideRoute[5].children[4].disabled = true;
+                }
+                break;
+                case 'courtAnnouncement':
+                if(arr[i][j]<1){
+                  this.sideRoute[5].children[5].disabled = true;
+                }
+                break;
+                case 'openAnnouncement':
+                if(arr[i][j]<1){
+                  this.sideRoute[5].children[6].disabled = true;
+                }
+                break;
+              default:
+                break;
+            }
+          }
+        }
+      }
+    }
   },
   methods: {
     handleOpen(key, keyPath) {
@@ -255,6 +395,12 @@ export default {
             margin-top: -5px;
           }
         }
+        .is-disabled:hover{
+          color: rgba(35, 35, 35, 0.8)!important;
+          &:before {
+            color: rgba(35, 35, 35, 0.8)!important;
+          }
+        }
         ::v-deep .el-submenu .el-menu-item{
           font-size: 12px;
           color: rgba(35,35,35,0.8);
@@ -268,7 +414,7 @@ export default {
             left: 21px;
             width: 2px;
             height: 2px;
-            background: rgba(35,35,35,0.8);
+            background: #0081FF;
             border-radius: 50%;
           }
         }

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

 <template>
   <div class="Tables">
     <div class="table-item">
-      <el-table
+      <el-table v-if="tableDataTotal>0" class="fixed-table"
         v-loading="tableLoading"
         :data="tableData"
         element-loading-text="Loading"
@@ -61,11 +61,12 @@
 
         </template>
         <template slot="empty">
-          <div style="padding: 30px 0">
-            <no-data />
-          </div>
         </template>
       </el-table>
+
+      <div style="padding: 30px 0" v-else>
+        <no-data />
+      </div>
     </div>
     <div class="pagination-box" v-if="show_page && tableDataTotal>queryParams.pageSize">
       <el-pagination background :current-page="current_page" :page-size="queryParams.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />

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

@@ -199,9 +199,12 @@ export default {
         },
         color: ['#5B9CF7','#8DCF96','#FFDC6B','#FE9C77','#8A82F3'],
         legend: {
+          selectedMode: false,
           x: 'center',
           y: 'bottom',
           itemHeight: 9,
+          itemWidth:12,
+          itemHeight:8,
           textStyle: {
             padding: [0, 0, -2, 0],
             color: '#000000',
@@ -248,6 +251,30 @@ export default {
       // 使用刚指定的配置项和数据显示图表。
       myChart.clear() //清空
       myChart.setOption(option)
+      // 默认高亮
+        let index = 0; // 高亮索引
+        myChart.dispatchAction({
+          type: "highlight",
+          seriesIndex: index,
+          dataIndex: index
+        });
+        myChart.on("mouseover", function(e) {
+          if (e.dataIndex != index) {
+            myChart.dispatchAction({
+              type: "downplay",
+              seriesIndex: 0,
+              dataIndex: index
+            });
+          }
+        });
+        myChart.on("mouseout", function(e) {
+          index = e.dataIndex;
+          myChart.dispatchAction({
+            type: "highlight",
+            seriesIndex: 0,
+            dataIndex: e.dataIndex
+          });
+        });
     }
   }
 }

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

@@ -3,7 +3,7 @@
     <Header :company-id="companyId" :companyInfo="companyInfo" :cooDetail="cooDetail" v-if="companyId" @close-detail="closeDetail" />
     <div class="flex-box part-main">
       <div class="part-left">
-        <side-bar @currentPath="showPartPage" :pathName="currentPath.pathName" :partBoxHeight="partBoxHeight" :customerId="customerId" :isCompany="isCompany" :isCustomer="isCustomer" />
+        <side-bar :statisticObj="statisticObj" ref="sidebar" @currentPath="showPartPage" :pathName="currentPath.pathName" :partBoxHeight="partBoxHeight" :customerId="customerId" :isCompany="isCompany" :isCustomer="isCustomer" />
       </div>
       <div class="part-right">
         <div id="partBox" v-if="companyId">
@@ -64,7 +64,7 @@
 
 <script>
 import { idRemark } from '@/api/common'
-import { infoHeader } from '@/api/detail/party-a/index'
+import { infoHeader,statistic } from '@/api/detail/party-a/index'
 import { customerInfo } from '@/api/detail/party-a/cooperate'
 import elementResizeDetectorMaker from "element-resize-detector"
 import Header from "./component/Header"
@@ -104,6 +104,9 @@ import Preference from "./preference" //招标偏好
 import Cooperate from "./cooperate" //合作情况
 import DecisionMaking from "./decisionMaking" //决策链条
 import Gjjl from "../../project/projectList/component/gjjl" //跟进记录
+import {
+  urbanInvestmentPage,
+} from '@/api/detail/party-a/urbanLnvestment'
 export default {
   name: 'PartyA',
   components: {
@@ -156,6 +159,7 @@ export default {
       currentPath: {
         pathName: 'overview'  //默认展示页
       },
+      statisticObj:{},
       partBoxHeight: null,
       cooDetail: false
     }
@@ -234,14 +238,34 @@ export default {
         this.$nextTick(() => {
           this.listenSider()
         })
-        this.handleQuery()
+        this.getStatistic();
+        this.handleQuery();
         this.association(this.$route.query.customerId)
       }
     },
+    async getStatistic(){
+      let res = await statistic({companyId:this.companyId});
+      if(res.code==200){
+        this.statisticObj = res.data
+      }
+    },
     async handleQuery() {
       let res = await infoHeader({companyId:this.companyId})
       if(res.code==200){
         this.companyInfo = res.data || {}
+        let data = {
+          pageNum: 1,
+          pageSize: 5,
+          provinceIds: [this.companyInfo.provinceId],
+          cityIds: [this.companyInfo.cityId],
+        }
+        urbanInvestmentPage(data).then(res => {
+          if(res.data.totalCount<1){
+            let arr = JSON.parse(JSON.stringify(this.$refs.sidebar.sideRoute))
+            arr[4].children[2].disabled = true;
+            this.$refs.sidebar.sideRoute = arr
+          }
+        })
         if(this.companyInfo && this.companyInfo.companyName){
           this.$nextTick(()=>{
             document.getElementById('tagTitle').innerText = this.companyInfo.companyName

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

@@ -5,6 +5,7 @@
       :form-data="formData"
       :query-params="queryParams"
       :isExcel="true"
+      @handle-search="handleSearch"
       :total="tableDataTotal"
     />
 
@@ -33,7 +34,7 @@
 
 <script>
 import mixin from '../mixins/mixin'
-import {bidPlanPage} from '@/api/detail/party-a/opport'
+import {bidPlanPage,bidPlanProjectType} from '@/api/detail/party-a/opport'
 export default {
   name: 'Biddingplan',
   props: ['companyId'],
@@ -59,7 +60,10 @@ export default {
         {label: '标的物类型', prop: 'objectType', minWidth: '100'},
         {label: '预计招标日期', prop: 'planTenderDateStart', sortable: 'custom', descending: '15', ascending: '16', minWidth: '110'}
       ],
-      formData: [],
+      formData: [
+        { type: 4, fieldName: 'buildingProjectType', value: '', placeholder: '项目类型', options: []},
+        { type: 3, fieldName: 'keys', value: '', placeholder: '输入项目名称关键词查询', options: [], width: 220}
+      ],
       //列表
       tableLoading:false,
       tableData:[],
@@ -70,8 +74,19 @@ export default {
   },
   created() {
     this.handleQuery()
+    this.handleOption()
   },
   methods: {
+    async handleOption(){
+      let res = await bidPlanProjectType({cid: this.companyId})
+      if(res.code==200){
+        let buildingProjectType = res.data.map(item => {
+          let it = {name:item.buildingProjectType+'('+item.count+')',value:item.buildingProjectType}
+          return it
+        })
+        this.setFormData('buildingProjectType', buildingProjectType)
+      }
+    },
     async handleQuery(params) {
       this.tableLoading = true
       let param = params?params:this.queryParams

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

@@ -52,7 +52,7 @@ export default {
       defaultSort: {prop: 'planStartTime', order: 'descending'},
       forData: [
         {label: '项目名称', prop: 'projectName', minWidth: '300', slot: true},
-        {label: '成交金额（万元）', prop: 'money', sortable: 'custom', descending: '1', ascending: '2', width: '150'},
+        // {label: '成交金额（万元）', prop: 'money', sortable: 'custom', descending: '1', ascending: '2', width: '150'},
         {label: '项目类别', prop: 'projectCategories', width: '100'},
         {label: '计划开工日期', prop: 'planStartTime', sortable: 'custom', descending: '3', ascending: '4', width: '130'},
         {label: '计划完工日期', prop: 'planEndTime', sortable: 'custom', descending: '13', ascending: '14', width: '130'},

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

@@ -102,5 +102,9 @@ export default {
         }
       }
     }
+    ::v-deep .el-input__inner{
+      padding-left: 10px;
+      padding-right: 22px;
+    }
   }
 </style>

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

@@ -30,22 +30,24 @@
             <span class="zbph-item-num">{{dataAll.bidAmount?parseFloat(dataAll.bidAmount.toFixed(6)):'--'}}</span></div>
         </div>
         <div class="zbph-account">招标动态
-          <div class="labels">
+          <div class="labels"  v-if="dataAll.totalCount">
             <div :class="{'on':datatype==3}" @click="getDT(3)">近7天</div>
             <div :class="{'on':datatype==2}" @click="getDT(2)">近30天</div>
             <div :class="{'on':datatype==1}" @click="getDT(1)">近5年</div>
           </div>
         </div>
-        <div id="myEcharts" style="width: 100%;height:250px; margin: 0 auto;"></div>
+        <div v-if="dataAll.totalCount" id="myEcharts" style="height:250px; margin: 0 auto;"></div>
+        <div class="bid-no-data" v-else>
+          <no-data />
+        </div>
       </template>
-      <div class="bid-no-data" v-else>
-        <no-data />
-      </div>
+      
     </div>
     <div class="bid-ywwl">
       <div class="common-title">业务往来供应商TOP5</div>
       <div class="table-item">
         <el-table
+          v-if="tableData.length>0"
           :data="tableData"
           style="width: 100%"
         >
@@ -80,12 +82,10 @@
               <span style="padding-right: 28px;">{{ scope.row.amount }}</span>
             </template>
           </el-table-column>
-          <template slot="empty">
-            <div style="padding: 30px 0">
-              <no-data />
-            </div>
-          </template>
         </el-table>
+        <div class="bid-no-data" style="margin-top: 100px;" v-else>
+          <no-data />
+        </div>
       </div>
     </div>
   </div>
@@ -105,7 +105,7 @@ export default {
   data() {
     return {
       encodeStr,
-      datatype:'3',//切换类型
+      datatype:'1',//切换类型
       dataAll: {},
       dtdata:[],//数据
       dttime:[],//坐标
@@ -166,7 +166,7 @@ export default {
           }
         },
         grid:{
-          left:'1',
+          left:'1%',
           top:'8%',
           right:'5%',
           bottom:'8%',
@@ -316,7 +316,17 @@ export default {
         ::v-deep .el-table .el-table__body-wrapper tr:nth-child(2n){
           background: #FFFFFF;
         }
+        ::v-deep .el-table .el-table__body-wrapper tr:nth-child(5) .el-table__cell{
+          border: none;
+        }
+        ::v-deep .el-table::before{
+          display: none;
+        }
       }
     }
   }
+  ::deep .el-table::before{
+    display: none;
+  }
+  
 </style>

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

@@ -7,13 +7,13 @@
     </el-tabs>
     <div class="flex-box clue-box">
       <div class="clue-echarts" v-if="viewData.length>0"><div id="echartsClue" style="width: 100%;height:300px; margin: 0 auto;"></div></div>
-      <div class="busc-no-data" v-else>
-        <no-data />
-      </div>
-      <div class="table-item">
+      
+      <div class="table-item" v-if="viewData.length>0">
         <el-table
+          v-if="viewData.length>0"
           :data="viewData"
           border
+          max-height="231"
           style="width: 100%"
           :default-sort = "{prop: 'date', order: 'descending'}"
         >
@@ -30,13 +30,11 @@
             align="right"
             label="占比（%）">
           </el-table-column>
-          <template slot="empty">
-            <div style="padding: 30px 0">
-              <no-data />
-            </div>
-          </template>
         </el-table>
       </div>
+      <div class="busc-no-data" v-else>
+        <no-data />
+      </div>
     </div>
     <div class="flex-box clue-type">
       <div class="flex-box clue-type-item" :class="!item.count?'disab':''" v-for="(item, index) in typeList" :key="index" @click="handleType(item, index)"><img :src="!item.count?item.dis_ico:item.ico">{{item.name}}</div>
@@ -197,7 +195,7 @@ export default {
         width: calc(50% - 8px);
       }
       .busc-no-data{
-        width: calc(50% - 8px);
+        width: 100%;
       }
       .table-item{
         width: calc(50% - 8px);

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

+<template>
+  <div class="app-container finance-container">
+    <div class="common-title">财务数据
+      <el-tooltip placement="top">
+        <div slot="content">营业收入数据优先取“营业总收入”<br/>营业总收入未披露时取“营业收入”</div>
+				    <img   style="width: 18px; height: 18px;margin-left:9px;" src="@/assets/images/detail/overview/zbph_question.png" >
+				  </el-tooltip>
+    </div>
+    <el-tabs v-model="activeIndex" @tab-click="handleQuery(vals[activeIndex])" class="tabpane selfTab">
+      <el-tab-pane label="营业收入" name="0"></el-tab-pane>
+      <el-tab-pane label="净利润" name="1"></el-tab-pane>
+      <el-tab-pane label="总资产" name="2"></el-tab-pane>
+      <el-tab-pane label="净资产" name="3"></el-tab-pane>
+    </el-tabs>
+    <div class="flex-box finance-box">
+      <div class="finance-echarts" v-if="viewData.length>0"><div id="echartsFinance" style="width: 100%;height:300px; margin: 0 auto;"></div></div>
+      <div class="finance-no-data" v-else>
+        <no-data />
+      </div>
+      <div class="table-item" v-if="viewData.length>0">
+        <el-table
+          :data="viewData"
+          border
+          style="width: 100%"
+          :default-sort = "{prop: 'date', order: 'descending'}"
+        >
+        <el-table-column label="币种：人民币">
+          <el-table-column
+            prop="year"
+            align="left"
+            label="报告期（年度）"></el-table-column>
+          <el-table-column
+            prop="operatingIncome"
+            align="right"
+            label="营业收入（亿）">
+          </el-table-column>
+          <el-table-column
+            prop="netProfit"
+            align="right"
+            label="净利润（亿）">
+          </el-table-column>
+          <el-table-column
+            prop="totalAssets"
+            align="right"
+            label="总资产（亿）">
+          </el-table-column>
+          <el-table-column
+            prop="netAssets"
+            align="right"
+            label="净资产（亿）">
+          </el-table-column>
+        </el-table-column>
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import {financialData} from '@/api/detail/party-a/overview'
+import * as echarts from 'echarts'
+import NoData from '../../component/noData'
+export default {
+  name: 'Finance',
+  props: ['companyId'],
+  components: {
+    NoData
+  },
+  data() {
+    return {
+      viewData:[],
+      activeIndex:0,
+      vals:['operatingIncome','netProfit','totalAssets','netAssets'],
+      names:['营业收入（亿）','净利润（亿）','总资产（亿）','净资产（亿）'],
+    }
+  },
+  created() {
+    this.handleQuery()
+  },
+  mounted() {
+  },
+  methods: {
+    async handleQuery(val){
+      let res = await financialData({cid: this.companyId})
+      if(res.code==200 && res.data){
+        this.viewData = res.data
+        if(this.viewData.length>0){
+          this.$nextTick(() => {
+            this.getDT(val)
+          })
+        }
+      }
+    },
+    getDT(val="operatingIncome"){
+      let myChart = echarts.init(document.getElementById("echartsFinance"))
+      let barData = [],years = [],compareData = [];
+      this.viewData.map(item=>{
+        barData.push(item[val+'Size'].toFixed(2));
+        compareData.push(item[val+'Compare']||'');
+        years.push(item.year)
+      })
+      // let compareDataMax = Math.max(...compareData)
+      // let compareDataMin = Math.min(...compareData)
+      let option = {
+        legend: {
+          show:true,
+						width: "100%",
+						left: 'center',
+            bottom:0,
+						textStyle: {
+							width: 120,
+							padding: [0, 26, 0, 0],
+							backgroundColor: "transparent",
+						},
+						itemWidth: 18,
+						itemHeight: 8,
+						data: [this.names[this.activeIndex], '同比（%）']
+					},
+        tooltip: {
+          trigger: 'axis',
+          axisPointer: {
+            type: 'shadow'
+          }
+        },
+        grid: {
+          left: '3%',
+          right: '4%',
+          bottom: '32',
+          containLabel: true
+        },
+        xAxis: [
+          {
+            type: 'category',
+            data: years,
+            axisTick: {
+              alignWithLabel: true,
+              show: false
+            }
+          }
+        ],
+        yAxis: [
+          {
+            type: 'value',
+            // min:0,
+            splitLine : { //网格线
+              lineStyle: {
+                type: 'dashed' //设置网格线类型 dotted：虚线 solid:实线
+              },
+            }
+          },
+          {
+            type: 'value',
+            // min:'dataMin',
+            // max:'dataMax',
+            // interval:((compareDataMax-compareDataMin)/5).toFixed(2),
+            splitLine : { //网格线
+              show:false
+            },
+            axisLabel: {
+                  formatter: '{value}%'
+              }
+          }
+          
+        ],
+        series: [
+          {
+            name: this.names[this.activeIndex],
+            type: 'bar',
+            barWidth: '20px',
+            data: barData,
+            itemStyle:{
+              normal:{
+                barBorderRadius:[4,4,0,0],
+                color:'#14C9C9'
+              },
+            }
+          },
+          {
+							name: '同比（%）',
+							symbolSize: 12, //标记的大小（折线图圆点大小）
+							label: {
+								color: "#666666",
+							},
+							lineStyle: {
+								color: "#0081FF",
+								width: 1
+							},
+							itemStyle: {
+								color: "#0081FF"
+							},
+							type: 'line',
+              yAxisIndex: 1,
+							data: compareData
+						},
+        ],
+
+        emphasis: {
+          itemStyle: {
+            // 高亮时点的颜色。
+            color: 'rgb(134,231,231)'
+          },
+        }
+      }
+      myChart.setOption(option)
+    },
+  },
+}
+</script>
+
+<style lang="scss" scoped>
+  .finance-container{
+    margin: 0;
+    padding: 24px 16px;
+    background: #FFFFFF;
+    border-radius: 4px;
+    .selfTab{
+      margin: 24px 0 0 -12px;
+      ::v-deep .el-tabs__nav-wrap::after{
+        display: none;
+      }
+      ::v-deep .el-tabs__item{
+        height: 30px;
+        line-height: 30px;
+        padding: 0 12px;
+      }
+    }
+    .finance-box{
+      width: 100%;
+      justify-content: space-between;
+      margin: 8px 0 24px 0;
+      .finance-echarts{
+        width: calc(50% - 8px);
+      }
+      .finance-no-data{
+        width: 100%;
+      }
+      .table-item{
+        width: calc(50% - 8px);
+      }
+    }
+  }
+</style>

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

@@ -65,7 +65,7 @@
         </div>
       </div>
       <div class="company-menu">
-        <el-button v-if="ifClaim==1" class="hasClaim"><i class="el-ico-claim" alt="已认领" title="已认领"></i> 已认领</el-button>
+        <el-button v-if="companyInfo.claimStatus==1"  @click="cancelClaimClick()" class="hasClaim"><i class="el-ico-claim" alt="已认领" title="已认领"></i> 已认领</el-button>
         <el-button @click="handleClaim" v-else class="claim" v-loading="claimLoading"><i class="el-ico-claim" alt="认领客户" title="认领客户"></i> 认领客户</el-button>
       </div>
 
@@ -134,21 +134,46 @@
         <span class="dialog-footer-btn2" @click="renHide()">稍后</span>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="dialogVisible2" custom-class='dialog-renlin' title="重新认领" width="260px" :show-close="false">
+      <div>再次认领将会恢复客户数据</div>
+      <div slot="footer" class="dialog-footer">
+        <span class="dialog-footer-btn1" type="primary" @click="handleHistoryClaim()">确认</span>
+        <span class="dialog-footer-btn2" @click="dialogVisible2 = false">关闭</span>
+      </div>
+    </el-dialog>
+    <el-dialog
+	    title="取消认领"
+	    :visible.sync="dialogVisible1"
+      :modal="false"
+      custom-class='dialog-renlin'
+      :show-close="false"
+        width="344px">
+        <span>是否取消认领客户？客户信息将放入“历史客户”。</span>
+        <div slot="footer" class="dialog-footer">
+        <span class="dialog-footer-btn1" type="primary" @click="confirm()" >
+          确认
+        </span>
+          <span class="dialog-footer-btn2" @click="dialogVisible1 = false">关闭</span>
+        </div>
+      </el-dialog>
   </div>
 </template>
 
 <script>
-import { changePath } from '@/assets/js/common'
+import { changePath,encodeStr } from '@/assets/js/common'
 var Swiper = require('@/assets/lib/swiper/swiper-bundle.min.js')
 import "@/assets/lib/swiper/swiper-bundle.css"
 import { claim } from "@/api/common"
+import api from "@/api/enterpriseData/enterpriseData.js"
 export default {
   name: 'Infoheader',
   props: ['companyId', 'companyInfo', 'statistic'],
   data() {
     return {
+      encodeStr,
       newStatic: null,
       labelList: [], //企业标签
+      customerId:'',
       claimLoading: false,
       ifClaim: 0, //是否认领
       showMore: false,
@@ -165,7 +190,9 @@ export default {
       //风险扫描
       labelArr:['失信联合惩戒企业','司法纠纷','注销'], //负向经营状态
       enterpriseLabel:[],//企业标签
-      dialogVisible: false
+      dialogVisible: false,
+      dialogVisible1: false,
+      dialogVisible2: false,
     }
   },
   created() {
@@ -192,16 +219,49 @@ export default {
           registerAddress:this.companyInfo.provinceName+(this.companyInfo.cityName?'-'+this.companyInfo.cityName:'')+(this.companyInfo.districtName?'-'+this.companyInfo.districtName:''),
           creditCode:this.companyInfo.creditCode
         }
-        let res = await claim(param)
-        this.claimLoading = false
-        if(res.code==200){
-          this.dialogVisible=true
-          this.ifClaim = 1
+        let res = await api.customerStatus(this.companyInfo.companyName)
+        if(res.data === 1){
+          this.claimLoading = false
+          this.dialogVisible2=true;
+        }else{
+          let res = await claim(param)
+          this.claimLoading = false
+          if(res.code==200){
+            this.dialogVisible=true
+            this.companyInfo.claimStatus = 1
+            this.customerId = res.data.customerId
+          }
         }
       }else{
         this.$message.warning('对不起，当前不能认领')
       }
     },
+    //取消认领
+    cancelClaimClick(){
+      this.dialogVisible1 = true;
+    },
+
+    async handleHistoryClaim(){
+      let res = await api.historyClaim(this.companyInfo.companyName)
+      if(res.code==200){
+          this.dialogVisible2 = false;
+          this.companyInfo.claimStatus = 1
+        }else{
+          this.$message.error(res.msg)
+        }
+    },
+    async confirm(){
+      let res = await api.cancelClaim(this.companyInfo.companyName)
+      if(res.code==200){
+          this.dialogVisible1 = false;
+          this.companyInfo.claimStatus = 0
+        }else{
+          this.$message.error(res.msg)
+        }
+      // api.cancelClaim(this.companyInfo.companyName).then(res=>{
+
+      // })
+    },
     companySwiper(){
       new Swiper('.swiper-info', {
         slidesPerView: 6,
@@ -292,7 +352,17 @@ export default {
     },
     renlin(){
       this.dialogVisible=false;
-      // this.$router.push({path:'/home',query: {id:'1'}})
+      // window.location.href = window.location.origin+window.location.pathname+'?customerId='+this.customerId+'&path=business'
+      this.$router.replace({
+        path: '/enterprise/'+encodeStr(this.companyId),
+        query: {
+          'customerId': this.customerId,
+          'path':'business'
+          } ,
+        })
+        this.$nextTick(()=>{
+          this.$tab.refreshPage();
+        })
       // 跳转地址
     },
     renHide(){
@@ -665,6 +735,12 @@ export default {
       text-align: center;
       padding-bottom: 24px;
     }
+    .el-dialog__header{
+      text-align: center;
+      .el-dialog__title{
+        font-size: 16px;
+      }
+    }
     .el-dialog__footer{
       padding: 0px;
       padding-bottom: 24px;

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

@@ -122,7 +122,7 @@ export default {
               margin-right: 22px;
               font-weight: bold;
               font-size: 20px;
-              color: #0081FF;
+              color: #232323;
               padding: 24px 16px 0 16px;
               span{
                 font-size: 16px;
@@ -132,7 +132,7 @@ export default {
               padding: 14px 16px 10px 16px;
               justify-content: space-between;
               font-size: 14px;
-              color: #416587;
+              color: #232323;
               div{
                 flex-shrink: 0;
               }

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

@@ -4,6 +4,7 @@
     <el-tabs v-model="activeName" @tab-click="handleClick" class="tabpane selfTab">
       <el-tab-pane label="股东" name="first"></el-tab-pane>
       <el-tab-pane label="对外投资" name="second"></el-tab-pane>
+      <el-tab-pane label="分支机构" :disabled="affiliatesTotal<1" name="third"></el-tab-pane>
     </el-tabs>
     <div class="table-item">
       <div class="rela-person" v-show="activeName=='first'">实际控制人：{{financial&&financial.actualController || '--'}}</div>
@@ -34,13 +35,8 @@
             <span>{{scope.row.businessStatus || '--'}}</span>
           </template>
         </el-table-column>
-        <template slot="empty">
-          <div style="padding: 30px 0">
-            <no-data />
-          </div>
-        </template>
       </el-table>
-      <el-table :data="shipData" border style="width: 100%" v-show="activeName=='second'">
+      <el-table v-if="shipData.length>0" :data="shipData" border style="width: 100%" v-show="activeName=='second'">
         <el-table-column label="序号" width="55" align="left" fixed>
           <template slot-scope="scope">{{ shipParams.pageNum * shipParams.pageSize - shipParams.pageSize + scope.$index + 1 }}</template>
         </el-table-column>
@@ -63,20 +59,49 @@
         <el-table-column prop="investStartDate" label="成立日期"></el-table-column>
         <el-table-column prop="stockPercentage" label="股权占比"></el-table-column>
         <el-table-column prop="shouldCapi" label="认缴出资额（万元）"></el-table-column>
-        <template slot="empty">
-          <div style="padding: 30px 0">
-            <no-data />
-          </div>
-        </template>
+      </el-table>
+      <no-data v-if="activeName=='second'&&shipData.length<1"/>
+      <el-table :data="affiliatesData" border style="width: 100%" v-show="activeName=='third'">
+        <el-table-column label="序号" width="55" align="left" >
+          <template slot-scope="scope">{{ affiliatesParams.pageNum * affiliatesParams.pageSize - affiliatesParams.pageSize + scope.$index + 1 }}</template>
+        </el-table-column>
+        <el-table-column min-width="140" label="被投资企业名称">
+          <template slot-scope="scope">
+            <router-link :to="scope.row.uipId?`/enterprise/${encodeStr(scope.row.id)}`:`/company/${encodeStr(scope.row.id)}`" tag="a" class="a-link" v-if="scope.row.id&&scope.row.name" v-html="scope.row.name"></router-link>
+            <div v-else v-html="scope.row.name  || '--'"></div>
+            <div class="tags" v-if="scope.row.status || scope.row.biddingCount|| scope.row.landInfoCount|| scope.row.proposedProjectCount">
+              <span class="tag" :class="labelArr.includes(scope.row.status)?'style2':'style1'" v-if="scope.row.status">{{scope.row.status}}</span>
+              <span class="tag style1" v-if="scope.row.proposedProjectCount">拟建{{scope.row.proposedProjectCount}}</span>
+              <span class="tag style1" v-if="scope.row.landInfoCount">土地{{scope.row.landInfoCount}}</span>
+              <span class="tag style1" v-if="scope.row.biddingCount">招标{{scope.row.biddingCount}}</span>
+            </div>
+          </template>
+        </el-table-column>
+        <el-table-column prop="operName" label="负责人"></el-table-column>
+        <el-table-column label="地区">
+          <template slot-scope="scope">
+							{{scope.row.provinceName}}
+							<template v-if="scope.row.cityName">
+							  -
+							</template>
+							{{scope.row.cityName}}
+							<template v-if="scope.row.districtName">
+							  -
+							</template>
+							{{scope.row.districtName}}
+	  			</template>
+        </el-table-column>
+        <el-table-column prop="startDate" label="成立日期"></el-table-column>
       </el-table>
       <div class="rela-more" v-show="activeName=='second'&& shipTotal>shipParams.pageSize"><span class="a-link" @click="handlePath">查看更多数据 ></span></div>
+      <div class="rela-more" v-show="activeName=='third'&& affiliatesTotal>affiliatesParams.pageSize"><span class="a-link" @click="handlePath1">查看更多数据 ></span></div>
     </div>
   </div>
 </template>
 
 <script>
 import {encodeStr, changePath} from "@/assets/js/common"
-import {bestStockPage, investment} from '@/api/detail/party-a/overview'
+import {bestStockPage, investment,affiliates} from '@/api/detail/party-a/overview'
 import NoData from '../../component/noData'
 export default {
   name: 'Relationship',
@@ -103,12 +128,20 @@ export default {
         pageSize: 5
       },
       shipTotal: 0,
+      affiliatesData:[],
+      affiliatesParams: {
+        cid: this.companyId,
+        pageNum: 1,
+        pageSize: 5
+      },
+      affiliatesTotal: 0,
       labelArr:['失信联合惩戒企业','严重行政处罚','司法纠纷','注销', '注销企业']
     }
   },
   created() {
     this.handleQuery()
     this.handleInvest()
+    this.getAffiliatesData()
   },
   mounted() {
   },
@@ -136,10 +169,20 @@ export default {
         this.shipTotal = res.total
       }
     },
+    async getAffiliatesData(){
+      let res = await affiliates(this.affiliatesParams)
+      if(res.code==200){
+        this.affiliatesData = res.rows
+        this.affiliatesTotal = res.total
+      }
+    },
     handleClick(){
     },
     handlePath(){
       changePath(this, 'overseas')
+    },
+    handlePath1(){
+      changePath(this, 'branch')
     }
   }
 }

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

 <template>
   <div class="app-container clue-container">
     <div class="common-title">风险概览</div>
-    <div class="flex-box clue-box">
+    <div class="flex-box clue-box" v-if="viewData[0].value>0">
       <div class="clue-echarts"><div id="echartsRisk" style="width: 100%;height:300px; margin: 0 auto;"></div></div>
       <div class="table-item">
         <el-table
@@ -28,14 +28,10 @@
               <span>{{ scope.row.bl }}</span>
             </template>
           </el-table-column>
-          <template slot="empty">
-            <div style="padding: 30px 0">
-              <no-data />
-            </div>
-          </template>
         </el-table>
       </div>
     </div>
+    <no-data  v-else/>
   </div>
 </template>
 
@@ -123,7 +119,7 @@ export default {
           tz:'',
           bl:''
         },
-      ]
+      ],
     }
   },
   created() {
@@ -145,7 +141,11 @@ export default {
       this.viewData.sort((a, b) => {
         return a.value < b.value ? 1 : -1;
       })
-      this.getDT()
+      this.$nextTick(()=>{
+        if(this.viewData[0].value>0){
+          this.getDT();
+        }
+      })
     },
     getDT(){
       let myChart = echarts.init(document.getElementById("echartsRisk"))
@@ -172,6 +172,8 @@ export default {
           bottom: 20,
           data: this.viewData,
           pageButtonPosition: 'end',
+          itemWidth:12,
+          itemHeight:8,
         },
         color: ['#8A82F3','#5B9CF7','#43BBE0','#8ECF95','#FFDC6B', '#FE9C77', '#E8649B', '#8A82F3'],
         series: [

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

@@ -3,6 +3,7 @@
     <div class="common-title">高管</div>
     <div class="table-item">
       <el-table
+        v-if="tableData.length>0"
         :data="tableData"
         border
         style="width: 100%"
@@ -26,12 +27,8 @@
         <el-table-column
           prop="userJobs"
           label="职务"></el-table-column>
-        <template slot="empty">
-          <div style="padding: 30px 0">
-            <no-data />
-          </div>
-        </template>
       </el-table>
+      <no-data v-else/>
     </div>
   </div>
 </template>

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

 <template>
   <div class="flex-box app-container part-container">
-    <div class="tender-list">
+    <div class="tender-list" ref="zbggScroll" @scroll="scrollbottom()">
       <div class="common-title">招标公告</div>
       <template v-if="zbggList.length>0">
-        <div class="tender-item" v-for="(item, index) in zbggList" :key="index">
-          <div class="flex-box tender-title"><div class="text-cl1" :title="item.projectName"><router-link :to="'/radar/Notice/details/'+item.bid" tag="a" class="a-link">{{item.projectName}}</router-link></div><span :class="item.projectCategory=='项目动态'?'style2':item.tag=='招投标'?'style4':'style1'" v-if="item.projectCategory">{{item.projectCategory}}</span></div>
+        <div class="tender-item"  v-for="(item, index) in zbggList" :key="index">
+          <div class="flex-box tender-title"><div class="text-cl2" :title="item.projectName"><router-link :to="'/radar/Notice/details/'+item.bid" tag="a" class="a-link">{{item.projectName}}</router-link></div><span :class="item.projectCategory=='项目动态'?'style2':item.tag=='招投标'?'style4':'style1'" v-if="item.projectCategory">{{item.projectCategory}}</span></div>
           <span class="tender-time"><span @click="handleUrl(item.url)" style="cursor: pointer;">{{item.dataSource}}</span> {{item.issueTime}}</span>
         </div>
       </template>
@@ -12,11 +12,11 @@
         <no-data />
       </div>
     </div>
-    <div class="tender-list">
+    <div class="tender-list" ref="trendScroll" @scroll="scrollbottom(true)">
       <div class="common-title">企业动态</div>
       <template v-if="trendList.length>0">
         <div class="tender-item" v-for="(item, index) in trendList" :key="index">
-          <div class="flex-box tender-title"><div class="text-cl1" :title="tendTitle(item.details)">{{tendTitle(item.details)}}</div><span :class="item.parentDimension=='新增分支机构'?'style2':item.parentDimension=='新增施工工法'?'style3':'style1'">{{item.parentDimension}}</span></div>
+          <div class="flex-box tender-title"><div class="text-cl2" :title="tendTitle(item.details)">{{tendTitle(item.details)}}</div><span :class="item.parentDimension=='新增分支机构'?'style2':item.parentDimension=='新增施工工法'?'style3':'style1'">{{item.parentDimension}}</span></div>
           <span class="tender-time">{{item.createTime}}</span>
         </div>
       </template>
@@ -42,17 +42,20 @@ export default {
         cid: this.companyId,
         sort: 3,
         pageNum: 1,
-        pageSize: 5
+        pageSize: 6
       },
       //招标公告数据
       zbggList:[],
+      zbggTotal:0,
       trendParams: {
         companyId: this.companyId,
         pageNum: 1,
-        pageSize: 5
+        pageSize: 6
       },
       //企业动态数据
-      trendList:[]
+      trendList:[],
+      trendTotal:0,
+
     }
   },
   computed: {
@@ -83,17 +86,54 @@ export default {
         dynamicPage(this.trendParams)
       ])
       if(notice.code==200){
-        this.zbggList = notice.rows
+        this.zbggList = notice.rows;
+        this.zbggTotal = notice.total;
       }
       if(namic.code==200){
-        this.trendList = namic.rows
+        this.trendList = namic.rows;
+        this.trendTotal = namic.total;
       }
     },
     handleUrl(url){
       if(url){
         window.open(url, "_blank")
       }
-    }
+    },
+    async getBidNotice(){
+      let notice = await bidNoticePage(this.zbggParams)
+      if(notice.code==200){
+        this.zbggTotal = notice.total;
+        this.zbggList = this.zbggList.concat(notice.rows)
+      }
+    },
+    async getDynamic(){
+      let dynamic = await dynamicPage(this.trendParams)
+      if(dynamic.code==200){
+        this.trendTotal = dynamic.total;
+        this.trendList = this.trendList.concat(dynamic.rows)
+      }
+    },
+    scrollbottom(type){
+        let scrllEl = type ? this.$refs.trendScroll : this.$refs.zbggScroll
+        let scrollHeight = scrllEl.scrollHeight
+        let clientHeight = scrllEl.clientHeight
+        let scrollTop = scrllEl.scrollTop
+        if(scrollHeight - (scrollTop+clientHeight) <= 1 ){
+          if(type){
+            if(this.trendParams.pageNum*this.trendParams.pageSize>=this.trendTotal){
+              return
+            }
+            this.trendParams.pageNum+=1;
+            this.getDynamic()
+          }else{
+            if(this.zbggParams.pageNum*this.zbggParams.pageSize>=this.zbggTotal){
+              return
+            }
+            this.zbggParams.pageNum+=1;
+            this.getBidNotice()
+          }
+        }
+      },
   }
 }
 </script>
@@ -108,8 +148,9 @@ export default {
       width: calc(50% - 8px);
       padding: 24px 16px;
       background: #FFFFFF;
-      overflow: hidden;
+      overflow-y:scroll ;
       border-radius: 4px;
+      height: 512px;
       .common-title{
         margin-bottom: 10px;
       }

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

@@ -10,6 +10,7 @@
     <tables
       :tableLoading="tableLoading"
       :tableData="tableData"
+      :tableDataTotal="tableDataTotal"
       :forData="forData"
       :isIndex="false"
       :queryParams="queryParams"

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

@@ -133,7 +133,7 @@ export default {
   border-radius: 4px;
   .tab-header{
     img{
-      margin-bottom: -3px;
+      margin-bottom: 2px;
       width: 14px;
       height: 14px;
       cursor: pointer;

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

@@ -4,6 +4,7 @@
     <div class="view-content"><Operations :companyId="companyId" :financial="financial" /></div><!-- 公司经营 -->
     <div class="view-content"><Bidding :companyId="companyId" /></div><!--招标偏好、业务往来-->
     <div class="view-content"><Busclue :companyId="companyId" :statistic="statistic" /></div><!--商机线索-->
+    <div class="view-content"><Finance :companyId="companyId" /></div><!--财务数据-->
     <div class="view-content"><Relationship :companyId="companyId" :financial="financial" /></div><!--关系企业-->
     <div class="view-content"><Senior :companyId="companyId" /></div><!--高管-->
     <div class="view-content"><Risk :companyId="companyId" :statistic="statistic" /></div><!--风险概览-->
@@ -18,6 +19,7 @@ import Infoheader from "./component/infoheader"
 import Operations from "./component/operations"
 import Bidding from "./component/bidding"
 import Busclue from './component/busclue'
+import Finance from './component/finance'
 import Relationship from './component/relationship'
 import Senior from './component/senior'
 import Risk from './component/risk'
@@ -33,6 +35,7 @@ export default {
     Relationship,
     Senior,
     Risk,
+    Finance,
     Tender
   },
   data() {

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

@@ -16,8 +16,8 @@ export default {
       loading: false, // 是否加载完成-当前页控制
       iframeTimer: '',  // 是否加载中定时器-当前页控制
       iframeHight: window.innerHeight, // iframe高度-当前页控制
-      navHeight: 68,  // iframe以为的高度px
-      src: '',
+      navigation: {isFixed: true, fixedHeight: 56, totalHeight: 68},  // iframe之外页面顶部对象，ifFixed:是否浮动；fixedHeight：浮动对象高度；totalHeight：顶部整体高度
+      src: '',  //iframe嵌套页面地址
       domain: 'https://pre-plug.jiansheku.com',
       // domain: 'http://192.168.60.30:3300',
       ak: 'aec7b3ff2y2q8x6t49a7e2c463ce21912' // 需要携带的sdkId
@@ -27,7 +27,15 @@ export default {
     if (this.$route.params.id) { // 获取companyId
       this.loading = true
       if(this.$route.name=='Company'){  //企业详情
-        this.src = `${this.domain}/enterprise/${this.$route.params.id}?ak=${this.ak}`
+        if(this.$route.query.html){
+          if(this.$route.query.type){
+            this.src = `${this.domain}/enterprise/${this.$route.params.id}/${this.$route.query.html}?flag=true&type=${this.$route.query.type}&ak=${this.ak}`
+          }else{
+            this.src = `${this.domain}/enterprise/${this.$route.params.id}/${this.$route.query.html}?ak=${this.ak}`
+          }
+        }else{
+          this.src = `${this.domain}/enterprise/${this.$route.params.id}?ak=${this.ak}`
+        }
       }
       if(this.$route.name=='Personnel'){ //人员详情
         this.src = `${this.domain}/personnel/${this.$route.params.id}.html?ak=${this.ak}`
@@ -36,11 +44,11 @@ export default {
   },
   mounted() {
     this.iframeLoading() // 判断iframe页面是否加载完成-当前页控制
-    steerScroll('companyIframe', this.navHeight, true) // 监听滚动（iframe的id、页面排除iframe后页面剩下高度[例:80]、增加监听[不传就是移除监听]、父级id[不带默认就是铺满整个页面]]）
+    steerScroll('companyIframe', this.navigation, true) // 监听滚动（iframe的id、页面排除iframe后页面剩下顶部高度[例:80]、增加监听[不传就是移除监听]、父级id[不带默认就是铺满整个页面]]）
   },
   beforeDestroy() {
     clearInterval(this.iframeTimer) // -当前页控制
-    steerScroll('companyIframe', this.navHeight) // 销毁滚动
+    steerScroll('companyIframe', this.navigation) // 销毁滚动
   },
   methods: {
     //判断iframe页面是否加载完成-当前页控制

dsk-operate-ui/src/views/enterpriseData/components/SearchEnterprise/index.vue

@@ -5,7 +5,7 @@
 			<div class="content_item content_item_padding0">
 			    <div class="content_right item_ckquery_list">
 			        <el-input class="ename_input" placeholder="请输入关键字，如企业名称、统一社会信用代码等" v-model="ename" @input="projectNamebtn('ename',ename,'关键字:')">
-						<div slot="append" class="btn-search" @click="search">搜索</div>
+						<div slot="append" class="btn-search" @click="search()">搜索</div>
 					</el-input>
 			        <!-- <template v-if="ename">
 			            <span v-for=" (item,k)  in enameQueryTypeList" :key="k" style="margin-right: 24px;">
@@ -99,7 +99,7 @@
 						<template v-else>
 							<el-popover placement="top-start" width="200" trigger="hover">
 								<div class="select-popper-title">
-									请先选择<span class="colorhover">进省备案</span>后,在选择本省与进省企业!
+									请先选择<span class="colorhover">进省备案</span>后，再选择本省与进省企业！
 								</div>
 					
 								<div class="" slot="reference">
@@ -512,49 +512,48 @@
         					</template>
         					<template v-if="item.recentlyCount!=null">
         						<span class="right-title-grey">中标业绩：</span>
-        						<router-link :to="toEnterprise(item.jskEid,'/performance')" target="_blank"  >
+        						<router-link :to="toEnterprise(item.jskEid,'performance')" target="_blank"  >
         						<span class="right-title-blue" v-html="item.recentlyCount"> </span>
         						</router-link>
         					</template>
         					<template v-if="item.skyCount!=null">
         						<span class="right-title-grey">四库业绩：</span>
-        						<router-link :to="toEnterprise(item.jskEid,'/performance',1)" target="_blank"  >
+        						<router-link :to="toEnterprise(item.jskEid,'performance',2)" target="_blank"  >
         						<span class="right-title-blue" v-html="item.skyCount"> </span>
         						</router-link>
         					</template>
         					<template v-if="item.registeredPersonnelCount!=null">
         						<span class="right-title-grey">注册人员：</span>
-        						<router-link :to="toEnterprise(item.jskEid,'/personnel',1)" target="_blank"  >
+        						<router-link :to="toEnterprise(item.jskEid,'personnel',2)" target="_blank"  >
         						<span class="right-title-blue" v-html="item.registeredPersonnelCount"> </span>
         						</router-link>
         					</template>
         					<template v-if="item.threePersonnelCount!=null">
         						<span class="right-title-grey">三类人员：</span>
-        						<router-link :to="toEnterprise(item.jskEid,'/personnel',4)" target="_blank"  >
+        						<router-link :to="toEnterprise(item.jskEid,'personnel',5)" target="_blank"  >
         						<span class="right-title-blue" v-html="item.threePersonnelCount"> </span>
         						</router-link>
         					</template>
         					<template v-if="item.jskBidCount>0">
         						<span class="right-title-grey">招标公告：</span>
-        						<router-link :to="toEnterprise(item.jskEid,'/business',6)" target="_blank"  >
+        						<router-link :to="toEnterprise(item.jskEid,'business',5)" target="_blank"  >
         						<span class="right-title-blue" v-html="item.jskBidCount"> </span>
         						</router-link>
         					</template>
         					<template v-if="item.customerCount>0">
         						<span class="right-title-grey">客户：</span>
-        						<router-link  :to="toEnterprise(item.jskEid,'/business',1)" target="_blank"  >
+        						<router-link  :to="toEnterprise(item.jskEid,'business',1)" target="_blank"  >
         							<span class="right-title-blue" v-html="item.customerCount"> </span>
         						</router-link>
         					</template>
         					<template v-if="item.supplierCount>0">
         						<span class="right-title-grey">供应商：</span>
-        						<router-link  :to="toEnterprise(item.jskEid,'/business',2)" target="_blank"  >
+        						<router-link  :to="toEnterprise(item.jskEid,'business',2)" target="_blank"  >
         							<span class="right-title-blue" v-html="item.supplierCount"> </span>
         						</router-link>
         					</template>
         				</p>
         				<p class="card-right-title" v-if="item.formerName!=null&&(item.formerName.indexOf('color')!=-1||item.name.indexOf('color')!=-1)" style="padding: 10px 0px 0px 0px;">
-        					<
         					<span class="right-title-grey">曾用名：</span>
         					<span class="right-title-grey" style="width: 984px;" v-html="item.formerName"></span>
         				</p>
@@ -2627,6 +2626,7 @@
 					this.fieldOptions[i].status = false;
 				}
 				this.fieldText = this.fieldOptions[index].value;
+				this.orderText = this.fieldOptions[index].order;
 				this.fieldOptions[index].status = true;
 				this.search();
 			},
@@ -2764,7 +2764,7 @@
       },
 			
 			toEnterprise(id, html,type) {
-				return '/company/' + encodeStr(id) + html + '/'+(type?'?flag=true&type='+type:'');
+				return '/company/' + encodeStr(id)  + '/'+(html?'?html='+html:'')+(type?'&flag=true&type='+type:'');
 			},
 			
 			toEnterpriseDetail(id) {

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

@@ -7,6 +7,7 @@
 						<div style="position:relative" v-for="(itme,i)  in personnelList"
 							:class="itme.status==true?'active':'' " :key='i' @click="personnelListbtn(i)">
 							<p>{{itme.value}}</p>
+							<img v-if="i==1" style="position: absolute;top:-10px;width:80px;height:16px;" src="@/assets/images/owner/tip.png" alt="">
 						</div>
 					</div>
 					
@@ -39,15 +40,16 @@
 				personnelList: [{
 						key: 'Owner',
 						status: true,
-						value: '查业主单位',
+						value: '查城投平台',
 					},
 					{
 						key: 'SearchEnterprise',
 						status: false,
-						value: '查建筑企业',
+						value: '查企业',
 					},
 
 				],
+
 				personnelHerf:'Owner'
 			}
 		},

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

@@ -111,7 +111,7 @@
                     <el-progress class="progress2" :text-inside="true" :stroke-width="14" :percentage="70"></el-progress>
                   </div>
                   <div style="background: #ffffff;margin: 0 12px 12px 12px;">
-                    <div id="pm-echarts" style="height: 288px;"></div>
+                    <div id="pm-echarts" style="height: 400px;"></div>
                   </div>
                 </div>
               </div>
@@ -279,6 +279,20 @@
                   <span>中标单位：中铁十二局集团</span>
                 </p>
               </div>
+              <div class="item">
+                <h3>太原市万柏林区2023年兴华街道老旧小区改造项目</h3>
+                <p>
+                  <span>中标金额：4754.34</span>
+                  <span>中标单位：中铁十二局集团</span>
+                </p>
+              </div>
+              <div class="item">
+                <h3>太原市万柏林区2023年兴华街道老旧小区改造项目</h3>
+                <p>
+                  <span>中标金额：4754.34</span>
+                  <span>中标单位：中铁十二局集团</span>
+                </p>
+              </div>
             </div>
           </div>
           <div v-if="user === 2" class="zbhxr">
@@ -314,6 +328,24 @@
                   <span>中标金额：4754.34</span>
                 </p>
               </div>
+              <div class="item">
+                <h3>太原市万柏林区2023年兴华街道老旧小区改造项目</h3>
+                <p>
+                  <span>中标金额：4754.34</span>
+                </p>
+              </div>
+              <div class="item">
+                <h3>太原市万柏林区2023年兴华街道老旧小区改造项目</h3>
+                <p>
+                  <span>中标金额：4754.34</span>
+                </p>
+              </div>
+              <div class="item">
+                <h3>太原市万柏林区2023年兴华街道老旧小区改造项目</h3>
+                <p>
+                  <span>中标金额：4754.34</span>
+                </p>
+              </div>
             </div>
           </div>
         </div>
@@ -429,6 +461,24 @@ export default {
           name:'重庆机场集团',
           time:'2023-04-12  14: 00'
         },
+        {
+          title:'拜访了重庆交通局杨科长，洽谈比较愉快，预计下月有项目招标，希望能有机会合作。',
+          user:'李婷婷',
+          name:'重庆机场集团',
+          time:'2023-04-12  14: 00'
+        },
+        {
+          title:'拜访了重庆交通局杨科长，洽谈比较愉快，预计下月有项目招标，希望能有机会合作。',
+          user:'李婷婷',
+          name:'重庆机场集团',
+          time:'2023-04-12  14: 00'
+        },
+        {
+          title:'拜访了重庆交通局杨科长，洽谈比较愉快，预计下月有项目招标，希望能有机会合作。',
+          user:'李婷婷',
+          name:'重庆机场集团',
+          time:'2023-04-12  14: 00'
+        },
       ],
       pmData:[
         {
@@ -974,6 +1024,7 @@ export default {
     margin: 0;
   }
   .home {
+    padding-bottom:24px;
     ::v-deep .el-row{
       .el-col:nth-child(1){
         padding-left: 0 !important;
@@ -1089,18 +1140,18 @@ export default {
       }
       .content-wrap{
         margin-bottom: 12px;
-        height: 460px;
+        height: 587px;
         .select-popper{
           margin-right:0;
         }
         .record{
-          height: 460px;
+          height: 587px;
           background: #FFFFFF;
           border-radius: 4px;
           padding: 16px;
           position: relative;
           .list{
-            height: 375px;
+            height: 510px;
             overflow: hidden;
             .item{
               border-bottom: 1px solid #EEEEEE;
@@ -1131,27 +1182,28 @@ export default {
             text-align: center;
             color: #0081FF;
             font-size: 14px;
-            margin-top: 4px;
             cursor: pointer;
             position: absolute;
-            bottom:16px;
-            left: 50%;
-            margin-left: -48px;
+            width: 95%;
+            height: 60px;
+            line-height: 60px;
+            background: linear-gradient(360deg, #FFFFFF 0%, #FFFFFF 17%, rgba(255,255,255,0.6) 100%);
+            bottom: 0;
           }
         }
         .ranking{
-          height: 460px;
+          height: 587px;
           background: #FFFFFF;
           border-radius: 4px;
           padding: 16px;
           .main{
             background: url("../assets/images/index/yjpm_bg.png");
             background-size: 100% 100%;
-            height: 399px;
+            height: 525px;
             margin-top: 10px;
           }
           .amount{
-            padding: 16px 24px;
+            padding: 16px 12px;
             p{
               display: flex;
               justify-content: space-between;
@@ -1175,6 +1227,8 @@ export default {
             }
             .progress1{
               height: 10px !important;
+              margin-bottom:6px;
+              margin-top:8px;
               ::v-deep .el-progress-bar__outer{
                 .el-progress-bar__inner{
                   background:#9AEAD3
@@ -1303,6 +1357,7 @@ export default {
             font-size: 14px;
             span{
               margin-right: 24px;
+              color:rgba(35, 35, 35, 0.8);
             }
           }
           .btn{
@@ -1380,7 +1435,7 @@ export default {
         background: #FFFFFF;
         border-radius: 4px;
         padding: 16px;
-        height: 440px;
+        height: 617px;
         overflow: hidden;
         position: relative;
         ::v-deep .el-tabs__header{
@@ -1388,7 +1443,7 @@ export default {
         }
         ::v-deep .el-tabs__content{
           overflow-y: auto;
-          height: 368px;
+          height: 567px;
         }
         ::v-deep .el-timeline{
           .el-timeline-item{
@@ -1528,7 +1583,7 @@ export default {
         }
       }
       .zbgg{
-        height: 470px;
+        height: 599px;
         background: #FFFFFF;
         border-radius: 4px;
         padding: 16px;
@@ -1570,7 +1625,7 @@ export default {
         }
       }
       .zbhxr{
-        height: 382px;
+        height: 558px;
         background: #FFFFFF;
         border-radius: 4px;
         padding: 16px;

dsk-operate-ui/src/views/login.vue

@@ -174,7 +174,7 @@ export default {
   .left{
     float: left;
     width: 730px;
-    margin-right: 170px;
+    /*margin-right: 170px;*/
   }
   .logo{
     width: 253px;

dsk-operate-ui/src/views/macro/component/region.vue

+<template>
+  <div class="region">
+    <div class="region_left">
+      <div>
+        <span class="province">{{province}}</span>
+        <span class="icon">
+          <i class="el-icon-location"></i>切换
+          <el-cascader ref="address" class="cascader-region" popper-class='cascader-region-addd'
+                       @change="addressListbtn"  v-model="address" :options="addressList" :props="props" collapse-tags></el-cascader>
+      </span>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import { location } from '@/api/macro/macro'
+  import dataRegion from '@/assets/json/dataRegion'
+  export default {
+    name:'region',
+    props:['province','dataQuery'],
+    data(){
+      return {
+        props: {
+          value: 'id',
+          label: 'label',
+          checkStrictly: true
+        },
+        addressList: [],
+        address:'',
+        provinceId:[],
+        location:''
+      }
+    },
+    watch: {
+      province(newValue, oldValue){
+        this.location = newValue;
+      },
+    },
+    created(){
+      this.dataRegion()
+      this.location=this.province
+    },
+    methods:{
+      addressListbtn() {
+        let nodesObj = this.$refs.address.getCheckedNodes()[0];
+        this.location=nodesObj.pathLabels[nodesObj.pathLabels.length-1];
+        this.provinceId=nodesObj.path;
+        let data={}
+        data.province=this.location
+        data.provinceId=this.provinceId
+        data.provinces=nodesObj.pathLabels
+        this.$parent.addressListbtn(data)
+        localStorage.setItem('location', true)
+      },
+      //地区
+      async dataRegion() {
+        // await axios.post("https://files.jiansheku.com/file/json/common/dataRegion.json", {}, {
+        //   headers: {
+        //     'Content-Type': 'application/json'
+        //   }
+        // }).then(res => {
+        //   if (res.data.code == 200) {
+        //     console.log(res.data.data)
+        //   }
+        // })
+        var str = [];
+        for (let x = 0; x < 3; x++) {
+          for (let i = 0; i < dataRegion.length; i++) {
+            if (dataRegion[i].regionLevel == x + 1 && x + 1 == 1) {
+              str.push({
+                'id': dataRegion[i].id,
+                "label": dataRegion[i].regionName,
+                "short": dataRegion[i].short,
+                "value": dataRegion[i].parentId,
+                "children": []
+              });
+            }else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 2) {
+              for (let j = 0; j < str.length; j++) {
+                if (str[j].id == dataRegion[i].parentId) {
+                  str[j].children.push({
+                    'id': dataRegion[i].id,
+                    "label": dataRegion[i].regionName,
+                    "short": dataRegion[i].short,
+                    "value": dataRegion[i].parentId,
+                    "children": []
+                  });
+                }
+              }
+            }else if (dataRegion[i].regionLevel == x + 1 && x + 1 == 3) {
+              for (let j = 0; j < str.length; j++) {
+                for (let k = 0; k < str[j].children.length; k++) {
+                  if (str[j].children[k].id == dataRegion[i].parentId) {
+                    str[j].children[k].children.push({
+                      'id': dataRegion[i].id,
+                      "label": dataRegion[i].regionName,
+                      "short": dataRegion[i].short,
+                      "value": dataRegion[i].parentId
+                      // "children":[]
+                    });
+                  }
+                }
+              }
+            }
+          }
+        }
+        this.addressList = str;
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .region{
+    height: 48px;
+    background: #F8FBFF;
+    border-radius: 4px;
+    margin-bottom: 12px;
+    .region_left{
+      background: url("~@/assets/images/economies/img_bg.png") no-repeat;
+      background-size: 100%;
+      width: 603px;
+      height: 48px;
+      padding-left: 16px;
+      .province{
+        font-size: 20px;
+        cursor: pointer;
+        font-weight: 700;
+        color: #004F9C;
+        margin-right: 12px;
+        line-height: 48px;
+        height: 48px;
+        float: left;
+      }
+      .icon{
+        width: 24px;
+        color: #0081FF;
+        font-size: 12px;
+        display: inline-block;
+        height: 48px;
+        position: relative;
+        i{
+          margin-left: 4px;
+          font-size: 16px;
+          color:#0081FF;
+          padding-top: 7px;
+        }
+      }
+      .cascader-region {
+        position: absolute;
+        left: -50px;
+        top: 8px;
+        opacity: 0;
+        line-height: 22px;
+        width: 80px;
+      }
+    }
+  }
+</style>

dsk-operate-ui/src/views/macro/component/skeleton.vue

+<template>
+  <el-skeleton  animated>
+    <template slot="template">
+      <el-skeleton-item variant="text" style="width: 60%;"/>
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 60%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+      <el-skeleton-item variant="text" style="width: 100%;" />
+    </template>
+  </el-skeleton>
+</template>
+
+<script>
+  export default {
+    name: 'skeleton'
+  }
+</script>
+
+<style lang="scss" scoped>
+.el-skeleton__item{
+  height: 20px;
+  border-radius: 0;
+  margin: 9px 0;
+  background: #f0f0f0;
+}
+</style>

dsk-operate-ui/src/views/macro/economies/component/comparison.vue

@@ -16,8 +16,9 @@
         <span class="flex-box" @click="handleMessage"><img src="@/assets/images/ability_excel.png">导出EXCEL</span>
       </div>
     </div>
-    <div class="table-item">
-      <div class="table-title">
+    <div class="table-item" ref="regionalStyle" id="regionalStyle">
+      <div class="table-title" :class="fixed == true ? 'fixed' : ''" :style="'width:' + StyWidth">
+      <!--<div class="table-title">-->
         <span class="span-tit">指标</span>
         <span class="span-tit">
           <span class="address" v-if="value1Flag">{{addressValue1}}<i class="el-icon-circle-close" @click="handleDelete(1)"></i></span>
@@ -102,6 +103,7 @@
 
 <script>
   import dataRegion from '@/assets/json/dataRegion'
+  import elementResizeDetectorMaker from "element-resize-detector"
   import { regionalCompare,getYears,multipleCompare } from '@/api/macro/macro'
 export default {
   name: 'comparison',
@@ -288,7 +290,9 @@ export default {
       value4Flag:false,
       value5Flag:false,
       regionData:[],
-      compareList:[{},{},{},{},{}]
+      compareList:[{},{},{},{},{}],
+      fixed: false,
+      StyWidth:null
     }
   },
   watch: {
@@ -296,6 +300,18 @@ export default {
       console.log(newValue)
     }
   },
+  mounted(){
+    window.addEventListener('scroll', this.handleScroll);
+    const _this = this, erd = elementResizeDetectorMaker(), partBox = document.getElementById("regionalStyle")
+    erd.listenTo(partBox, element => {
+      _this.$nextTick(() => {
+        this.StyWidth = partBox.offsetWidth + 'px';
+      })
+    })
+  },
+  destroyed () {
+    window.removeEventListener('scroll', this.handleScroll)
+  },
   created() {
     this.dataRegion();
     // this.getData();
@@ -313,9 +329,9 @@ export default {
         if(this.provinceId.length >= 2){
           item.areaId=this.provinceId[2]
         }
-        if(this.dataQuery.id){
-          item.id=this.dataQuery.id
-        }
+        // if(this.dataQuery.id){
+        //   item.id=this.dataQuery.id
+        // }
         this.compareList.splice(0,1,item);
         this.value1Flag=true
         this.addressValue1=this.dataQuery.province.join('-')
@@ -343,6 +359,14 @@ export default {
     }
   },
   methods: {
+    handleScroll () {
+      let scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
+      if (scrollTop > 145) {
+        this.fixed = true
+      } else {
+        this.fixed = false
+      }
+    },
     getData(params){
       params.year=this.queryParams.year;
       multipleCompare(params).then(res => {
@@ -448,9 +472,9 @@ export default {
           if(code.length >= 3){
             item.areaId=code[2]
           }
-          if(this.dataQuery.id){
-            item.id=this.dataQuery.id
-          }
+          // if(this.dataQuery.id){
+          //   item.id=this.dataQuery.id
+          // }
           this.compareList.splice(index-1,1,item);
 
           let list=[];
@@ -631,6 +655,7 @@ export default {
     }
     .table-item{
       margin-top: 22px;
+      position: relative;
       ::v-deep .el-table{
         .el-table__body{
           width: 100% !important;
@@ -641,9 +666,22 @@ export default {
             /*}*/
           /*}*/
         }
+        th{
+          font-size: 12px !important;
+          font-weight: 400 !important;
+        }
+        .el-table__fixed-header-wrapper th{
+          background: #F0F3FA;
+        }
+        td.el-table__cell{
+          border-bottom: 0;
+        }
+        .caret-wrapper{
+          width: 10px;
+        }
       }
       .table-title{
-        width: 100%;
+        /*width: 100%;*/
         display: flex;
         /*justify-content:space-around;*/
         border: 1px solid #E6EAF1;
@@ -677,5 +715,10 @@ export default {
         }
       }
     }
+    .fixed{
+      position: fixed;
+      z-index: 999;
+      top: 56px;
+    }
   }
 </style>

dsk-operate-ui/src/views/macro/economies/component/industrialStructure.vue

@@ -20,7 +20,7 @@
         <div id="echarts"  style="height: 400px"></div>
         <p class="tips">  注：数据均来源于统计公报、统计年鉴，实际披露中由于部分地区最新年度数据不全，导致年份间数据差距较大</p>
       </div>
-      <div class="content-right">
+      <div class="content-right table-item">
         <el-table
           v-loading="tableLoading"
           :data="tableData"
@@ -35,7 +35,7 @@
           </el-table-column>
           <el-table-column label="产业类型" prop="projectType"></el-table-column>
           <el-table-column :label="oneYear">
-            <el-table-column prop="money" label="金额（亿元）" sortable> </el-table-column>
+            <el-table-column prop="money" label="金额（亿元）" sortable></el-table-column>
             <el-table-column prop="rate" label="占比（%）"> </el-table-column>
           </el-table-column>
           <el-table-column :label="twoYear">
@@ -45,6 +45,12 @@
         </el-table>
       </div>
     </div>
+    <!--<div class="content content-box" v-else>-->
+      <!--<div class="empty">-->
+        <!--<img class="img" src="@/assets/images/project/empty.png">-->
+        <!--<div class="p1">抱歉，暂无专项债项目数据</div>-->
+      <!--</div>-->
+    <!--</div>-->
   </div>
 </template>
 
@@ -66,11 +72,13 @@ export default {
       data:[],
       oneYear:'',
       twoYear:'',
+      state:false
     }
   },
   watch: {
     provinceId(newValue, oldValue){
       this.getData()
+      this.getGroupCount()
     }
   },
   created() {
@@ -105,16 +113,24 @@ export default {
         params.county=this.provinceId[2]
       }
       bidMoneyGroupByProjectType(params).then(res => {
-        let list=res.data[1].type
-        for (let i=0; i<res.data[0].type.length; i++){
-          for (let j=0; j<list.length; j++){
-            if(res.data[0].type[i].projectType === list[j].projectType){
-              list[j].lastMoney=res.data[0].type[i].money;
-              list[j].lastRate=res.data[0].type[i].rate;
+        if(res.data.length > 0){
+          let list=res.data[1].type
+          for (let i=0; i<res.data[0].type.length; i++){
+            for (let j=0; j<list.length; j++){
+              if(res.data[0].type[i].projectType === list[j].projectType){
+                list[j].lastMoney=res.data[0].type[i].money;
+                list[j].lastRate=res.data[0].type[i].rate;
+              }
             }
           }
+          for(let i=0; i<list.length; i++){
+            list[i].money=list[i].money ? Number(list[i].money).toFixed(2) : '-';
+            list[i].rate=list[i].rate ? Number(list[i].rate).toFixed(2) : '-';
+            list[i].lastMoney=list[i].lastMoney ? Number(list[i].lastMoney).toFixed(2) : '-';
+            list[i].lastRate=list[i].lastRate ? Number(list[i].lastRate).toFixed(2) : '-';
+          }
+          this.tableData=list.reverse()
         }
-        this.tableData=list.reverse()
       })
     },
     getGroupCount(){
@@ -128,7 +144,17 @@ export default {
         startTime=this.queryParams.year+'-01-01';
         endTime=this.queryParams.year+'-12-31';
       }
-      bidGroupCountByProjectType({startDate:startTime,endDate:endTime}).then(res => {
+      let params={startDate:startTime,endDate:endTime}
+      if(this.provinceId.length >= 0){
+        params.province=this.provinceId[0]
+      }
+      if(this.provinceId.length >= 1){
+        params.city=this.provinceId[1]
+      }
+      if(this.provinceId.length >= 2){
+        params.county=this.provinceId[2]
+      }
+      bidGroupCountByProjectType(params).then(res => {
         if(res.code === 200){
           let list=[]
           for(let i=0; i<res.data.length; i++){
@@ -138,9 +164,9 @@ export default {
             list.push(item);
           }
           this.data=list;
-          if(list.length > 0){
+          // if(list.length > 0){
             this.initChart()
-          }
+          // }
         }
       })
     },
@@ -220,7 +246,7 @@ export default {
         sums[index] = values.reduce((prev, curr) => {
           const value = Number(curr);
           if (!isNaN(value)) {
-            return Number(Number(prev) + Number(curr)).toFixed(3)
+            return Number(Number(prev) + Number(curr)).toFixed(2)
           } else {
             return prev;
           }
@@ -277,6 +303,57 @@ export default {
             z-index: 0;
             top: 46px;
           }
+          th{
+            font-size: 12px !important;
+            font-weight: 400 !important;
+          }
+          .el-table__fixed-header-wrapper th{
+            background: #F0F3FA;
+          }
+          td.el-table__cell{
+            border-bottom: 0;
+          }
+          .caret-wrapper{
+            width: 10px;
+          }
+          .has-gutter{
+            tr{
+              th:nth-child(4){
+                border-right:0;
+                .cell{
+                  padding-right: 24px !important;
+                }
+              }
+              td:nth-child(6){
+                border-right:0;
+              }
+            }
+          }
+          .el-table__cell.gutter{
+            background: #F5F7FA;
+            width: 16px !important;
+            border-top: 1px solid #dfe6ec;
+          }
+        }
+      }
+      .empty{
+        margin: 0 auto;
+        height: 550px;
+        text-align: center;
+        .img{
+          width: 108px;
+          height: 108px;
+          margin-bottom: 24px;
+          margin-top: 150px;
+        }
+        .p1{
+          color: #333333;
+          font-size: 16px;
+        }
+        .p2{
+          color: #999999;
+          font-size: 14px;
+          margin-top: 8px;
         }
       }
     }

dsk-operate-ui/src/views/macro/economies/component/localEconomy.vue

@@ -6,7 +6,7 @@
           <span class="common-title">经济数据</span>
           <el-form ref="queryForm" :model="queryParams" :inline="true" size="small">
             <el-form-item prop="year">
-              <el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择" @change="getData">
+              <el-select v-model="queryParams.year" filterable class="form-content-width" placeholder="请选择" @change="changeSelect">
                 <el-option v-for="(item, index) in yearOptions" :key="index" :label="item.year" :value="item.year" />
               </el-select>
             </el-form-item>
@@ -25,7 +25,7 @@
           @sort-change="sortChange"
           :default-sort = "{prop: 'gdp', order: 'descending'}"
         >
-          <el-table-column prop="province" label="下辖区" width="170" :formatter="formatStatus" fixed>
+          <el-table-column prop="province" label="下辖区" width="100" :formatter="formatStatus" fixed>
             <!--<template slot-scope="scope">-->
               <!--{{ scope.row.province}}{{scope.row.city ? '-': ''}}{{ scope.row.city}}{{scope.row.area ? '-': ''}}{{ scope.row.area}}-->
             <!--</template>-->
@@ -102,14 +102,13 @@ export default {
       if(this.queryParams.order){
         params.order=this.queryParams.order
       }
-
-      if(this.provinceId.length >= 0){
+      if(this.provinceId.length > 0){
         params.provinceIds=[this.provinceId[0]]
       }
-      if(this.provinceId.length >= 1){
+      if(this.provinceId.length > 1){
         params.cityId=[this.provinceId[1]]
       }
-      if(this.provinceId.length >= 2){
+      if(this.provinceId.length > 2){
         params.areaId=[this.provinceId[2]]
       }
       // params.provinceIds=[this.dataQuery.provinceId]
@@ -118,6 +117,10 @@ export default {
         this.tableDataTotal = res.data.totalCount
       })
     },
+    changeSelect(){
+      this.pageIndex=1
+      this.getData()
+    },
     // 重置页数
     handleSizeChange(val) {
       this.pageIndex = 1
@@ -199,6 +202,36 @@ export default {
     }
     .table-item{
       margin-top: 22px;
+      ::v-deep .el-table{
+        overflow:visible;
+        .el-table__header-wrapper{
+          position: sticky;
+          top:56px;
+          z-index: 9;
+        }
+        .el-table__fixed-header-wrapper{
+          position: sticky;
+          z-index: 9;
+          top: 56px;
+        }
+        .el-table__fixed{
+          overflow-x: clip;
+          overflow-y: clip;
+        }
+        th{
+          font-size: 12px !important;
+          font-weight: 400 !important;
+        }
+        .el-table__fixed-header-wrapper th{
+          background: #F0F3FA;
+        }
+        td.el-table__cell{
+          border-bottom: 0;
+        }
+        .caret-wrapper{
+          width: 10px;
+        }
+      }
     }
   }
 

dsk-operate-ui/src/views/macro/financing/details.vue

@@ -130,9 +130,9 @@
               {{formatDate(scope.row.tenderDate)}}
             </template>
           </el-table-column>
-          <el-table-column prop="actualBondIssueScale" label="专项债规模（亿）"  width="260" />
-          <el-table-column prop="isUsedProjectScale" label="用于项目规模(亿)" width="260" />
-          <el-table-column prop="isUsedCapital" label="是否资本金" width="200" />
+          <el-table-column prop="actualBondIssueScale" label="专项债规模（亿）"  width="260" :formatter="formatStatus"/>
+          <el-table-column prop="isUsedProjectScale" label="用于项目规模(亿)" width="260" :formatter="formatStatus"/>
+          <el-table-column prop="isUsedCapital" label="是否资本金" width="200" :formatter="formatStatus"/>
         </el-table>
       </div>
     </div>
@@ -185,7 +185,10 @@ export default {
       // var seconds = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
       // return year + '-' + month + '-' + day + ' ' + hours + ':' + minutes + ':' + seconds
       return year + '-' + month + '-' + day
-    }
+    },
+    formatStatus: function(row, column, cellValue) {
+      return cellValue? cellValue : '-'
+    },
   }
 }
 </script>

dsk-operate-ui/src/views/macro/nationalEconomies/component/economies-detail.vue

@@ -295,5 +295,17 @@ export default {
   }
   .table-item{
     padding: 16px 10px 16px 16px;
+    ::v-deep .el-table{
+      /*.el-table__body-wrapper{*/
+        /*overflow:visible;*/
+      /*}*/
+      /*.el-table__body{*/
+        /*tr:first-child{*/
+          /*position: fixed;*/
+          /*top: 49px;*/
+          /*z-index: 9;*/
+        /*}*/
+      /*}*/
+    }
   }
 </style>

dsk-operate-ui/src/views/macro/nationalEconomies/index.vue

 <template>
-  <div class="app-container container-box nationalEconomies">
+  <div class="app-container nationalEconomies">
     <div class="header">
       <el-tabs v-model="activeName" @tab-click="handleClick">
         <el-tab-pane label="全国经济大全" name="first"></el-tab-pane>
@@ -7,6 +7,7 @@
         <el-tab-pane label="全国中标市场分析" name="third"></el-tab-pane>
       </el-tabs>
     </div>
+
     <Economic v-if="activeName === 'first'"></Economic>
     <ZhaoBiao v-if="activeName === 'second'"></ZhaoBiao>
     <ZhongBiao v-if="activeName === 'third'"></ZhongBiao>