Merge remote-tracking branch 'origin/V20231129-中建一局二公司' into V20231129-中建一局二公司

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

@@ -204,6 +204,7 @@ tenant:
     - cb_scene_expense_month
     - cb_subject
     - cb_project_other
+    - s_materiel_project
 
 # MyBatisPlus配置
 # https://baomidou.com/config/

dsk-module/dsk-biz-api/pom.xml

@@ -56,6 +56,36 @@
             <artifactId>elasticsearch-java</artifactId>
             <version>8.7.0</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/commons-logging/commons-logging -->
+        <dependency>
+            <groupId>commons-logging</groupId>
+            <artifactId>commons-logging</artifactId>
+            <version>1.2</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.61</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpclient -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpclient</artifactId>
+            <version>4.3.2</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.httpcomponents/httpcore -->
+        <dependency>
+            <groupId>org.apache.httpcomponents</groupId>
+            <artifactId>httpcore</artifactId>
+            <version>4.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.zjyj</groupId>
+            <artifactId>cloudt-rest-client</artifactId>
+            <version>2.8.0-SNAPSHOT</version>
+        </dependency>
+
 
         <!--        <dependency>-->
 <!--            <groupId>com.tencentcloudapi</groupId>-->

dsk-module/dsk-biz-api/src/main/java/com/dsk/component/MaterielComponent.java

+package com.dsk.component;
+
+import cn.hutool.core.date.DatePattern;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.dsk.common.exception.ServiceException;
+import com.dsk.common.utils.DateUtils;
+import com.dsk.cscec.domain.CbProjectRecord;
+import com.dsk.cscec.domain.CbQuantitySummary;
+import com.dsk.cscec.domain.CbSubject;
+import com.dsk.cscec.domain.SMaterielProject;
+import com.dsk.cscec.mapper.CbSubjectMapper;
+import com.dsk.cscec.service.CbProjectRecordService;
+import com.dsk.cscec.service.ICbQuantitySummaryService;
+import com.dsk.cscec.service.ISMaterielProjectService;
+import com.glodon.cloudt.rest.client.RestServiceClient;
+import com.glodon.cloudt.rest.client.data.HmacRestAuthInfo;
+import com.glodon.cloudt.rest.client.data.RestResponseInfo;
+import com.glodon.cloudt.rest.client.exception.AuthenticateException;
+import com.glodon.cloudt.rest.client.exception.InvalidUriException;
+import com.glodon.cloudt.rest.client.exception.NoAuthenticateException;
+import com.glodon.cloudt.rest.client.impl.HmacRestServiceClient;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 物料相关组件
+ *
+ * @Author lcl
+ * @Data 2024/3/14 15:56
+ */
+@Component
+public class MaterielComponent {
+
+    @Resource
+    private ISMaterielProjectService materielProjectService;
+    @Resource
+    private ICbQuantitySummaryService quantitySummaryService;
+    @Resource
+    private CbProjectRecordService projectRecordService;
+    @Resource
+    private CbSubjectMapper subjectMapper;
+
+    /**
+     * 物料项目定时拉取
+     */
+    @Scheduled(cron = "0 0 1 20 * ? ")
+    public void materielProjectPull() {
+        String apiURI = "/api/inspection/v1.0/project/getTenantHasCodeProject";
+        String resStr = materielRequest(apiURI);
+        JSONObject jsonObject = JSONObject.parseObject(resStr);
+        if (!ObjectUtils.isEmpty(jsonObject.getString("data"))) {
+            List<SMaterielProject> list = JSON.parseArray(jsonObject.getString("data"), SMaterielProject.class);
+            materielProjectService.saveOrUpdateBatch(list);
+        }
+    }
+
+    /**
+     * 物料数据定时拉取
+     */
+    @Scheduled(cron = "0 0 2 20 * ? ")
+    public void materielDataPull() {
+        String beginTimestamp = DatePattern.PURE_DATETIME_MS_FORMAT.format(DateUtils.addMonths(new Date(), -1));
+        String apiURI = "/gys/inspection-api-service/integrate-v2/getSLlist?beginTimestamp=" + beginTimestamp;
+        String resStr = materielRequest(apiURI);
+        JSONObject jsonObject = JSONObject.parseObject(resStr);
+        JSONObject data = JSONObject.parseObject(jsonObject.getString("data"));
+        JSONArray bills = JSONObject.parseArray(data.getString("Bills"));
+        if(ObjectUtils.isEmpty(bills)) return;
+        List<CbQuantitySummary> list = new ArrayList<>();
+        for (int i = 0; i < bills.size(); i++) {
+            JSONObject obj = bills.getJSONObject(i);
+            JSONArray bdcls = JSONObject.parseArray(obj.getString("BDCL"));
+            for (int j = 0; j < bdcls.size(); j++) {
+                JSONObject bean = bdcls.getJSONObject(j);
+                //材料code
+                String code = bean.getString("CLLBBM").substring(bean.getString("CLLBBM").lastIndexOf(".") + 1);
+                CbSubject subject = subjectMapper.selectOne(Wrappers.<CbSubject>lambdaQuery().eq(CbSubject::getCode, code));
+                //获取项目id 通过第三方项目id->ipm编码->系统项目id
+                String projectId = bean.getString("projectId");
+                if (ObjectUtils.isEmpty(projectId)) {
+                    continue;
+                }
+                SMaterielProject materielProject = materielProjectService.getById(projectId);
+                if (ObjectUtils.isEmpty(materielProject) || ObjectUtils.isEmpty(materielProject.getSyncCode())) {
+                    continue;
+                }
+                CbProjectRecord one = projectRecordService.getOne(Wrappers.<CbProjectRecord>lambdaQuery()
+                        .eq(CbProjectRecord::getIpmProjectNo, materielProject.getSyncCode())
+                        .orderByDesc(CbProjectRecord::getCbStage));
+                if(ObjectUtils.isEmpty(one)){
+                    continue;
+                }
+
+                CbQuantitySummary cb = new CbQuantitySummary();
+                cb.setProjectId(one.getId());
+                cb.setCbStage(one.getCbStage());
+                cb.setCbSubjectName(bean.getString("CLLBMC"));
+                cb.setCbSubjectNo(subject.getCbSubjectNo());
+                cb.setCbName(bean.getString("CLMC"));
+                cb.setUnit(bean.getString("JLDW"));
+                cb.setQuantity(bean.getDouble("SJSL"));
+
+
+                list.add(cb);
+            }
+        }
+        quantitySummaryService.batchInsert(list);
+        System.out.println(list);
+    }
+
+    private String materielRequest(String apiURI) {
+        try {
+            /** ------------ 授权认证 --------------*/
+            //第3步：创建客户端实例
+            RestServiceClient serviceClient = HmacRestServiceClient.getInstance();
+            //第4步：加载/验证授权文件
+            //4.1构建认证信息
+            HmacRestAuthInfo restAuthInfo = new HmacRestAuthInfo();
+            //4.2设置授权文件路径
+//            restAuthInfo.setLicPath("src/main/resource/auth/auth.lic");
+            restAuthInfo.setLicStream(this.getClass().getResourceAsStream("/auth/auth.lic"));
+            //4.3权限认证
+            serviceClient.authenticate(restAuthInfo);
+
+            /** ------------ 拼接请求地址 --------------*/
+            //第5步：获取授权文件关联的GYS平台地址hostAddress
+            String hostAddress = serviceClient.getRestRootAddress();
+            //第6步：设置请求接口的URI地址apiURI(以获取集成项目列表信息为例)
+            //第7步：拼装完整的请求网址
+            String fullURL = hostAddress + apiURI;
+            //第8步：请求数据准备（本例中为从GYS平台获取数据，无需进行请求数据的准备）
+
+            //第9步：发送请求，用来推送/获取数据
+            RestResponseInfo restResponseInfo = serviceClient.get(fullURL);
+
+            /** ------------ 处理请求返回结果 --------------*/
+            if (restResponseInfo.isSuccess()) {
+                //请求成功：
+                //第10步：处理请求结果（第三方系统自行处理）
+                return restResponseInfo.getStringContent();
+            } else {
+                //请求失败:
+                //第11步：拼接完整的上报请求失败地址
+                String faultLogApiURI = "/gys/tl/services/trace/api-fault-log";
+                String faultLogFullURL = hostAddress + faultLogApiURI;
+                //第12步：构建上报请求失败数据
+                JSONObject faultLog = new JSONObject();
+                faultLog.put("requestUrl", fullURL);
+                faultLog.put("requestMethod", "GET");
+                faultLog.put("requestBody", "");
+                faultLog.put("statusCode", restResponseInfo.getErrorCode());
+                faultLog.put("response", restResponseInfo.getStringContent());
+                faultLog.put("description", restResponseInfo.getErrorMessage());
+                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMddHHmmss");//时间戳格式，到秒
+                LocalDateTime dateTime = LocalDateTime.now();
+                String searchKey = formatter.format(dateTime);
+                faultLog.put("searchKey", searchKey);  //能表征本次请求记录的标识，方便进行问题排查
+                //第13步：上报请求失败数据
+                serviceClient.post(faultLogFullURL, faultLog.toJSONString());
+            }
+        } catch (AuthenticateException e) {
+            e.printStackTrace();
+        } catch (InvalidUriException e) {
+            e.printStackTrace();
+        } catch (NoAuthenticateException e) {
+            e.printStackTrace();
+        }
+        throw new ServiceException("物料接口调用失败！");
+    }
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/constant/CbProjectConstants.java

@@ -20,6 +20,10 @@ public interface CbProjectConstants {
      * 成本阶段:转固
      */
     Integer CB_STAGE_TO_SOLID = 2;
+    /**
+     * 成本阶段:暂无成本计划
+     */
+    Integer CB_STAGE_NO_COST_PLAN = 3;
     /**
      * 项目文件状态:准备中
      */

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbProjectRecordController.java

@@ -43,7 +43,11 @@ public class CbProjectRecordController extends BaseController {
      */
     @GetMapping("/checkProjectCodeExist")
     public R<Boolean> checkProjectCodeExist(@Validated CbCheckProjectCodeExistBo checkBo) {
-        return R.ok(dProjectService.checkProjectCodeExist(checkBo));
+        if (dProjectService.checkProjectCodeExist(checkBo)) {
+            return R.ok(true);
+        } else {
+            return R.fail("IPM项目编码无效", false);
+        }
     }
 
     /**

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/controller/CbQuantitySummaryController.java

@@ -83,5 +83,13 @@ public class CbQuantitySummaryController extends BaseController {
         return R.ok();
     }
 
+    /**
+     * 修改工程量
+     */
+    @PostMapping("/editEngineeringQuantity")
+    public R<Void> editEngineeringQuantity(@RequestBody CbQuantitySummaryActual bo) {
+        return toAjax(baseService.editEngineeringQuantity(bo));
+    }
+
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/CbSubject.java

@@ -53,5 +53,7 @@ public class CbSubject implements Serializable {
     private Date createTime;
 
     private Integer sort;
+
+    private String code;
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/SMaterielProject.java

+package com.dsk.cscec.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+/**
+ * 物料项目类
+ *
+ * @Author lcl
+ * @Data 2024/3/15 9:15
+ */
+@Data
+@TableName("s_materiel_project")
+public class SMaterielProject {
+
+    /**
+     * 第三方项目id
+     */
+    @TableId(value = "id")
+    private Long id;
+    /**
+     * 项目名称
+     */
+    private String name;
+
+    private String ownerDeptName;
+    /**
+     * 项目对应的组织id
+     */
+    private Long ownerOrg;
+    /**
+     * 项目对应的父组织id
+     */
+    private Long parentId;
+
+    private String shortName;
+    /**
+     * 项目（建设）状态 0:未开工; 1:在建; 2:停工; 3:完工; 4:验收
+     */
+    private Integer status;
+    /**
+     * 同步编码(ipm项目编码：project_code)
+     */
+    private String syncCode;
+    /**
+     * 1:表示普通项目;3:表示搅拌站
+     */
+    private Integer type;
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/AddCbProjectBo.java

@@ -2,6 +2,7 @@ package com.dsk.cscec.domain.bo;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -14,6 +15,7 @@ public class AddCbProjectBo {
     /**
      * 项目名称
      */
+    @NotBlank(message = "项目名称不能为空")
     private String projectName;
     /**
      * IPM项目编码
@@ -29,7 +31,7 @@ public class AddCbProjectBo {
      */
     private String projectFileName;
     /**
-     * 成本阶段(0:标前成本、1:标后成本、2:转固成本)
+     * 成本阶段(0:标前成本、1:标后成本、2:转固成本、3:暂无成本计划)
      */
     @NotNull(message = "未选择成本阶段")
     private Integer cbStage;

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/bo/CbQuantitySummaryListBo.java

@@ -17,4 +17,8 @@ public class CbQuantitySummaryListBo extends CbProjectBaseBo {
      * 记录月份
      */
     private String recordDate;
+    /**
+     * 是否超出计划成本合价(不含税)
+     */
+    private Boolean isOutPlanCostCombinedPrice;
 }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/domain/vo/CbQuantitySummaryListVo.java

@@ -100,6 +100,14 @@ public class CbQuantitySummaryListVo {
      * 采购单价
      */
     private Double purchaseUnitPrice;
+    /**
+     * 实际成本合价(不含税)
+     */
+    private Double actualCombinedPrice = 0.0;
+    /**
+     * 实际成本合价(不含税)成本是否超出计划成本当中合价(不含税)
+     */
+    private Boolean isActualGreaterThanPlan;
     /**
      * 创建时间
      */
@@ -117,7 +125,7 @@ public class CbQuantitySummaryListVo {
      */
     private Double pushQuantities;
     /**
-     *  IPM项目编码
+     * IPM项目编码
      */
     private String ipmProjectCode;
     /**

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/CbProjectRecordMapper.java

@@ -23,12 +23,12 @@ public interface CbProjectRecordMapper extends BaseMapper<CbProjectRecord> {
     Page<CbProjectRecordSearchVo> selectPageProjectRecordList(IPage<CbProjectSearchBo> build,
                                                               @Param("searchBo") CbProjectSearchBo searchBo,
                                                               @Param("deleteFlagExist") Integer deleteFlagExist,
-                                                              @Param("projectFileStatusPreparing") Integer projectFileStatusPreparing);
+                                                              @Param("projectFileStatusPreparing") Integer projectFileStatusPreparing,
+                                                              @Param("cbStageNoCostPlan") Integer cbStageNoCostPlan);
 
     /**
      * 获取草稿弹窗列表
      */
     Page<CbProjectRecord> selectPageDraftDialogList(@Param("page") Page<CbProjectRecord> page, @Param(Constants.WRAPPER) QueryWrapper<CbProjectRecord> wrapper);
-
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/mapper/SMaterielProjectMapper.java

+package com.dsk.cscec.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.dsk.cscec.domain.SMaterielProject;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SMaterielProjectMapper extends BaseMapper<SMaterielProject> {
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/ICbQuantitySummaryService.java

@@ -32,5 +32,10 @@ public interface ICbQuantitySummaryService extends IService<CbQuantitySummary> {
     boolean batchInsert(List<CbQuantitySummary> list);
 
     R conversionNotice(CbQuantitySummaryListBo bo);
+
+    /**
+     * 修改工程量
+     */
+    Boolean editEngineeringQuantity(CbQuantitySummaryActual bo);
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/ISMaterielProjectService.java

+package com.dsk.cscec.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.dsk.cscec.domain.SMaterielProject;
+
+public interface ISMaterielProjectService extends IService<SMaterielProject> {
+}

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbDirectExpenseServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.lang.Assert;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.ReUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.dsk.common.excel.ExcelUtils;
@@ -65,7 +66,7 @@ public class CbDirectExpenseServiceImpl extends ServiceImpl<CbDirectExpenseMappe
         //校验项目是否存在
         this.checkProjectExist(projectId);
 
-        //查询清单/费用项分类标识为数字的数字
+        //查询清单/费用项分类标识为数字123的数据
         List<CbDirectExpenseMenuVo> menuVoList = baseMapper.selectMenuData(projectId, regx, CbProjectConstants.DELETE_FLAG_EXIST);
         Assert.isFalse(menuVoList.isEmpty(), "当前项目不存在直接费菜单");
 
@@ -241,19 +242,28 @@ public class CbDirectExpenseServiceImpl extends ServiceImpl<CbDirectExpenseMappe
      */
     @Override
     public List<CbDirectExpenseDataDetailVo> getDataDetail(Long menuId) {
-        //查询该菜单下的清
-        List<CbDirectExpenseDataDetailVo> qingList = BeanUtil.copyToList(baseMapper.selectList(new LambdaQueryWrapper<CbDirectExpense>()
+        //查询该菜单下的子集
+        List<CbDirectExpenseDataDetailVo> level4List = BeanUtil.copyToList(baseMapper.selectList(new LambdaQueryWrapper<CbDirectExpense>()
                 .eq(CbDirectExpense::getParentId, menuId)
-                //.eq(CbDirectExpense::getExpenseCategoryTag, CbProjectConstants.DIRECT_EXPENSE_CATEGORY_TAG_QING)
         ), CbDirectExpenseDataDetailVo.class);
-        Assert.isFalse(qingList.isEmpty(), "该菜单下无数据");
+        Assert.isFalse(level4List.isEmpty(), "该菜单下无数据");
 
         //生成数据树形
-        qingList.forEach(qing -> {
-            qing.getChildrenList().addAll(BeanUtil.copyToList(baseMapper.selectList(new LambdaQueryWrapper<CbDirectExpense>()
-                    .eq(CbDirectExpense::getParentId, qing.getId())), CbDirectExpenseDataDetailVo.class));
+        this.generateDataDetailTree(level4List);
+        return level4List;
+    }
+
+    //生成数据详情树形
+    public void generateDataDetailTree(List<CbDirectExpenseDataDetailVo> level4List) {
+        level4List.forEach(item -> {
+            if (ReUtil.isMatch(regx, item.getExpenseCategoryTag())) {
+                item.setExpenseCategoryTag(null);
+            }
+            List<CbDirectExpenseDataDetailVo> childrenList = BeanUtil.copyToList(baseMapper.selectList(new LambdaQueryWrapper<CbDirectExpense>()
+                    .eq(CbDirectExpense::getParentId, item.getId())), CbDirectExpenseDataDetailVo.class);
+            item.getChildrenList().addAll(childrenList);
+            generateDataDetailTree(childrenList);
         });
-        return qingList;
     }
 
     /**

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbProjectRecordServiceImpl.java

@@ -193,7 +193,7 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
      */
     @Override
     public TableDataInfo<CbProjectRecordSearchVo> getProjectList(CbProjectSearchBo searchBo, PageQuery pageQuery) {
-        Page<CbProjectRecordSearchVo> page = baseMapper.selectPageProjectRecordList(pageQuery.build(), searchBo, CbProjectConstants.DELETE_FLAG_EXIST, CbProjectConstants.PROJECT_FILE_STATUS_PREPARING);
+        Page<CbProjectRecordSearchVo> page = baseMapper.selectPageProjectRecordList(pageQuery.build(), searchBo, CbProjectConstants.DELETE_FLAG_EXIST, CbProjectConstants.PROJECT_FILE_STATUS_PREPARING, CbProjectConstants.CB_STAGE_NO_COST_PLAN);
 
         for (CbProjectRecordSearchVo searchVo : page.getRecords()) {
             //判断是否有历史阶段
@@ -212,8 +212,10 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
                     .eq(CbProjectFile::getProjectId, searchVo.getId())
                     .orderByDesc(CbProjectFile::getUpdateTime)
                     .last("LIMIT 1"));
-            searchVo.setUpdateBy(projectFile.getUpdateBy());
-            searchVo.setUpdateTime(projectFile.getUpdateTime());
+            if (ObjectUtil.isNotNull(projectFile)) {
+                searchVo.setUpdateBy(projectFile.getUpdateBy());
+                searchVo.setUpdateTime(projectFile.getUpdateTime());
+            }
         }
         return TableDataInfo.build(page);
     }
@@ -378,12 +380,11 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
                     , "存在解析中的项目,删除失败");
 
             //各个成本类型数据和对应每月成本数据暂不做删除,项目台账列表查不出来自然也无法查看数据
-
             //删除项目文件记录
             flag = projectFileMapper.delete(new LambdaQueryWrapper<CbProjectFile>()
                     .eq(CbProjectFile::getProjectId, projectId));
             //删除项目记录
-            Assert.isTrue(flag > 0, "操作异常,请联系管理员");
+            Assert.isTrue(flag == 0, "操作异常,请联系管理员");
             flag = baseMapper.deleteById(projectId);
         }
         return flag;
@@ -412,6 +413,7 @@ public class CbProjectRecordServiceImpl extends ServiceImpl<CbProjectRecordMappe
         QueryWrapper<CbProjectRecord> wrapper = Wrappers.query();
         wrapper
                 .eq("project_file_status", CbProjectConstants.PROJECT_FILE_STATUS_PREPARING)
+                .ne("cb_stage", CbProjectConstants.CB_STAGE_NO_COST_PLAN)
                 .eq("del_flag", CbProjectConstants.DELETE_FLAG_EXIST)
                 .orderByDesc("update_time");
         return TableDataInfo.build(baseMapper.selectPageDraftDialogList(pageQuery.build(), wrapper));

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CbQuantitySummaryServiceImpl.java

@@ -59,27 +59,36 @@ public class CbQuantitySummaryServiceImpl extends ServiceImpl<CbQuantitySummaryM
         List<Map<String, Object>> resultList = new ArrayList<>();
         List<Map<String, Object>> list = baseMapper.selectSubject(bo);
         if (!ObjectUtils.isEmpty(list)) {
-            Map<String, Map<String, Map<String, List<Map<String, Object>>>>> map = list.stream()
+            Map<String, Map<String, Map<String, Map<String, List<Map<String, Object>>>>>> map = list.stream()
                     .collect(
                             Collectors.groupingBy(item -> item.get("one").toString(),
                                     Collectors.groupingBy(item -> item.get("two").toString(),
-                                            Collectors.groupingBy(item -> item.get("three").toString()))));
+                                            Collectors.groupingBy(item -> item.get("three").toString(),
+                                                    Collectors.groupingBy(item -> item.get("four").toString()
+                                                    )))));
             Map<String, Object> resMap = new HashMap<>();
             List<Map<String, Object>> resList = new ArrayList<>();
             resMap.put("name", "房建类成本科目");
             resMap.put("sort", 1);
-            for (Map.Entry<String, Map<String, Map<String, List<Map<String, Object>>>>> entry : map.entrySet()) {
+            for (Map.Entry<String, Map<String, Map<String, Map<String, List<Map<String, Object>>>>>> entry : map.entrySet()) {
                 Map<String, Object> oneMap = new HashMap<>();
                 List<Map<String, Object>> oneList = new ArrayList<>();
                 oneMap.put("name", entry.getKey());
                 oneMap.put("sort", cbSubjectMapper.selectOne(Wrappers.<CbSubject>lambdaQuery().eq(CbSubject::getCbSubjectName, entry.getKey())).getSort());
-                for (Map.Entry<String, Map<String, List<Map<String, Object>>>> twoEntry : entry.getValue().entrySet()) {
+                for (Map.Entry<String, Map<String, Map<String, List<Map<String, Object>>>>> twoEntry : entry.getValue().entrySet()) {
                     Map<String, Object> twoMap = new HashMap<>();
                     List<Map<String, Object>> twoList = new ArrayList<>();
                     twoMap.put("name", twoEntry.getKey());
-                    for (Map.Entry<String, List<Map<String, Object>>> threeEntry : twoEntry.getValue().entrySet()) {
+                    for (Map.Entry<String, Map<String, List<Map<String, Object>>>> threeEntry : twoEntry.getValue().entrySet()) {
                         Map<String, Object> threeMap = new HashMap<>();
+                        List<Map<String, Object>> threeList = new ArrayList<>();
                         threeMap.put("name", threeEntry.getKey());
+                        for (Map.Entry<String, List<Map<String, Object>>> fourEntry : threeEntry.getValue().entrySet()) {
+                            Map<String, Object> fourMap = new HashMap<>();
+                            fourMap.put("name", fourEntry.getKey());
+                            threeList.add(fourMap);
+                        }
+                        threeMap.put("children", threeList);
                         twoList.add(threeMap);
                     }
                     twoMap.put("children", twoList);
@@ -109,13 +118,52 @@ public class CbQuantitySummaryServiceImpl extends ServiceImpl<CbQuantitySummaryM
 
     @Override
     public List<CbQuantitySummaryListVo> subjectList(CbQuantitySummaryListBo bo) {
-        if(ObjectUtils.isEmpty(bo.getRecordDate())){
+        if (ObjectUtils.isEmpty(bo.getRecordDate())) {
             //默认当前月
             bo.setRecordDate(DatePattern.SIMPLE_MONTH_FORMAT.format(new Date()));
         }
         if (ObjectUtils.isEmpty(bo.getProjectId())) throw new BeanException("项目id不能为空！");
         if (ObjectUtils.isEmpty(bo.getCbStage())) throw new BeanException("成本阶段不能为空！");
-        return baseMapper.selectListBySubject(bo);
+        List<CbQuantitySummaryListVo> listVo = baseMapper.selectListBySubject(bo);
+        //超出计划成本合价(不含税)的集合
+        List<CbQuantitySummaryListVo> outList = new ArrayList<>();
+        //未超出计划成本合价(不含税)的集合
+        List<CbQuantitySummaryListVo> notOutList = new ArrayList<>();
+        listVo.forEach(vo -> {
+            if (ObjectUtil.isNotNull(vo.getPushQuantities())) {
+                //实际成本合价(不含税)
+                vo.setActualCombinedPrice(vo.getQuantity() * vo.getPushQuantities());
+            } else {
+                //实际成本合价(不含税)
+                vo.setActualCombinedPrice(
+                        (ObjectUtil.isNull(vo.getPurchaseUnitPrice()) ? 0.0 : vo.getPurchaseUnitPrice())
+                                *
+                                (ObjectUtil.isNull(vo.getPushQuantities()) ? 0.0 : vo.getPushQuantities())
+                );
+            }
+
+            //如果实际成本合价(不含税)超出了计划成本合价(不含税),则设置标识,以便前端标红
+            Double combinedPrice = ObjectUtil.isNull(vo.getCombinedPrice()) ? 0.0 : vo.getCombinedPrice();
+            if (vo.getActualCombinedPrice().compareTo(combinedPrice) > 0) {
+                //vo.setActualCombinedPrice(Double.parseDouble(StringUtils.markInRed(vo.getActualCombinedPrice().toString(), vo.getActualCombinedPrice().toString())));
+                vo.setIsActualGreaterThanPlan(true);
+                outList.add(vo);
+            } else {
+                vo.setIsActualGreaterThanPlan(false);
+                notOutList.add(vo);
+            }
+        });
+
+        //筛选是否超出计划成本合价(不含税)
+        Boolean flag = bo.getIsOutPlanCostCombinedPrice();
+        if (ObjectUtil.isNotNull(flag)) {
+            if (flag) {
+                return outList;
+            } else {
+                return notOutList;
+            }
+        }
+        return listVo;
     }
 
     @Override
@@ -190,5 +238,20 @@ public class CbQuantitySummaryServiceImpl extends ServiceImpl<CbQuantitySummaryM
         }
         return R.ok();
     }
+
+    /**
+     * 修改工程量
+     */
+    @Override
+    public Boolean editEngineeringQuantity(CbQuantitySummaryActual bo) {
+        if (ObjectUtils.isEmpty(bo.getId())) throw new BeanException("id不能为空！");
+        if (ObjectUtils.isEmpty(bo.getPushQuantities())) throw new BeanException("修改后的工程量不能为空！");
+        boolean update = baseActualService.updateById(bo);
+        if (!update) {
+            log.error("CbQuantitySummaryServiceImpl.editEngineeringQuantity() data update error! data:" + JSONUtil.toJsonStr(bo));
+            throw new ServiceException("数据更新错误！");
+        }
+        return update;
+    }
 }
 

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/CustomerInfoServiceImpl.java

@@ -73,10 +73,6 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
                 if(!ObjectUtils.isEmpty(bo.getCustomerName())){
                     item.setCustomerName(StringUtils.markInRed(item.getCustomerName(), bo.getCustomerName()));
                 }
-                //关键字标红
-                if(!ObjectUtils.isEmpty(bo.getLeaderName())){
-                    item.setCustomerName(StringUtils.markInRed(item.getLeaderName(), bo.getLeaderName()));
-                }
                 try {
                     Map<String, Object> map = opportunityRadarService.enterpriseByName(item.getCustomerName());
                     if (!ObjectUtils.isEmpty(map.get("data"))) {
@@ -87,6 +83,10 @@ public class CustomerInfoServiceImpl extends ServiceImpl<DCustomerMapper, DCusto
                 }catch (Exception e){
                     log.error("CustomerInfoServiceImpl.queryPageList() error:" + e);
                 }
+                //关键字标红
+                if(!ObjectUtils.isEmpty(bo.getLeaderName())){
+                    item.setCustomerName(StringUtils.markInRed(item.getLeaderName(), bo.getLeaderName()));
+                }
             });
         }
         return TableDataInfo.build(page);

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/IDProjectServiceImpl.java

@@ -273,8 +273,8 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
                     .eq(DProject::getProjectCode, projectCode));
         } else {
             CbProjectRecord projectRecord = projectRecordMapper.selectById(projectId);
-            //未做任何改动时
-            Assert.isFalse(projectCode.equals(projectRecord.getIpmProjectNo()), "新编码与旧编码相同");
+            ////未做任何改动时
+            //Assert.isFalse(projectCode.equals(projectRecord.getIpmProjectNo()), "新编码与旧编码相同");
             //修改项目信息or新增新阶段项目时
             if (projectCode.equals(projectRecord.getIpmProjectNo())
                     && projectRecord.getIsGetProjectDetail()) {
@@ -297,7 +297,9 @@ public class IDProjectServiceImpl extends ServiceImpl<DProjectMapper, DProject>
     @Override
     public CbProjectInfoVo getCbProjectInfo(Long projectId) {
         CbProjectRecord projectRecord = projectRecordMapper.selectById(projectId);
-        Assert.isTrue(projectRecord.getIsGetProjectDetail(), "请先通过IPM项目编码获取数据,或IPM项目编码无效");
+        if (!projectRecord.getIsGetProjectDetail()) {
+            return null;
+        }
         return BeanUtil.toBean(baseMapper.selectOne(new LambdaQueryWrapper<DProject>()
                 .eq(DProject::getProjectCode, projectRecord.getIpmProjectNo())), CbProjectInfoVo.class);
     }

dsk-module/dsk-biz-api/src/main/java/com/dsk/cscec/service/impl/SMaterielProjectServiceImpl.java

+package com.dsk.cscec.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dsk.cscec.domain.SMaterielProject;
+import com.dsk.cscec.mapper.SMaterielProjectMapper;
+import com.dsk.cscec.service.ISMaterielProjectService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author lcl
+ * @Data 2024/3/15 10:00
+ */
+@Service
+public class SMaterielProjectServiceImpl extends ServiceImpl<SMaterielProjectMapper, SMaterielProject> implements ISMaterielProjectService{
+}

dsk-module/dsk-biz-api/src/main/resources/auth/auth.lic

+Fsj/9hmISdE3AkSo8tpwb2an4K+BGCrN5xafwa0p3ej89iE7bllHhR1WU25d+UVI23K9ib+YYOoYqdPpodi1tm5G1AELKEEOhXAb5cAohVJ7Z7a7ABEw4hf39qLy3AjCTWsn8XBJmszNvx9gPZ+6mUGgqOEnuwNa+smkEtV24QXqPfB+wugDXLOMB6GK/GLRzDe5vbbLEWHzoKCbZloAgnMJqfjlBrgfekQRPwwASfsreQsWCeOcuh7ValPaj7/s9fuaDqg3nSTUXZwnORiteC2BH6PJa41hKVDRGgOEZMtXROcD01LizyjbstdQE0EnCJsk3P76zvzaY2w547NCmyqwhl9sCmpoB+CbAVctDR2DXnVg22Y2QdHDe0eoa66dFR/FCZaD1/LTM/xbIGZaZ3kJyP8XzQYtrzq5Go6WkpMUSOeRcjJ4JlNPU7oN67P4AAHiG6sI5n6hZTr+6InpPoCMvqPbcyNanrc+Eo7h3ToqF0XyU9uzblgcZbRtCuvmERvoZ/siTQhl/bTntG71NsA2WT3SnWsAf0MrwlkJqnwErn1ynit5nfeStDeX2+vfL16UCvDDnCG1JU2GcbYYK3dAkPXlADD6lp//s2TJuRzeeBlGfp88rSDS5EmcwSmn1F1ZoVipP7M92vmWq4bO1sowqEaHJmXmMP99WfUiW9KYGZa223CJONINBFEH1IlDrzJ1yh79uE2KxP3E9n00RX6SjZ/TbJWVTgBP5t9oXeASFIMqetdP8ZfgjwsiL0J1ag1uYMbbbmS8nJDL13O2sII6YTPDQ2qcW/9a2Iy/MwILHENplZpWZn1ifmZifsqASVlenVnjy2brnoGXLFS0hbynVRAzt44MDHonOzHsvZ4e4ZfXU55YoBNJRPe6oLgRUCxPsA2LjXWgH5YNa9pJya0XQeI69h876z+w6fg2dFGabJdB+2dE/JTOw2J8gbfjG9N9Lf8FawtLAr5GIEFLzXpr/QusnmYzuIbXN0fxn/7f6DLArS9uABaiuNVDjDrCVuMGNyrgtIgo8rIShuZjU+7uIE3xsD6srnZ7EvV1fA+SATk+XgWNmgMaiPriRDj2y1mTOIXRWtLGHFaCi2w6yA==
\ No newline at end of file

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

@@ -13,6 +13,8 @@
         cpr.ipm_project_no,
         cpr.is_get_project_detail,
         cpr.project_file_name,
+        cpr.del_flag,
+        cpr.create_by,
         cpr.create_time
         from cb_project_record cpr
         where cpr.del_flag=#{deleteFlagExist}
@@ -30,6 +32,10 @@
         </if>
         and
         cpr.project_file_status != #{projectFileStatusPreparing}
+        or
+        cpr.cb_stage = #{cbStageNoCostPlan}
+        and
+        cpr.del_flag=#{deleteFlagExist}
         order by cpr.cb_stage desc) a
         group by a.related_id
         order by a.create_time desc

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

@@ -3,12 +3,12 @@
 <mapper namespace="com.dsk.cscec.mapper.CbQuantitySummaryMapper">
     <insert id="batchInsert" parameterType="com.dsk.cscec.domain.CbQuantitySummary">
         INSERT INTO cscec_bms.cb_quantity_summary
-        (project_id, `number`, cb_stage, cb_subject_name, company_no, org_no, cb_name, job_content,
+        (project_id, `number`, cb_stage, cb_subject_name, cb_subject_no, company_no, org_no, cb_name, job_content,
         calculation_rule, unit, material_description, guide_price, bid_unit_price, unit_price_difference, quantity,
         combined_price, combined_price_tax, brand_name, bid_source, remark, cb_project_file_id)
         VALUES
         <foreach collection="list" item="item" separator="," >
-            (#{item.projectId}, #{item.number}, #{item.cbStage}, #{item.cbSubjectName}, #{item.companyNo}, #{item.orgNo}, #{item.cbName},
+            (#{item.projectId}, #{item.number}, #{item.cbStage}, #{item.cbSubjectName}, #{item.cbSubjectNo}, #{item.companyNo}, #{item.orgNo}, #{item.cbName},
             #{item.jobContent},#{item.calculationRule},#{item.unit},#{item.materialDescription},#{item.guidePrice},
             #{item.bidUnitPrice},#{item.unitPriceDifference},#{item.quantity},#{item.combinedPrice},#{item.combinedPriceTax},
             #{item.brandName},#{item.bidSource},#{item.remark},#{item.cbProjectFileId})
@@ -17,13 +17,46 @@
 
     <select id="selectSubject" resultType="java.util.Map">
         select
-            cs1.cb_subject_name as one, cs2.cb_subject_name as two, cs3.cb_subject_name as three
+            cs1.cb_subject_name as one, cs2.cb_subject_name as two, cs3.cb_subject_name as three , '' as four
         from cb_subject cs1
         join cb_subject cs2 on (cs2.cb_subject_no like concat(cs1.cb_subject_no,'%') and cs2.`level` = 2 )
         join cb_subject cs3 on (cs3.cb_subject_no like concat(cs2.cb_subject_no,'%') and cs3.`level` = 3 )
         join cb_quantity_summary cqs on (cqs.cb_subject_name = cs3.cb_subject_name and cqs.del_falg = 0 and cqs.project_id = #{projectId} and cqs.cb_stage = #{cbStage} )
-        where cs1.`level` = 1
+        where cs1.`level` = 1 and cs1.cb_subject_no != 'CL'
         group by cs1.cb_subject_name,cs2.cb_subject_name,cs3.cb_subject_name
+
+            union all
+
+        select
+            cs1.cb_subject_name as one, cs2.cb_subject_name as two, '' as three, '' as four
+        from cb_subject cs1
+        join cb_subject cs2 on (cs2.cb_subject_no like concat(cs1.cb_subject_no,'%') and cs2.`level` = 2 )
+        join cb_quantity_summary cqs on (cqs.cb_subject_no = cs2.cb_subject_no and cqs.del_falg = 0 and cqs.project_id = #{projectId} and cqs.cb_stage = #{cbStage} )
+        where cs1.`level` = 1 and cs1.cb_subject_no = 'CL'
+        group by cs1.cb_subject_name,cs2.cb_subject_name
+
+			union all
+
+		select
+            cs1.cb_subject_name as one, cs2.cb_subject_name as two, cs3.cb_subject_name as three, '' as four
+        from cb_subject cs1
+        join cb_subject cs2 on (cs2.cb_subject_no like concat(cs1.cb_subject_no,'%') and cs2.`level` = 2 )
+        join cb_subject cs3 on (cs3.cb_subject_no like concat(cs2.cb_subject_no,'%') and cs3.`level` = 3 )
+        join cb_quantity_summary cqs on (cqs.cb_subject_no = cs3.cb_subject_no and cqs.del_falg = 0 and cqs.project_id = #{projectId} and cqs.cb_stage = #{cbStage} )
+        where cs1.`level` = 1 and cs1.cb_subject_no = 'CL'
+        group by cs1.cb_subject_name,cs2.cb_subject_name,cs3.cb_subject_name
+
+				union all
+
+		select
+            cs1.cb_subject_name as one, cs2.cb_subject_name as two, cs3.cb_subject_name as three, cs4.cb_subject_name as four
+        from cb_subject cs1
+        join cb_subject cs2 on (cs2.cb_subject_no like concat(cs1.cb_subject_no,'%') and cs2.`level` = 2 )
+        join cb_subject cs3 on (cs3.cb_subject_no like concat(cs2.cb_subject_no,'%') and cs3.`level` = 3 )
+        join cb_subject cs4 on (cs4.cb_subject_no like concat(cs3.cb_subject_no,'%') and cs4.`level` = 4 )
+        join cb_quantity_summary cqs on (cqs.cb_subject_no = cs4.cb_subject_no and cqs.del_falg = 0 and cqs.project_id = #{projectId} and cqs.cb_stage = #{cbStage} )
+        where cs1.`level` = 1 and cs1.cb_subject_no = 'CL'
+        group by cs1.cb_subject_name,cs2.cb_subject_name,cs3.cb_subject_name,cs4.cb_subject_name
     </select>
 
     <select id="selectOtherSubjectCount" resultType="java.lang.Integer">

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

@@ -134,12 +134,12 @@
 
     <select id="getGainLossAnalysisById" resultType="com.dsk.cscec.domain.vo.CbGainLossAnalysisListVo">
         select csu.id, csu.cb_name, csu.tax_exclusive_total, csu.cb_taxes_total, csu.tax_inclusive_total, csa.tax_inclusive_expense, csa.tax_exclusive_expense,
-            sum(cde.tender_control_sum_price) tenderSumPrice, sum(cde.exclude_tax_cb_sum_price) taxExcludeTenderSumPrice, sum(cde.include_tax_cb_sum_price) taxIncludeTenderSumPrice,
+--             sum(cde.tender_control_sum_price) tenderSumPrice, sum(cde.exclude_tax_cb_sum_price) taxExcludeTenderSumPrice, sum(cde.include_tax_cb_sum_price) taxIncludeTenderSumPrice,
             sum(csa1.tax_inclusive_expense) sumTaxInclusiveExpense, sum(csa1.tax_exclusive_expense) sumTaxExclusiveExpense
         from cb_summary csu
         left join cb_summary_actual csa on (csu.id = csa.cb_summary_id and csa.expense_date = #{expenseDate}  AND csa.del_flag = 0)
         left join cb_summary_actual csa1 on (csu.id = csa1.cb_summary_id and csa1.expense_date &lt;= #{expenseDate}  AND csa1.del_flag = 0)
-        left join cb_direct_expense cde on (csu.project_id = cde.project_id and cde.del_flag = 0)
+--         left join cb_direct_expense cde on (csu.project_id = cde.project_id and cde.del_flag = 0)
         where csu.id = #{id} and csu.del_flag = 0
         group by csu.id
         order by csu.sort
@@ -147,12 +147,12 @@
 
     <select id="getGainLossAnalysisByParentId" resultType="com.dsk.cscec.domain.vo.CbGainLossAnalysisListVo">
         select csu.id, csu.cb_name, csu.tax_exclusive_total, csu.cb_taxes_total, csu.tax_inclusive_total, csa.tax_inclusive_expense, csa.tax_exclusive_expense,
-            sum(cde.tender_control_sum_price) tenderSumPrice, sum(cde.exclude_tax_cb_sum_price) taxExcludeTenderSumPrice, sum(cde.include_tax_cb_sum_price) taxIncludeTenderSumPrice,
+--             sum(cde.tender_control_sum_price) tenderSumPrice, sum(cde.exclude_tax_cb_sum_price) taxExcludeTenderSumPrice, sum(cde.include_tax_cb_sum_price) taxIncludeTenderSumPrice,
             sum(csa1.tax_inclusive_expense) sumTaxInclusiveExpense, sum(csa1.tax_exclusive_expense) sumTaxExclusiveExpense
         from cb_summary csu
         left join cb_summary_actual csa on (csu.id = csa.cb_summary_id and csa.expense_date = #{expenseDate}  AND csa.del_flag = 0)
         left join cb_summary_actual csa1 on (csu.id = csa1.cb_summary_id and csa1.expense_date &lt;= #{expenseDate}  AND csa1.del_flag = 0)
-        left join cb_direct_expense cde on (csu.project_id = cde.project_id  and cde.del_flag = 0)
+--         left join cb_direct_expense cde on (csu.project_id = cde.project_id  and cde.del_flag = 0)
         where csu.parent_id = #{parentId} and csu.del_flag = 0
         group by csu.id
         order by csu.sort

dsk-operate-ui/src/api/projectCostLedger/index.js

@@ -274,6 +274,13 @@ export const pushFeedSummaryRowsApi = (data) => request({
   data
 });
 
+//修改工程用量
+export const editEngineeringQuantityApi = (data) => request({
+  url: "/cb/quantity/summary/editEngineeringQuantity",
+  method: "POST",
+  data
+});
+
 
 
 //工程项目信息
@@ -383,8 +390,8 @@ export const getFieldExpensesOtherListApi = (params = {}) => request({
 
 /**
  * 成本汇总左侧一级菜单
- * @param {*} params 
- * @returns 
+ * @param {*} params
+ * @returns
  */
 export const getCostSummaryMenuTreeApi = (params = {}) => request({
   url: "/cbSummary/cbNameList",
@@ -394,8 +401,8 @@ export const getCostSummaryMenuTreeApi = (params = {}) => request({
 
 /**
  * 成本汇总已添加成本月份
- * @param {*} params 
- * @returns 
+ * @param {*} params
+ * @returns
  */
 export const getCostSummaryMonthListApi = (params = {}) => request({
   url: "/cbSummary/expenseDateList",
@@ -405,8 +412,8 @@ export const getCostSummaryMonthListApi = (params = {}) => request({
 
 /**
  * 获取成本汇总数据列表 懒加载
- * @param {*} params 
- * @returns 
+ * @param {*} params
+ * @returns
  */
 export const getCostSummaryListApi = (params = {}) => request({
   url: "/cbSummary/list",
@@ -416,8 +423,8 @@ export const getCostSummaryListApi = (params = {}) => request({
 
 /**
  * 获取全量成本汇总列表
- * @param {*} params 
- * @returns 
+ * @param {*} params
+ * @returns
  */
 export const getCostSummaryAllListApi = (params = {}) => request({
   url: "/cbSummary/allList",
@@ -427,8 +434,8 @@ export const getCostSummaryAllListApi = (params = {}) => request({
 
 /**
  * 锁定成本前提示未填项
- * @param {*} params 
- * @returns 
+ * @param {*} params
+ * @returns
  */
 export const validateBeforeCostLockApi = (params = {}) => request({
   url: "/cbSummary/getUnfilled",
@@ -438,8 +445,8 @@ export const validateBeforeCostLockApi = (params = {}) => request({
 
 /**
  * 确定锁定成本
- * @param {*} data 
- * @returns 
+ * @param {*} data
+ * @returns
  */
 export const setCostLockApi = (data = {}) => request({
   url: "/cbSummary/lockActual",
@@ -449,8 +456,8 @@ export const setCostLockApi = (data = {}) => request({
 
 /**
  * 获取已经锁定成本月份
- * @param {*} params 
- * @returns 
+ * @param {*} params
+ * @returns
  */
 export const getLockMonthListApi = (params = {}) => request({
   url: "/cbSummary/expenseDateList/locked",
@@ -460,8 +467,8 @@ export const getLockMonthListApi = (params = {}) => request({
 
 /**
  * 成本汇总导出
- * @param {*} data 
- * @returns 
+ * @param {*} data
+ * @returns
  */
 export const exportCostLockExcelApi = (data = {}) => request({
   url: "/cbSummary/export",
@@ -473,8 +480,8 @@ export const exportCostLockExcelApi = (data = {}) => request({
 
 /**
  * 编辑成本 保存成本
- * @param {*} data 
- * @returns 
+ * @param {*} data
+ * @returns
  */
 export const saveCostModifyApi = (data = {}) => request({
   url: "/cbSummary/editActual",

dsk-operate-ui/src/assets/icons/svg/bigDataTag.svg

-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_233_92225/11_04941"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_233_92225/11_04941)"><g><path d="M0.5,3.5L0.5,12.5Q0.5,13.1213,0.93934,13.5607Q1.3786800000000001,14,2,14L14,14Q14.6213,14,15.0607,13.5607Q15.5,13.1213,15.5,12.5L15.5,3.5Q15.5,2.878679,15.0607,2.4393399Q14.6213,2,14,2L2,2Q1.3786800000000001,2,0.9393398,2.4393399Q0.5,2.87868,0.5,3.5ZM1.646447,12.8536Q1.5,12.7071,1.5,12.5L1.5,3.5Q1.5,3.292893,1.646447,3.146447Q1.7928929999999998,3,2,3L14,3Q14.2071,3,14.3536,3.146447Q14.5,3.292894,14.5,3.5L14.5,12.5Q14.5,12.7071,14.3536,12.8536Q14.2071,13,14,13L2,13Q1.792894,13,1.646447,12.8536Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M7.5,10L7.5,11Q7.5,11.04925,7.509607,11.09755Q7.519215,11.14585,7.53806,11.19134Q7.556906,11.23684,7.584265,11.27779Q7.611625,11.31873,7.646447,11.35356Q7.681269,11.38838,7.722215,11.41574Q7.763161,11.4431,7.808658,11.46194Q7.854155,11.48079,7.9024549,11.49039Q7.9507543,11.5,8,11.5Q8.0492457,11.5,8.0975451,11.49039Q8.145845,11.48079,8.191342,11.46194Q8.236839,11.4431,8.277785,11.41574Q8.318731,11.38838,8.353553,11.35356Q8.388375,11.31873,8.415735,11.27779Q8.443094,11.23684,8.46194,11.19134Q8.480785000000001,11.14585,8.490393,11.09755Q8.5,11.04925,8.5,11L8.5,10Q8.5,9.9507543,8.490393,9.9024549Q8.480785000000001,9.854155,8.46194,9.808658Q8.443094,9.763161,8.415735,9.722215Q8.388375,9.681269,8.353553,9.646447Q8.318731,9.611625,8.277785,9.584265Q8.236839,9.556906,8.191342,9.53806Q8.145845,9.519214999999999,8.0975451,9.509607Q8.0492457,9.5,8,9.5Q7.9507543,9.5,7.9024549,9.509607Q7.854155,9.519214999999999,7.808658,9.53806Q7.763161,9.556906,7.722215,9.584265Q7.681269,9.611625,7.646447,9.646447Q7.611625,9.681269,7.584265,9.722215Q7.556906,9.763161,7.53806,9.808658Q7.519215,9.854155,7.509607,9.9024549Q7.5,9.9507543,7.5,10Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M5.5,9L5.5,11Q5.5,11.04925,5.509607,11.09754Q5.519215,11.14584,5.53806,11.19134Q5.556906,11.23684,5.584265,11.27778Q5.611625,11.31873,5.646447,11.35355Q5.681269,11.38838,5.722215,11.41573Q5.763161,11.44309,5.808658,11.46194Q5.854155,11.48078,5.9024549,11.49039Q5.9507543,11.5,6,11.5Q6.0492457,11.5,6.0975451,11.49039Q6.145845,11.48078,6.191342,11.46194Q6.236839,11.44309,6.277785,11.41573Q6.318731,11.38838,6.353553,11.35355Q6.388375,11.31873,6.415735,11.27779Q6.443094,11.23684,6.46194,11.19134Q6.480785,11.14584,6.490393,11.09754Q6.5,11.04925,6.5,11L6.5,9Q6.5,8.9507543,6.490393,8.9024549Q6.480785,8.854155,6.46194,8.808658Q6.443094,8.763161,6.415735,8.722215Q6.388375,8.681269,6.353553,8.646447Q6.318731,8.611625,6.277785,8.584265Q6.236839,8.556906,6.191342,8.53806Q6.145845,8.519214999999999,6.0975451,8.509607Q6.0492457,8.5,6,8.5Q5.9507543,8.5,5.9024549,8.509607Q5.854155,8.519214999999999,5.808658,8.53806Q5.763161,8.556906,5.722215,8.584265Q5.681269,8.611625,5.646447,8.646447Q5.611625,8.681269,5.584265,8.722215Q5.556906,8.763161,5.53806,8.808658Q5.519215,8.854155,5.509607,8.9024549Q5.5,8.9507543,5.5,9Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M3.5,7L3.5,11Q3.5,11.04925,3.509607,11.09755Q3.519215,11.14584,3.5380599999999998,11.19134Q3.556906,11.23684,3.584265,11.27778Q3.611625,11.31873,3.646447,11.35355Q3.681269,11.38837,3.722215,11.41573Q3.763161,11.44309,3.808658,11.46194Q3.854155,11.48078,3.9024549,11.49039Q3.9507543,11.5,4,11.5Q4.0492457,11.5,4.0975451,11.49039Q4.145845,11.48078,4.191342,11.46194Q4.236839,11.44309,4.277785,11.41573Q4.318731,11.38837,4.353553,11.35355Q4.388375,11.31873,4.415735,11.27778Q4.443094,11.23684,4.46194,11.19134Q4.480785,11.14584,4.490393,11.09755Q4.5,11.04925,4.5,11L4.5,7Q4.5,6.9507543,4.490393,6.9024549Q4.480785,6.854155,4.46194,6.808658Q4.443094,6.763161,4.415735,6.722215Q4.388375,6.681269,4.353553,6.646447Q4.318731,6.611625,4.277785,6.584265Q4.236839,6.556906,4.191342,6.53806Q4.145845,6.519215,4.0975451,6.509607Q4.0492457,6.5,4,6.5Q3.9507543,6.5,3.9024549,6.509607Q3.854155,6.519215,3.808658,6.53806Q3.763161,6.556906,3.722215,6.584265Q3.681269,6.611625,3.646447,6.646447Q3.611625,6.681269,3.584265,6.722215Q3.556906,6.763161,3.5380599999999998,6.808658Q3.519215,6.854155,3.509607,6.9024549Q3.5,6.9507543,3.5,7Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g><ellipse cx="10.3787841796875" cy="6.1363677978515625" rx="1.5" ry="1.5" fill-opacity="0" stroke-opacity="1" stroke="#FFFFFF" fill="none" stroke-width="1"/></g><g><path d="M11.5252901796875,7.989980797851563L12.5252311796875,8.989917797851563Q12.5955571796875,9.060247797851563,12.6874421796875,9.098307797851563Q12.7793281796875,9.136367797851562,12.8787841796875,9.136367797851562Q12.9782441796875,9.136367797851562,13.0701241796875,9.098307797851563Q13.1620141796875,9.060247797851563,13.2323341796875,8.989917797851563Q13.3026641796875,8.919597797851562,13.3407241796875,8.827707797851563Q13.3787841796875,8.735827797851563,13.3787841796875,8.636367797851562Q13.3787841796875,8.536911797851563,13.3407241796875,8.445025797851562Q13.3026641796875,8.353140797851562,13.2323341796875,8.282814797851563L12.2323971796875,7.282873797851563L12.2323371796875,7.282814797851563Q12.1620111796875,7.212487797851563,12.0701261796875,7.174427797851562Q11.9782403796875,7.1363677978515625,11.8787841796875,7.1363677978515625Q11.7793279796875,7.1363677978515625,11.6874421796875,7.174427797851562Q11.5955571796875,7.212487797851563,11.5252311796875,7.282814797851563Q11.4549041796875,7.353140797851562,11.4168441796875,7.445025797851563Q11.3787841796875,7.536911597851563,11.3787841796875,7.6363677978515625Q11.3787841796875,7.735823997851562,11.4168441796875,7.827709797851562Q11.4549041796875,7.919594797851563,11.5252311796875,7.989920797851562L11.5252901796875,7.989980797851563Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_233_92225/11_04941"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_233_92225/11_04941)"><g><path d="M0.5,3.5L0.5,12.5Q0.5,13.1213,0.93934,13.5607Q1.3786800000000001,14,2,14L14,14Q14.6213,14,15.0607,13.5607Q15.5,13.1213,15.5,12.5L15.5,3.5Q15.5,2.878679,15.0607,2.4393399Q14.6213,2,14,2L2,2Q1.3786800000000001,2,0.9393398,2.4393399Q0.5,2.87868,0.5,3.5ZM1.646447,12.8536Q1.5,12.7071,1.5,12.5L1.5,3.5Q1.5,3.292893,1.646447,3.146447Q1.7928929999999998,3,2,3L14,3Q14.2071,3,14.3536,3.146447Q14.5,3.292894,14.5,3.5L14.5,12.5Q14.5,12.7071,14.3536,12.8536Q14.2071,13,14,13L2,13Q1.792894,13,1.646447,12.8536Z" fill-rule="evenodd"  fill-opacity="1"/></g><g><path d="M7.5,10L7.5,11Q7.5,11.04925,7.509607,11.09755Q7.519215,11.14585,7.53806,11.19134Q7.556906,11.23684,7.584265,11.27779Q7.611625,11.31873,7.646447,11.35356Q7.681269,11.38838,7.722215,11.41574Q7.763161,11.4431,7.808658,11.46194Q7.854155,11.48079,7.9024549,11.49039Q7.9507543,11.5,8,11.5Q8.0492457,11.5,8.0975451,11.49039Q8.145845,11.48079,8.191342,11.46194Q8.236839,11.4431,8.277785,11.41574Q8.318731,11.38838,8.353553,11.35356Q8.388375,11.31873,8.415735,11.27779Q8.443094,11.23684,8.46194,11.19134Q8.480785000000001,11.14585,8.490393,11.09755Q8.5,11.04925,8.5,11L8.5,10Q8.5,9.9507543,8.490393,9.9024549Q8.480785000000001,9.854155,8.46194,9.808658Q8.443094,9.763161,8.415735,9.722215Q8.388375,9.681269,8.353553,9.646447Q8.318731,9.611625,8.277785,9.584265Q8.236839,9.556906,8.191342,9.53806Q8.145845,9.519214999999999,8.0975451,9.509607Q8.0492457,9.5,8,9.5Q7.9507543,9.5,7.9024549,9.509607Q7.854155,9.519214999999999,7.808658,9.53806Q7.763161,9.556906,7.722215,9.584265Q7.681269,9.611625,7.646447,9.646447Q7.611625,9.681269,7.584265,9.722215Q7.556906,9.763161,7.53806,9.808658Q7.519215,9.854155,7.509607,9.9024549Q7.5,9.9507543,7.5,10Z" fill-rule="evenodd"  fill-opacity="1"/></g><g><path d="M5.5,9L5.5,11Q5.5,11.04925,5.509607,11.09754Q5.519215,11.14584,5.53806,11.19134Q5.556906,11.23684,5.584265,11.27778Q5.611625,11.31873,5.646447,11.35355Q5.681269,11.38838,5.722215,11.41573Q5.763161,11.44309,5.808658,11.46194Q5.854155,11.48078,5.9024549,11.49039Q5.9507543,11.5,6,11.5Q6.0492457,11.5,6.0975451,11.49039Q6.145845,11.48078,6.191342,11.46194Q6.236839,11.44309,6.277785,11.41573Q6.318731,11.38838,6.353553,11.35355Q6.388375,11.31873,6.415735,11.27779Q6.443094,11.23684,6.46194,11.19134Q6.480785,11.14584,6.490393,11.09754Q6.5,11.04925,6.5,11L6.5,9Q6.5,8.9507543,6.490393,8.9024549Q6.480785,8.854155,6.46194,8.808658Q6.443094,8.763161,6.415735,8.722215Q6.388375,8.681269,6.353553,8.646447Q6.318731,8.611625,6.277785,8.584265Q6.236839,8.556906,6.191342,8.53806Q6.145845,8.519214999999999,6.0975451,8.509607Q6.0492457,8.5,6,8.5Q5.9507543,8.5,5.9024549,8.509607Q5.854155,8.519214999999999,5.808658,8.53806Q5.763161,8.556906,5.722215,8.584265Q5.681269,8.611625,5.646447,8.646447Q5.611625,8.681269,5.584265,8.722215Q5.556906,8.763161,5.53806,8.808658Q5.519215,8.854155,5.509607,8.9024549Q5.5,8.9507543,5.5,9Z" fill-rule="evenodd"  fill-opacity="1"/></g><g><path d="M3.5,7L3.5,11Q3.5,11.04925,3.509607,11.09755Q3.519215,11.14584,3.5380599999999998,11.19134Q3.556906,11.23684,3.584265,11.27778Q3.611625,11.31873,3.646447,11.35355Q3.681269,11.38837,3.722215,11.41573Q3.763161,11.44309,3.808658,11.46194Q3.854155,11.48078,3.9024549,11.49039Q3.9507543,11.5,4,11.5Q4.0492457,11.5,4.0975451,11.49039Q4.145845,11.48078,4.191342,11.46194Q4.236839,11.44309,4.277785,11.41573Q4.318731,11.38837,4.353553,11.35355Q4.388375,11.31873,4.415735,11.27778Q4.443094,11.23684,4.46194,11.19134Q4.480785,11.14584,4.490393,11.09755Q4.5,11.04925,4.5,11L4.5,7Q4.5,6.9507543,4.490393,6.9024549Q4.480785,6.854155,4.46194,6.808658Q4.443094,6.763161,4.415735,6.722215Q4.388375,6.681269,4.353553,6.646447Q4.318731,6.611625,4.277785,6.584265Q4.236839,6.556906,4.191342,6.53806Q4.145845,6.519215,4.0975451,6.509607Q4.0492457,6.5,4,6.5Q3.9507543,6.5,3.9024549,6.509607Q3.854155,6.519215,3.808658,6.53806Q3.763161,6.556906,3.722215,6.584265Q3.681269,6.611625,3.646447,6.646447Q3.611625,6.681269,3.584265,6.722215Q3.556906,6.763161,3.5380599999999998,6.808658Q3.519215,6.854155,3.509607,6.9024549Q3.5,6.9507543,3.5,7Z" fill-rule="evenodd"  fill-opacity="1"/></g><g><ellipse cx="10.3787841796875" cy="6.1363677978515625" rx="1.5" ry="1.5" fill-opacity="0" stroke-opacity="1" stroke="#FFFFFF" fill="none" stroke-width="1"/></g><g><path d="M11.5252901796875,7.989980797851563L12.5252311796875,8.989917797851563Q12.5955571796875,9.060247797851563,12.6874421796875,9.098307797851563Q12.7793281796875,9.136367797851562,12.8787841796875,9.136367797851562Q12.9782441796875,9.136367797851562,13.0701241796875,9.098307797851563Q13.1620141796875,9.060247797851563,13.2323341796875,8.989917797851563Q13.3026641796875,8.919597797851562,13.3407241796875,8.827707797851563Q13.3787841796875,8.735827797851563,13.3787841796875,8.636367797851562Q13.3787841796875,8.536911797851563,13.3407241796875,8.445025797851562Q13.3026641796875,8.353140797851562,13.2323341796875,8.282814797851563L12.2323971796875,7.282873797851563L12.2323371796875,7.282814797851563Q12.1620111796875,7.212487797851563,12.0701261796875,7.174427797851562Q11.9782403796875,7.1363677978515625,11.8787841796875,7.1363677978515625Q11.7793279796875,7.1363677978515625,11.6874421796875,7.174427797851562Q11.5955571796875,7.212487797851563,11.5252311796875,7.282814797851563Q11.4549041796875,7.353140797851562,11.4168441796875,7.445025797851563Q11.3787841796875,7.536911597851563,11.3787841796875,7.6363677978515625Q11.3787841796875,7.735823997851562,11.4168441796875,7.827709797851562Q11.4549041796875,7.919594797851563,11.5252311796875,7.989920797851562L11.5252901796875,7.989980797851563Z" fill-rule="evenodd"  fill-opacity="1"/></g></g></svg>
\ No newline at end of file

dsk-operate-ui/src/assets/icons/svg/consulting-org-management-sidebar.svg

-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_3_5568"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_3_5568)"><g><path d="M1.33331298828125,14.500007629394531L14.66661298828125,14.500007629394531Q14.71591298828125,14.500007629394531,14.76421298828125,14.49040062939453Q14.81251298828125,14.480792629394532,14.85801298828125,14.461947629394531Q14.90351298828125,14.443101629394532,14.94441298828125,14.415742629394531Q14.98541298828125,14.388382629394531,15.02021298828125,14.353560629394531Q15.05501298828125,14.318738629394531,15.08241298828125,14.277792629394531Q15.10971298828125,14.236846629394531,15.12861298828125,14.191349629394532Q15.14741298828125,14.14585262939453,15.15701298828125,14.09755272939453Q15.16661298828125,14.049253329394531,15.16661298828125,14.000007629394531Q15.16661298828125,13.950761929394531,15.15701298828125,13.902462529394532Q15.14741298828125,13.854162629394532,15.12861298828125,13.80866562939453Q15.10971298828125,13.763168629394531,15.08241298828125,13.722222629394532Q15.05501298828125,13.681276629394532,15.02021298828125,13.646454629394531Q14.98541298828125,13.611632629394531,14.94441298828125,13.584272629394532Q14.90351298828125,13.556913629394531,14.85801298828125,13.538067629394531Q14.81251298828125,13.51922262939453,14.76421298828125,13.509614629394532Q14.71591298828125,13.500007629394531,14.66661298828125,13.500007629394531L1.33331298828125,13.500007629394531Q1.28406728828125,13.500007629394531,1.23576788828125,13.509614629394532Q1.18746798828125,13.51922262939453,1.1419709882812499,13.538067629394531Q1.09647398828125,13.556913629394531,1.05552798828125,13.584272629394532Q1.01458198828125,13.611632629394531,0.97975998828125,13.646454629394531Q0.94493798828125,13.681276629394532,0.91757798828125,13.722222629394532Q0.89021898828125,13.763168629394531,0.87137298828125,13.80866562939453Q0.85252798828125,13.854162629394532,0.8429199882812499,13.902462529394532Q0.83331298828125,13.950761929394531,0.83331298828125,14.000007629394531Q0.83331298828125,14.049253329394531,0.8429199882812499,14.09755272939453Q0.85252798828125,14.14585262939453,0.87137298828125,14.191349629394532Q0.89021898828125,14.236846629394531,0.91757798828125,14.277792629394531Q0.94493798828125,14.318738629394531,0.97975998828125,14.353560629394531Q1.01458198828125,14.388382629394531,1.05552798828125,14.415742629394531Q1.09647398828125,14.443101629394532,1.1419709882812499,14.461947629394531Q1.18746798828125,14.480792629394532,1.23576788828125,14.49040062939453Q1.28406728828125,14.500007629394531,1.33331298828125,14.500007629394531Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M2.16668701171875,8.333335876464844Q2.16668701171875,7.712015876464844,2.60602681171875,7.272675676464844Q3.04536701171875,6.833335876464844,3.66668701171875,6.833335876464844L6.66668701171875,6.833335876464844Q6.71593701171875,6.833335876464844,6.76423701171875,6.842942876464844Q6.81252701171875,6.852550876464844,6.85802701171875,6.8713958764648435Q6.90352701171875,6.890241876464843,6.94446701171875,6.917600876464844Q6.98541701171875,6.944960876464844,7.02023701171875,6.979782876464844Q7.05505701171875,7.014604876464844,7.08241701171875,7.055550876464844Q7.10977701171875,7.096496876464844,7.12862701171875,7.141993876464844Q7.14746701171875,7.187490876464844,7.15707701171875,7.235790776464844Q7.16668701171875,7.284090176464844,7.16668701171875,7.333335876464844L7.16668701171875,14.000005876464844Q7.16668701171875,14.049245876464845,7.15707701171875,14.097545876464844Q7.14746701171875,14.145845876464843,7.12862701171875,14.191345876464844Q7.10977701171875,14.236835876464845,7.08241701171875,14.277785876464844Q7.05505701171875,14.318735876464844,7.02023701171875,14.353555876464844Q6.98541701171875,14.388375876464844,6.94446701171875,14.415735876464844Q6.90352701171875,14.443095876464843,6.85802701171875,14.461945876464844Q6.81252701171875,14.480785876464843,6.76423701171875,14.490395876464845Q6.71593701171875,14.500005876464844,6.66668701171875,14.500005876464844L2.66668701171875,14.500005876464844Q2.61744131171875,14.500005876464844,2.56914191171875,14.490395876464845Q2.52084201171875,14.480785876464843,2.47534501171875,14.461945876464844Q2.42984801171875,14.443095876464843,2.38890201171875,14.415735876464844Q2.34795601171875,14.388375876464844,2.31313401171875,14.353555876464844Q2.27831201171875,14.318735876464844,2.25095201171875,14.277785876464844Q2.22359301171875,14.236845876464844,2.2047470117187498,14.191345876464844Q2.18590201171875,14.145845876464843,2.17629401171875,14.097545876464844Q2.16668701171875,14.049245876464845,2.16668701171875,14.000005876464844L2.16668701171875,8.333335876464844ZM3.16668701171875,8.333335876464844L3.16668701171875,14.000005876464844L2.66668701171875,14.000005876464844L2.66668701171875,13.500005876464844L6.66668701171875,13.500005876464844L6.66668701171875,14.000005876464844L6.16668701171875,14.000005876464844L6.16668701171875,7.333335876464844L6.66668701171875,7.333335876464844L6.66668701171875,7.833335876464844L3.66668701171875,7.833335876464844Q3.45958001171875,7.833335876464844,3.31313401171875,7.979782876464844Q3.16668701171875,8.126228876464843,3.16668701171875,8.333335876464844Z" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M6.16668701171875,2.3333358764648438Q6.16668701171875,1.7120158764648439,6.60602681171875,1.2726756764648437Q7.04536701171875,0.8333358764648438,7.66668701171875,0.8333358764648438L12.33335701171875,0.8333358764648438Q12.95467701171875,0.8333358764648438,13.39401701171875,1.2726756764648437Q13.83335701171875,1.7120158764648439,13.83335701171875,2.3333358764648438L13.83335701171875,14.000035876464844Q13.83335701171875,14.049235876464843,13.823747011718751,14.097535876464844Q13.81413701171875,14.145835876464844,13.79529701171875,14.191335876464844Q13.77644701171875,14.236835876464843,13.74908701171875,14.277835876464843Q13.72172701171875,14.318735876464844,13.68690701171875,14.353535876464845Q13.65208701171875,14.388335876464843,13.61113701171875,14.415735876464844Q13.57019701171875,14.443135876464844,13.52469701171875,14.461935876464844Q13.47919701171875,14.480835876464845,13.43089701171875,14.490435876464844Q13.382597011718751,14.500035876464844,13.33335701171875,14.500035876464844L6.66668701171875,14.500035876464844Q6.61744131171875,14.500035876464844,6.56914191171875,14.490435876464844Q6.52084201171875,14.480835876464845,6.47534501171875,14.461935876464844Q6.42984801171875,14.443135876464844,6.38890201171875,14.415735876464844Q6.34795601171875,14.388335876464843,6.31313401171875,14.353535876464845Q6.27831201171875,14.318735876464844,6.25095201171875,14.277835876464843Q6.22359301171875,14.236835876464843,6.20474701171875,14.191335876464844Q6.18590201171875,14.145835876464844,6.17629401171875,14.097535876464844Q6.16668701171875,14.049235876464843,6.16668701171875,14.000035876464844L6.16668701171875,2.3333358764648438ZM7.16668701171875,2.3333358764648438L7.16668701171875,14.000035876464844L6.66668701171875,14.000035876464844L6.66668701171875,13.500035876464844L13.33335701171875,13.500035876464844L13.33335701171875,14.000035876464844L12.83335701171875,14.000035876464844L12.83335701171875,2.3333358764648438Q12.83335701171875,2.1262288764648436,12.68690701171875,1.9797828764648437Q12.54045701171875,1.8333358764648438,12.33335701171875,1.8333358764648438L7.66668701171875,1.8333358764648438Q7.45958001171875,1.8333358764648438,7.31313401171875,1.9797828764648437Q7.16668701171875,2.1262288764648436,7.16668701171875,2.3333358764648438Z" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M9.33331298828125,11.16943359375L10.66664298828125,11.16943359375Q10.71589298828125,11.16943359375,10.76419298828125,11.15982659375Q10.81249298828125,11.150218593750001,10.85799298828125,11.13137359375Q10.903482988281251,11.11252759375,10.94443298828125,11.08516859375Q10.98537298828125,11.05780859375,11.02020298828125,11.02298659375Q11.05502298828125,10.98816459375,11.08238298828125,10.94721859375Q11.10974298828125,10.90627259375,11.12858298828125,10.86077559375Q11.147432988281249,10.81527859375,11.15704298828125,10.76697869375Q11.16664298828125,10.71867929375,11.16664298828125,10.66943359375Q11.16664298828125,10.62018789375,11.15704298828125,10.57188849375Q11.147432988281249,10.52358859375,11.12858298828125,10.47809159375Q11.10974298828125,10.43259459375,11.08238298828125,10.39164859375Q11.05502298828125,10.35070259375,11.02020298828125,10.31588059375Q10.98537298828125,10.28105859375,10.94443298828125,10.25369859375Q10.903482988281251,10.22633959375,10.85799298828125,10.20749359375Q10.81249298828125,10.188648593749999,10.76419298828125,10.17904059375Q10.71589298828125,10.16943359375,10.66664298828125,10.16943359375L9.33331298828125,10.16943359375Q9.28406728828125,10.16943359375,9.23576788828125,10.17904059375Q9.18746798828125,10.188648593749999,9.14197098828125,10.20749359375Q9.09647398828125,10.22633959375,9.05552798828125,10.25369859375Q9.01458198828125,10.28105859375,8.97975998828125,10.31588059375Q8.94493798828125,10.35070259375,8.91757798828125,10.39164859375Q8.89021898828125,10.43259459375,8.87137298828125,10.47809159375Q8.852527988281249,10.52358859375,8.84291998828125,10.57188849375Q8.83331298828125,10.62018789375,8.83331298828125,10.66943359375Q8.83331298828125,10.71867929375,8.84291998828125,10.76697869375Q8.852527988281249,10.81527859375,8.87137298828125,10.86077559375Q8.89021898828125,10.90627259375,8.91757798828125,10.94721859375Q8.94493798828125,10.98816459375,8.97975998828125,11.02298659375Q9.01458198828125,11.05780859375,9.05552798828125,11.08516859375Q9.09647398828125,11.11252759375,9.14197098828125,11.13137359375Q9.18746798828125,11.150218593750001,9.23576788828125,11.15982659375Q9.28406728828125,11.16943359375,9.33331298828125,11.16943359375Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M4,11.16943359375L5.33333,11.16943359375Q5.38258,11.16943359375,5.43088,11.15982659375Q5.4791799999999995,11.150218593750001,5.52468,11.13137359375Q5.57017,11.11252759375,5.61112,11.08516859375Q5.6520600000000005,11.05780859375,5.68689,11.02298659375Q5.72171,10.98816459375,5.74907,10.94721859375Q5.7764299999999995,10.90627259375,5.79527,10.86077559375Q5.81412,10.81527859375,5.82373,10.76697869375Q5.83333,10.71867929375,5.83333,10.66943359375Q5.83333,10.62018789375,5.82373,10.57188849375Q5.81412,10.52358859375,5.79527,10.47809159375Q5.7764299999999995,10.43259459375,5.74907,10.39164859375Q5.72171,10.35070259375,5.68689,10.31588059375Q5.6520600000000005,10.28105859375,5.61112,10.25369859375Q5.57017,10.22633959375,5.52468,10.20749359375Q5.4791799999999995,10.188648593749999,5.43088,10.17904059375Q5.38258,10.16943359375,5.33333,10.16943359375L4,10.16943359375Q3.9507543,10.16943359375,3.9024549,10.17904059375Q3.854155,10.188648593749999,3.808658,10.20749359375Q3.763161,10.22633959375,3.722215,10.25369859375Q3.681269,10.28105859375,3.646447,10.31588059375Q3.611625,10.35070259375,3.584265,10.39164859375Q3.556906,10.43259459375,3.5380599999999998,10.47809159375Q3.519215,10.52358859375,3.509607,10.57188849375Q3.5,10.62018789375,3.5,10.66943359375Q3.5,10.71867929375,3.509607,10.76697869375Q3.519215,10.81527859375,3.5380599999999998,10.86077559375Q3.556906,10.90627259375,3.584265,10.94721859375Q3.611625,10.98816459375,3.646447,11.02298659375Q3.681269,11.05780859375,3.722215,11.08516859375Q3.763161,11.11252759375,3.808658,11.13137359375Q3.854155,11.150218593750001,3.9024549,11.15982659375Q3.9507543,11.16943359375,4,11.16943359375Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M9.33331298828125,8.16943359375L10.66664298828125,8.16943359375Q10.71589298828125,8.16943359375,10.76419298828125,8.15982659375Q10.81249298828125,8.150218593750001,10.85799298828125,8.13137359375Q10.903482988281251,8.11252759375,10.94443298828125,8.08516859375Q10.98537298828125,8.05780859375,11.02020298828125,8.02298659375Q11.05502298828125,7.98816459375,11.08238298828125,7.94721859375Q11.10974298828125,7.90627259375,11.12858298828125,7.86077559375Q11.147432988281249,7.81527859375,11.15704298828125,7.76697869375Q11.16664298828125,7.71867929375,11.16664298828125,7.66943359375Q11.16664298828125,7.62018789375,11.15704298828125,7.57188849375Q11.147432988281249,7.52358859375,11.12858298828125,7.47809159375Q11.10974298828125,7.43259459375,11.08238298828125,7.39164859375Q11.05502298828125,7.35070259375,11.02020298828125,7.31588059375Q10.98537298828125,7.28105859375,10.94443298828125,7.25369859375Q10.903482988281251,7.22633959375,10.85799298828125,7.20749359375Q10.81249298828125,7.18864859375,10.76419298828125,7.17904059375Q10.71589298828125,7.16943359375,10.66664298828125,7.16943359375L9.33331298828125,7.16943359375Q9.28406728828125,7.16943359375,9.23576788828125,7.17904059375Q9.18746798828125,7.18864859375,9.14197098828125,7.20749359375Q9.09647398828125,7.22633959375,9.05552798828125,7.25369859375Q9.01458198828125,7.28105859375,8.97975998828125,7.31588059375Q8.94493798828125,7.35070259375,8.91757798828125,7.39164859375Q8.89021898828125,7.43259459375,8.87137298828125,7.47809159375Q8.852527988281249,7.52358859375,8.84291998828125,7.57188849375Q8.83331298828125,7.62018789375,8.83331298828125,7.66943359375Q8.83331298828125,7.71867929375,8.84291998828125,7.76697869375Q8.852527988281249,7.81527859375,8.87137298828125,7.86077559375Q8.89021898828125,7.90627259375,8.91757798828125,7.94721859375Q8.94493798828125,7.98816459375,8.97975998828125,8.02298659375Q9.01458198828125,8.05780859375,9.05552798828125,8.08516859375Q9.09647398828125,8.11252759375,9.14197098828125,8.13137359375Q9.18746798828125,8.150218593750001,9.23576788828125,8.15982659375Q9.28406728828125,8.16943359375,9.33331298828125,8.16943359375Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M9.33331298828125,5.16943359375L10.66664298828125,5.16943359375Q10.71589298828125,5.16943359375,10.76419298828125,5.15982659375Q10.81249298828125,5.15021859375,10.85799298828125,5.13137359375Q10.903482988281251,5.11252759375,10.94443298828125,5.08516859375Q10.98537298828125,5.05780859375,11.02020298828125,5.02298659375Q11.05502298828125,4.98816459375,11.08238298828125,4.94721859375Q11.10974298828125,4.90627259375,11.12858298828125,4.86077559375Q11.147432988281249,4.81527859375,11.15704298828125,4.76697869375Q11.16664298828125,4.71867929375,11.16664298828125,4.66943359375Q11.16664298828125,4.62018789375,11.15704298828125,4.57188849375Q11.147432988281249,4.52358859375,11.12858298828125,4.47809159375Q11.10974298828125,4.43259459375,11.08238298828125,4.39164859375Q11.05502298828125,4.35070259375,11.02020298828125,4.31588059375Q10.98537298828125,4.28105859375,10.94443298828125,4.25369859375Q10.903482988281251,4.22633959375,10.85799298828125,4.20749359375Q10.81249298828125,4.18864859375,10.76419298828125,4.17904059375Q10.71589298828125,4.16943359375,10.66664298828125,4.16943359375L9.33331298828125,4.16943359375Q9.28406728828125,4.16943359375,9.23576788828125,4.17904059375Q9.18746798828125,4.18864859375,9.14197098828125,4.20749359375Q9.09647398828125,4.22633959375,9.05552798828125,4.25369859375Q9.01458198828125,4.28105859375,8.97975998828125,4.31588059375Q8.94493798828125,4.35070259375,8.91757798828125,4.39164859375Q8.89021898828125,4.43259459375,8.87137298828125,4.47809159375Q8.852527988281249,4.52358859375,8.84291998828125,4.57188849375Q8.83331298828125,4.62018789375,8.83331298828125,4.66943359375Q8.83331298828125,4.71867929375,8.84291998828125,4.76697869375Q8.852527988281249,4.81527859375,8.87137298828125,4.86077559375Q8.89021898828125,4.90627259375,8.91757798828125,4.94721859375Q8.94493798828125,4.98816459375,8.97975998828125,5.02298659375Q9.01458198828125,5.05780859375,9.05552798828125,5.08516859375Q9.09647398828125,5.11252759375,9.14197098828125,5.13137359375Q9.18746798828125,5.15021859375,9.23576788828125,5.15982659375Q9.28406728828125,5.16943359375,9.33331298828125,5.16943359375Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_3_5568"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_3_5568)"><g><path d="M1.33331298828125,14.500007629394531L14.66661298828125,14.500007629394531Q14.71591298828125,14.500007629394531,14.76421298828125,14.49040062939453Q14.81251298828125,14.480792629394532,14.85801298828125,14.461947629394531Q14.90351298828125,14.443101629394532,14.94441298828125,14.415742629394531Q14.98541298828125,14.388382629394531,15.02021298828125,14.353560629394531Q15.05501298828125,14.318738629394531,15.08241298828125,14.277792629394531Q15.10971298828125,14.236846629394531,15.12861298828125,14.191349629394532Q15.14741298828125,14.14585262939453,15.15701298828125,14.09755272939453Q15.16661298828125,14.049253329394531,15.16661298828125,14.000007629394531Q15.16661298828125,13.950761929394531,15.15701298828125,13.902462529394532Q15.14741298828125,13.854162629394532,15.12861298828125,13.80866562939453Q15.10971298828125,13.763168629394531,15.08241298828125,13.722222629394532Q15.05501298828125,13.681276629394532,15.02021298828125,13.646454629394531Q14.98541298828125,13.611632629394531,14.94441298828125,13.584272629394532Q14.90351298828125,13.556913629394531,14.85801298828125,13.538067629394531Q14.81251298828125,13.51922262939453,14.76421298828125,13.509614629394532Q14.71591298828125,13.500007629394531,14.66661298828125,13.500007629394531L1.33331298828125,13.500007629394531Q1.28406728828125,13.500007629394531,1.23576788828125,13.509614629394532Q1.18746798828125,13.51922262939453,1.1419709882812499,13.538067629394531Q1.09647398828125,13.556913629394531,1.05552798828125,13.584272629394532Q1.01458198828125,13.611632629394531,0.97975998828125,13.646454629394531Q0.94493798828125,13.681276629394532,0.91757798828125,13.722222629394532Q0.89021898828125,13.763168629394531,0.87137298828125,13.80866562939453Q0.85252798828125,13.854162629394532,0.8429199882812499,13.902462529394532Q0.83331298828125,13.950761929394531,0.83331298828125,14.000007629394531Q0.83331298828125,14.049253329394531,0.8429199882812499,14.09755272939453Q0.85252798828125,14.14585262939453,0.87137298828125,14.191349629394532Q0.89021898828125,14.236846629394531,0.91757798828125,14.277792629394531Q0.94493798828125,14.318738629394531,0.97975998828125,14.353560629394531Q1.01458198828125,14.388382629394531,1.05552798828125,14.415742629394531Q1.09647398828125,14.443101629394532,1.1419709882812499,14.461947629394531Q1.18746798828125,14.480792629394532,1.23576788828125,14.49040062939453Q1.28406728828125,14.500007629394531,1.33331298828125,14.500007629394531Z" fill-rule="evenodd"  fill-opacity="1"/></g><g><path d="M2.16668701171875,8.333335876464844Q2.16668701171875,7.712015876464844,2.60602681171875,7.272675676464844Q3.04536701171875,6.833335876464844,3.66668701171875,6.833335876464844L6.66668701171875,6.833335876464844Q6.71593701171875,6.833335876464844,6.76423701171875,6.842942876464844Q6.81252701171875,6.852550876464844,6.85802701171875,6.8713958764648435Q6.90352701171875,6.890241876464843,6.94446701171875,6.917600876464844Q6.98541701171875,6.944960876464844,7.02023701171875,6.979782876464844Q7.05505701171875,7.014604876464844,7.08241701171875,7.055550876464844Q7.10977701171875,7.096496876464844,7.12862701171875,7.141993876464844Q7.14746701171875,7.187490876464844,7.15707701171875,7.235790776464844Q7.16668701171875,7.284090176464844,7.16668701171875,7.333335876464844L7.16668701171875,14.000005876464844Q7.16668701171875,14.049245876464845,7.15707701171875,14.097545876464844Q7.14746701171875,14.145845876464843,7.12862701171875,14.191345876464844Q7.10977701171875,14.236835876464845,7.08241701171875,14.277785876464844Q7.05505701171875,14.318735876464844,7.02023701171875,14.353555876464844Q6.98541701171875,14.388375876464844,6.94446701171875,14.415735876464844Q6.90352701171875,14.443095876464843,6.85802701171875,14.461945876464844Q6.81252701171875,14.480785876464843,6.76423701171875,14.490395876464845Q6.71593701171875,14.500005876464844,6.66668701171875,14.500005876464844L2.66668701171875,14.500005876464844Q2.61744131171875,14.500005876464844,2.56914191171875,14.490395876464845Q2.52084201171875,14.480785876464843,2.47534501171875,14.461945876464844Q2.42984801171875,14.443095876464843,2.38890201171875,14.415735876464844Q2.34795601171875,14.388375876464844,2.31313401171875,14.353555876464844Q2.27831201171875,14.318735876464844,2.25095201171875,14.277785876464844Q2.22359301171875,14.236845876464844,2.2047470117187498,14.191345876464844Q2.18590201171875,14.145845876464843,2.17629401171875,14.097545876464844Q2.16668701171875,14.049245876464845,2.16668701171875,14.000005876464844L2.16668701171875,8.333335876464844ZM3.16668701171875,8.333335876464844L3.16668701171875,14.000005876464844L2.66668701171875,14.000005876464844L2.66668701171875,13.500005876464844L6.66668701171875,13.500005876464844L6.66668701171875,14.000005876464844L6.16668701171875,14.000005876464844L6.16668701171875,7.333335876464844L6.66668701171875,7.333335876464844L6.66668701171875,7.833335876464844L3.66668701171875,7.833335876464844Q3.45958001171875,7.833335876464844,3.31313401171875,7.979782876464844Q3.16668701171875,8.126228876464843,3.16668701171875,8.333335876464844Z"  fill-opacity="1"/></g><g><path d="M6.16668701171875,2.3333358764648438Q6.16668701171875,1.7120158764648439,6.60602681171875,1.2726756764648437Q7.04536701171875,0.8333358764648438,7.66668701171875,0.8333358764648438L12.33335701171875,0.8333358764648438Q12.95467701171875,0.8333358764648438,13.39401701171875,1.2726756764648437Q13.83335701171875,1.7120158764648439,13.83335701171875,2.3333358764648438L13.83335701171875,14.000035876464844Q13.83335701171875,14.049235876464843,13.823747011718751,14.097535876464844Q13.81413701171875,14.145835876464844,13.79529701171875,14.191335876464844Q13.77644701171875,14.236835876464843,13.74908701171875,14.277835876464843Q13.72172701171875,14.318735876464844,13.68690701171875,14.353535876464845Q13.65208701171875,14.388335876464843,13.61113701171875,14.415735876464844Q13.57019701171875,14.443135876464844,13.52469701171875,14.461935876464844Q13.47919701171875,14.480835876464845,13.43089701171875,14.490435876464844Q13.382597011718751,14.500035876464844,13.33335701171875,14.500035876464844L6.66668701171875,14.500035876464844Q6.61744131171875,14.500035876464844,6.56914191171875,14.490435876464844Q6.52084201171875,14.480835876464845,6.47534501171875,14.461935876464844Q6.42984801171875,14.443135876464844,6.38890201171875,14.415735876464844Q6.34795601171875,14.388335876464843,6.31313401171875,14.353535876464845Q6.27831201171875,14.318735876464844,6.25095201171875,14.277835876464843Q6.22359301171875,14.236835876464843,6.20474701171875,14.191335876464844Q6.18590201171875,14.145835876464844,6.17629401171875,14.097535876464844Q6.16668701171875,14.049235876464843,6.16668701171875,14.000035876464844L6.16668701171875,2.3333358764648438ZM7.16668701171875,2.3333358764648438L7.16668701171875,14.000035876464844L6.66668701171875,14.000035876464844L6.66668701171875,13.500035876464844L13.33335701171875,13.500035876464844L13.33335701171875,14.000035876464844L12.83335701171875,14.000035876464844L12.83335701171875,2.3333358764648438Q12.83335701171875,2.1262288764648436,12.68690701171875,1.9797828764648437Q12.54045701171875,1.8333358764648438,12.33335701171875,1.8333358764648438L7.66668701171875,1.8333358764648438Q7.45958001171875,1.8333358764648438,7.31313401171875,1.9797828764648437Q7.16668701171875,2.1262288764648436,7.16668701171875,2.3333358764648438Z"  fill-opacity="1"/></g><g><path d="M9.33331298828125,11.16943359375L10.66664298828125,11.16943359375Q10.71589298828125,11.16943359375,10.76419298828125,11.15982659375Q10.81249298828125,11.150218593750001,10.85799298828125,11.13137359375Q10.903482988281251,11.11252759375,10.94443298828125,11.08516859375Q10.98537298828125,11.05780859375,11.02020298828125,11.02298659375Q11.05502298828125,10.98816459375,11.08238298828125,10.94721859375Q11.10974298828125,10.90627259375,11.12858298828125,10.86077559375Q11.147432988281249,10.81527859375,11.15704298828125,10.76697869375Q11.16664298828125,10.71867929375,11.16664298828125,10.66943359375Q11.16664298828125,10.62018789375,11.15704298828125,10.57188849375Q11.147432988281249,10.52358859375,11.12858298828125,10.47809159375Q11.10974298828125,10.43259459375,11.08238298828125,10.39164859375Q11.05502298828125,10.35070259375,11.02020298828125,10.31588059375Q10.98537298828125,10.28105859375,10.94443298828125,10.25369859375Q10.903482988281251,10.22633959375,10.85799298828125,10.20749359375Q10.81249298828125,10.188648593749999,10.76419298828125,10.17904059375Q10.71589298828125,10.16943359375,10.66664298828125,10.16943359375L9.33331298828125,10.16943359375Q9.28406728828125,10.16943359375,9.23576788828125,10.17904059375Q9.18746798828125,10.188648593749999,9.14197098828125,10.20749359375Q9.09647398828125,10.22633959375,9.05552798828125,10.25369859375Q9.01458198828125,10.28105859375,8.97975998828125,10.31588059375Q8.94493798828125,10.35070259375,8.91757798828125,10.39164859375Q8.89021898828125,10.43259459375,8.87137298828125,10.47809159375Q8.852527988281249,10.52358859375,8.84291998828125,10.57188849375Q8.83331298828125,10.62018789375,8.83331298828125,10.66943359375Q8.83331298828125,10.71867929375,8.84291998828125,10.76697869375Q8.852527988281249,10.81527859375,8.87137298828125,10.86077559375Q8.89021898828125,10.90627259375,8.91757798828125,10.94721859375Q8.94493798828125,10.98816459375,8.97975998828125,11.02298659375Q9.01458198828125,11.05780859375,9.05552798828125,11.08516859375Q9.09647398828125,11.11252759375,9.14197098828125,11.13137359375Q9.18746798828125,11.150218593750001,9.23576788828125,11.15982659375Q9.28406728828125,11.16943359375,9.33331298828125,11.16943359375Z" fill-rule="evenodd"  fill-opacity="1"/></g><g><path d="M4,11.16943359375L5.33333,11.16943359375Q5.38258,11.16943359375,5.43088,11.15982659375Q5.4791799999999995,11.150218593750001,5.52468,11.13137359375Q5.57017,11.11252759375,5.61112,11.08516859375Q5.6520600000000005,11.05780859375,5.68689,11.02298659375Q5.72171,10.98816459375,5.74907,10.94721859375Q5.7764299999999995,10.90627259375,5.79527,10.86077559375Q5.81412,10.81527859375,5.82373,10.76697869375Q5.83333,10.71867929375,5.83333,10.66943359375Q5.83333,10.62018789375,5.82373,10.57188849375Q5.81412,10.52358859375,5.79527,10.47809159375Q5.7764299999999995,10.43259459375,5.74907,10.39164859375Q5.72171,10.35070259375,5.68689,10.31588059375Q5.6520600000000005,10.28105859375,5.61112,10.25369859375Q5.57017,10.22633959375,5.52468,10.20749359375Q5.4791799999999995,10.188648593749999,5.43088,10.17904059375Q5.38258,10.16943359375,5.33333,10.16943359375L4,10.16943359375Q3.9507543,10.16943359375,3.9024549,10.17904059375Q3.854155,10.188648593749999,3.808658,10.20749359375Q3.763161,10.22633959375,3.722215,10.25369859375Q3.681269,10.28105859375,3.646447,10.31588059375Q3.611625,10.35070259375,3.584265,10.39164859375Q3.556906,10.43259459375,3.5380599999999998,10.47809159375Q3.519215,10.52358859375,3.509607,10.57188849375Q3.5,10.62018789375,3.5,10.66943359375Q3.5,10.71867929375,3.509607,10.76697869375Q3.519215,10.81527859375,3.5380599999999998,10.86077559375Q3.556906,10.90627259375,3.584265,10.94721859375Q3.611625,10.98816459375,3.646447,11.02298659375Q3.681269,11.05780859375,3.722215,11.08516859375Q3.763161,11.11252759375,3.808658,11.13137359375Q3.854155,11.150218593750001,3.9024549,11.15982659375Q3.9507543,11.16943359375,4,11.16943359375Z" fill-rule="evenodd"  fill-opacity="1"/></g><g><path d="M9.33331298828125,8.16943359375L10.66664298828125,8.16943359375Q10.71589298828125,8.16943359375,10.76419298828125,8.15982659375Q10.81249298828125,8.150218593750001,10.85799298828125,8.13137359375Q10.903482988281251,8.11252759375,10.94443298828125,8.08516859375Q10.98537298828125,8.05780859375,11.02020298828125,8.02298659375Q11.05502298828125,7.98816459375,11.08238298828125,7.94721859375Q11.10974298828125,7.90627259375,11.12858298828125,7.86077559375Q11.147432988281249,7.81527859375,11.15704298828125,7.76697869375Q11.16664298828125,7.71867929375,11.16664298828125,7.66943359375Q11.16664298828125,7.62018789375,11.15704298828125,7.57188849375Q11.147432988281249,7.52358859375,11.12858298828125,7.47809159375Q11.10974298828125,7.43259459375,11.08238298828125,7.39164859375Q11.05502298828125,7.35070259375,11.02020298828125,7.31588059375Q10.98537298828125,7.28105859375,10.94443298828125,7.25369859375Q10.903482988281251,7.22633959375,10.85799298828125,7.20749359375Q10.81249298828125,7.18864859375,10.76419298828125,7.17904059375Q10.71589298828125,7.16943359375,10.66664298828125,7.16943359375L9.33331298828125,7.16943359375Q9.28406728828125,7.16943359375,9.23576788828125,7.17904059375Q9.18746798828125,7.18864859375,9.14197098828125,7.20749359375Q9.09647398828125,7.22633959375,9.05552798828125,7.25369859375Q9.01458198828125,7.28105859375,8.97975998828125,7.31588059375Q8.94493798828125,7.35070259375,8.91757798828125,7.39164859375Q8.89021898828125,7.43259459375,8.87137298828125,7.47809159375Q8.852527988281249,7.52358859375,8.84291998828125,7.57188849375Q8.83331298828125,7.62018789375,8.83331298828125,7.66943359375Q8.83331298828125,7.71867929375,8.84291998828125,7.76697869375Q8.852527988281249,7.81527859375,8.87137298828125,7.86077559375Q8.89021898828125,7.90627259375,8.91757798828125,7.94721859375Q8.94493798828125,7.98816459375,8.97975998828125,8.02298659375Q9.01458198828125,8.05780859375,9.05552798828125,8.08516859375Q9.09647398828125,8.11252759375,9.14197098828125,8.13137359375Q9.18746798828125,8.150218593750001,9.23576788828125,8.15982659375Q9.28406728828125,8.16943359375,9.33331298828125,8.16943359375Z" fill-rule="evenodd"  fill-opacity="1"/></g><g><path d="M9.33331298828125,5.16943359375L10.66664298828125,5.16943359375Q10.71589298828125,5.16943359375,10.76419298828125,5.15982659375Q10.81249298828125,5.15021859375,10.85799298828125,5.13137359375Q10.903482988281251,5.11252759375,10.94443298828125,5.08516859375Q10.98537298828125,5.05780859375,11.02020298828125,5.02298659375Q11.05502298828125,4.98816459375,11.08238298828125,4.94721859375Q11.10974298828125,4.90627259375,11.12858298828125,4.86077559375Q11.147432988281249,4.81527859375,11.15704298828125,4.76697869375Q11.16664298828125,4.71867929375,11.16664298828125,4.66943359375Q11.16664298828125,4.62018789375,11.15704298828125,4.57188849375Q11.147432988281249,4.52358859375,11.12858298828125,4.47809159375Q11.10974298828125,4.43259459375,11.08238298828125,4.39164859375Q11.05502298828125,4.35070259375,11.02020298828125,4.31588059375Q10.98537298828125,4.28105859375,10.94443298828125,4.25369859375Q10.903482988281251,4.22633959375,10.85799298828125,4.20749359375Q10.81249298828125,4.18864859375,10.76419298828125,4.17904059375Q10.71589298828125,4.16943359375,10.66664298828125,4.16943359375L9.33331298828125,4.16943359375Q9.28406728828125,4.16943359375,9.23576788828125,4.17904059375Q9.18746798828125,4.18864859375,9.14197098828125,4.20749359375Q9.09647398828125,4.22633959375,9.05552798828125,4.25369859375Q9.01458198828125,4.28105859375,8.97975998828125,4.31588059375Q8.94493798828125,4.35070259375,8.91757798828125,4.39164859375Q8.89021898828125,4.43259459375,8.87137298828125,4.47809159375Q8.852527988281249,4.52358859375,8.84291998828125,4.57188849375Q8.83331298828125,4.62018789375,8.83331298828125,4.66943359375Q8.83331298828125,4.71867929375,8.84291998828125,4.76697869375Q8.852527988281249,4.81527859375,8.87137298828125,4.86077559375Q8.89021898828125,4.90627259375,8.91757798828125,4.94721859375Q8.94493798828125,4.98816459375,8.97975998828125,5.02298659375Q9.01458198828125,5.05780859375,9.05552798828125,5.08516859375Q9.09647398828125,5.11252759375,9.14197098828125,5.13137359375Q9.18746798828125,5.15021859375,9.23576788828125,5.15982659375Q9.28406728828125,5.16943359375,9.33331298828125,5.16943359375Z" fill-rule="evenodd"  fill-opacity="1"/></g></g></svg>
\ No newline at end of file

dsk-operate-ui/src/assets/icons/svg/icon_menu_mark.svg

-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_1384_096539"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_1384_096539)"><g><path d="M3.3336591875,15.1663078125L7.3336621875,15.1663078125Q7.3829021875,15.1663078125,7.4312021875,15.1567078125Q7.4795021875,15.1471078125,7.5250021875,15.1283078125Q7.5705021875,15.1094078125,7.6114421875,15.0821078125Q7.6523921875,15.0547078125,7.6872121875,15.0199078125Q7.7220321875,14.9851078125,7.7493921875,14.9441078125Q7.7767521875,14.9032078125,7.7956021875,14.8577078125Q7.8144421875,14.8122078125,7.8240521875,14.7639078125Q7.8336621875,14.7156078125,7.8336621875,14.6663078125Q7.8336621875,14.6171078125,7.8240521875,14.5688078125Q7.8144421875,14.5205078125,7.7956021875,14.4750078125Q7.7767521875,14.4295078125,7.7493921875,14.3885078125Q7.7220321875,14.3476078125,7.6872121875,14.3128078125Q7.6523921875,14.2780078125,7.6114421875,14.2506078125Q7.5705021875,14.2232078125,7.5250021875,14.2044078125Q7.4795021875,14.1855078125,7.4312021875,14.1759078125Q7.3829021875,14.1663078125,7.3336621875,14.1663078125L3.3336591875,14.1663078125Q3.2646201875000003,14.1663078125,3.2158061875,14.1175078125Q3.1669921875,14.0687078125,3.1669921875,13.9997078125L3.1669921875,1.9996748125Q3.1669921875,1.8330078125,3.3336591875,1.8330078125L10.1109821875,1.8330078125L12.8336921875,4.8582078125L12.8336921875,7.6663378125Q12.8336921875,7.7155878125,12.8432921875,7.7638878125Q12.8528921875,7.8121878125,12.8716921875,7.8576778125Q12.8905921875,7.9031778125,12.9178921875,7.9441278125Q12.9452921875,7.9850678125,12.9800921875,8.0198978125Q13.0148921875,8.0547178125,13.0558921875,8.0820778125Q13.0967921875,8.109437812500001,13.1422921875,8.1282778125Q13.1877921875,8.147127812499999,13.2360921875,8.156737812500001Q13.2843921875,8.1663378125,13.3336921875,8.1663378125Q13.3828921875,8.1663378125,13.4311921875,8.156737812500001Q13.4794921875,8.147127812499999,13.5249921875,8.1282778125Q13.5704921875,8.109437812500001,13.6114921875,8.0820778125Q13.6523921875,8.0547178125,13.6871921875,8.0198978125Q13.7219921875,7.9850678125,13.7493921875,7.9441278125Q13.7767921875,7.9031778125,13.7955921875,7.8576778125Q13.8144921875,7.8121878125,13.8240921875,7.7638878125Q13.8336921875,7.7155878125,13.8336921875,7.6663378125L13.8336921875,4.6663378125Q13.8336921875,4.5736978125,13.8004921875,4.4872078124999994Q13.7672921875,4.4007178125,13.7052921875,4.3318578125L10.7053021875,0.9985258125Q10.6341921875,0.9195078125,10.537082187500001,0.8762578125Q10.4399621875,0.8330078125,10.3336621875,0.8330078125L3.3336591875,0.8330078125Q2.8504091875,0.8330078125,2.5087011875,1.1747168125Q2.1669921875,1.5164248125,2.1669921875,1.9996748125L2.1669921875,13.9997078125Q2.1669921875,14.4829078125,2.5087021875,14.8246078125Q2.8504101875,15.1663078125,3.3336591875,15.1663078125Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M8.8330078125,13.33333L8.8330078125,14.66667Q8.8330078125,14.715910000000001,8.8426148125,14.76421Q8.852222812499999,14.81251,8.8710678125,14.85801Q8.8899138125,14.90351,8.9172728125,14.94445Q8.9446328125,14.9854,8.9794548125,15.02022Q9.0142768125,15.05504,9.0552228125,15.0824Q9.0961688125,15.10976,9.1416658125,15.12861Q9.1871628125,15.14745,9.2354627125,15.157060000000001Q9.2837621125,15.16667,9.3330078125,15.16667L10.6663378125,15.16667Q10.7657978125,15.16667,10.8576878125,15.12861Q10.9495678125,15.09055,11.0198978125,15.02022L14.3532278125,11.68689Q14.3880478125,11.65206,14.4154078125,11.61112Q14.4427678125,11.570170000000001,14.4616178125,11.52468Q14.4804578125,11.47918,14.490067812500001,11.43088Q14.4996778125,11.38258,14.4996778125,11.33333Q14.4996778125,11.284089999999999,14.490067812500001,11.23579Q14.4804578125,11.18749,14.4616178125,11.14199Q14.4427678125,11.09649,14.4154078125,11.05555Q14.3880478125,11.0146,14.3532278125,10.97978L13.0198978125,9.646447Q12.9495678125,9.57612,12.8576878125,9.53806Q12.7657978125,9.5,12.6663378125,9.5Q12.5668878125,9.5,12.4749978125,9.53806Q12.3831178125,9.57612,12.3127878125,9.646447L8.9794548125,12.97978Q8.9091278125,13.05011,8.8710678125,13.14199Q8.8330078125,13.23388,8.8330078125,13.33333ZM9.8330078125,14.16667L10.4592378125,14.16667L13.2925678125,11.33333L12.6663378125,10.707107L9.8330078125,13.54044L9.8330078125,14.16667Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M10,5.1663378125L13.33333,5.1663378125Q13.38258,5.1663378125,13.43088,5.156737812499999Q13.47918,5.1471278125,13.52467,5.1282778125Q13.570170000000001,5.1094378124999995,13.61112,5.0820778125Q13.65206,5.0547178125,13.68689,5.0198978125Q13.72171,4.9850678125000005,13.74907,4.9441278125Q13.77643,4.9031778125,13.79527,4.8576778125Q13.814119999999999,4.8121878124999995,13.82373,4.7638878125Q13.83333,4.7155878125,13.83333,4.6663378125Q13.83333,4.6170978125,13.82373,4.5687978125Q13.814119999999999,4.5204978125,13.79527,4.4749978125Q13.77643,4.4294978125,13.74907,4.3885578125Q13.72171,4.3476078125,13.68689,4.3127878125Q13.65206,4.2779678125,13.61112,4.2506078125Q13.570170000000001,4.2232478125,13.52467,4.2043978125Q13.47918,4.1855578125,13.43088,4.1759478125000005Q13.38258,4.1663378125,13.33333,4.1663378125L10.5,4.1663378125L10.5,1.3330078125Q10.5,1.2837621125,10.490393,1.2354627125Q10.480785000000001,1.1871628125,10.46194,1.1416658124999999Q10.443094,1.0961688125,10.415735,1.0552228125Q10.388375,1.0142768125,10.353553,0.9794548125Q10.318731,0.9446328125,10.277785,0.9172728125Q10.236839,0.8899138125,10.191342,0.8710678125Q10.145845,0.8522228125,10.0975451,0.8426148124999999Q10.0492457,0.8330078125,10,0.8330078125Q9.9507543,0.8330078125,9.9024549,0.8426148124999999Q9.854155,0.8522228125,9.808658,0.8710678125Q9.763161,0.8899138125,9.722215,0.9172728125Q9.681269,0.9446328125,9.646447,0.9794548125Q9.611625,1.0142768125,9.584265,1.0552228125Q9.556906,1.0961688125,9.53806,1.1416658124999999Q9.519214999999999,1.1871628125,9.509607,1.2354627125Q9.5,1.2837621125,9.5,1.3330078125L9.5,4.6663378125Q9.5,4.7155878125,9.509607,4.7638878125Q9.519214999999999,4.8121878124999995,9.53806,4.8576778125Q9.556906,4.9031778125,9.584265,4.9441278125Q9.611625,4.9850678125000005,9.646447,5.0198978125Q9.681269,5.0547178125,9.722215,5.0820778125Q9.763161,5.1094378124999995,9.808658,5.1282778125Q9.854155,5.1471278125,9.9024549,5.156737812499999Q9.9507543,5.1663378125,10,5.1663378125Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_1384_096539"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_1384_096539)"><g><path d="M3.3336591875,15.1663078125L7.3336621875,15.1663078125Q7.3829021875,15.1663078125,7.4312021875,15.1567078125Q7.4795021875,15.1471078125,7.5250021875,15.1283078125Q7.5705021875,15.1094078125,7.6114421875,15.0821078125Q7.6523921875,15.0547078125,7.6872121875,15.0199078125Q7.7220321875,14.9851078125,7.7493921875,14.9441078125Q7.7767521875,14.9032078125,7.7956021875,14.8577078125Q7.8144421875,14.8122078125,7.8240521875,14.7639078125Q7.8336621875,14.7156078125,7.8336621875,14.6663078125Q7.8336621875,14.6171078125,7.8240521875,14.5688078125Q7.8144421875,14.5205078125,7.7956021875,14.4750078125Q7.7767521875,14.4295078125,7.7493921875,14.3885078125Q7.7220321875,14.3476078125,7.6872121875,14.3128078125Q7.6523921875,14.2780078125,7.6114421875,14.2506078125Q7.5705021875,14.2232078125,7.5250021875,14.2044078125Q7.4795021875,14.1855078125,7.4312021875,14.1759078125Q7.3829021875,14.1663078125,7.3336621875,14.1663078125L3.3336591875,14.1663078125Q3.2646201875000003,14.1663078125,3.2158061875,14.1175078125Q3.1669921875,14.0687078125,3.1669921875,13.9997078125L3.1669921875,1.9996748125Q3.1669921875,1.8330078125,3.3336591875,1.8330078125L10.1109821875,1.8330078125L12.8336921875,4.8582078125L12.8336921875,7.6663378125Q12.8336921875,7.7155878125,12.8432921875,7.7638878125Q12.8528921875,7.8121878125,12.8716921875,7.8576778125Q12.8905921875,7.9031778125,12.9178921875,7.9441278125Q12.9452921875,7.9850678125,12.9800921875,8.0198978125Q13.0148921875,8.0547178125,13.0558921875,8.0820778125Q13.0967921875,8.109437812500001,13.1422921875,8.1282778125Q13.1877921875,8.147127812499999,13.2360921875,8.156737812500001Q13.2843921875,8.1663378125,13.3336921875,8.1663378125Q13.3828921875,8.1663378125,13.4311921875,8.156737812500001Q13.4794921875,8.147127812499999,13.5249921875,8.1282778125Q13.5704921875,8.109437812500001,13.6114921875,8.0820778125Q13.6523921875,8.0547178125,13.6871921875,8.0198978125Q13.7219921875,7.9850678125,13.7493921875,7.9441278125Q13.7767921875,7.9031778125,13.7955921875,7.8576778125Q13.8144921875,7.8121878125,13.8240921875,7.7638878125Q13.8336921875,7.7155878125,13.8336921875,7.6663378125L13.8336921875,4.6663378125Q13.8336921875,4.5736978125,13.8004921875,4.4872078124999994Q13.7672921875,4.4007178125,13.7052921875,4.3318578125L10.7053021875,0.9985258125Q10.6341921875,0.9195078125,10.537082187500001,0.8762578125Q10.4399621875,0.8330078125,10.3336621875,0.8330078125L3.3336591875,0.8330078125Q2.8504091875,0.8330078125,2.5087011875,1.1747168125Q2.1669921875,1.5164248125,2.1669921875,1.9996748125L2.1669921875,13.9997078125Q2.1669921875,14.4829078125,2.5087021875,14.8246078125Q2.8504101875,15.1663078125,3.3336591875,15.1663078125Z" fill-rule="evenodd"  fill-opacity="1"/></g><g><path d="M8.8330078125,13.33333L8.8330078125,14.66667Q8.8330078125,14.715910000000001,8.8426148125,14.76421Q8.852222812499999,14.81251,8.8710678125,14.85801Q8.8899138125,14.90351,8.9172728125,14.94445Q8.9446328125,14.9854,8.9794548125,15.02022Q9.0142768125,15.05504,9.0552228125,15.0824Q9.0961688125,15.10976,9.1416658125,15.12861Q9.1871628125,15.14745,9.2354627125,15.157060000000001Q9.2837621125,15.16667,9.3330078125,15.16667L10.6663378125,15.16667Q10.7657978125,15.16667,10.8576878125,15.12861Q10.9495678125,15.09055,11.0198978125,15.02022L14.3532278125,11.68689Q14.3880478125,11.65206,14.4154078125,11.61112Q14.4427678125,11.570170000000001,14.4616178125,11.52468Q14.4804578125,11.47918,14.490067812500001,11.43088Q14.4996778125,11.38258,14.4996778125,11.33333Q14.4996778125,11.284089999999999,14.490067812500001,11.23579Q14.4804578125,11.18749,14.4616178125,11.14199Q14.4427678125,11.09649,14.4154078125,11.05555Q14.3880478125,11.0146,14.3532278125,10.97978L13.0198978125,9.646447Q12.9495678125,9.57612,12.8576878125,9.53806Q12.7657978125,9.5,12.6663378125,9.5Q12.5668878125,9.5,12.4749978125,9.53806Q12.3831178125,9.57612,12.3127878125,9.646447L8.9794548125,12.97978Q8.9091278125,13.05011,8.8710678125,13.14199Q8.8330078125,13.23388,8.8330078125,13.33333ZM9.8330078125,14.16667L10.4592378125,14.16667L13.2925678125,11.33333L12.6663378125,10.707107L9.8330078125,13.54044L9.8330078125,14.16667Z" fill-rule="evenodd"  fill-opacity="1"/></g><g><path d="M10,5.1663378125L13.33333,5.1663378125Q13.38258,5.1663378125,13.43088,5.156737812499999Q13.47918,5.1471278125,13.52467,5.1282778125Q13.570170000000001,5.1094378124999995,13.61112,5.0820778125Q13.65206,5.0547178125,13.68689,5.0198978125Q13.72171,4.9850678125000005,13.74907,4.9441278125Q13.77643,4.9031778125,13.79527,4.8576778125Q13.814119999999999,4.8121878124999995,13.82373,4.7638878125Q13.83333,4.7155878125,13.83333,4.6663378125Q13.83333,4.6170978125,13.82373,4.5687978125Q13.814119999999999,4.5204978125,13.79527,4.4749978125Q13.77643,4.4294978125,13.74907,4.3885578125Q13.72171,4.3476078125,13.68689,4.3127878125Q13.65206,4.2779678125,13.61112,4.2506078125Q13.570170000000001,4.2232478125,13.52467,4.2043978125Q13.47918,4.1855578125,13.43088,4.1759478125000005Q13.38258,4.1663378125,13.33333,4.1663378125L10.5,4.1663378125L10.5,1.3330078125Q10.5,1.2837621125,10.490393,1.2354627125Q10.480785000000001,1.1871628125,10.46194,1.1416658124999999Q10.443094,1.0961688125,10.415735,1.0552228125Q10.388375,1.0142768125,10.353553,0.9794548125Q10.318731,0.9446328125,10.277785,0.9172728125Q10.236839,0.8899138125,10.191342,0.8710678125Q10.145845,0.8522228125,10.0975451,0.8426148124999999Q10.0492457,0.8330078125,10,0.8330078125Q9.9507543,0.8330078125,9.9024549,0.8426148124999999Q9.854155,0.8522228125,9.808658,0.8710678125Q9.763161,0.8899138125,9.722215,0.9172728125Q9.681269,0.9446328125,9.646447,0.9794548125Q9.611625,1.0142768125,9.584265,1.0552228125Q9.556906,1.0961688125,9.53806,1.1416658124999999Q9.519214999999999,1.1871628125,9.509607,1.2354627125Q9.5,1.2837621125,9.5,1.3330078125L9.5,4.6663378125Q9.5,4.7155878125,9.509607,4.7638878125Q9.519214999999999,4.8121878124999995,9.53806,4.8576778125Q9.556906,4.9031778125,9.584265,4.9441278125Q9.611625,4.9850678125000005,9.646447,5.0198978125Q9.681269,5.0547178125,9.722215,5.0820778125Q9.763161,5.1094378124999995,9.808658,5.1282778125Q9.854155,5.1471278125,9.9024549,5.156737812499999Q9.9507543,5.1663378125,10,5.1663378125Z" fill-rule="evenodd"  fill-opacity="1"/></g></g></svg>
\ No newline at end of file

dsk-operate-ui/src/assets/icons/svg/managelog.svg

-<svg xmlns="http://www.w3.org/2000/svg" fill="white" version="1.1" width="14" height="14" viewBox="0 0 14 14">
+<svg xmlns="http://www.w3.org/2000/svg"  version="1.1" width="14" height="14" viewBox="0 0 14 14">
   <defs>
     <clipPath id="master_svg0_634_008390">
       <rect x="0" y="0" width="14" height="14" rx="0"/>
@@ -8,25 +8,25 @@
     <g>
       <path
         d="M1.0104570234375,2.9374589765625L1.0104570234375,11.9582959765625Q1.0104570234375,12.3854259765625,1.3125050234375,12.6875259765625Q1.6145490234375,12.9895259765625,2.0417070234375,12.9895259765625L11.9583740234375,12.9895259765625Q12.3855740234375,12.9895259765625,12.6875740234375,12.6875259765625Q12.9895740234375,12.3854259765625,12.9895740234375,11.9582859765625L12.9895740234375,2.9374539765625Q12.9895740234375,2.3808559765625,12.5959740234375,1.9872829765625Q12.2024740234375,1.5937089765625,11.6458740234375,1.5937089765625L2.3542070234375,1.5937089765625Q1.7976080234375,1.5937089765625,1.4040326234375,1.9872845765625Q1.0104570234375,2.3808599765625,1.0104570234375,2.9374589765625ZM2.0417070234375,12.0937259765625Q1.9062910234375,12.0937259765625,1.9062910234375,11.9582959765625L1.9062910234375,2.9374589765625Q1.9062910234375,2.7519259765625,2.0374820234374997,2.6207339765624997Q2.1686740234375,2.4895429765625,2.3542070234375,2.4895429765625L11.6458740234375,2.4895429765625Q11.8313740234375,2.4895429765625,11.9625740234375,2.6207339765624997Q12.0937740234375,2.7519249765625,12.0937740234375,2.9374579765625L12.0937740234375,11.9582959765625Q12.0937740234375,12.0937259765625,11.9583740234375,12.0937259765625L2.0417070234375,12.0937259765625Z"
-        fill-rule="evenodd" fill="#ffffff" fill-opacity="1"/>
+        fill-rule="evenodd"  fill-opacity="1"/>
     </g>
     <g>
       <path
         d="M4.822917,1.3557511Q4.825,1.3341757,4.825,1.3125Q4.825,1.2681789,4.816353,1.2247094Q4.807707,1.18124,4.790746,1.140292Q4.773785,1.099345,4.749161,1.062493Q4.724538,1.025642,4.693198,0.994302Q4.661858,0.962962,4.625007,0.938339Q4.588155,0.913715,4.547208,0.896754Q4.50626,0.879793,4.4627906,0.871147Q4.4193211,0.8625,4.375,0.8625Q4.3306789,0.8625,4.2872094,0.871147Q4.24374,0.879793,4.202792,0.896754Q4.161845,0.913715,4.124993,0.938339Q4.088142,0.962962,4.056802,0.994302Q4.025462,1.025642,4.000839,1.062493Q3.976215,1.099345,3.959254,1.140292Q3.942293,1.18124,3.933647,1.2247094Q3.925,1.2681789,3.925,1.3125Q3.925,1.3341757,3.927083,1.3557511L3.927083,3.45675Q3.925,3.47832,3.925,3.5Q3.925,3.54432,3.933647,3.58779Q3.942293,3.63126,3.959254,3.67221Q3.976215,3.71315,4.000839,3.75001Q4.025462,3.78686,4.056802,3.8182Q4.088142,3.84954,4.124993,3.87416Q4.161845,3.89878,4.202792,3.91575Q4.24374,3.93271,4.2872094,3.94135Q4.3306789,3.95,4.375,3.95Q4.4193211,3.95,4.4627906,3.94135Q4.50626,3.93271,4.547208,3.91575Q4.588155,3.89878,4.625007,3.87416Q4.661858,3.84954,4.693198,3.8182Q4.724538,3.78686,4.749161,3.75001Q4.773785,3.71315,4.790746,3.67221Q4.807707,3.63126,4.816353,3.58779Q4.825,3.54432,4.825,3.5Q4.825,3.47832,4.822917,3.45675L4.822917,1.3557511Z"
-        fill-rule="evenodd" fill="#ffffff" fill-opacity="1"/>
+        fill-rule="evenodd"  fill-opacity="1"/>
     </g>
     <g>
       <path
         d="M10.072917,1.3557511Q10.075,1.3341757,10.075,1.3125Q10.075,1.2681789,10.066353,1.2247094Q10.057707,1.18124,10.040746,1.140292Q10.023785,1.099345,9.999161,1.062493Q9.974538,1.025642,9.943198,0.994302Q9.911858,0.962962,9.875007,0.938339Q9.838155,0.913715,9.797208,0.896754Q9.75626,0.879793,9.7127906,0.871147Q9.6693211,0.8625,9.625,0.8625Q9.5806789,0.8625,9.5372094,0.871147Q9.49374,0.879793,9.452792,0.896754Q9.411845,0.913715,9.374993,0.938339Q9.338142,0.962962,9.306802,0.994302Q9.275462,1.025642,9.250839,1.062493Q9.226215,1.099345,9.209254,1.140292Q9.192293,1.18124,9.183647,1.2247094Q9.175,1.2681789,9.175,1.3125Q9.175,1.3341757,9.177083,1.3557511L9.177083,3.45675Q9.175,3.47832,9.175,3.5Q9.175,3.54432,9.183647,3.58779Q9.192293,3.63126,9.209254,3.67221Q9.226215,3.71315,9.250839,3.75001Q9.275462,3.78686,9.306802,3.8182Q9.338142,3.84954,9.374993,3.87416Q9.411845,3.89878,9.452792,3.91575Q9.49374,3.93271,9.5372094,3.94135Q9.5806789,3.95,9.625,3.95Q9.6693211,3.95,9.7127906,3.94135Q9.75626,3.93271,9.797208,3.91575Q9.838155,3.89878,9.875007,3.87416Q9.911858,3.84954,9.943198,3.8182Q9.974538,3.78686,9.999161,3.75001Q10.023785,3.71315,10.040746,3.67221Q10.057707,3.63126,10.066353,3.58779Q10.075,3.54432,10.075,3.5Q10.075,3.47832,10.072917,3.45675L10.072917,1.3557511Z"
-        fill-rule="evenodd" fill="#ffffff" fill-opacity="1"/>
+        fill-rule="evenodd"  fill-opacity="1"/>
     </g>
     <g>
-      <ellipse cx="7" cy="7.875" rx="0.875" ry="0.875" fill="#ffffff" fill-opacity="1"/>
+      <ellipse cx="7" cy="7.875" rx="0.875" ry="0.875"  fill-opacity="1"/>
     </g>
     <g transform="matrix(0,1,-1,0,14.875,-4.375)">
       <path
         d="M12.47396,4.862093L14.74727,6.174593Q14.79834,6.204078,14.84004,6.245775Q14.88174,6.28747,14.91122,6.33854Q14.94071,6.38961,14.95597,6.4465699999999995Q14.97123,6.50353,14.97123,6.5625L14.97123,9.1875Q14.97123,9.24647,14.95597,9.303429999999999Q14.94071,9.360389999999999,14.91122,9.41146Q14.88174,9.462530000000001,14.84004,9.50422Q14.79834,9.545919999999999,14.74727,9.57541L12.47396,10.88791Q12.42289,10.917390000000001,12.36593,10.932649999999999Q12.30897,10.94792,12.25,10.94792Q12.19103,10.94792,12.13407,10.932649999999999Q12.07711,10.917390000000001,12.02604,10.88791L9.752725,9.57541Q9.701656,9.545919999999999,9.6599584,9.50422Q9.61826079,9.462530000000001,9.5887761,9.41146Q9.5592914,9.360389999999999,9.544029,9.303429999999999Q9.5287667,9.24647,9.5287667,9.1875L9.5287666,6.5625Q9.5287666,6.50353,9.544029,6.4465699999999995Q9.5592914,6.38961,9.5887761,6.33854Q9.61826075,6.28747,9.6599584,6.245775Q9.701656,6.204077,9.752725,6.174593L12.02604,4.862093Q12.07711,4.8326080000000005,12.13407,4.817346Q12.19103,4.802083,12.25,4.802083Q12.30897,4.802083,12.36593,4.817346Q12.42289,4.8326080000000005,12.47396,4.862093L12.47396,4.862093ZM12.02604,5.637907L12.25,5.25L12.47396,5.637907L10.200642,6.95041L9.976683,6.5625L10.4246,6.5625L10.4246,9.1875L9.976683,9.1875L10.200642,8.79959L12.47396,10.11209L12.25,10.5L12.02604,10.11209L14.29936,8.79959L14.52332,9.1875L14.0754,9.1875L14.0754,6.5625L14.52332,6.5625L14.29936,6.95041L12.02604,5.637907Z"
-        fill="#ffffff" fill-opacity="1"/>
+         fill-opacity="1"/>
     </g>
   </g>
 </svg>

dsk-operate-ui/src/assets/icons/svg/monitor.svg

-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_233_92225/11_04949"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_233_92225/11_04949)"><g><path d="M6.5,14L6.5,11Q6.5,10.9507543,6.509607,10.9024549Q6.519215,10.854155,6.53806,10.808658Q6.556906,10.763161,6.584265,10.722215Q6.611625,10.681269,6.646447,10.646447Q6.681269,10.611625,6.722215,10.584265Q6.763161,10.556906,6.808658,10.53806Q6.854155,10.519214999999999,6.9024549,10.509607Q6.9507543,10.5,7,10.5L9,10.5Q9.04925,10.5,9.09754,10.509607Q9.14584,10.519214999999999,9.19134,10.53806Q9.23684,10.556906,9.27778,10.584265Q9.31873,10.611625,9.35355,10.646447Q9.38838,10.681269,9.41573,10.722215Q9.44309,10.763161,9.46194,10.808658Q9.48078,10.854155,9.49039,10.9024549Q9.5,10.9507543,9.5,11L9.5,14Q9.5,14.04925,9.49039,14.09754Q9.48078,14.14584,9.46194,14.19134Q9.44309,14.23684,9.41573,14.27778Q9.38838,14.31873,9.35355,14.35355Q9.31873,14.38837,9.27779,14.41573Q9.23684,14.44309,9.19134,14.46194Q9.14584,14.48078,9.09754,14.49039Q9.04925,14.5,9,14.5L7,14.5Q6.9507543,14.5,6.9024549,14.49039Q6.854155,14.48078,6.808658,14.46194Q6.763161,14.44309,6.722215,14.41573Q6.681269,14.38837,6.646447,14.35355Q6.611625,14.31873,6.584265,14.27778Q6.556906,14.23684,6.53806,14.19134Q6.519215,14.14584,6.509607,14.09754Q6.5,14.04925,6.5,14ZM7.5,11.5L7.5,13.5L8.5,13.5L8.5,11.5L7.5,11.5Z" fill="#FFFFFF" fill-opacity="1"/></g><g><rect x="2" y="3" width="12" height="8" rx="1" fill-opacity="0" stroke-opacity="1" stroke="#FFFFFF" fill="none" stroke-width="1"/></g><g transform="matrix(1,0.0000922808758332394,-0.00009228093404090032,1,0.0012919330765726045,-0.0003691235033329576)"><path d="M4,14.5L12.00001,14.5Q12.04926,14.5,12.09756,14.490393Q12.14586,14.480785000000001,12.19135,14.46194Q12.23685,14.443094,12.2778,14.415735Q12.31874,14.388375,12.35357,14.353553Q12.38839,14.318731,12.41575,14.277785Q12.44311,14.236839,12.46195,14.191342Q12.4808,14.145845,12.49041,14.0975451Q12.50001,14.0492457,12.50001,14Q12.50001,13.9507543,12.49041,13.9024549Q12.4808,13.854155,12.46195,13.808658Q12.44311,13.763161,12.41575,13.722215Q12.38839,13.681269,12.35357,13.646447Q12.31874,13.611625,12.2778,13.584265Q12.23685,13.556906,12.19135,13.53806Q12.14586,13.519214999999999,12.09756,13.509607Q12.04926,13.5,12.00001,13.5L4,13.5Q3.9507543,13.5,3.9024549,13.509607Q3.854155,13.519214999999999,3.808658,13.53806Q3.763161,13.556906,3.722215,13.584265Q3.681269,13.611625,3.646447,13.646447Q3.611625,13.681269,3.584265,13.722215Q3.556906,13.763161,3.5380599999999998,13.808658Q3.519215,13.854155,3.509607,13.9024549Q3.5,13.9507543,3.5,14Q3.5,14.0492457,3.509607,14.0975451Q3.519215,14.145845,3.5380599999999998,14.191342Q3.556906,14.236839,3.584265,14.277785Q3.611625,14.318731,3.646447,14.353553Q3.681269,14.388375,3.722215,14.415735Q3.763161,14.443094,3.808658,14.46194Q3.854155,14.480785000000001,3.9024549,14.490393Q3.9507543,14.5,4,14.5Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M11.85355,5.353553Q11.92388,5.283227,11.96194,5.191342Q12,5.0994562,12,5Q12,4.9507543,11.99039,4.9024549Q11.98078,4.854155,11.96194,4.808658Q11.94309,4.763161,11.91573,4.722215Q11.88837,4.681269,11.85355,4.646447Q11.81873,4.611625,11.77778,4.584265Q11.73684,4.556906,11.69134,4.53806Q11.64584,4.519215,11.59754,4.509607Q11.54925,4.5,11.5,4.5Q11.40054,4.5,11.30866,4.53806Q11.21677,4.57612,11.14645,4.646447L11.14626,4.646634L8.5,7.29289L7.35355,6.14645Q7.31873,6.11162,7.27778,6.08427Q7.23684,6.05691,7.19134,6.03806Q7.14584,6.01921,7.09754,6.00961Q7.04925,6,7,6Q6.95075,6,6.90245,6.00961Q6.85416,6.01921,6.80866,6.03806Q6.76316,6.05691,6.7222100000000005,6.08427Q6.68127,6.11162,6.64645,6.14645L4.646634,8.14626L4.646447,8.14645Q4.57612,8.21677,4.53806,8.30866Q4.5,8.40054,4.5,8.5Q4.5,8.54925,4.509607,8.59754Q4.519215,8.64584,4.53806,8.69134Q4.556906,8.73684,4.584265,8.77778Q4.611625,8.81873,4.646447,8.85355Q4.681269,8.88838,4.722215,8.91573Q4.763161,8.94309,4.808658,8.96194Q4.854155,8.98078,4.9024549,8.99039Q4.9507543,9,5,9Q5.0994562,9,5.191342,8.96194Q5.283227,8.92388,5.353553,8.85355L5.353741,8.85337L7,7.20711L8.14645,8.35355Q8.21677,8.42388,8.30866,8.46194Q8.40054,8.5,8.5,8.5Q8.59946,8.5,8.69134,8.46194Q8.78323,8.42388,8.85355,8.35355L11.85337,5.353741L11.85355,5.353553L11.85355,5.353553Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  version="1.1" width="14" height="14" viewBox="0 0 14 14"><defs><clipPath id="master_svg0_264_80210"><rect x="0" y="0" width="14" height="14" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_264_80210)"><g><path d="M5.625,12.25L5.625,9.625Q5.625,9.5757543,5.634607,9.5274549Q5.644215,9.479155,5.66306,9.433658Q5.681906,9.388161,5.709265,9.347215Q5.736625,9.306269,5.771447,9.271447Q5.806269,9.236625,5.847215,9.209265Q5.888161,9.181906,5.933658,9.16306Q5.979155,9.144214999999999,6.0274549,9.134607Q6.0757543,9.125,6.125,9.125L7.875,9.125Q7.92425,9.125,7.97254,9.134607Q8.02084,9.144214999999999,8.06634,9.16306Q8.11184,9.181906,8.15278,9.209265Q8.19373,9.236625,8.22855,9.271447Q8.26337,9.306269,8.29073,9.347215Q8.31809,9.388161,8.33694,9.433658Q8.35578,9.479155,8.36539,9.5274549Q8.375,9.5757543,8.375,9.625L8.375,12.25Q8.375,12.29925,8.36539,12.34755Q8.35578,12.39584,8.33694,12.44134Q8.31809,12.48684,8.29073,12.52778Q8.26337,12.56873,8.22855,12.60355Q8.19373,12.63838,8.15278,12.66573Q8.11184,12.69309,8.06634,12.71194Q8.02084,12.73078,7.97254,12.74039Q7.92425,12.75,7.875,12.75L6.125,12.75Q6.0757543,12.75,6.0274549,12.74039Q5.979155,12.73078,5.933658,12.71194Q5.888161,12.69309,5.847215,12.66573Q5.806269,12.63838,5.771447,12.60355Q5.736625,12.56873,5.709265,12.52778Q5.681906,12.48684,5.66306,12.44134Q5.644215,12.39584,5.634607,12.34755Q5.625,12.29925,5.625,12.25ZM6.625,10.125L6.625,11.75L7.375,11.75L7.375,10.125L6.625,10.125Z"  fill-opacity="1"/></g><g><rect x="1.75" y="2.625" width="10.5" height="7" rx="1" fill-opacity="0" stroke-opacity="1" stroke="#86909C"  stroke-width="1"/></g><g transform="matrix(1,0.0000922808758332394,-0.00009228093404090032,1,0.001130441442001029,-0.0003229830654163379)"><path d="M3.5,11.75L10.50001,11.75Q10.54926,11.75,10.59756,11.759607Q10.645859999999999,11.769214999999999,10.69135,11.78806Q10.73685,11.806906,10.7778,11.834265Q10.81874,11.861625,10.85356,11.896447Q10.888390000000001,11.931269,10.91575,11.972215Q10.943100000000001,12.013161,10.96195,12.058658Q10.9808,12.104155,10.990400000000001,12.1524549Q11.00001,12.2007543,11.00001,12.25Q11.00001,12.2992457,10.990400000000001,12.3475451Q10.9808,12.395845,10.96195,12.441342Q10.943100000000001,12.486839,10.91575,12.527785Q10.888390000000001,12.568731,10.85356,12.603553Q10.81874,12.638375,10.7778,12.665735Q10.73685,12.693094,10.69135,12.71194Q10.645859999999999,12.730785000000001,10.59756,12.740393Q10.54926,12.75,10.50001,12.75L3.5,12.75Q3.4507543,12.75,3.4024549,12.740393Q3.354155,12.730785000000001,3.308658,12.71194Q3.263161,12.693094,3.222215,12.665735Q3.181269,12.638375,3.146447,12.603553Q3.111625,12.568731,3.084265,12.527785Q3.056906,12.486839,3.0380599999999998,12.441342Q3.019215,12.395845,3.009607,12.3475451Q3,12.2992457,3,12.25Q3,12.2007543,3.009607,12.1524549Q3.019215,12.104155,3.0380599999999998,12.058658Q3.056906,12.013161,3.084265,11.972215Q3.111625,11.931269,3.146447,11.896447Q3.181269,11.861625,3.222215,11.834265Q3.263161,11.806906,3.308658,11.78806Q3.354155,11.769214999999999,3.4024549,11.759607Q3.4507543,11.75,3.5,11.75Z" fill-rule="evenodd"  fill-opacity="1"/></g><g><path d="M10.41605,4.728553Q10.48638,4.658227,10.52444,4.566342Q10.5625,4.4744562,10.5625,4.375Q10.5625,4.3257543,10.55289,4.2774549Q10.54328,4.229155,10.52444,4.183658Q10.50559,4.138161,10.47823,4.097215Q10.45087,4.056269,10.41605,4.021447Q10.38123,3.986625,10.34028,3.959265Q10.29934,3.931906,10.25384,3.9130599999999998Q10.20834,3.894215,10.16004,3.884607Q10.11175,3.875,10.0625,3.875Q9.96304,3.875,9.87116,3.9130599999999998Q9.77927,3.95112,9.70895,4.021447L9.70876,4.021634L7.4375,6.29289L6.47855,5.333947Q6.44373,5.299124,6.40278,5.271765Q6.36184,5.244406,6.31634,5.22556Q6.27084,5.206715,6.22254,5.197107Q6.17425,5.1875,6.125,5.1875Q6.07575,5.1875,6.02745,5.197107Q5.97916,5.206715,5.93366,5.22556Q5.88816,5.244406,5.8472100000000005,5.271765Q5.80627,5.299124,5.77145,5.333947L4.021634,7.08376L4.021447,7.08395Q3.95112,7.15427,3.9130599999999998,7.24616Q3.875,7.3380399999999995,3.875,7.4375Q3.875,7.48675,3.884607,7.53504Q3.894215,7.58334,3.9130599999999998,7.62884Q3.931906,7.67434,3.959265,7.71528Q3.986625,7.75623,4.021447,7.79105Q4.056269,7.82588,4.097215,7.85323Q4.138161,7.88059,4.183658,7.89944Q4.229155,7.91829,4.2774549,7.92789Q4.3257543,7.9375,4.375,7.9375Q4.4744562,7.9375,4.566342,7.89944Q4.658227,7.8613800000000005,4.728553,7.79105L4.728741,7.79087L6.125,6.39461L7.08395,7.35355Q7.15427,7.4238800000000005,7.24616,7.46194Q7.3380399999999995,7.5,7.4375,7.5Q7.5369600000000005,7.5,7.62884,7.46194Q7.72073,7.4238800000000005,7.79105,7.35355L10.41587,4.728741L10.41605,4.728553L10.41605,4.728553Z" fill-rule="evenodd"  fill-opacity="1"/></g></g></svg>
\ No newline at end of file

dsk-operate-ui/src/assets/icons/svg/sideProjectCostLedgerIcon.svg

-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="14" height="14" viewBox="0 0 14 14"><defs><clipPath id="master_svg0_913_022647"><rect x="0" y="0" width="14" height="14" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_913_022647)"><g><path d="M11.95833,10.0499559765625L11.08841,10.0499559765625L11.08841,10.9499559765625L11.95833,10.9499559765625Q12.50718,10.9499559765625,12.89526,10.5618859765625Q13.28333,10.1738059765625,13.28333,9.6249559765625L13.28333,2.0416259765625Q13.28333,1.4927929765624999,12.89526,1.1047117765625Q12.50718,0.7166259765625,11.95833,0.7166259765625L4.375,0.7166259765625Q3.826158,0.7166259765625,3.4380766,1.1047118765625Q3.05,1.4927929765624999,3.05,2.0416259765625L3.05,2.8953459765625L3.95,2.8953459765625L3.95,2.0416259765625Q3.95,1.8655819765625,4.074476,1.7411039765625Q4.198953,1.6166259765625,4.375,1.6166259765625L11.95833,1.6166259765625Q12.13438,1.6166259765625,12.25886,1.7411039765625Q12.38333,1.8655829765625,12.38333,2.0416259765625L12.38333,9.6249559765625Q12.38333,9.8010059765625,12.25886,9.9254859765625Q12.13438,10.0499559765625,11.95833,10.0499559765625Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M0.7166259765625,11.8332959765625L0.7166259765625,3.9166259765625Q0.7166259765625,3.3160159765625,1.1413210765625,2.8913210765625Q1.5660159765625,2.4666259765625,2.1666259765625,2.4666259765625L10.0832959765625,2.4666259765625Q10.6839059765625,2.4666259765625,11.1085959765625,2.8913210765625Q11.5333259765625,3.3160159765625,11.5333259765625,3.9166259765625L11.5333259765625,11.8332959765625Q11.5333259765625,12.4339059765625,11.1085959765625,12.8585959765625Q10.6839059765625,13.2833259765625,10.0832959765625,13.2833259765625L2.1666259765625,13.2833259765625Q1.5660159765625,13.2833259765625,1.1413210765625,12.8585959765625Q0.7166259765625,12.4339059765625,0.7166259765625,11.8332959765625ZM1.6166259765625,11.8332959765625Q1.6166259765625,12.0611059765625,1.7777169765625,12.2222059765625Q1.9388089765625,12.3832959765625,2.1666259765625,12.3832959765625L10.0832959765625,12.3832959765625Q10.3111059765625,12.3832959765625,10.4722059765625,12.2222059765625Q10.6332959765625,12.0611059765625,10.6332959765625,11.8332959765625L10.6332959765625,3.9166259765625Q10.6332959765625,3.6888089765625,10.4722059765625,3.5277169765625Q10.3111059765625,3.3666259765625,10.0832959765625,3.3666259765625L2.1666259765625,3.3666259765625Q1.9388089765625,3.3666259765625,1.7777169765625,3.5277169765625Q1.6166259765625,3.6888079765625,1.6166259765625,3.9166259765625L1.6166259765625,11.8332959765625Z" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M4.693302,4.6402800234375L4.693198,4.6401760234375Q4.629905,4.5768820234375,4.547208,4.5426280234375Q4.4645106,4.5083740234375,4.375,4.5083740234375Q4.2854894,4.5083740234375,4.202792,4.5426280234375Q4.120095,4.5768820234375,4.056802,4.6401760234375Q3.993508,4.7034690234375,3.959254,4.7861660234375Q3.925,4.8688634234375,3.925,4.9583740234375Q3.925,5.0478846234375,3.959254,5.1305820234375Q3.993508,5.2132790234375,4.056802,5.2765720234375L4.056906,5.2766760234375L5.8068,7.0265740234375Q5.83814,7.0579140234375,5.87499,7.0825340234375Q5.91184,7.1071540234375,5.95279,7.1241240234375Q5.99374,7.1410840234375,6.03721,7.1497240234375Q6.08068,7.1583740234375,6.125,7.1583740234375Q6.16932,7.1583740234375,6.21279,7.1497240234375Q6.25626,7.1410840234375,6.29721,7.1241240234375Q6.33815,7.1071540234375,6.37501,7.0825340234375Q6.41186,7.0579140234375,6.4432,7.0265740234375L8.19299,5.2767800234375L8.193200000000001,5.2765720234375Q8.25649,5.2132790234375,8.29075,5.1305820234375Q8.325,5.0478846234375,8.325,4.9583740234375Q8.325,4.8688634234375,8.29075,4.7861660234375Q8.25649,4.7034690234375,8.193200000000001,4.6401760234375L8.19294,4.6399190234375Q8.19114,4.6381180234375,8.189309999999999,4.6363380234375L8.18905,4.6360840234375Q8.12603,4.5746710234375,8.044509999999999,4.5415220234374996Q7.963,4.5083740234375,7.875,4.5083740234375Q7.85474,4.5083740234375,7.834569999999999,4.5101940234375Q7.67213,4.5248490234375,7.5568,4.6401760234375L7.55659,4.6403840234375L6.125,6.0719740234375L4.693302,4.6402800234375Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M4.0833740234375,7.7416259765625L8.1667140234375,7.7416259765625Q8.211034023437499,7.7416259765625,8.2545040234375,7.7329789765625Q8.2979740234375,7.7243329765625,8.3389240234375,7.7073719765625Q8.3798640234375,7.6904109765625,8.4167240234375,7.6657869765625Q8.4535740234375,7.6411639765625,8.4849140234375,7.6098239765625Q8.5162540234375,7.5784839765625,8.5408740234375,7.5416329765625Q8.5654940234375,7.5047809765625,8.582464023437499,7.4638339765625Q8.5994240234375,7.4228859765625,8.6080640234375,7.3794165765625Q8.616714023437499,7.3359470765625,8.616714023437499,7.2916259765625Q8.616714023437499,7.2473048765625,8.6080640234375,7.2038353765625Q8.5994240234375,7.1603659765625,8.5824540234375,7.1194179765625Q8.5654940234375,7.0784709765625,8.5408740234375,7.0416189765625Q8.5162540234375,7.0047679765625,8.4849140234375,6.9734279765625Q8.4535740234375,6.9420879765625,8.4167240234375,6.9174649765625Q8.3798640234375,6.8928409765625,8.3389240234375,6.8758799765625Q8.2979740234375,6.8589189765625,8.2545040234375,6.8502729765625Q8.211034023437499,6.8416259765625,8.1667140234375,6.8416259765625L4.0833740234375,6.8416259765625Q4.0390529234375,6.8416259765625,3.9955834234375,6.8502729765625Q3.9521140234375,6.8589189765625,3.9111660234375,6.8758799765625Q3.8702190234375,6.8928409765625,3.8333670234375,6.9174649765625Q3.7965160234375,6.9420879765625,3.7651760234375002,6.9734279765625Q3.7338360234375,7.0047679765625,3.7092130234375,7.0416189765625Q3.6845890234375,7.0784709765625,3.6676280234375,7.1194179765625Q3.6506670234375,7.1603659765625,3.6420210234375,7.2038353765625Q3.6333740234375,7.2473048765625,3.6333740234375,7.2916259765625Q3.6333740234375,7.3359470765625,3.6420210234375,7.3794165765625Q3.6506670234375,7.4228859765625,3.6676280234375,7.4638339765625Q3.6845890234375,7.5047809765625,3.7092130234375,7.5416329765625Q3.7338360234375,7.5784839765625,3.7651760234375002,7.6098239765625Q3.7965160234375,7.6411639765625,3.8333670234375,7.6657869765625Q3.8702190234375,7.6904109765625,3.9111660234375,7.7073719765625Q3.9521140234375,7.7243329765625,3.9955834234375,7.7329789765625Q4.0390529234375,7.7416259765625,4.0833740234375,7.7416259765625Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M4.0833740234375,9.4916259765625L8.1667140234375,9.4916259765625Q8.211034023437499,9.4916259765625,8.2545040234375,9.4829789765625Q8.2979740234375,9.4743329765625,8.3389240234375,9.4573719765625Q8.3798640234375,9.4404109765625,8.4167240234375,9.4157869765625Q8.4535740234375,9.3911639765625,8.4849140234375,9.3598239765625Q8.5162540234375,9.3284839765625,8.5408740234375,9.2916329765625Q8.5654940234375,9.2547809765625,8.582464023437499,9.2138339765625Q8.5994240234375,9.1728859765625,8.6080640234375,9.1294165765625Q8.616714023437499,9.0859470765625,8.616714023437499,9.0416259765625Q8.616714023437499,8.9973048765625,8.6080640234375,8.9538353765625Q8.5994240234375,8.9103659765625,8.5824540234375,8.8694179765625Q8.5654940234375,8.8284709765625,8.5408740234375,8.7916189765625Q8.5162540234375,8.7547679765625,8.4849140234375,8.7234279765625Q8.4535740234375,8.6920879765625,8.4167240234375,8.6674649765625Q8.3798640234375,8.6428409765625,8.3389240234375,8.6258799765625Q8.2979740234375,8.6089189765625,8.2545040234375,8.6002729765625Q8.211034023437499,8.5916259765625,8.1667140234375,8.5916259765625L4.0833740234375,8.5916259765625Q4.0390529234375,8.5916259765625,3.9955834234375,8.6002729765625Q3.9521140234375,8.6089189765625,3.9111660234375,8.6258799765625Q3.8702190234375,8.6428409765625,3.8333670234375,8.6674649765625Q3.7965160234375,8.6920879765625,3.7651760234375002,8.7234279765625Q3.7338360234375,8.7547679765625,3.7092130234375,8.7916189765625Q3.6845890234375,8.8284709765625,3.6676280234375,8.8694179765625Q3.6506670234375,8.9103659765625,3.6420210234375,8.9538353765625Q3.6333740234375,8.9973048765625,3.6333740234375,9.0416259765625Q3.6333740234375,9.0859470765625,3.6420210234375,9.1294165765625Q3.6506670234375,9.1728859765625,3.6676280234375,9.2138339765625Q3.6845890234375,9.2547809765625,3.7092130234375,9.2916329765625Q3.7338360234375,9.3284839765625,3.7651760234375002,9.3598239765625Q3.7965160234375,9.3911639765625,3.8333670234375,9.4157869765625Q3.8702190234375,9.4404109765625,3.9111660234375,9.4573719765625Q3.9521140234375,9.4743329765625,3.9955834234375,9.4829789765625Q4.0390529234375,9.4916259765625,4.0833740234375,9.4916259765625Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M5.675,7.2916259765625L5.675,10.4999559765625Q5.675,10.5442759765625,5.683647,10.5877459765625Q5.692293,10.6312159765625,5.709254,10.6721659765625Q5.726215,10.7131159765625,5.750839,10.7499659765625Q5.775462,10.786815976562501,5.806802,10.818155976562501Q5.838142,10.8494959765625,5.874993,10.8741159765625Q5.911845,10.8987459765625,5.952792,10.9157059765625Q5.99374,10.9326659765625,6.0372094,10.9413159765625Q6.0806789,10.9499559765625,6.125,10.9499559765625Q6.1693211,10.9499559765625,6.2127906,10.9413159765625Q6.25626,10.9326659765625,6.297208,10.9157059765625Q6.338155,10.8987459765625,6.375007,10.8741159765625Q6.411858,10.8494959765625,6.443198,10.818155976562501Q6.474538,10.786815976562501,6.499161,10.7499659765625Q6.523785,10.7131159765625,6.540746,10.6721659765625Q6.557707,10.6312159765625,6.566353,10.5877459765625Q6.575,10.5442759765625,6.575,10.4999559765625L6.575,7.2916259765625Q6.575,7.2473048765625,6.566353,7.2038353765625Q6.557707,7.1603659765625,6.540746,7.1194179765625Q6.523785,7.0784709765625,6.499161,7.0416189765625Q6.474538,7.0047679765625,6.443198,6.9734279765625Q6.411858,6.9420879765625,6.375007,6.9174649765625Q6.338155,6.8928409765625,6.297208,6.8758799765625Q6.25626,6.8589189765625,6.2127906,6.8502729765625Q6.1693211,6.8416259765625,6.125,6.8416259765625Q6.0806789,6.8416259765625,6.0372094,6.8502729765625Q5.99374,6.8589189765625,5.952792,6.8758799765625Q5.911845,6.8928409765625,5.874993,6.9174649765625Q5.838142,6.9420879765625,5.806802,6.9734279765625Q5.775462,7.0047679765625,5.750839,7.0416189765625Q5.726215,7.0784709765625,5.709254,7.1194179765625Q5.692293,7.1603659765625,5.683647,7.2038353765625Q5.675,7.2473048765625,5.675,7.2916259765625Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  version="1.1" width="14" height="14" viewBox="0 0 14 14"><defs><clipPath id="master_svg0_913_022647"><rect x="0" y="0" width="14" height="14" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_913_022647)"><g><path d="M11.95833,10.0499559765625L11.08841,10.0499559765625L11.08841,10.9499559765625L11.95833,10.9499559765625Q12.50718,10.9499559765625,12.89526,10.5618859765625Q13.28333,10.1738059765625,13.28333,9.6249559765625L13.28333,2.0416259765625Q13.28333,1.4927929765624999,12.89526,1.1047117765625Q12.50718,0.7166259765625,11.95833,0.7166259765625L4.375,0.7166259765625Q3.826158,0.7166259765625,3.4380766,1.1047118765625Q3.05,1.4927929765624999,3.05,2.0416259765625L3.05,2.8953459765625L3.95,2.8953459765625L3.95,2.0416259765625Q3.95,1.8655819765625,4.074476,1.7411039765625Q4.198953,1.6166259765625,4.375,1.6166259765625L11.95833,1.6166259765625Q12.13438,1.6166259765625,12.25886,1.7411039765625Q12.38333,1.8655829765625,12.38333,2.0416259765625L12.38333,9.6249559765625Q12.38333,9.8010059765625,12.25886,9.9254859765625Q12.13438,10.0499559765625,11.95833,10.0499559765625Z" fill-rule="evenodd"  fill-opacity="1"/></g><g><path d="M0.7166259765625,11.8332959765625L0.7166259765625,3.9166259765625Q0.7166259765625,3.3160159765625,1.1413210765625,2.8913210765625Q1.5660159765625,2.4666259765625,2.1666259765625,2.4666259765625L10.0832959765625,2.4666259765625Q10.6839059765625,2.4666259765625,11.1085959765625,2.8913210765625Q11.5333259765625,3.3160159765625,11.5333259765625,3.9166259765625L11.5333259765625,11.8332959765625Q11.5333259765625,12.4339059765625,11.1085959765625,12.8585959765625Q10.6839059765625,13.2833259765625,10.0832959765625,13.2833259765625L2.1666259765625,13.2833259765625Q1.5660159765625,13.2833259765625,1.1413210765625,12.8585959765625Q0.7166259765625,12.4339059765625,0.7166259765625,11.8332959765625ZM1.6166259765625,11.8332959765625Q1.6166259765625,12.0611059765625,1.7777169765625,12.2222059765625Q1.9388089765625,12.3832959765625,2.1666259765625,12.3832959765625L10.0832959765625,12.3832959765625Q10.3111059765625,12.3832959765625,10.4722059765625,12.2222059765625Q10.6332959765625,12.0611059765625,10.6332959765625,11.8332959765625L10.6332959765625,3.9166259765625Q10.6332959765625,3.6888089765625,10.4722059765625,3.5277169765625Q10.3111059765625,3.3666259765625,10.0832959765625,3.3666259765625L2.1666259765625,3.3666259765625Q1.9388089765625,3.3666259765625,1.7777169765625,3.5277169765625Q1.6166259765625,3.6888079765625,1.6166259765625,3.9166259765625L1.6166259765625,11.8332959765625Z"  fill-opacity="1"/></g><g><path d="M4.693302,4.6402800234375L4.693198,4.6401760234375Q4.629905,4.5768820234375,4.547208,4.5426280234375Q4.4645106,4.5083740234375,4.375,4.5083740234375Q4.2854894,4.5083740234375,4.202792,4.5426280234375Q4.120095,4.5768820234375,4.056802,4.6401760234375Q3.993508,4.7034690234375,3.959254,4.7861660234375Q3.925,4.8688634234375,3.925,4.9583740234375Q3.925,5.0478846234375,3.959254,5.1305820234375Q3.993508,5.2132790234375,4.056802,5.2765720234375L4.056906,5.2766760234375L5.8068,7.0265740234375Q5.83814,7.0579140234375,5.87499,7.0825340234375Q5.91184,7.1071540234375,5.95279,7.1241240234375Q5.99374,7.1410840234375,6.03721,7.1497240234375Q6.08068,7.1583740234375,6.125,7.1583740234375Q6.16932,7.1583740234375,6.21279,7.1497240234375Q6.25626,7.1410840234375,6.29721,7.1241240234375Q6.33815,7.1071540234375,6.37501,7.0825340234375Q6.41186,7.0579140234375,6.4432,7.0265740234375L8.19299,5.2767800234375L8.193200000000001,5.2765720234375Q8.25649,5.2132790234375,8.29075,5.1305820234375Q8.325,5.0478846234375,8.325,4.9583740234375Q8.325,4.8688634234375,8.29075,4.7861660234375Q8.25649,4.7034690234375,8.193200000000001,4.6401760234375L8.19294,4.6399190234375Q8.19114,4.6381180234375,8.189309999999999,4.6363380234375L8.18905,4.6360840234375Q8.12603,4.5746710234375,8.044509999999999,4.5415220234374996Q7.963,4.5083740234375,7.875,4.5083740234375Q7.85474,4.5083740234375,7.834569999999999,4.5101940234375Q7.67213,4.5248490234375,7.5568,4.6401760234375L7.55659,4.6403840234375L6.125,6.0719740234375L4.693302,4.6402800234375Z" fill-rule="evenodd"  fill-opacity="1"/></g><g><path d="M4.0833740234375,7.7416259765625L8.1667140234375,7.7416259765625Q8.211034023437499,7.7416259765625,8.2545040234375,7.7329789765625Q8.2979740234375,7.7243329765625,8.3389240234375,7.7073719765625Q8.3798640234375,7.6904109765625,8.4167240234375,7.6657869765625Q8.4535740234375,7.6411639765625,8.4849140234375,7.6098239765625Q8.5162540234375,7.5784839765625,8.5408740234375,7.5416329765625Q8.5654940234375,7.5047809765625,8.582464023437499,7.4638339765625Q8.5994240234375,7.4228859765625,8.6080640234375,7.3794165765625Q8.616714023437499,7.3359470765625,8.616714023437499,7.2916259765625Q8.616714023437499,7.2473048765625,8.6080640234375,7.2038353765625Q8.5994240234375,7.1603659765625,8.5824540234375,7.1194179765625Q8.5654940234375,7.0784709765625,8.5408740234375,7.0416189765625Q8.5162540234375,7.0047679765625,8.4849140234375,6.9734279765625Q8.4535740234375,6.9420879765625,8.4167240234375,6.9174649765625Q8.3798640234375,6.8928409765625,8.3389240234375,6.8758799765625Q8.2979740234375,6.8589189765625,8.2545040234375,6.8502729765625Q8.211034023437499,6.8416259765625,8.1667140234375,6.8416259765625L4.0833740234375,6.8416259765625Q4.0390529234375,6.8416259765625,3.9955834234375,6.8502729765625Q3.9521140234375,6.8589189765625,3.9111660234375,6.8758799765625Q3.8702190234375,6.8928409765625,3.8333670234375,6.9174649765625Q3.7965160234375,6.9420879765625,3.7651760234375002,6.9734279765625Q3.7338360234375,7.0047679765625,3.7092130234375,7.0416189765625Q3.6845890234375,7.0784709765625,3.6676280234375,7.1194179765625Q3.6506670234375,7.1603659765625,3.6420210234375,7.2038353765625Q3.6333740234375,7.2473048765625,3.6333740234375,7.2916259765625Q3.6333740234375,7.3359470765625,3.6420210234375,7.3794165765625Q3.6506670234375,7.4228859765625,3.6676280234375,7.4638339765625Q3.6845890234375,7.5047809765625,3.7092130234375,7.5416329765625Q3.7338360234375,7.5784839765625,3.7651760234375002,7.6098239765625Q3.7965160234375,7.6411639765625,3.8333670234375,7.6657869765625Q3.8702190234375,7.6904109765625,3.9111660234375,7.7073719765625Q3.9521140234375,7.7243329765625,3.9955834234375,7.7329789765625Q4.0390529234375,7.7416259765625,4.0833740234375,7.7416259765625Z" fill-rule="evenodd"  fill-opacity="1"/></g><g><path d="M4.0833740234375,9.4916259765625L8.1667140234375,9.4916259765625Q8.211034023437499,9.4916259765625,8.2545040234375,9.4829789765625Q8.2979740234375,9.4743329765625,8.3389240234375,9.4573719765625Q8.3798640234375,9.4404109765625,8.4167240234375,9.4157869765625Q8.4535740234375,9.3911639765625,8.4849140234375,9.3598239765625Q8.5162540234375,9.3284839765625,8.5408740234375,9.2916329765625Q8.5654940234375,9.2547809765625,8.582464023437499,9.2138339765625Q8.5994240234375,9.1728859765625,8.6080640234375,9.1294165765625Q8.616714023437499,9.0859470765625,8.616714023437499,9.0416259765625Q8.616714023437499,8.9973048765625,8.6080640234375,8.9538353765625Q8.5994240234375,8.9103659765625,8.5824540234375,8.8694179765625Q8.5654940234375,8.8284709765625,8.5408740234375,8.7916189765625Q8.5162540234375,8.7547679765625,8.4849140234375,8.7234279765625Q8.4535740234375,8.6920879765625,8.4167240234375,8.6674649765625Q8.3798640234375,8.6428409765625,8.3389240234375,8.6258799765625Q8.2979740234375,8.6089189765625,8.2545040234375,8.6002729765625Q8.211034023437499,8.5916259765625,8.1667140234375,8.5916259765625L4.0833740234375,8.5916259765625Q4.0390529234375,8.5916259765625,3.9955834234375,8.6002729765625Q3.9521140234375,8.6089189765625,3.9111660234375,8.6258799765625Q3.8702190234375,8.6428409765625,3.8333670234375,8.6674649765625Q3.7965160234375,8.6920879765625,3.7651760234375002,8.7234279765625Q3.7338360234375,8.7547679765625,3.7092130234375,8.7916189765625Q3.6845890234375,8.8284709765625,3.6676280234375,8.8694179765625Q3.6506670234375,8.9103659765625,3.6420210234375,8.9538353765625Q3.6333740234375,8.9973048765625,3.6333740234375,9.0416259765625Q3.6333740234375,9.0859470765625,3.6420210234375,9.1294165765625Q3.6506670234375,9.1728859765625,3.6676280234375,9.2138339765625Q3.6845890234375,9.2547809765625,3.7092130234375,9.2916329765625Q3.7338360234375,9.3284839765625,3.7651760234375002,9.3598239765625Q3.7965160234375,9.3911639765625,3.8333670234375,9.4157869765625Q3.8702190234375,9.4404109765625,3.9111660234375,9.4573719765625Q3.9521140234375,9.4743329765625,3.9955834234375,9.4829789765625Q4.0390529234375,9.4916259765625,4.0833740234375,9.4916259765625Z" fill-rule="evenodd"  fill-opacity="1"/></g><g><path d="M5.675,7.2916259765625L5.675,10.4999559765625Q5.675,10.5442759765625,5.683647,10.5877459765625Q5.692293,10.6312159765625,5.709254,10.6721659765625Q5.726215,10.7131159765625,5.750839,10.7499659765625Q5.775462,10.786815976562501,5.806802,10.818155976562501Q5.838142,10.8494959765625,5.874993,10.8741159765625Q5.911845,10.8987459765625,5.952792,10.9157059765625Q5.99374,10.9326659765625,6.0372094,10.9413159765625Q6.0806789,10.9499559765625,6.125,10.9499559765625Q6.1693211,10.9499559765625,6.2127906,10.9413159765625Q6.25626,10.9326659765625,6.297208,10.9157059765625Q6.338155,10.8987459765625,6.375007,10.8741159765625Q6.411858,10.8494959765625,6.443198,10.818155976562501Q6.474538,10.786815976562501,6.499161,10.7499659765625Q6.523785,10.7131159765625,6.540746,10.6721659765625Q6.557707,10.6312159765625,6.566353,10.5877459765625Q6.575,10.5442759765625,6.575,10.4999559765625L6.575,7.2916259765625Q6.575,7.2473048765625,6.566353,7.2038353765625Q6.557707,7.1603659765625,6.540746,7.1194179765625Q6.523785,7.0784709765625,6.499161,7.0416189765625Q6.474538,7.0047679765625,6.443198,6.9734279765625Q6.411858,6.9420879765625,6.375007,6.9174649765625Q6.338155,6.8928409765625,6.297208,6.8758799765625Q6.25626,6.8589189765625,6.2127906,6.8502729765625Q6.1693211,6.8416259765625,6.125,6.8416259765625Q6.0806789,6.8416259765625,6.0372094,6.8502729765625Q5.99374,6.8589189765625,5.952792,6.8758799765625Q5.911845,6.8928409765625,5.874993,6.9174649765625Q5.838142,6.9420879765625,5.806802,6.9734279765625Q5.775462,7.0047679765625,5.750839,7.0416189765625Q5.726215,7.0784709765625,5.709254,7.1194179765625Q5.692293,7.1603659765625,5.683647,7.2038353765625Q5.675,7.2473048765625,5.675,7.2916259765625Z" fill-rule="evenodd"  fill-opacity="1"/></g></g></svg>
\ No newline at end of file

dsk-operate-ui/src/assets/icons/svg/supplier-management-siderbar.svg

-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_3_5582"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_3_5582)"><g><path d="M0.83331298828125,4L0.83331298828125,6.66667Q0.83331298828125,6.73142,0.84980998828125,6.79405Q0.86630798828125,6.856669999999999,0.89821398828125,6.9130199999999995Q0.93011998828125,6.96937,0.9753299882812501,7.01573Q1.02053998828125,7.0621,1.07606898828125,7.09542L1.54223698828125,7.375109999999999Q2.2151899882812502,7.7788900000000005,2.99998298828125,7.7788900000000005Q3.78477298828125,7.7788900000000005,4.45772298828125,7.375109999999999L4.66664298828125,7.24976L4.87556298828125,7.375109999999999Q5.54852298828125,7.7788900000000005,6.33331298828125,7.7788900000000005Q7.11810298828125,7.7788900000000005,7.79106298828125,7.375109999999999L7.99998298828125,7.24976L8.20889298828125,7.375109999999999Q8.88185298828125,7.7788900000000005,9.66664298828125,7.7788900000000005Q10.45144298828125,7.7788900000000005,11.12439298828125,7.375109999999999L11.33331298828125,7.24976L11.54221298828125,7.375109999999999Q12.21521298828125,7.7788900000000005,13.00001298828125,7.7788900000000005Q13.78481298828125,7.7788900000000005,14.45771298828125,7.375109999999999L14.92391298828125,7.09541Q14.97941298828125,7.0621,15.02461298828125,7.01573Q15.06981298828125,6.96937,15.10171298828125,6.9130199999999995Q15.13361298828125,6.85666,15.15011298828125,6.79404Q15.16661298828125,6.73142,15.16661298828125,6.66667L15.16661298828125,4Q15.16661298828125,3.9507543,15.15701298828125,3.9024549Q15.14741298828125,3.854155,15.12861298828125,3.808658Q15.10971298828125,3.763161,15.08241298828125,3.722215Q15.05501298828125,3.681269,15.02021298828125,3.646447Q14.98541298828125,3.611625,14.94441298828125,3.584265Q14.90351298828125,3.556906,14.85801298828125,3.5380599999999998Q14.81251298828125,3.519215,14.76421298828125,3.509607Q14.71591298828125,3.5,14.66661298828125,3.5L1.33331298828125,3.5Q1.28406728828125,3.5,1.23576788828125,3.509607Q1.18746798828125,3.519215,1.1419709882812499,3.5380599999999998Q1.09647398828125,3.556906,1.05552798828125,3.584265Q1.01458198828125,3.611625,0.97975998828125,3.646447Q0.94493798828125,3.681269,0.91757798828125,3.722215Q0.89021898828125,3.763161,0.87137298828125,3.808658Q0.85252798828125,3.854155,0.8429199882812499,3.9024549Q0.83331298828125,3.9507543,0.83331298828125,4ZM1.83331298828125,6.383570000000001L2.05674198828125,6.51762Q2.99998298828125,7.0835799999999995,3.94323298828125,6.51762L4.409402988281251,6.23792Q4.4676829882812505,6.2029499999999995,4.533182988281251,6.184810000000001Q4.59868298828125,6.16667,4.66664298828125,6.16667Q4.73461298828125,6.16667,4.80011298828125,6.184810000000001Q4.86561298828125,6.2029499999999995,4.92389298828125,6.23792L5.39006298828125,6.51762Q6.33331298828125,7.0835799999999995,7.27656298828125,6.51762L7.74273298828125,6.23792Q7.80101298828125,6.2029499999999995,7.86651298828125,6.184810000000001Q7.93201298828125,6.16667,7.99998298828125,6.16667Q8.06794298828125,6.16667,8.13344298828125,6.184810000000001Q8.19894298828125,6.2029499999999995,8.25722298828125,6.23792L8.72340298828125,6.51762Q9.66664298828125,7.0835799999999995,10.60990298828125,6.51762L11.07606298828125,6.23792Q11.13434298828125,6.2029499999999995,11.19984298828125,6.184810000000001Q11.26534298828125,6.16667,11.33331298828125,6.16667Q11.40131298828125,6.16667,11.46681298828125,6.184810000000001Q11.53231298828125,6.2029499999999995,11.59051298828125,6.23792L12.05671298828125,6.51762Q13.00001298828125,7.0835799999999995,13.94321298828125,6.51762L14.16661298828125,6.383570000000001L14.16661298828125,4.5L1.83331298828125,4.5L1.83331298828125,6.383570000000001Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M13.83338701171875,14.666665876464844L13.83338701171875,7.333335876464844Q13.83338701171875,7.284090176464844,13.82378701171875,7.235790776464844Q13.81418701171875,7.187490876464844,13.79528701171875,7.141993876464844Q13.77648701171875,7.096496876464844,13.74908701171875,7.055550876464844Q13.72168701171875,7.014604876464844,13.68688701171875,6.979782876464844Q13.65208701171875,6.944960876464844,13.61118701171875,6.917600876464844Q13.57018701171875,6.890241876464843,13.52468701171875,6.8713958764648435Q13.47918701171875,6.852550876464844,13.43088701171875,6.842942876464844Q13.38258701171875,6.833335876464844,13.33338701171875,6.833335876464844Q13.28408701171875,6.833335876464844,13.23578701171875,6.842942876464844Q13.18748701171875,6.852550876464844,13.14198701171875,6.8713958764648435Q13.09648701171875,6.890241876464843,13.05558701171875,6.917600876464844Q13.01458701171875,6.944960876464844,12.97978701171875,6.979782876464844Q12.94498701171875,7.014604876464844,12.91758701171875,7.055550876464844Q12.89028701171875,7.096496876464844,12.87138701171875,7.141993876464844Q12.85258701171875,7.187490876464844,12.84298701171875,7.235790776464844Q12.83338701171875,7.284090176464844,12.83338701171875,7.333335876464844L12.83338701171875,14.166665876464844L3.16668701171875,14.166665876464844L3.16668701171875,7.496301876464844Q3.16668701171875,7.447056876464844,3.15708001171875,7.398757176464843Q3.14747201171875,7.350457676464844,3.1286270117187502,7.304960576464843Q3.10978101171875,7.259463476464844,3.08242201171875,7.218516876464844Q3.05506201171875,7.177570876464844,3.02024001171875,7.142748876464844Q2.98541801171875,7.107926876464844,2.94447201171875,7.080567876464844Q2.90352601171875,7.053207876464843,2.85802901171875,7.034362876464844Q2.81253201171875,7.015516876464844,2.76423211171875,7.005909876464844Q2.71593271171875,6.996301876464844,2.66668701171875,6.996301876464844Q2.61744131171875,6.996301876464844,2.56914191171875,7.005909876464844Q2.52084201171875,7.015516876464844,2.47534501171875,7.034362876464844Q2.42984801171875,7.053207876464843,2.38890201171875,7.080567876464844Q2.34795601171875,7.107926876464844,2.31313401171875,7.142748876464844Q2.27831201171875,7.177570876464844,2.25095201171875,7.218516876464844Q2.22359301171875,7.259463476464844,2.2047470117187498,7.304960576464843Q2.18590201171875,7.350457676464844,2.17629401171875,7.398757176464843Q2.16668701171875,7.447056876464844,2.16668701171875,7.496301876464844L2.16668701171875,14.666665876464844Q2.16668701171875,14.715915876464845,2.17629401171875,14.764215876464844Q2.18590201171875,14.812515876464843,2.2047470117187498,14.858005876464844Q2.22359301171875,14.903505876464845,2.25095201171875,14.944455876464843Q2.27831201171875,14.985395876464843,2.31313401171875,15.020225876464844Q2.34795601171875,15.055045876464844,2.38890201171875,15.082405876464843Q2.42984801171875,15.109765876464845,2.47534501171875,15.128605876464844Q2.52084201171875,15.147455876464843,2.56914191171875,15.157065876464845Q2.61744131171875,15.166665876464844,2.66668701171875,15.166665876464844L13.33338701171875,15.166665876464844Q13.38258701171875,15.166665876464844,13.43088701171875,15.157065876464845Q13.47918701171875,15.147455876464843,13.52468701171875,15.128605876464844Q13.57018701171875,15.109765876464845,13.61118701171875,15.082405876464843Q13.65208701171875,15.055045876464844,13.68688701171875,15.020225876464844Q13.72168701171875,14.985395876464843,13.74908701171875,14.944455876464843Q13.77648701171875,14.903505876464845,13.79528701171875,14.858005876464844Q13.81418701171875,14.812515876464843,13.82378701171875,14.764215876464844Q13.83338701171875,14.715915876464845,13.83338701171875,14.666665876464844Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M12.83338701171875,2.3333358764648438L12.83338701171875,4.000005876464844Q12.83338701171875,4.049245876464844,12.84298701171875,4.097545876464844Q12.85258701171875,4.145845876464843,12.87138701171875,4.191345876464844Q12.89028701171875,4.236845876464844,12.91758701171875,4.2777858764648435Q12.94498701171875,4.318735876464844,12.97978701171875,4.353555876464844Q13.01458701171875,4.388375876464844,13.05558701171875,4.415735876464844Q13.09648701171875,4.443095876464843,13.14198701171875,4.461945876464844Q13.18748701171875,4.480785876464844,13.23578701171875,4.490395876464843Q13.28408701171875,4.500005876464844,13.33338701171875,4.500005876464844Q13.38258701171875,4.500005876464844,13.43088701171875,4.490395876464843Q13.47918701171875,4.480785876464844,13.52468701171875,4.461945876464844Q13.57018701171875,4.443095876464843,13.61118701171875,4.415735876464844Q13.65208701171875,4.388375876464844,13.68688701171875,4.353555876464844Q13.72168701171875,4.318735876464844,13.74908701171875,4.2777858764648435Q13.77648701171875,4.236845876464844,13.79528701171875,4.191345876464844Q13.81418701171875,4.145845876464843,13.82378701171875,4.097545876464844Q13.83338701171875,4.049245876464844,13.83338701171875,4.000005876464844L13.83338701171875,2.3333358764648438Q13.83338701171875,1.7120148764648437,13.39398701171875,1.2726757764648438Q12.95468701171875,0.8333358764648438,12.33335701171875,0.8333358764648438L3.66668701171875,0.8333358764648438Q3.04536701171875,0.8333358764648438,2.60602681171875,1.2726756764648437Q2.16668701171875,1.7120158764648439,2.16668701171875,2.3333358764648438L2.16668701171875,3.940735876464844Q2.16668701171875,3.9899858764648437,2.17629401171875,4.038275876464844Q2.18590201171875,4.086575876464844,2.2047470117187498,4.132075876464844Q2.22359301171875,4.177575876464844,2.25095201171875,4.218515876464844Q2.27831201171875,4.259465876464844,2.31313401171875,4.294285876464844Q2.34795601171875,4.329115876464844,2.38890201171875,4.356465876464844Q2.42984801171875,4.383825876464844,2.47534501171875,4.402675876464844Q2.52084201171875,4.421515876464843,2.56914191171875,4.431125876464844Q2.61744131171875,4.440735876464844,2.66668701171875,4.440735876464844Q2.71593271171875,4.440735876464844,2.76423211171875,4.431125876464844Q2.81253201171875,4.421515876464843,2.85802901171875,4.402675876464844Q2.90352601171875,4.383825876464844,2.94447201171875,4.356465876464844Q2.98541801171875,4.329115876464844,3.02024001171875,4.294285876464844Q3.05506201171875,4.259465876464844,3.08242201171875,4.2185258764648434Q3.10978101171875,4.177575876464844,3.1286270117187502,4.132075876464844Q3.14747201171875,4.086575876464844,3.15708001171875,4.038275876464844Q3.16668701171875,3.9899858764648437,3.16668701171875,3.940735876464844L3.16668701171875,2.3333358764648438Q3.16668701171875,2.1262288764648436,3.31313401171875,1.9797828764648437Q3.45958001171875,1.8333358764648438,3.66668701171875,1.8333358764648438L12.33335701171875,1.8333358764648438Q12.54045701171875,1.8333358764648438,12.68688701171875,1.9797828764648437Q12.83338701171875,2.1262298764648437,12.83338701171875,2.3333358764648438Z" fill-rule="evenodd" fill="#FFFFFF" fill-opacity="1"/></g><g><path d="M5.83331298828125,11.666664123535156Q5.83331298828125,11.045344123535155,6.27265278828125,10.606003923535157Q6.71199298828125,10.166664123535156,7.33331298828125,10.166664123535156L8.66664298828125,10.166664123535156Q9.28796298828125,10.166664123535156,9.72730298828125,10.606003923535157Q10.16664298828125,11.045344123535155,10.16664298828125,11.666664123535156L10.16664298828125,14.666664123535156Q10.16664298828125,14.715914123535157,10.15704298828125,14.764214123535156Q10.147432988281249,14.812504123535156,10.12858298828125,14.858004123535157Q10.10974298828125,14.903504123535157,10.08238298828125,14.944444123535156Q10.05502298828125,14.985394123535157,10.02020298828125,15.020214123535157Q9.98537298828125,15.055034123535156,9.94443298828125,15.082394123535156Q9.903482988281251,15.109754123535156,9.85798298828125,15.128604123535156Q9.81249298828125,15.147444123535156,9.76419298828125,15.157054123535156Q9.71589298828125,15.166664123535156,9.66664298828125,15.166664123535156L6.33331298828125,15.166664123535156Q6.28406728828125,15.166664123535156,6.23576788828125,15.157054123535156Q6.18746798828125,15.147444123535156,6.14197098828125,15.128604123535156Q6.09647398828125,15.109754123535156,6.05552798828125,15.082394123535156Q6.01458198828125,15.055034123535156,5.97975998828125,15.020214123535157Q5.94493798828125,14.985394123535157,5.91757798828125,14.944444123535156Q5.89021898828125,14.903504123535157,5.87137298828125,14.858004123535157Q5.85252798828125,14.812504123535156,5.84291998828125,14.764214123535156Q5.83331298828125,14.715914123535157,5.83331298828125,14.666664123535156L5.83331298828125,11.666664123535156ZM6.83331298828125,11.666664123535156L6.83331298828125,14.666664123535156L6.33331298828125,14.666664123535156L6.33331298828125,14.166664123535156L9.66664298828125,14.166664123535156L9.66664298828125,14.666664123535156L9.16664298828125,14.666664123535156L9.16664298828125,11.666664123535156Q9.16664298828125,11.459557123535156,9.02020298828125,11.313111123535156Q8.87375298828125,11.166664123535156,8.66664298828125,11.166664123535156L7.33331298828125,11.166664123535156Q7.12620598828125,11.166664123535156,6.97975998828125,11.313111123535156Q6.83331298828125,11.459557123535156,6.83331298828125,11.666664123535156Z" fill="#FFFFFF" fill-opacity="1"/></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"  version="1.1" width="16" height="16" viewBox="0 0 16 16"><defs><clipPath id="master_svg0_3_5582"><rect x="0" y="0" width="16" height="16" rx="0"/></clipPath></defs><g clip-path="url(#master_svg0_3_5582)"><g><path d="M0.83331298828125,4L0.83331298828125,6.66667Q0.83331298828125,6.73142,0.84980998828125,6.79405Q0.86630798828125,6.856669999999999,0.89821398828125,6.9130199999999995Q0.93011998828125,6.96937,0.9753299882812501,7.01573Q1.02053998828125,7.0621,1.07606898828125,7.09542L1.54223698828125,7.375109999999999Q2.2151899882812502,7.7788900000000005,2.99998298828125,7.7788900000000005Q3.78477298828125,7.7788900000000005,4.45772298828125,7.375109999999999L4.66664298828125,7.24976L4.87556298828125,7.375109999999999Q5.54852298828125,7.7788900000000005,6.33331298828125,7.7788900000000005Q7.11810298828125,7.7788900000000005,7.79106298828125,7.375109999999999L7.99998298828125,7.24976L8.20889298828125,7.375109999999999Q8.88185298828125,7.7788900000000005,9.66664298828125,7.7788900000000005Q10.45144298828125,7.7788900000000005,11.12439298828125,7.375109999999999L11.33331298828125,7.24976L11.54221298828125,7.375109999999999Q12.21521298828125,7.7788900000000005,13.00001298828125,7.7788900000000005Q13.78481298828125,7.7788900000000005,14.45771298828125,7.375109999999999L14.92391298828125,7.09541Q14.97941298828125,7.0621,15.02461298828125,7.01573Q15.06981298828125,6.96937,15.10171298828125,6.9130199999999995Q15.13361298828125,6.85666,15.15011298828125,6.79404Q15.16661298828125,6.73142,15.16661298828125,6.66667L15.16661298828125,4Q15.16661298828125,3.9507543,15.15701298828125,3.9024549Q15.14741298828125,3.854155,15.12861298828125,3.808658Q15.10971298828125,3.763161,15.08241298828125,3.722215Q15.05501298828125,3.681269,15.02021298828125,3.646447Q14.98541298828125,3.611625,14.94441298828125,3.584265Q14.90351298828125,3.556906,14.85801298828125,3.5380599999999998Q14.81251298828125,3.519215,14.76421298828125,3.509607Q14.71591298828125,3.5,14.66661298828125,3.5L1.33331298828125,3.5Q1.28406728828125,3.5,1.23576788828125,3.509607Q1.18746798828125,3.519215,1.1419709882812499,3.5380599999999998Q1.09647398828125,3.556906,1.05552798828125,3.584265Q1.01458198828125,3.611625,0.97975998828125,3.646447Q0.94493798828125,3.681269,0.91757798828125,3.722215Q0.89021898828125,3.763161,0.87137298828125,3.808658Q0.85252798828125,3.854155,0.8429199882812499,3.9024549Q0.83331298828125,3.9507543,0.83331298828125,4ZM1.83331298828125,6.383570000000001L2.05674198828125,6.51762Q2.99998298828125,7.0835799999999995,3.94323298828125,6.51762L4.409402988281251,6.23792Q4.4676829882812505,6.2029499999999995,4.533182988281251,6.184810000000001Q4.59868298828125,6.16667,4.66664298828125,6.16667Q4.73461298828125,6.16667,4.80011298828125,6.184810000000001Q4.86561298828125,6.2029499999999995,4.92389298828125,6.23792L5.39006298828125,6.51762Q6.33331298828125,7.0835799999999995,7.27656298828125,6.51762L7.74273298828125,6.23792Q7.80101298828125,6.2029499999999995,7.86651298828125,6.184810000000001Q7.93201298828125,6.16667,7.99998298828125,6.16667Q8.06794298828125,6.16667,8.13344298828125,6.184810000000001Q8.19894298828125,6.2029499999999995,8.25722298828125,6.23792L8.72340298828125,6.51762Q9.66664298828125,7.0835799999999995,10.60990298828125,6.51762L11.07606298828125,6.23792Q11.13434298828125,6.2029499999999995,11.19984298828125,6.184810000000001Q11.26534298828125,6.16667,11.33331298828125,6.16667Q11.40131298828125,6.16667,11.46681298828125,6.184810000000001Q11.53231298828125,6.2029499999999995,11.59051298828125,6.23792L12.05671298828125,6.51762Q13.00001298828125,7.0835799999999995,13.94321298828125,6.51762L14.16661298828125,6.383570000000001L14.16661298828125,4.5L1.83331298828125,4.5L1.83331298828125,6.383570000000001Z" fill-rule="evenodd"  fill-opacity="1"/></g><g><path d="M13.83338701171875,14.666665876464844L13.83338701171875,7.333335876464844Q13.83338701171875,7.284090176464844,13.82378701171875,7.235790776464844Q13.81418701171875,7.187490876464844,13.79528701171875,7.141993876464844Q13.77648701171875,7.096496876464844,13.74908701171875,7.055550876464844Q13.72168701171875,7.014604876464844,13.68688701171875,6.979782876464844Q13.65208701171875,6.944960876464844,13.61118701171875,6.917600876464844Q13.57018701171875,6.890241876464843,13.52468701171875,6.8713958764648435Q13.47918701171875,6.852550876464844,13.43088701171875,6.842942876464844Q13.38258701171875,6.833335876464844,13.33338701171875,6.833335876464844Q13.28408701171875,6.833335876464844,13.23578701171875,6.842942876464844Q13.18748701171875,6.852550876464844,13.14198701171875,6.8713958764648435Q13.09648701171875,6.890241876464843,13.05558701171875,6.917600876464844Q13.01458701171875,6.944960876464844,12.97978701171875,6.979782876464844Q12.94498701171875,7.014604876464844,12.91758701171875,7.055550876464844Q12.89028701171875,7.096496876464844,12.87138701171875,7.141993876464844Q12.85258701171875,7.187490876464844,12.84298701171875,7.235790776464844Q12.83338701171875,7.284090176464844,12.83338701171875,7.333335876464844L12.83338701171875,14.166665876464844L3.16668701171875,14.166665876464844L3.16668701171875,7.496301876464844Q3.16668701171875,7.447056876464844,3.15708001171875,7.398757176464843Q3.14747201171875,7.350457676464844,3.1286270117187502,7.304960576464843Q3.10978101171875,7.259463476464844,3.08242201171875,7.218516876464844Q3.05506201171875,7.177570876464844,3.02024001171875,7.142748876464844Q2.98541801171875,7.107926876464844,2.94447201171875,7.080567876464844Q2.90352601171875,7.053207876464843,2.85802901171875,7.034362876464844Q2.81253201171875,7.015516876464844,2.76423211171875,7.005909876464844Q2.71593271171875,6.996301876464844,2.66668701171875,6.996301876464844Q2.61744131171875,6.996301876464844,2.56914191171875,7.005909876464844Q2.52084201171875,7.015516876464844,2.47534501171875,7.034362876464844Q2.42984801171875,7.053207876464843,2.38890201171875,7.080567876464844Q2.34795601171875,7.107926876464844,2.31313401171875,7.142748876464844Q2.27831201171875,7.177570876464844,2.25095201171875,7.218516876464844Q2.22359301171875,7.259463476464844,2.2047470117187498,7.304960576464843Q2.18590201171875,7.350457676464844,2.17629401171875,7.398757176464843Q2.16668701171875,7.447056876464844,2.16668701171875,7.496301876464844L2.16668701171875,14.666665876464844Q2.16668701171875,14.715915876464845,2.17629401171875,14.764215876464844Q2.18590201171875,14.812515876464843,2.2047470117187498,14.858005876464844Q2.22359301171875,14.903505876464845,2.25095201171875,14.944455876464843Q2.27831201171875,14.985395876464843,2.31313401171875,15.020225876464844Q2.34795601171875,15.055045876464844,2.38890201171875,15.082405876464843Q2.42984801171875,15.109765876464845,2.47534501171875,15.128605876464844Q2.52084201171875,15.147455876464843,2.56914191171875,15.157065876464845Q2.61744131171875,15.166665876464844,2.66668701171875,15.166665876464844L13.33338701171875,15.166665876464844Q13.38258701171875,15.166665876464844,13.43088701171875,15.157065876464845Q13.47918701171875,15.147455876464843,13.52468701171875,15.128605876464844Q13.57018701171875,15.109765876464845,13.61118701171875,15.082405876464843Q13.65208701171875,15.055045876464844,13.68688701171875,15.020225876464844Q13.72168701171875,14.985395876464843,13.74908701171875,14.944455876464843Q13.77648701171875,14.903505876464845,13.79528701171875,14.858005876464844Q13.81418701171875,14.812515876464843,13.82378701171875,14.764215876464844Q13.83338701171875,14.715915876464845,13.83338701171875,14.666665876464844Z" fill-rule="evenodd"  fill-opacity="1"/></g><g><path d="M12.83338701171875,2.3333358764648438L12.83338701171875,4.000005876464844Q12.83338701171875,4.049245876464844,12.84298701171875,4.097545876464844Q12.85258701171875,4.145845876464843,12.87138701171875,4.191345876464844Q12.89028701171875,4.236845876464844,12.91758701171875,4.2777858764648435Q12.94498701171875,4.318735876464844,12.97978701171875,4.353555876464844Q13.01458701171875,4.388375876464844,13.05558701171875,4.415735876464844Q13.09648701171875,4.443095876464843,13.14198701171875,4.461945876464844Q13.18748701171875,4.480785876464844,13.23578701171875,4.490395876464843Q13.28408701171875,4.500005876464844,13.33338701171875,4.500005876464844Q13.38258701171875,4.500005876464844,13.43088701171875,4.490395876464843Q13.47918701171875,4.480785876464844,13.52468701171875,4.461945876464844Q13.57018701171875,4.443095876464843,13.61118701171875,4.415735876464844Q13.65208701171875,4.388375876464844,13.68688701171875,4.353555876464844Q13.72168701171875,4.318735876464844,13.74908701171875,4.2777858764648435Q13.77648701171875,4.236845876464844,13.79528701171875,4.191345876464844Q13.81418701171875,4.145845876464843,13.82378701171875,4.097545876464844Q13.83338701171875,4.049245876464844,13.83338701171875,4.000005876464844L13.83338701171875,2.3333358764648438Q13.83338701171875,1.7120148764648437,13.39398701171875,1.2726757764648438Q12.95468701171875,0.8333358764648438,12.33335701171875,0.8333358764648438L3.66668701171875,0.8333358764648438Q3.04536701171875,0.8333358764648438,2.60602681171875,1.2726756764648437Q2.16668701171875,1.7120158764648439,2.16668701171875,2.3333358764648438L2.16668701171875,3.940735876464844Q2.16668701171875,3.9899858764648437,2.17629401171875,4.038275876464844Q2.18590201171875,4.086575876464844,2.2047470117187498,4.132075876464844Q2.22359301171875,4.177575876464844,2.25095201171875,4.218515876464844Q2.27831201171875,4.259465876464844,2.31313401171875,4.294285876464844Q2.34795601171875,4.329115876464844,2.38890201171875,4.356465876464844Q2.42984801171875,4.383825876464844,2.47534501171875,4.402675876464844Q2.52084201171875,4.421515876464843,2.56914191171875,4.431125876464844Q2.61744131171875,4.440735876464844,2.66668701171875,4.440735876464844Q2.71593271171875,4.440735876464844,2.76423211171875,4.431125876464844Q2.81253201171875,4.421515876464843,2.85802901171875,4.402675876464844Q2.90352601171875,4.383825876464844,2.94447201171875,4.356465876464844Q2.98541801171875,4.329115876464844,3.02024001171875,4.294285876464844Q3.05506201171875,4.259465876464844,3.08242201171875,4.2185258764648434Q3.10978101171875,4.177575876464844,3.1286270117187502,4.132075876464844Q3.14747201171875,4.086575876464844,3.15708001171875,4.038275876464844Q3.16668701171875,3.9899858764648437,3.16668701171875,3.940735876464844L3.16668701171875,2.3333358764648438Q3.16668701171875,2.1262288764648436,3.31313401171875,1.9797828764648437Q3.45958001171875,1.8333358764648438,3.66668701171875,1.8333358764648438L12.33335701171875,1.8333358764648438Q12.54045701171875,1.8333358764648438,12.68688701171875,1.9797828764648437Q12.83338701171875,2.1262298764648437,12.83338701171875,2.3333358764648438Z" fill-rule="evenodd"  fill-opacity="1"/></g><g><path d="M5.83331298828125,11.666664123535156Q5.83331298828125,11.045344123535155,6.27265278828125,10.606003923535157Q6.71199298828125,10.166664123535156,7.33331298828125,10.166664123535156L8.66664298828125,10.166664123535156Q9.28796298828125,10.166664123535156,9.72730298828125,10.606003923535157Q10.16664298828125,11.045344123535155,10.16664298828125,11.666664123535156L10.16664298828125,14.666664123535156Q10.16664298828125,14.715914123535157,10.15704298828125,14.764214123535156Q10.147432988281249,14.812504123535156,10.12858298828125,14.858004123535157Q10.10974298828125,14.903504123535157,10.08238298828125,14.944444123535156Q10.05502298828125,14.985394123535157,10.02020298828125,15.020214123535157Q9.98537298828125,15.055034123535156,9.94443298828125,15.082394123535156Q9.903482988281251,15.109754123535156,9.85798298828125,15.128604123535156Q9.81249298828125,15.147444123535156,9.76419298828125,15.157054123535156Q9.71589298828125,15.166664123535156,9.66664298828125,15.166664123535156L6.33331298828125,15.166664123535156Q6.28406728828125,15.166664123535156,6.23576788828125,15.157054123535156Q6.18746798828125,15.147444123535156,6.14197098828125,15.128604123535156Q6.09647398828125,15.109754123535156,6.05552798828125,15.082394123535156Q6.01458198828125,15.055034123535156,5.97975998828125,15.020214123535157Q5.94493798828125,14.985394123535157,5.91757798828125,14.944444123535156Q5.89021898828125,14.903504123535157,5.87137298828125,14.858004123535157Q5.85252798828125,14.812504123535156,5.84291998828125,14.764214123535156Q5.83331298828125,14.715914123535157,5.83331298828125,14.666664123535156L5.83331298828125,11.666664123535156ZM6.83331298828125,11.666664123535156L6.83331298828125,14.666664123535156L6.33331298828125,14.666664123535156L6.33331298828125,14.166664123535156L9.66664298828125,14.166664123535156L9.66664298828125,14.666664123535156L9.16664298828125,14.666664123535156L9.16664298828125,11.666664123535156Q9.16664298828125,11.459557123535156,9.02020298828125,11.313111123535156Q8.87375298828125,11.166664123535156,8.66664298828125,11.166664123535156L7.33331298828125,11.166664123535156Q7.12620598828125,11.166664123535156,6.97975998828125,11.313111123535156Q6.83331298828125,11.459557123535156,6.83331298828125,11.666664123535156Z"  fill-opacity="1"/></g></g></svg>
\ No newline at end of file

dsk-operate-ui/src/assets/icons/svg/systemmonitor.svg

-<svg xmlns="http://www.w3.org/2000/svg" fill="none" version="1.1" width="14" height="14" viewBox="0 0 14 14">
+<svg xmlns="http://www.w3.org/2000/svg"  version="1.1" width="14" height="14" viewBox="0 0 14 14">
   <defs>
     <clipPath id="master_svg0_634_008380">
       <rect x="0" y="0" width="14" height="14" rx="0"/>
@@ -10,32 +10,32 @@
         <g>
           <path
             d="M3.500078046875,10.07293701171875L12.833448046875,10.07293701171875Q12.877548046875,10.07293701171875,12.920848046875,10.06432701171875Q12.964048046875,10.05572701171875,13.004848046875,10.038837011718751Q13.045548046875,10.02195701171875,13.082248046875,9.99744701171875Q13.118948046875,9.97293701171875,13.150148046875,9.94174701171875Q13.181348046875,9.91054701171875,13.205848046875,9.873867011718751Q13.230348046875,9.83718701171875,13.247248046875,9.79642701171875Q13.264148046875,9.75566701171875,13.272748046875,9.71240701171875Q13.281348046875,9.66913701171875,13.281348046875,9.62501701171875L13.281348046875,2.04168701171875Q13.281348046875,1.99757111171875,13.272748046875,1.95430281171875Q13.264148046875,1.91103501171875,13.247248046875,1.87027701171875Q13.230348046875,1.82951901171875,13.205848046875,1.7928380117187501Q13.181348046875,1.75615701171875,13.150148046875,1.72496201171875Q13.118948046875,1.69376701171875,13.082248046875,1.66925801171875Q13.045548046875,1.64474801171875,13.004848046875,1.62786601171875Q12.964048046875,1.61098401171875,12.920848046875,1.6023770117187501Q12.877548046875,1.59377001171875,12.833448046875,1.59377001171875L1.166748046875,1.59377001171875Q1.122632146875,1.59377001171875,1.079363846875,1.6023770117187501Q1.036096046875,1.61098401171875,0.9953380468749999,1.62786601171875Q0.954580046875,1.64474801171875,0.917899046875,1.66925801171875Q0.8812180468749999,1.69376701171875,0.8500230468750001,1.72496201171875Q0.818828046875,1.75615701171875,0.794319046875,1.7928380117187501Q0.7698090468750001,1.82951901171875,0.752927046875,1.87027701171875Q0.7360450468749999,1.91103501171875,0.727438046875,1.95430281171875Q0.718831046875,1.99757111171875,0.718831046875,2.04168701171875L0.718831046875,9.62501701171875Q0.718831046875,9.66913701171875,0.727438046875,9.71240701171875Q0.7360450468749999,9.755677011718749,0.752927046875,9.79642701171875Q0.7698090468750001,9.83718701171875,0.794319046875,9.873867011718751Q0.818828046875,9.91054701171875,0.8500230468750001,9.94174701171875Q0.8812180468749999,9.97293701171875,0.917899046875,9.99744701171875Q0.954580046875,10.02195701171875,0.9953380468749999,10.038837011718751Q1.036096046875,10.05572701171875,1.079363846875,10.06432701171875Q1.122632146875,10.07293701171875,1.166748046875,10.07293701171875L3.500078046875,10.07293701171875ZM12.385548046875,9.17710701171875L1.614665046875,9.17710701171875L1.614665046875,2.48960401171875L12.385548046875,2.48960401171875L12.385548046875,9.17710701171875Z"
-            fill-rule="evenodd" fill="#ffffff" fill-opacity="1"/>
+            fill-rule="evenodd"  fill-opacity="1"/>
         </g>
         <g>
           <path
             d="M5.114665046875,6.45993811171875Q5.116748046875,6.43836271171875,5.116748046875,6.41668701171875Q5.116748046875,6.37236591171875,5.108101046875,6.32889641171875Q5.099455046875,6.28542701171875,5.082494046875,6.24447901171875Q5.065533046875,6.20353201171875,5.040909046875,6.16668001171875Q5.016286046875,6.12982901171875,4.984946046875,6.09848901171875Q4.953606046875,6.06714901171875,4.916755046875,6.04252601171875Q4.879903046875,6.01790201171875,4.838956046875,6.00094101171875Q4.798008046875,5.98398001171875,4.754538646875,5.97533401171875Q4.711069146875,5.96668701171875,4.666748046875,5.96668701171875Q4.622426946875,5.96668701171875,4.578957446875,5.97533401171875Q4.535488046875,5.98398001171875,4.494540046875,6.00094101171875Q4.453593046875,6.01790201171875,4.416741046875,6.04252601171875Q4.379890046875,6.06714901171875,4.348550046875,6.09848901171875Q4.317210046875,6.12982901171875,4.292587046875,6.16668001171875Q4.267963046875,6.20353201171875,4.251002046875,6.24447901171875Q4.234041046875,6.28542701171875,4.225395046875,6.32889641171875Q4.216748046875,6.37236591171875,4.216748046875,6.41668701171875Q4.216748046875,6.43836271171875,4.218831046875,6.45993811171875L4.218831046875,7.54010701171875Q4.216748046875,7.56167701171875,4.216748046875,7.58335701171875Q4.216748046875,7.62767701171875,4.225395046875,7.67114701171875Q4.234041046875,7.71461701171875,4.251002046875,7.75555701171875Q4.267963046875,7.7965070117187505,4.292587046875,7.83335701171875Q4.317210046875,7.87020701171875,4.348550046875,7.90154701171875Q4.379890046875,7.9328870117187495,4.416741046875,7.95751701171875Q4.453593046875,7.98213701171875,4.494540046875,7.99909701171875Q4.535488046875,8.01605701171875,4.578957446875,8.02470701171875Q4.622426946875,8.03335701171875,4.666748046875,8.03335701171875Q4.711069146875,8.03335701171875,4.754538646875,8.02470701171875Q4.798008046875,8.01605701171875,4.838956046875,7.99909701171875Q4.879903046875,7.98213701171875,4.916755046875,7.95751701171875Q4.953606046875,7.9328870117187495,4.984946046875,7.90154701171875Q5.016286046875,7.87020701171875,5.040909046875,7.83335701171875Q5.065533046875,7.7965070117187505,5.082494046875,7.75555701171875Q5.099455046875,7.71461701171875,5.108101046875,7.67114701171875Q5.116748046875,7.62767701171875,5.116748046875,7.58335701171875Q5.116748046875,7.56167701171875,5.114665046875,7.54010701171875L5.114665046875,6.45993811171875Z"
-            fill-rule="evenodd" fill="#ffffff" fill-opacity="1"/>
+            fill-rule="evenodd"  fill-opacity="1"/>
         </g>
         <g>
           <path
             d="M7.447917,9.66831213515625Q7.45,9.64673673515625,7.45,9.62506103515625Q7.45,9.58073993515625,7.441353,9.53727043515625Q7.432707,9.49380103515625,7.415746,9.45285303515625Q7.398785,9.41190603515625,7.374161,9.37505403515625Q7.349538,9.33820303515625,7.318198,9.30686303515625Q7.286858,9.27552303515625,7.250007,9.25090003515625Q7.213155,9.22627603515625,7.172208,9.20931503515625Q7.13126,9.19235403515625,7.0877906,9.18370803515625Q7.0443211,9.17506103515625,7,9.17506103515625Q6.9556789,9.17506103515625,6.9122094,9.18370803515625Q6.86874,9.19235403515625,6.827792,9.20931503515625Q6.786845,9.22627603515625,6.749993,9.25090003515625Q6.713142,9.27552303515625,6.681802,9.30686303515625Q6.650462,9.33820303515625,6.625839,9.37505403515625Q6.601215,9.41190603515625,6.584254,9.45285303515625Q6.567293,9.49380103515625,6.558647,9.53727043515625Q6.55,9.58073993515625,6.55,9.62506103515625Q6.55,9.64673673515625,6.552083,9.66831213515625L6.552083,11.33181103515625Q6.55,11.35338103515625,6.55,11.37506103515625Q6.55,11.419381035156249,6.558647,11.46285103515625Q6.567293,11.50632103515625,6.584254,11.54727103515625Q6.601215,11.58821103515625,6.625839,11.62507103515625Q6.650462,11.66192103515625,6.681802,11.693261035156251Q6.713142,11.724601035156251,6.749993,11.74922103515625Q6.786845,11.77384103515625,6.827792,11.79081103515625Q6.86874,11.80777103515625,6.9122094,11.81641103515625Q6.9556789,11.82506103515625,7,11.82506103515625Q7.0443211,11.82506103515625,7.0877906,11.81641103515625Q7.13126,11.80777103515625,7.172208,11.79081103515625Q7.213155,11.77384103515625,7.250007,11.74922103515625Q7.286858,11.724601035156251,7.318198,11.693261035156251Q7.349538,11.66192103515625,7.374161,11.62507103515625Q7.398785,11.58821103515625,7.415746,11.54727103515625Q7.432707,11.50632103515625,7.441353,11.46285103515625Q7.45,11.419381035156249,7.45,11.37506103515625Q7.45,11.35338103515625,7.447917,11.33181103515625L7.447917,9.66831213515625Z"
-            fill-rule="evenodd" fill="#ffffff" fill-opacity="1"/>
+            fill-rule="evenodd"  fill-opacity="1"/>
         </g>
         <g>
           <path
             d="M7.447917,5.29331213515625Q7.45,5.27173673515625,7.45,5.25006103515625Q7.45,5.20573993515625,7.441353,5.16227043515625Q7.432707,5.11880103515625,7.415746,5.07785303515625Q7.398785,5.03690603515625,7.374161,5.00005403515625Q7.349538,4.96320303515625,7.318198,4.93186303515625Q7.286858,4.90052303515625,7.250007,4.87590003515625Q7.213155,4.85127603515625,7.172208,4.83431503515625Q7.13126,4.81735403515625,7.0877906,4.80870803515625Q7.0443211,4.80006103515625,7,4.80006103515625Q6.9556789,4.80006103515625,6.9122094,4.80870803515625Q6.86874,4.81735403515625,6.827792,4.83431503515625Q6.786845,4.85127603515625,6.749993,4.87590003515625Q6.713142,4.90052303515625,6.681802,4.93186303515625Q6.650462,4.96320303515625,6.625839,5.00005403515625Q6.601215,5.03690603515625,6.584254,5.07785303515625Q6.567293,5.11880103515625,6.558647,5.16227043515625Q6.55,5.20573993515625,6.55,5.25006103515625Q6.55,5.27173673515625,6.552083,5.29331213515625L6.552083,7.54014103515625Q6.55,7.56172103515625,6.55,7.58339103515625Q6.55,7.62771103515625,6.558647,7.67118103515625Q6.567293,7.714651035156249,6.584254,7.75560103515625Q6.601215,7.79655103515625,6.625839,7.83340103515625Q6.650462,7.87025103515625,6.681802,7.90159103515625Q6.713142,7.932931035156249,6.749993,7.95755103515625Q6.786845,7.98218103515625,6.827792,7.99914103515625Q6.86874,8.01610103515625,6.9122094,8.02475103515625Q6.9556789,8.03339103515625,7,8.03339103515625Q7.0443211,8.03339103515625,7.0877906,8.02475103515625Q7.13126,8.01610103515625,7.172208,7.99914103515625Q7.213155,7.98218103515625,7.250007,7.95755103515625Q7.286858,7.932931035156249,7.318198,7.90159103515625Q7.349538,7.87025103515625,7.374161,7.83340103515625Q7.398785,7.79655103515625,7.415746,7.75560103515625Q7.432707,7.714651035156249,7.441353,7.67118103515625Q7.45,7.62771103515625,7.45,7.58339103515625Q7.45,7.56172103515625,7.447917,7.54014103515625L7.447917,5.29331213515625Z"
-            fill-rule="evenodd" fill="#ffffff" fill-opacity="1"/>
+            fill-rule="evenodd"  fill-opacity="1"/>
         </g>
         <g>
           <path
             d="M9.781168953125,4.12656408828125Q9.783251953125,4.10498868828125,9.783251953125,4.08331298828125Q9.783251953125,4.03899188828125,9.774604953125,3.99552238828125Q9.765958953125,3.95205298828125,9.748997953125,3.91110498828125Q9.732036953125,3.87015798828125,9.707412953125,3.83330598828125Q9.682789953125,3.79645498828125,9.651449953125,3.7651149882812502Q9.620109953125,3.73377498828125,9.583258953125,3.70915198828125Q9.546406953125,3.68452798828125,9.505459953125,3.66756698828125Q9.464511953125,3.65060598828125,9.421042553125,3.64195998828125Q9.377573053125,3.63331298828125,9.333251953125,3.63331298828125Q9.288930853125,3.63331298828125,9.245461353125,3.64195998828125Q9.201991953125,3.65060598828125,9.161043953125,3.66756698828125Q9.120096953125,3.68452798828125,9.083244953125,3.70915198828125Q9.046393953125,3.73377498828125,9.015053953125,3.7651149882812502Q8.983713953125,3.79645498828125,8.959090953125,3.83330598828125Q8.934466953125,3.87015798828125,8.917505953125,3.91110498828125Q8.900544953125,3.95205298828125,8.891898953125,3.99552238828125Q8.883251953125,4.03899188828125,8.883251953125,4.08331298828125Q8.883251953125,4.10498868828125,8.885334953125,4.12656408828125L8.885334953125,7.5400629882812495Q8.883251953125,7.56163298828125,8.883251953125,7.58331298828125Q8.883251953125,7.62763298828125,8.891898953125,7.67110298828125Q8.900544953125,7.71457298828125,8.917505953125,7.75552298828125Q8.934466953125,7.796462988281251,8.959090953125,7.83332298828125Q8.983713953125,7.87017298828125,9.015053953125,7.90151298828125Q9.046393953125,7.93285298828125,9.083244953125,7.95747298828125Q9.120096953125,7.98209298828125,9.161043953125,7.99906298828125Q9.201991953125,8.01602298828125,9.245461353125,8.02466298828125Q9.288930853125,8.03331298828125,9.333251953125,8.03331298828125Q9.377573053125,8.03331298828125,9.421042553125,8.02466298828125Q9.464511953125,8.01602298828125,9.505459953125,7.99906298828125Q9.546406953125,7.98209298828125,9.583258953125,7.95747298828125Q9.620109953125,7.93285298828125,9.651449953125,7.90151298828125Q9.682789953125,7.87017298828125,9.707412953125,7.83332298828125Q9.732036953125,7.796462988281251,9.748997953125,7.75552298828125Q9.765958953125,7.71457298828125,9.774604953125,7.67110298828125Q9.783251953125,7.62763298828125,9.783251953125,7.58331298828125Q9.783251953125,7.56163298828125,9.781168953125,7.5400629882812495L9.781168953125,4.12656408828125Z"
-            fill-rule="evenodd" fill="#ffffff" fill-opacity="1"/>
+            fill-rule="evenodd"  fill-opacity="1"/>
         </g>
         <g>
           <path
             d="M3.5432511,12.40622998828125Q3.5216757,12.40831298828125,3.5,12.40831298828125Q3.4556789,12.40831298828125,3.4122094,12.39966598828125Q3.36874,12.39101998828125,3.327792,12.37405898828125Q3.286845,12.35709798828125,3.249993,12.33247398828125Q3.213142,12.30785098828125,3.1818020000000002,12.27651098828125Q3.150462,12.24517098828125,3.125839,12.20831998828125Q3.101215,12.17146798828125,3.084254,12.13052098828125Q3.067293,12.08957298828125,3.058647,12.04610358828125Q3.05,12.00263408828125,3.05,11.95831298828125Q3.05,11.91399188828125,3.058647,11.87052238828125Q3.067293,11.82705298828125,3.084254,11.78610498828125Q3.101215,11.74515798828125,3.125839,11.70830598828125Q3.150462,11.67145498828125,3.1818020000000002,11.64011498828125Q3.213142,11.60877498828125,3.249993,11.58415198828125Q3.286845,11.55952798828125,3.327792,11.54256698828125Q3.36874,11.52560598828125,3.4122094,11.51695998828125Q3.4556789,11.50831298828125,3.5,11.50831298828125Q3.5216757,11.50831298828125,3.5432511,11.51039598828125L10.45676,11.51039598828125Q10.47834,11.50831298828125,10.50001,11.50831298828125Q10.54433,11.50831298828125,10.5878,11.51695998828125Q10.63127,11.52560598828125,10.67222,11.54256698828125Q10.71317,11.55952798828125,10.75002,11.58415198828125Q10.78687,11.60877498828125,10.81821,11.64011498828125Q10.84955,11.67145498828125,10.87417,11.70830598828125Q10.8988,11.74515798828125,10.915759999999999,11.78610498828125Q10.93272,11.82705298828125,10.94136,11.87052238828125Q10.950009999999999,11.91399188828125,10.950009999999999,11.95831298828125Q10.950009999999999,12.00263408828125,10.94136,12.04610358828125Q10.93272,12.08957298828125,10.915759999999999,12.13052098828125Q10.89879,12.17146798828125,10.87417,12.20831998828125Q10.84955,12.24517098828125,10.81821,12.27651098828125Q10.78687,12.30785098828125,10.75002,12.33247398828125Q10.71317,12.35709798828125,10.67222,12.37405898828125Q10.63127,12.39101998828125,10.5878,12.39966598828125Q10.54433,12.40831298828125,10.50001,12.40831298828125Q10.47834,12.40831298828125,10.45676,12.40622998828125L3.5432511,12.40622998828125Z"
-            fill-rule="evenodd" fill="#ffffff" fill-opacity="1"/>
+            fill-rule="evenodd"  fill-opacity="1"/>
         </g>
       </g>
     </g>

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

@@ -130,7 +130,6 @@
       width: 100% !important;
       min-width: 128px;
       font-size: 12px;
-      color: #fff !important;
       padding-left: 24px;
     }
     .el-menu--inline .nest-menu .el-menu-item .svg-icon {
@@ -143,7 +142,6 @@
       align-items: center;
       height: 36px;
       line-height: 36px;
-      border: 1px solid #141b2f;
       border-radius: 4px;
       color: #fff;
       margin-bottom: 8px;
@@ -165,13 +163,11 @@
     // menu hover
     .el-menu-item.is-active {
       // 点击菜单的颜色
-      background-color: #1e2c4c !important;
-      color: #fff !important;
-      border: 1px solid #2b3f69;
+      background-color: #fff !important;
+      color: #0081FF !important;
       &:hover {
-        background-color: #1e2c4c !important;
-        color: #fff !important;
-        border: 1px solid #2b3f69;
+        background-color: #fff !important;
+        color: #0081FF !important;
       }
       &:before {
         background: #fff !important;
@@ -184,18 +180,17 @@
       border-radius: 4px;
       color: #fff !important;
       &:hover {
-        background-color: #1e2c4c !important;
-        color: #fff !important;
-        border: 1px solid #2b3f69;
+        background-color: #fff !important;
+        color: #0081FF !important;
       }
     }
+    
   }
   .sidebar-container .el-submenu .el-menu-item:hover,
   .sidebar-container .nest-menu .el-submenu > .el-submenu__title:hover {
-    background-color: #1e2c4c !important;
-    color: #fff !important;
+    background-color: #fff !important;
+    color: #0081FF !important;
     border-radius: 4px;
-    border: 1px solid #2b3f69;
   }
 
   // .sidebar-container .el-submenu .el-menu-item:before,
@@ -351,11 +346,18 @@
                 .el-menu-item {
                   font-size: 14px;
                   padding-left: 32px !important;
+                  &:hover{
+                    background-color: #fff!important;
+                  }
                 }
 
                 & > .secondary-menu-item {
                   .el-submenu__title {
                     padding-left: 32px !important;
+                    background-color: unset!important;
+                    &:hover{
+                      background-color: #fff!important;
+                    }
                   }
 
                   & > .el-menu--inline {
@@ -363,6 +365,9 @@
                       .el-menu-item {
                         font-size: 14px;
                         padding-left: 56px !important;
+                        &:hover{
+                          background-color: #fff!important;
+                        }
                       }
                     }
                   }

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

@@ -37,14 +37,14 @@ $base-sub-menu-hover:#001528;
 */
 
 // 央企颜色设置自定义
-$base-menu-background:#141b2f;
+$base-menu-background:#0067CC;
 $base-menu-light-background: #fff; // 选中菜单的字体颜色
 $base-logo-light-title-color: #fff; // 对应base-logo-title-color
 $menuText:#FFFFFF;
 $menuActiveText:#FFFFFF;
 $subMenuActiveText:#f4f4f5; //https://github.com/ElemeFE/element/issues/12951
 
-$menuBg:#141B2F;
+$menuBg:#0067CC;
 $menuHover:#263445;
 
 $subMenuBg:#1f2d3d;

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

@@ -5,7 +5,7 @@
     <div class="custom-table-item">
       <el-table v-if="tableDataTotal>0" class="custom-table" v-loading="comTableLoading" :data="tableData" element-loading-text="加载中"
         ref="customTableRef" border fit highlight-current-row :default-sort="defaultSort?defaultSort:{}" @sort-change="sortChange"
-        @selection-change="selectionChange" @expand-change="expandChange" :cell-class-name="cellClassName" :cell-style="cellStyle"
+        @selection-change="selectionChange" @expand-change="expandChange" :cell-class-name="cellClassName" :cell-style="cellStyle" :header-cell-class-name="headerCellClassName"
         :row-class-name="rowClassName" :row-style="rowStyle" :row-key="rowKey" :lazy="lazy" :load="loadFn" :tree-props="treeOptions"
         :default-expand-all="defaultExpandAll" :indent="indent" :height="height" :maxHeight="comMaxHeight" v-sticky-header="stickyHeader">
 
@@ -56,6 +56,10 @@ export default {
       type: Function,
       default: () => { }
     },
+    headerCellClassName: {
+      type: Function,
+      default: () => { }
+    },
     cellStyle: {
       type: Function,
       default: () => { }
@@ -235,7 +239,7 @@ export default {
         if (isFixedNumber && !resize) {
           containerMaxHeight = this.maxHeight;
         } else {
-          /** 
+          /**
            * @type {HTMLDivElement}
           */
           const container = this.$el;
@@ -248,7 +252,7 @@ export default {
         this.comMaxHeight = containerMaxHeight ? `${containerMaxHeight}px` : null;
         // 重新计算表格高度 有横向滚动条则需要减去滚动条高度差 16 - 6 有固定列的情况
         if (containerMaxHeight) {
-          /** 
+          /**
            * @type {HTMLDivElement}
           */
           const tableFixedHeader = this.$el.querySelector(".el-table__fixed-header-wrapper");
@@ -635,6 +639,7 @@ export default {
               box-shadow: unset;
             }
           }
+
           /* 滚动条在最右侧时 */
           &.is-scrolling-right {
             /* 右侧固定列 */
@@ -643,6 +648,19 @@ export default {
               box-shadow: unset;
             }
           }
+
+          // 没有滚动条
+          &.is-scrolling-none {
+            & + .el-table__fixed {
+              box-shadow: unset;
+            }
+
+            /* 右侧固定列 */
+            & + .el-table__fixed + .el-table__fixed-right,
+            & + .el-table__fixed-right {
+              box-shadow: unset;
+            }
+          }
         }
         .el-table__fixed-right,
         .el-table__fixed {

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

@@ -59,6 +59,7 @@ export default {
   },
   //可访问data属性
   created() {
+    console.log(this.tabs,"||||||||")
     this.initSlidingBar();
   },
   //计算集

dsk-operate-ui/src/layout/components/Sidebar/Logo.vue

@@ -69,7 +69,7 @@ export default {
   height: 56px;
   line-height: 56px;
   background: #141b2f;
-  border-bottom: 1px solid #1a2743;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.2);
   text-align: center;
   padding: 0px 18px;
   box-sizing: border-box;

dsk-operate-ui/src/main.js

@@ -55,6 +55,8 @@ import DictData from '@/components/DictData';
 // 全局缩放
 import ScreenScal from "@/utils/screenScal";
 
+import { decimalFormat } from "@/utils/decimal";
+
 // 全局方法挂载
 Vue.prototype.getDicts = getDicts;
 Vue.prototype.getConfigKey = getConfigKey;
@@ -66,6 +68,7 @@ Vue.prototype.selectDictLabels = selectDictLabels;
 Vue.prototype.download = download;
 Vue.prototype.handleTree = handleTree;
 Vue.prototype.$mitt = mitt();
+Vue.prototype.$decimalFormat = (num) => decimalFormat(num);
 
 // 全局组件挂载
 Vue.component('DictTag', DictTag);

dsk-operate-ui/src/utils/decimal.js

 import Decimal from "decimal.js";
 
+
+/**
+ * 全局方法 处理为特定的decimal 格式
+ * @param {*} num 
+ */
+export const decimalFormat = (num) => {
+  // 处理特殊字符为字母的情况
+  const reg = /[a-zA-Z]/gmi;
+  if (reg.test(num) && num != undefined && num != null && isFinite(num)) {
+    return num;
+  } else if (!parseFloat(num)) {
+    return "-";
+  } else {
+    return add(num, 0, 4, 15, true);
+  }
+};
+
 /**
  * 加法
  * @param {*} num1 
@@ -12,7 +29,7 @@ export const add = (num1, num2, digit = 9, intLen = 20, omit = false) => {
   const decimal1 = new Decimal(num1);
   const decimal2 = new Decimal(num2);
   const result = decimal1.plus(decimal2);
-  return omit ? result.toFixed(digit, Decimal.ROUND_UP) : result.toDecimalPlaces(digit, Decimal.ROUND_UP).toSignificantDigits(intLen).toString();
+  return omit ? result.toFixed(digit, Decimal.ROUND_HALF_UP) : result.toDecimalPlaces(digit, Decimal.ROUND_HALF_UP).toSignificantDigits(intLen).toString();
 };
 
 /**
@@ -27,7 +44,7 @@ export const subtract = (num1, num2, digit = 9, intLen = 20, omit = false) => {
   const decimal1 = new Decimal(num1);
   const decimal2 = new Decimal(num2);
   const result = decimal1.minus(decimal2);
-  return omit ? result.toFixed(digit, Decimal.ROUND_UP) : result.toDecimalPlaces(digit, Decimal.ROUND_UP).toSignificantDigits(intLen).toString();
+  return omit ? result.toFixed(digit, Decimal.ROUND_HALF_UP) : result.toDecimalPlaces(digit, Decimal.ROUND_HALF_UP).toSignificantDigits(intLen).toString();
 };
 
 /**
@@ -42,7 +59,7 @@ export const multiply = (num1, num2, digit = 9, intLen = 20, omit = false) => {
   const decimal1 = new Decimal(num1);
   const decimal2 = new Decimal(num2);
   const result = decimal1.times(decimal2);
-  return omit ? result.toFixed(digit, Decimal.ROUND_UP) : result.toDecimalPlaces(digit, Decimal.ROUND_UP).toSignificantDigits(intLen).toString();
+  return omit ? result.toFixed(digit, Decimal.ROUND_HALF_UP) : result.toDecimalPlaces(digit, Decimal.ROUND_HALF_UP).toSignificantDigits(intLen).toString();
 };
 
 /**
@@ -57,7 +74,7 @@ export const divide = (num1, num2, digit = 9, intLen = 20, omit = false) => {
   const decimal1 = new Decimal(num1);
   const decimal2 = new Decimal(num2);
   const result = decimal1.dividedBy(decimal2);
-  return omit ? result.toFixed(digit, Decimal.ROUND_UP) : result.toDecimalPlaces(digit, Decimal.ROUND_UP).toSignificantDigits(intLen).toString();
+  return omit ? result.toFixed(digit, Decimal.ROUND_HALF_UP) : result.toDecimalPlaces(digit, Decimal.ROUND_HALF_UP).toSignificantDigits(intLen).toString();
 };
 
 // 检测结果是否是负数

dsk-operate-ui/src/views/component/CustomTimeSelect.vue

@@ -173,6 +173,10 @@ export default {
         let startTime = ''
         let endTime = new Date()
         switch (value) {
+          case '昨日':
+            startTime = new Date(endTime.getTime() - 3600 * 1000 * 24 * 1)
+            timeStr = [this.formatDate(startTime), this.formatDate(endTime)]
+            break;
           case '今日':
             startTime = new Date(endTime.getTime())
             timeStr = [this.formatDate(startTime), this.formatDate(endTime)]

dsk-operate-ui/src/views/detail/groupAccount/component/members.vue

@@ -387,14 +387,14 @@
           }
         }
         if(key === '2'){
+          this.queryParams.maxStockPercent=''
+          // this.paramsData.maxStockPercent=''
           if(name === this.cgblName){
             this.cgblName=''
+            this.queryParams.minStockPercent=''
+            this.queryParams.maxStockPercent=''
           }else {
             this.cgblName=name;
-          }
-          this.queryParams.maxStockPercent=''
-          this.paramsData.maxStockPercent=''
-          if(this.cgblName){
             if(name === '100%'){
               this.queryParams.minStockPercent=1
             }
@@ -411,14 +411,11 @@
               this.queryParams.minStockPercent=0.01
               this.queryParams.maxStockPercent=0.05
             }
-          }else {
-            this.queryParams.minStockPercent=''
-            this.queryParams.maxStockPercent=''
           }
           if(this.paramsData){
-            if(!this.paramsData.combineId){
-              this.paramsData=this.queryParams
-            }
+            // if(!this.paramsData.combineId){
+            this.paramsData=this.queryParams
+            // }
             this.paramsData.pageNum =1
             this.queryParams.pageNum =1
           }

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

@@ -170,12 +170,27 @@ export default {
             {
               title: '供应商合作记录', pathName: '', children: [
                 { title: '准入情况', pathName: 'accessCondition' },
-                { title: '供应商考评', pathName: 'assessMent' },
+                { title: '管理人员信息', pathName: 'managerial' },
+                { title: '设备信息', pathName: 'equipment' },
+                { title: '工程考察情况记录', pathName: 'projectRecord' },
                 { title: '施工业绩', pathName: 'constructionPerformance' },
                 { title: '在施工程情况', pathName: 'constructionSituation' },
+                { title: '生活保障基地', pathName: 'livingSecurity' },
                 { title: '合作记录', pathName: 'cooperationRecord' },
               ]
             },
+            {
+              title: '供应商评价信息', pathName: '', children: [
+                { title: '履约评价', pathName: 'honourAgreement' },
+                { title: '信用评价', pathName: 'creditRate' },
+                { title: '年度考评', pathName: 'assessMent' },
+              ]
+            },
+            {
+              title: '供应商不良行为', pathName: '', children: [
+                { title: '不良行为列表', pathName: 'badlist' },
+              ]
+            },
           ]
         }
       ],
@@ -434,6 +449,7 @@ export default {
 
     },
     handleItem(item) {
+      console.log(item)
       let obj = item;
       for (var i in this.sideRoute1) {
         if (this.sideRoute1[i].children) {

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

@@ -66,8 +66,12 @@
               :company-id="companyId"></consulting-agency-cooperation>
             <!-- 2、准入情况 -->
             <access-condition v-if="currentPath.pathName=='accessCondition'" :company-id="companyId" :companyInfo="companyInfo"></access-condition>
-            <!-- 2、供应商考评 -->
-            <assessMent class="no-padding" v-if="currentPath.pathName=='assessMent'" :company-id="companyId" :companyInfo="companyInfo"></assessMent>
+            <!-- 管理人员信息 -->
+            <Managerial v-if="currentPath.pathName=='managerial'" :company-id="companyId" :companyInfo="companyInfo"></Managerial>
+            <!-- 设备信息 -->
+            <equipment v-if="currentPath.pathName=='equipment'" :company-id="companyId" :companyInfo="companyInfo"></equipment>
+            <!-- 工程考察情况记录 -->
+            <project-record v-if="currentPath.pathName=='projectRecord'" :company-id="companyId" :companyInfo="companyInfo"></project-record>
             <!-- 3、供应商合作记录 -->
             <cooperation-record v-if="currentPath.pathName=='cooperationRecord'" :company-id="companyId"
               :company-name="companyName" :ctm-id="ctmId"></cooperation-record>
@@ -75,6 +79,16 @@
             <construction-performance v-if="currentPath.pathName=='constructionPerformance'" :company-id="companyId"></construction-performance>
             <!-- 5、在施工程情况 -->
             <construction-situation v-if="currentPath.pathName=='constructionSituation'" :company-id="companyId"></construction-situation>
+            <!-- 生活保障基地 -->
+            <living-security v-if="currentPath.pathName=='livingSecurity'" :company-id="companyId"></living-security>
+            <!-- 履约评价 -->
+            <honour-agreement v-if="currentPath.pathName=='honourAgreement'" :company-id="companyId"></honour-agreement>
+            <!-- 信用评价 -->
+            <credit-rate v-if="currentPath.pathName=='creditRate'" :company-id="companyId"></credit-rate>
+            <!-- 年度考评 -->
+            <assessMent class="no-padding" v-if="currentPath.pathName=='assessMent'" :company-id="companyId" :companyInfo="companyInfo"></assessMent>
+            <!-- 不良行为列表 -->
+            <badlist class="no-padding" v-if="currentPath.pathName=='badlist'" :company-id="companyId" :companyInfo="companyInfo"></badlist>
           </template>
           <template v-if="customerId && isCustomer">
             <!-- 商务信息 -->
@@ -146,10 +160,20 @@ import DecisionMaking from "./decisionMaking"; //决策链条
 import Gjjl from "../../project/projectList/component/gjjl"; //跟进记录
 import ConsultingAgencyCooperation from "@/views/detail/party-a/internalCooperation/consultingAgencyCooperation"; //内部合作 咨询机构合作
 import AccessCondition from "@/views/detail/party-a/internalCooperation/accessCondition"; //内部合作 准入情况
-import assessMent from "@/views/supplier/supplierlist/assessment"; //供应商考评
+import Managerial from "@/views/detail/party-a/internalCooperation/managerial"; //内部合作 管理人员信息
+import equipment from "@/views/detail/party-a/internalCooperation/equipment"; //内部合作 设备信息
+import projectRecord from "@/views/detail/party-a/internalCooperation/projectRecord"; //内部合作 工程考察情况记录
+import badlist from "@/views/detail/party-a/internalCooperation/badlist"; //不良行为列表
+
+import assessMent from "@/views/supplier/supplierlist/assessment"; //年度考评
 import CooperationRecord from "@/views/detail/party-a/internalCooperation/cooperationRecord"; //内部合作 供应商合作记录
 import ConstructionPerformance from "@/views/detail/party-a/internalCooperation/constructionPerformance"; //内部合作 施工业绩
 import ConstructionSituation from "@/views/detail/party-a/internalCooperation/constructionSituation"; //内部合作 在施工程情况
+import livingSecurity from "@/views/detail/party-a/internalCooperation/livingSecurity"; //内部合作 生活保障基地
+
+import honourAgreement from "@/views/detail/party-a/ratelist/honourAgreement"; //供应商评价信息 履约评价
+import creditRate from "@/views/detail/party-a/ratelist/creditRate"; //供应商评价信息 信用评价
+
 import {
   urbanInvestmentPage,
 } from '@/api/detail/party-a/urbanLnvestment';
@@ -157,6 +181,11 @@ import skeleton from './component/skeleton';
 export default {
   name: 'PartyA',
   components: {
+    honourAgreement,
+    creditRate,
+    livingSecurity,
+    equipment,
+    projectRecord,
     Header,
     SideBar,
     Overview,
@@ -201,11 +230,13 @@ export default {
     ConsultingAgencyCooperation,
     AccessCondition,
     assessMent,
+    badlist,
     CooperationRecord,
     CooperativeConstructionUnit,
     CooperativeGroup,
     ConstructionPerformance,
     ConstructionSituation,
+    Managerial,
     skeleton
   },
   data() {

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

+<template>
+    <div class="supplier">
+        <template v-if="!showDetail">
+            <div class="search-supplier">
+                <div class="title_wrap">
+                <div class="enterprise_title">
+                    供应商不良行为
+                </div>
+                </div>
+            </div>
+            <div class="table-supplier table-supplier2">
+                <!--<el-divider class="supdivider"></el-divider>
+                <div class="total-title">
+                <div class="totals">共{{total}}条</div>
+                <p class="total-dc" @click="customerExport">
+                    <img src="@/assets/images/EXCEL.png" alt="">
+                    <span class="excel">导出EXCEL</span>
+                </p>
+                </div> -->
+                <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+                <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+                <div class="item-jf-titel">暂无相关数据</div>
+                <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+                </div>
+                <skeleton v-if="isSkeleton"></skeleton>
+        
+                <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
+                    <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
+                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
+                  :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
+                  ref="theOwnerListTable" :row-key="'customerKey'">
+            
+                        <el-table-column type="index" label="序号" :fixed="tableColumnFixed" width="60" :resizable="false">
+                        <template slot-scope="scope">
+                            <span>{{(queryParams.pageNum - 1) *queryParams.pageSize + scope.$index + 1}}</span>
+                        </template>
+                        </el-table-column>
+                        <el-table-column label="判定组织" prop="name1" :fixed="tableColumnFixed" width="310" :resizable="false"></el-table-column>
+                        <el-table-column label="不良类型" prop="name2" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="不良明细" prop="name3" :fixed="tableColumnFixed"  :resizable="false"></el-table-column>
+                        <el-table-column label="判定状态" prop="name5" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="不良禁用范围" prop="name1" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="解除状态" prop="name66" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="创建时间" prop="name6" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="生效时间" prop="name6" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+
+                        <el-table-column label="操作" width="90" fixed="right">
+                            <template slot-scope="scope">
+                                <span style="color: #0081FF;cursor: pointer;" @click="viewDetail(scope.row)">详情</span>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+                <div class="pagination clearfix" v-show="total>queryParams.pageSize">
+                    <el-pagination background :page-size="queryParams.pageSize" :current-page.sync="queryParams.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+                                :total="total">
+                    </el-pagination>
+                </div>
+            </div>
+        </template>
+        <template v-else>
+            <div class="detail-title">
+                <div><span style="cursor: pointer;" @click="showDetail = false">供应商不良行为列表</span><i class="el-icon-arrow-right"></i><span class="tip">详情</span></div>
+                <div class="search-supplier">
+                  <div class="title_wrap title_wrap1">
+                    <div class="enterprise_title">
+                        不良行为状态
+                    </div>
+                  </div>
+                </div>
+                <info-table class="info-tab"  :list="defaultList" :obj="detailInfo" :labelWidth="140"></info-table>
+                <div class="search-supplier">
+                  <div class="title_wrap title_wrap1">
+                    <div class="enterprise_title">
+                      不良行为判定信息
+                    </div>
+                  </div>
+                </div>
+                <info-table class="info-tab"  :list="defaultList1" :obj="detailInfo" :labelWidth="140"></info-table>
+            </div>
+            
+        </template>
+    </div>
+  
+  </template>
+  
+  <script>
+    import '@/assets/styles/public.scss'
+    import '@/assets/styles/supplierlist.scss'
+    import mixin from '@/views/detail/party-a/mixins/mixin'
+    import InfoTable from '../component/infoTable';
+  
+    export default {
+      name: 'ratinglist',
+      components: {InfoTable},
+      mixins: [mixin],
+      data(){
+        return{
+          detailInfo:{},
+          showDetail:false,
+          formData: [
+            {
+              type: 1, fieldName: 'businessTypes', value: '',width:108, placeholder: '分供方分类', uid: '', options: [
+                {name:'品类',value:1},
+                {name:'物资',value:2},
+                {name:'设备',value:3},
+                {name:'劳务分包',value:4},
+                {name:'专业分包',value:5},
+                {name:'专业服务',value:6},
+                {name:'租赁',value:7},
+              ],
+            },
+            { type: 3, fieldName: 'advisoryBodyName', value: '', placeholder: '分供方名称', uid: '',isword:'分供方名称' },
+          ],
+          defaultList: [
+            { name: '分供方', prop: 'name1' },
+            { name: '分供方编号', prop: 'name7' },
+            { name: '判定分类', prop: 'name9' },
+            { name: '判定组织', prop: 'name1' },
+            { name: '不良类型', prop: 'name2' },
+            { name: '判定人', prop: 'name4' },
+            { name: '判定状态', prop: 'name5' },
+            { name: '生效时间', prop: 'name6' },
+            { name: '解除状态', prop: 'name66' },
+            { name: '申请时间', prop: 'name6' },
+          ],
+          defaultList1: [
+            { name: '判定组织', prop: 'name1' },
+            { name: '判定分类', prop: 'name9' },
+            { name: '判定人', prop: 'name4' },
+            { name: '创建时间', prop: 'name6' },
+            { name: '生效时间', prop: 'name6' },
+            { name: '不良类型', prop: 'name2' },
+            { name: '不良行为有效期', prop: 'name5' ,style: true},
+            { name: '不良行为', prop: 'name3',style: true },
+            { name: '诉讼说明', prop: 'name81',style: true },
+            { name: '依据/原因', prop: 'name81',style: true },
+          ],
+          queryParams: {
+            // customerId: this.companyId,
+            // customerName: this.companyName,
+  
+            pageNum: 1,
+            pageSize: 10,
+          },
+          total: 19,
+          isSkeleton:false,
+          tableData:[
+            {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'不良行为',name3:'其他不履行合同义务造成发包方严重损失的行为',name4:'郑丽青',name5:'长期99',name6:'2022-05-13',name66:'已解除',name7:'118',name8:'118',name81:'经查该劳务分包单位于2021年1月至2022年3月期间，多达十余次放任大量工人恶意讨薪，围堵市政府、劳动局、业主售楼部，且不妥善处理工人工伤造成仲裁，部分班组在我司已支付工程款情况下仍恶意拖欠工人工资，对我司社会形象造成恶劣影响，且存在政府部门及业主单位处罚风险。',name9:'劳务分包类'},
+            {name1:'河南荣川实业有限公司',name2:'恶意行为',name3:'未履行分包合同的责任和义务',name4:'郑青',name5:'长期5',name6:'2022-01-23',name66:'已解除',name7:'118',name8:'118',name81:'经查该劳务分包单位于2021年1月至2022年3月期间，多达十余次放任大量工人恶意讨薪，围堵市政府、劳动局、业主售楼部，且不妥善处理工人工伤造成仲裁，部分班组在我司已支付工程款情况下仍恶意拖欠工人工资，对我司社会形象造成恶劣影响，且存在政府部门及业主单位处罚风险。',name9:'专业分包'},
+            {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'不良行为',name3:'未履行分包合同的责任和义务',name4:'郑丽',name5:'长期19',name6:'2022-05-23',name66:'已解除',name7:'109',name8:'109',name81:'经查该劳务分包单位于2021年1月至2022年3月期间，多达十余次放任大量工人恶意讨薪，围堵市政府、劳动局、业主售楼部，且不妥善处理工人工伤造成仲裁，部分班组在我司已支付工程款情况下仍恶意拖欠工人工资，对我司社会形象造成恶劣影响，且存在政府部门及业主单位处罚风险。',name9:'专业分包'},
+            {name1:'北京九主澜商贸有限公司',name2:'恶意行为',name3:'未履行分包合同的责任和义务',name4:'郑丽青',name5:'长期1',name6:'2022-01-23',name66:'已解除',name7:'105',name8:'109',name81:'经查该劳务分包单位于2021年1月至2022年3月期间，多达十余次放任大量工人恶意讨薪，围堵市政府、劳动局、业主售楼部，且不妥善处理工人工伤造成仲裁，部分班组在我司已支付工程款情况下仍恶意拖欠工人工资，对我司社会形象造成恶劣影响，且存在政府部门及业主单位处罚风险。',name9:'专业分包'},
+            {name1:'重庆拉瑞永固混凝土有限公司',name2:'不良行为',name3:'其他不履行合同义务造成发包方严重损失的行为',name4:'郑丽青',name5:'长期3',name6:'2022-05-21',name66:'已解除',name7:'109',name8:'109',name81:'经查该劳务分包单位于2021年1月至2022年3月期间，多达十余次放任大量工人恶意讨薪，围堵市政府、劳动局、业主售楼部，且不妥善处理工人工伤造成仲裁，部分班组在我司已支付工程款情况下仍恶意拖欠工人工资，对我司社会形象造成恶劣影响，且存在政府部门及业主单位处罚风险。',name9:'专业分包'},
+            {name1:'山东乾途伟业建材有限公司',name2:'恶意行为',name3:'未履行分包合同的责任和义务',name4:'郑丽青',name5:'长期',name6:'2022-05-23',name66:'已解除',name7:'109',name8:'109',name81:'经查该劳务分包单位于2021年1月至2022年3月期间，多达十余次放任大量工人恶意讨薪，围堵市政府、劳动局、业主售楼部，且不妥善处理工人工伤造成仲裁，部分班组在我司已支付工程款情况下仍恶意拖欠工人工资，对我司社会形象造成恶劣影响，且存在政府部门及业主单位处罚风险。',name9:'专业分包'},
+            {name1:'厦门市集美区鸿铭建材有限公司',name2:'不良行为',name3:'其他不履行合同义务造成发包方严重损失的行为',name4:'郑丽青',name5:'长期1',name6:'2022-05-23',name66:'已解除',name7:'109',name8:'109',name81:'经查该劳务分包单位于2021年1月至2022年3月期间，多达十余次放任大量工人恶意讨薪，围堵市政府、劳动局、业主售楼部，且不妥善处理工人工伤造成仲裁，部分班组在我司已支付工程款情况下仍恶意拖欠工人工资，对我司社会形象造成恶劣影响，且存在政府部门及业主单位处罚风险。',name9:'专业分包'},
+            {name1:'重庆匠伦家居用品有限公司',name2:'恶意行为',name3:'未履行分包合同的责任和义务',name4:'郑丽青',name5:'长期7',name6:'2022-05-23',name66:'已解除',name7:'109',name8:'109',name81:'经查该劳务分包单位于2021年1月至2022年3月期间，多达十余次放任大量工人恶意讨薪，围堵市政府、劳动局、业主售楼部，且不妥善处理工人工伤造成仲裁，部分班组在我司已支付工程款情况下仍恶意拖欠工人工资，对我司社会形象造成恶劣影响，且存在政府部门及业主单位处罚风险。',name9:'专业分包'},
+            {name1:'荆门市飞图混凝土有限公司',name2:'不良行为',name3:'其他不履行合同义务造成发包方严重损失的行为',name4:'郑丽青',name5:'长期',name6:'2022-05-23',name66:'已解除',name7:'109',name8:'109',name81:'经查该劳务分包单位于2021年1月至2022年3月期间，多达十余次放任大量工人恶意讨薪，围堵市政府、劳动局、业主售楼部，且不妥善处理工人工伤造成仲裁，部分班组在我司已支付工程款情况下仍恶意拖欠工人工资，对我司社会形象造成恶劣影响，且存在政府部门及业主单位处罚风险。',name9:'专业分包'},
+            {name1:'重庆满煦商贸有限公司',name2:'恶意行为',name3:'未履行分包合同的责任和义务',name4:'郑丽青',name5:'长期',name6:'2022-05-23',name66:'已解除',name7:'109',name8:'109',name81:'经查该劳务分包单位于2021年1月至2022年3月期间，多达十余次放任大量工人恶意讨薪，围堵市政府、劳动局、业主售楼部，且不妥善处理工人工伤造成仲裁，部分班组在我司已支付工程款情况下仍恶意拖欠工人工资，对我司社会形象造成恶劣影响，且存在政府部门及业主单位处罚风险。',name9:'劳务分包类'},
+            {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'不良行为',name3:'其他不履行合同义务造成发包方严重损失的行为',name4:'郑丽青',name5:'长期99',name6:'2022-05-23',name66:'已解除',name7:'118',name8:'118',name81:'经查该劳务分包单位于2021年1月至2022年3月期间，多达十余次放任大量工人恶意讨薪，围堵市政府、劳动局、业主售楼部，且不妥善处理工人工伤造成仲裁，部分班组在我司已支付工程款情况下仍恶意拖欠工人工资，对我司社会形象造成恶劣影响，且存在政府部门及业主单位处罚风险。',name9:'劳务分包类'},
+            {name1:'河南荣川实业有限公司',name2:'恶意行为',name3:'未履行分包合同的责任和义务',name4:'郑丽青',name5:'长期5',name6:'2022-05-23',name66:'已解除',name7:'118',name8:'118',name81:'经查该劳务分包单位于2021年1月至2022年3月期间，多达十余次放任大量工人恶意讨薪，围堵市政府、劳动局、业主售楼部，且不妥善处理工人工伤造成仲裁，部分班组在我司已支付工程款情况下仍恶意拖欠工人工资，对我司社会形象造成恶劣影响，且存在政府部门及业主单位处罚风险。',name9:'专业分包'},
+            {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'不良行为',name3:'未履行分包合同的责任和义务',name4:'郑丽青',name5:'长期19',name6:'2022-05-23',name66:'已解除',name7:'109',name8:'109',name81:'经查该劳务分包单位于2021年1月至2022年3月期间，多达十余次放任大量工人恶意讨薪，围堵市政府、劳动局、业主售楼部，且不妥善处理工人工伤造成仲裁，部分班组在我司已支付工程款情况下仍恶意拖欠工人工资，对我司社会形象造成恶劣影响，且存在政府部门及业主单位处罚风险。',name9:'专业分包'},
+            {name1:'北京九主澜商贸有限公司',name2:'恶意行为',name3:'未履行分包合同的责任和义务',name4:'郑丽青',name5:'长期1',name6:'2022-05-23',name66:'已解除',name7:'105',name8:'109',name81:'经查该劳务分包单位于2021年1月至2022年3月期间，多达十余次放任大量工人恶意讨薪，围堵市政府、劳动局、业主售楼部，且不妥善处理工人工伤造成仲裁，部分班组在我司已支付工程款情况下仍恶意拖欠工人工资，对我司社会形象造成恶劣影响，且存在政府部门及业主单位处罚风险。',name9:'专业分包'},
+            {name1:'重庆拉瑞永固混凝土有限公司',name2:'不良行为',name3:'其他不履行合同义务造成发包方严重损失的行为',name4:'郑丽青',name5:'长期3',name6:'2022-05-23',name66:'已解除',name7:'109',name8:'109',name81:'经查该劳务分包单位于2021年1月至2022年3月期间，多达十余次放任大量工人恶意讨薪，围堵市政府、劳动局、业主售楼部，且不妥善处理工人工伤造成仲裁，部分班组在我司已支付工程款情况下仍恶意拖欠工人工资，对我司社会形象造成恶劣影响，且存在政府部门及业主单位处罚风险。',name9:'专业分包'},
+            {name1:'山东乾途伟业建材有限公司',name2:'恶意行为',name3:'未履行分包合同的责任和义务',name4:'郑丽青',name5:'长期',name6:'2022-05-23',name66:'已解除',name7:'109',name8:'109',name81:'经查该劳务分包单位于2021年1月至2022年3月期间，多达十余次放任大量工人恶意讨薪，围堵市政府、劳动局、业主售楼部，且不妥善处理工人工伤造成仲裁，部分班组在我司已支付工程款情况下仍恶意拖欠工人工资，对我司社会形象造成恶劣影响，且存在政府部门及业主单位处罚风险。',name9:'专业分包'},
+            {name1:'厦门市集美区鸿铭建材有限公司',name2:'不良行为',name3:'其他不履行合同义务造成发包方严重损失的行为',name4:'郑丽青',name5:'长期1',name6:'2022-05-23',name66:'已解除',name7:'109',name8:'109',name81:'经查该劳务分包单位于2021年1月至2022年3月期间，多达十余次放任大量工人恶意讨薪，围堵市政府、劳动局、业主售楼部，且不妥善处理工人工伤造成仲裁，部分班组在我司已支付工程款情况下仍恶意拖欠工人工资，对我司社会形象造成恶劣影响，且存在政府部门及业主单位处罚风险。',name9:'专业分包'},
+            {name1:'重庆匠伦家居用品有限公司',name2:'恶意行为',name3:'未履行分包合同的责任和义务',name4:'郑丽青',name5:'长期7',name6:'2022-05-23',name66:'已解除',name7:'109',name8:'109',name81:'经查该劳务分包单位于2021年1月至2022年3月期间，多达十余次放任大量工人恶意讨薪，围堵市政府、劳动局、业主售楼部，且不妥善处理工人工伤造成仲裁，部分班组在我司已支付工程款情况下仍恶意拖欠工人工资，对我司社会形象造成恶劣影响，且存在政府部门及业主单位处罚风险。',name9:'专业分包'},
+            {name1:'荆门市飞图混凝土有限公司',name2:'不良行为',name3:'其他不履行合同义务造成发包方严重损失的行为',name4:'郑丽青',name5:'长期',name6:'2022-05-23',name66:'已解除',name7:'109',name8:'109',name81:'经查该劳务分包单位于2021年1月至2022年3月期间，多达十余次放任大量工人恶意讨薪，围堵市政府、劳动局、业主售楼部，且不妥善处理工人工伤造成仲裁，部分班组在我司已支付工程款情况下仍恶意拖欠工人工资，对我司社会形象造成恶劣影响，且存在政府部门及业主单位处罚风险。',name9:'专业分包'},
+          ],
+          tableColumnFixed:false,
+        }
+      },
+      methods:{
+        viewDetail(obj){
+            this.detailInfo = obj
+            this.showDetail = true
+        },
+        handleSearch(){},
+        handleExcel() {
+  
+        },
+        customerExport(){
+  
+        },
+        setHeaderRow() {
+          return "owner-table-list-header";
+        },
+        setCellClass({ row, column, rowIndex, columnIndex }) {
+          if (columnIndex == 1) {
+            return "enterprise-name-column";
+          }
+        },
+        setRowClass({ row, rowIndex }) {
+          return "enterprise-name-row";
+        },
+        handleCurrentChange(){
+
+        }
+      }
+    }
+  </script>
+  
+  <style lang="scss" scoped>
+  .infoTable-container{
+    margin-bottom: 16px;
+  }
+    ::v-deep .el-form-item__label{
+      min-height: 40px!important;
+    }
+    .title_wrap{
+        border: none;
+    }
+    .title_wrap1{
+      padding: 0;
+    }
+    .detail-title{
+        border-radius: 4px 4px 0px 0px;
+        opacity: 1;
+        /* 自动布局 */
+        display: flex;
+        flex-direction: column;
+        padding: 16px;
+        gap: 16px;
+        background: #FFFFFF;
+        box-sizing: border-box;
+        /* 分割线 */
+        font-size: 14px;
+        color: rgba(35, 35, 35, 0.4);
+        .el-icon-arrow-right{
+            font-size: 12px;
+            margin: 4px;
+        }
+        .tip{
+            font-size: 12px;
+            color: rgba(35, 35, 35, 1);
+        }
+        img{
+            width: 28px;
+            height: 28px;
+            border-radius: 6px;
+            margin-right: 12px;
+        }
+        strong{
+            font-size: 16px;
+            color: rgba(35, 35, 35, 1);
+            font-weight: 700;
+        }
+        .label{
+            color: rgba(35, 35, 35, 0.8);
+            margin-right: 24px;
+        }
+      }
+    .table-supplier {
+      background: #ffffff;
+      border-radius: 4px;
+      padding: 16px;
+    .supdivider{
+      width: calc(100% + 32px);
+      margin-left: -16px;
+      margin-top: 8px;
+      margin-bottom: 16px;
+    }
+      ::v-deep .head-form-new {
+        .ability-total {
+          display: none !important;
+        }
+        .from-item .normal-search-container{
+          white-space: nowrap;
+          width: 134px;
+        }
+  
+      }
+      input {
+        border: 1px solid #efefef;
+      }
+  
+      ::v-deep .el-form-item {
+        margin-right: 8px !important;
+      }
+  
+      .query-box {
+        margin: 10px 0 20px;
+      }
+  
+      .cell-span {
+        display: inline-block;
+        position: relative;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 4;
+        cursor: pointer;
+  
+        > span {
+          display: inline-block;
+          width: 37px;
+          position: absolute;
+          right: 0;
+          bottom: 0;
+          background-color: #fff;
+          z-index: 1;
+        }
+      }
+  
+      @import "@/assets/styles/search-common.scss";
+    }
+    .table-supplier2{
+        padding-top: 0;
+        margin-top: 0;
+    }
+  </style>
+  
\ No newline at end of file

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

+<template>
+  <!--设备信息-->
+  <div class="supplier">
+    <div class="search-supplier">
+      <div class="title_wrap i">
+        <div class="enterprise_title">
+          设备信息
+        </div>
+      </div>
+    </div>
+    <div class="table-supplier i">
+      <div class="table-item-jf table-item-jf1 empty-table" v-if="!tableData.length && !isSkeleton">
+        <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+        <div class="item-jf-titel">暂无相关数据</div>
+        <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+      </div>
+      <skeleton v-if="isSkeleton"></skeleton>
+
+      <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
+        <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
+                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
+                  :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
+                  ref="theOwnerListTable">
+
+          <el-table-column type="index" label="序号" width="60" :resizable="false">
+            <template slot-scope="scope">
+              <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="客商代码" width="160" prop="name1" :resizable="false">
+          </el-table-column>
+          <el-table-column label="设备种类" :resizable="false" width="100">
+            <template slot-scope="scope">
+              {{scope.row.name5||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="型号" :resizable="false" width="100">
+            <template slot-scope="scope">
+              {{scope.row.name22||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="设备数量" width="100" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name4||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="已使用年限" width="100" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name4||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="当年使用情况" width="100" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name7||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="考察项目" min-width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name3||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="考察公司" min-width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name2||"--"}}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="pagination clearfix" v-show="total>pageSize">
+        <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+                       :total="total">
+        </el-pagination>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { encodeStr } from "@/assets/js/common.js";
+  import "@/assets/styles/public.scss";
+  import "@/assets/styles/supplierlist.scss";
+  import skeleton from '@/views/project/projectList/component/skeleton';
+  export default {
+    name: 'assessment',
+    components:{skeleton},
+    data(){
+      return{
+        encodeStr,
+        tableData:[
+          {name1:'345462018',name22:'3948-91',name2:'华北公司',name3:'北京航华科贸项目',name4:'19',name5:'机械',name7:'正常',name6:'19.4'},
+          {name1:'345462017',name22:'3948-91',name2:'中建一局集团第三建筑有限公司',name3:'朝阳区崔各庄乡大望京村2号地626地块1号楼工程',name4:'81',name5:'机械',name7:'正常',name6:'82'},
+          {name1:'345462017',name22:'3948-91',name2:'总承包公司',name3:'晋中万达广场项目',name4:'82',name5:'机械',name7:'正常',name6:'80'},
+          {name1:'345462017',name22:'3948-91',name2:'总承包公司',name3:'晋中万达广场项目',name4:'80',name5:'机械',name7:'正常',name6:'96'},
+          {name1:'345462017',name22:'3948-91',name2:'中建一局集团第五建筑有限公司',name3:'运河国际生态城一期百合座',name4:'96',name5:'机械',name7:'正常',name6:'100'},
+          {name1:'345462017',name22:'3948-91',name2:'中建一局集团第五建筑有限公司',name3:'北京新机场安置房郑西.鑫苑名家(二期)项目施工总承包工程',name4:'100',name5:'机械',name7:'正常',name6:'82'},
+          {name1:'345462017',name22:'3948-91',name2:'中建一局集团第五建筑有限公司',name3:'胶州鼎峰中央公园c26#楼项目德州鲁班御景国际二期工程及地下车库一标段',name4:'82',name5:'机械',name7:'正常',name6:'95'},
+          {name1:'345462017',name22:'3948-91',name2:'中建一局集团第五建筑有限公司',name3:'济南转山项目B-2地块',name4:'95',name5:'机械',name7:'正常',name6:'91'},
+          {name1:'345462017',name22:'3948-91',name2:'中建一局集团第五建筑有限公司',name3:'济南未来城A5地块房地产开发项目(西地块一期)',name4:'91',name5:'机械',name7:'正常',name6:'88'},
+          {name1:'345462017',name22:'3948-91',name2:'中建一局集团第五建筑有限公司',name3:'盐城万达广场项目部',name4:'84',name5:'机械',name7:'正常',name6:'84'},
+          {name1:'345462017',name22:'3948-91',name2:'中建一局集团第五建筑有限公司',name3:'济南雪山项目A04地块工程总承包',name4:'84',name5:'机械',name7:'正常',name6:'84'},
+          {name1:'345462017',name22:'3948-91',name2:'中建一局集团第五建筑有限公司',name3:'合肥整机智能制造生产线',name4:'84',name5:'机械',name7:'正常',name6:'95'},
+          {name1:'345462017',name22:'3948-91',name2:'中建一局集团第五建筑有限公司',name3:'清华附中凯文国际学校工程武汉新城四新项目C地块一期总包工程',name4:'95',name5:'机械',name7:'正常',name6:'83'},
+          {name1:'345462017',name22:'3948-91',name2:'中建一局集团第五建筑有限公司',name3:'合肥京东方医院项目',name4:'86',name5:'机械',name7:'正常',name6:'95'},
+          {name1:'345462017',name22:'3948-91',name2:'中建一局集团第五建筑有限公司',name3:'长春吾悦广场住宅区土建安装工程(一标段)',name4:'98',name5:'机械',name7:'正常',name6:'86'},
+          {name1:'345462017',name22:'3948-91',name2:'中建一局集团第五建筑有限公司',name3:'中国机械设备工程股份有限公司总部综合楼工程',name4:'83',name5:'机械',name7:'正常',name6:'98'},
+          {name1:'345462017',name22:'3948-91',name2:'中建一局集团第五建筑有限公司',name3:'郑州航空港经济综合实验区(郑州新郑综合保税区)河东第六棚户区第五标段2#地块',name4:'92',name5:'机械',name7:'正常',name6:'83'},
+        ],
+        isSkeleton:false,
+        total:2,
+        pageSize:10,
+        pageNum:1,
+      }
+    },
+    methods: {
+      handleCurrentChange() {
+
+      },
+      setHeaderRow() {
+        return "owner-table-list-header";
+      },
+      setCellClass({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex == 1) {
+          return "enterprise-name-column";
+        }
+      },
+      setRowClass({ row, rowIndex }) {
+        return "enterprise-name-row";
+      },
+    }
+  }
+</script>
+
+<style scoped>
+.supplier{
+    padding: 0;
+  }
+</style>

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

+<template>
+  <!--生活保障基地-->
+  <div class="supplier">
+    <div class="search-supplier">
+      <div class="title_wrap i">
+        <div class="enterprise_title">
+          生活保障基地
+        </div>
+      </div>
+    </div>
+    <div class="table-supplier i">
+      <div class="table-item-jf table-item-jf1 empty-table" v-if="!tableData.length && !isSkeleton">
+        <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+        <div class="item-jf-titel">暂无相关数据</div>
+        <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+      </div>
+      <skeleton v-if="isSkeleton"></skeleton>
+
+      <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
+        <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
+                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
+                  :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
+                  ref="theOwnerListTable">
+
+          <el-table-column type="index" label="序号" width="60" :resizable="false">
+            <template slot-scope="scope">
+              <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="地址" width="160" prop="area" :resizable="false">
+          </el-table-column>
+          <el-table-column label="建筑面积(㎡)" :resizable="false" width="160">
+            <template slot-scope="scope">
+              {{scope.row.name6||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="到期年限" width="160" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name1||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="当前状况" width="160" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name5||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="考察项目" min-width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name3||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="考察公司" min-width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name2||"--"}}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="pagination clearfix" v-show="total>pageSize">
+        <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+                       :total="total">
+        </el-pagination>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { encodeStr } from "@/assets/js/common.js";
+  import "@/assets/styles/public.scss";
+  import "@/assets/styles/supplierlist.scss";
+  import skeleton from '@/views/project/projectList/component/skeleton';
+  export default {
+    name: 'assessment',
+    components:{skeleton},
+    data(){
+      return{
+        encodeStr,
+        tableData:[
+          {area:'北京朝阳区',name1:'2018',name2:'华北公司',name3:'北京航华科贸项目',name4:'19',name5:'使用中',name6:'19.4'},
+          {area:'北京朝阳区',name1:'2017',name2:'中建一局集团第三建筑有限公司',name3:'朝阳区崔各庄乡大望京村2号地626地块1号楼工程',name4:'81',name5:'使用中',name6:'82'},
+          {area:'北京朝阳区',name1:'2017',name2:'总承包公司',name3:'晋中万达广场项目',name4:'82',name5:'使用中',name6:'80'},
+          {area:'北京朝阳区',name1:'2017',name2:'总承包公司',name3:'晋中万达广场项目',name4:'80',name5:'使用中',name6:'96'},
+          {area:'北京朝阳区',name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'运河国际生态城一期百合座',name4:'96',name5:'使用中',name6:'100'},
+          {area:'北京朝阳区',name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'北京新机场安置房郑西.鑫苑名家(二期)项目施工总承包工程',name4:'100',name5:'使用中',name6:'82'},
+          {area:'北京朝阳区',name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'胶州鼎峰中央公园c26#楼项目德州鲁班御景国际二期工程及地下车库一标段',name4:'82',name5:'使用中',name6:'95'},
+          {area:'北京朝阳区',name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'济南转山项目B-2地块',name4:'95',name5:'使用中',name6:'91'},
+          {area:'北京朝阳区',name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'济南未来城A5地块房地产开发项目(西地块一期)',name4:'91',name5:'使用中',name6:'88'},
+          {area:'北京朝阳区',name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'盐城万达广场项目部',name4:'84',name5:'使用中',name6:'84'},
+          {area:'北京朝阳区',name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'济南雪山项目A04地块工程总承包',name4:'84',name5:'使用中',name6:'84'},
+          {area:'北京朝阳区',name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'合肥整机智能制造生产线',name4:'84',name5:'使用中',name6:'95'},
+          {area:'北京朝阳区',name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'清华附中凯文国际学校工程武汉新城四新项目C地块一期总包工程',name4:'95',name5:'使用中',name6:'83'},
+          {area:'北京朝阳区',name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'合肥京东方医院项目',name4:'86',name5:'使用中',name6:'95'},
+          {area:'北京朝阳区',name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'长春吾悦广场住宅区土建安装工程(一标段)',name4:'98',name5:'使用中',name6:'86'},
+          {area:'北京朝阳区',name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'中国机械设备工程股份有限公司总部综合楼工程',name4:'83',name5:'使用中',name6:'98'},
+          {area:'北京朝阳区',name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'郑州航空港经济综合实验区(郑州新郑综合保税区)河东第六棚户区第五标段2#地块',name4:'92',name5:'使用中',name6:'83'},
+        ],
+        isSkeleton:false,
+        total:2,
+        pageSize:10,
+        pageNum:1,
+      }
+    },
+    methods: {
+      handleCurrentChange() {
+
+      },
+      setHeaderRow() {
+        return "owner-table-list-header";
+      },
+      setCellClass({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex == 1) {
+          return "enterprise-name-column";
+        }
+      },
+      setRowClass({ row, rowIndex }) {
+        return "enterprise-name-row";
+      },
+    }
+  }
+</script>
+
+<style scoped>
+  .supplier{
+    padding: 0;
+  }
+</style>

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

+<template>
+  <!--供应商考评-->
+  <div class="supplier">
+    <div class="search-supplier">
+      <div class="title_wrap i">
+        <div class="enterprise_title">
+          管理人员信息
+        </div>
+      </div>
+    </div>
+    <div class="table-supplier i">
+      <div class="table-item-jf table-item-jf1 empty-table" v-if="!tableData.length && !isSkeleton">
+        <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+        <div class="item-jf-titel">暂无相关数据</div>
+        <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+      </div>
+      <skeleton v-if="isSkeleton"></skeleton>
+
+      <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
+        <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
+                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
+                  :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
+                  ref="theOwnerListTable">
+
+          <el-table-column type="index" label="序号" width="60" :resizable="false">
+            <template slot-scope="scope">
+              <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="客商代码" width="160" prop="name1" :resizable="false">
+          </el-table-column>
+          <el-table-column label="职务" :resizable="false" width="160">
+            <template slot-scope="scope">
+              {{scope.row.name5||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="数量" width="160" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name4||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="考察项目" min-width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name3||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="考察公司" min-width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name2||"--"}}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="pagination clearfix" v-show="total>pageSize">
+        <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+                       :total="total">
+        </el-pagination>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { encodeStr } from "@/assets/js/common.js";
+  import "@/assets/styles/public.scss";
+  import "@/assets/styles/supplierlist.scss";
+  import skeleton from '@/views/project/projectList/component/skeleton';
+  export default {
+    name: 'assessment',
+    components:{skeleton},
+    data(){
+      return{
+        encodeStr,
+        tableData:[
+          {name1:'2018',name2:'华北公司',name3:'北京航华科贸项目',name4:'19',name5:'项目经理',name6:'19.4'},
+          {name1:'2017',name2:'中建一局集团第三建筑有限公司',name3:'朝阳区崔各庄乡大望京村2号地626地块1号楼工程',name4:'81',name5:'项目经理',name6:'82'},
+          {name1:'2017',name2:'总承包公司',name3:'晋中万达广场项目',name4:'82',name5:'项目经理',name6:'80'},
+          {name1:'2017',name2:'总承包公司',name3:'晋中万达广场项目',name4:'80',name5:'项目经理',name6:'96'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'运河国际生态城一期百合座',name4:'96',name5:'项目经理',name6:'100'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'北京新机场安置房郑西.鑫苑名家(二期)项目施工总承包工程',name4:'100',name5:'项目经理',name6:'82'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'胶州鼎峰中央公园c26#楼项目德州鲁班御景国际二期工程及地下车库一标段',name4:'82',name5:'项目经理',name6:'95'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'济南转山项目B-2地块',name4:'95',name5:'项目经理',name6:'91'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'济南未来城A5地块房地产开发项目(西地块一期)',name4:'91',name5:'项目经理',name6:'88'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'盐城万达广场项目部',name4:'84',name5:'项目经理',name6:'84'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'济南雪山项目A04地块工程总承包',name4:'84',name5:'项目经理',name6:'84'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'合肥整机智能制造生产线',name4:'84',name5:'项目经理',name6:'95'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'清华附中凯文国际学校工程武汉新城四新项目C地块一期总包工程',name4:'95',name5:'项目经理',name6:'83'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'合肥京东方医院项目',name4:'86',name5:'项目经理',name6:'95'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'长春吾悦广场住宅区土建安装工程(一标段)',name4:'98',name5:'项目经理',name6:'86'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'中国机械设备工程股份有限公司总部综合楼工程',name4:'83',name5:'项目经理',name6:'98'},
+          {name1:'2017',name2:'中建一局集团第五建筑有限公司',name3:'郑州航空港经济综合实验区(郑州新郑综合保税区)河东第六棚户区第五标段2#地块',name4:'92',name5:'项目经理',name6:'83'},
+        ],
+        isSkeleton:false,
+        total:2,
+        pageSize:10,
+        pageNum:1,
+      }
+    },
+    methods: {
+      handleCurrentChange() {
+
+      },
+      setHeaderRow() {
+        return "owner-table-list-header";
+      },
+      setCellClass({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex == 1) {
+          return "enterprise-name-column";
+        }
+      },
+      setRowClass({ row, rowIndex }) {
+        return "enterprise-name-row";
+      },
+    }
+  }
+</script>
+
+<style scoped>
+  .supplier{
+    padding: 0;
+  }
+</style>

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

+<template>
+  <!--工程考察情况记录-->
+  <div class="supplier">
+    <div class="search-supplier">
+      <div class="title_wrap i">
+        <div class="enterprise_title">
+          工程考察情况记录
+        </div>
+      </div>
+    </div>
+    <div class="table-supplier i">
+      <div class="table-item-jf table-item-jf1 empty-table" v-if="!tableData.length && !isSkeleton">
+        <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+        <div class="item-jf-titel">暂无相关数据</div>
+        <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+      </div>
+      <skeleton v-if="isSkeleton"></skeleton>
+
+      <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
+        <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
+                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
+                  :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
+                  ref="theOwnerListTable">
+
+          <el-table-column type="index" label="序号" width="60" :resizable="false">
+            <template slot-scope="scope">
+              <span>{{(pageNum - 1) *pageSize + scope.$index + 1}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="工程名称" min-width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name3||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="工程地点" width="110" prop="area" :resizable="false">
+          </el-table-column>
+          <el-table-column label="建筑面积(㎡)" :resizable="false" width="110">
+            <template slot-scope="scope">
+              {{scope.row.name6||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="结构形式" width="110" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name5||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="开工日期" width="110" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name1||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="竣工日期" width="110" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name1||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="施工承包范围" min-width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name4||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="合同额" width="110" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name6||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="劳务队长" width="110" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name44||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="质量目标" width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name45||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="现场管理目标" width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name45||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="考察项目" min-width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name3||"--"}}
+            </template>
+          </el-table-column>
+          <el-table-column label="考察公司" min-width="120" :resizable="false">
+            <template slot-scope="scope">
+              {{scope.row.name2||"--"}}
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+      <div class="pagination clearfix" v-show="total>pageSize">
+        <el-pagination background :page-size="pageSize" :current-page.sync="pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+                       :total="total">
+        </el-pagination>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import { encodeStr } from "@/assets/js/common.js";
+  import "@/assets/styles/public.scss";
+  import "@/assets/styles/supplierlist.scss";
+  import skeleton from '@/views/project/projectList/component/skeleton';
+  export default {
+    name: 'assessment',
+    components:{skeleton},
+    data(){
+      return{
+        encodeStr,
+        tableData:[
+          {area:'北京市大兴区黄村镇',name1:'2018-01-21',name2:'华北公司',name3:'北京航华科贸项目',name4:'可承担各类房屋建筑工程的施工',name44:'夏志豪',name45:'合格率达到99.9%',name5:'钢结构',name6:'19.4'},
+          {area:'北京市大兴区黄村镇',name1:'2017-01-21',name2:'中建一局集团第三建筑有限公司',name3:'朝阳区崔各庄乡大望京村2号地626地块1号楼工程',name4:'可承担各类房屋建筑工程的施工',name44:'夏志豪',name45:'合格率达到99.9%',name5:'框架结构',name6:'82'},
+          {area:'北京市大兴区黄村镇',name1:'2017-01-21',name2:'总承包公司',name3:'晋中万达广场项目',name4:'可承担各类房屋建筑工程的施工',name44:'夏志豪',name45:'合格率达到99.9%',name5:'框架结构',name6:'80'},
+          {area:'北京市大兴区黄村镇',name1:'2017-01-21',name2:'总承包公司',name3:'晋中万达广场项目',name4:'可承担各类房屋建筑工程的施工',name44:'夏志豪',name45:'合格率达到99.9%',name5:'钢结构',name6:'96'},
+          {area:'北京市大兴区黄村镇',name1:'2017-01-21',name2:'中建一局集团第五建筑有限公司',name3:'运河国际生态城一期百合座',name4:'可承担各类房屋建筑工程的施工',name44:'夏志豪',name45:'合格率达到99.9%',name5:'钢结构',name6:'100'},
+          {area:'北京市大兴区黄村镇',name1:'2017-01-21',name2:'中建一局集团第五建筑有限公司',name3:'北京新机场安置房郑西.鑫苑名家(二期)项目施工总承包工程',name4:'可承担各类房屋建筑工程的施工',name44:'夏志豪',name45:'合格率达到99.9%',name5:'框架结构',name6:'82'},
+          {area:'北京市大兴区黄村镇',name1:'2017-01-21',name2:'中建一局集团第五建筑有限公司',name3:'胶州鼎峰中央公园c26#楼项目德州鲁班御景国际二期工程及地下车库一标段',name4:'可承担各类房屋建筑工程的施工',name44:'夏志豪',name45:'合格率达到99.9%',name5:'框架结构',name6:'95'},
+          {area:'北京市大兴区黄村镇',name1:'2017-01-21',name2:'中建一局集团第五建筑有限公司',name3:'济南转山项目B-2地块',name4:'可承担各类房屋建筑工程的施工',name44:'夏志豪',name45:'合格率达到99.9%',name5:'框架结构',name6:'91'},
+          {area:'北京市大兴区黄村镇',name1:'2017-01-21',name2:'中建一局集团第五建筑有限公司',name3:'济南未来城A5地块房地产开发项目(西地块一期)',name4:'可承担各类房屋建筑工程的施工',name44:'夏志豪',name45:'合格率达到99.9%',name5:'框架结构',name6:'88'},
+          {area:'北京市大兴区黄村镇',name1:'2017-01-21',name2:'中建一局集团第五建筑有限公司',name3:'盐城万达广场项目部',name4:'可承担各类房屋建筑工程的施工',name44:'夏志豪',name45:'合格率达到99.9%',name5:'框架结构',name6:'84'},
+          {area:'北京市大兴区黄村镇',name1:'2017-01-21',name2:'中建一局集团第五建筑有限公司',name3:'济南雪山项目A04地块工程总承包',name4:'可承担各类房屋建筑工程的施工',name44:'夏志豪',name45:'合格率达到99.9%',name5:'框架结构',name6:'84'},
+          {area:'北京市大兴区黄村镇',name1:'2017-01-21',name2:'中建一局集团第五建筑有限公司',name3:'合肥整机智能制造生产线',name4:'可承担各类房屋建筑工程的施工',name44:'夏志豪',name45:'合格率达到99.9%',name5:'框架结构',name6:'95'},
+          {area:'北京市大兴区黄村镇',name1:'2017-01-21',name2:'中建一局集团第五建筑有限公司',name3:'清华附中凯文国际学校工程武汉新城四新项目C地块一期总包工程',name4:'可承担各类房屋建筑工程的施工',name44:'夏志豪',name45:'合格率达到99.9%',name5:'框架结构',name6:'83'},
+          {area:'北京市大兴区黄村镇',name1:'2017-01-21',name2:'中建一局集团第五建筑有限公司',name3:'合肥京东方医院项目',name4:'可承担各类房屋建筑工程的施工',name44:'夏志豪',name45:'合格率达到99.9%',name5:'框架结构',name6:'95'},
+          {area:'北京市大兴区黄村镇',name1:'2017-01-21',name2:'中建一局集团第五建筑有限公司',name3:'长春吾悦广场住宅区土建安装工程(一标段)',name4:'可承担各类房屋建筑工程的施工',name44:'夏志豪',name45:'合格率达到99.9%',name5:'框架结构',name6:'86'},
+          {area:'北京市大兴区黄村镇',name1:'2017-01-21',name2:'中建一局集团第五建筑有限公司',name3:'中国机械设备工程股份有限公司总部综合楼工程',name4:'可承担各类房屋建筑工程的施工',name44:'夏志豪',name45:'合格率达到99.9%',name5:'框架结构',name6:'98'},
+          {area:'北京市大兴区黄村镇',name1:'2017-01-21',name2:'中建一局集团第五建筑有限公司',name3:'郑州航空港经济综合实验区(郑州新郑综合保税区)河东第六棚户区第五标段2#地块',name4:'可承担各类房屋建筑工程的施工',name44:'夏志豪',name45:'合格率达到99.9%',name5:'框架结构',name6:'83'},
+        ],
+        isSkeleton:false,
+        total:2,
+        pageSize:10,
+        pageNum:1,
+      }
+    },
+    methods: {
+      handleCurrentChange() {
+
+      },
+      setHeaderRow() {
+        return "owner-table-list-header";
+      },
+      setCellClass({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex == 1) {
+          return "enterprise-name-column";
+        }
+      },
+      setRowClass({ row, rowIndex }) {
+        return "enterprise-name-row";
+      },
+    }
+  }
+</script>
+
+<style scoped>
+.supplier{
+    padding: 0;
+  }
+</style>

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

+<template>
+  <div class="supplier supplier1">
+      <template v-if="!showDetail">
+          <div class="search-supplier">
+              <div class="title_wrap">
+              <div class="enterprise_title">
+                  信用评价
+              </div>
+              </div>
+          </div>
+          <div class="table-supplier table-supplier2">
+              <head-form-new title="" :form-data="formData" :query-params="queryParams" :total="0" :isExcel="false"
+                          @handle-search="handleSearch" ref="searchFormNew" @handle-excel="handleExcel" />
+              <!--<el-divider class="supdivider"></el-divider>
+              <div class="total-title">
+              <div class="totals">共{{total}}条</div>
+              <p class="total-dc" @click="customerExport">
+                  <img src="@/assets/images/EXCEL.png" alt="">
+                  <span class="excel">导出EXCEL</span>
+              </p>
+              </div> -->
+              <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+              <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+              <div class="item-jf-titel">暂无相关数据</div>
+              <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+              </div>
+              <skeleton v-if="isSkeleton"></skeleton>
+      
+              <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
+                  <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
+                              v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
+                              :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
+                              ref="theOwnerListTable">
+          
+                      <el-table-column type="index" label="排名" :fixed="tableColumnFixed" width="60" :resizable="false">
+                      <template slot-scope="scope">
+                          <span>{{(queryParams.pageNum - 1) *queryParams.pageSize + scope.$index + 1}}</span>
+                      </template>
+                      </el-table-column>
+                      <el-table-column label="供应商名称" prop="name1" :fixed="tableColumnFixed" width="310" :resizable="false"></el-table-column>
+                      <el-table-column label="所属组织" prop="name1" :fixed="tableColumnFixed" width="310" :resizable="false"></el-table-column>
+                      <el-table-column label="品类" prop="name2" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                      <el-table-column label="当前信用得分" prop="name3" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                      <el-table-column label="来源" prop="name5" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                      <el-table-column label="操作" width="90">
+                          <template slot-scope="scope">
+                              <span style="color: #0081FF;cursor: pointer;" @click="viewDetail(scope.row)">详情</span>
+                          </template>
+                      </el-table-column>
+                  </el-table>
+              </div>
+              <div class="pagination clearfix" v-show="total>queryParams.pageSize">
+                  <el-pagination background :page-size="queryParams.pageSize" :current-page.sync="queryParams.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+                              :total="total">
+                  </el-pagination>
+              </div>
+          </div>
+      </template>
+      <template v-else>
+          <div class="detail-title">
+              <div><span style="cursor: pointer;" @click="showDetail = false">信用评价列表</span><i class="el-icon-arrow-right"></i><span class="tip">详情</span></div>
+          </div>
+          <div class="table-supplier table-supplier2">
+              <head-form-new title="" :form-data="formData2" :query-params="queryParams" :total="0" :isExcel="false"
+                          @handle-search="handleSearch" ref="searchFormNew" @handle-excel="handleExcel" />
+              <!--<el-divider class="supdivider"></el-divider>
+              <div class="total-title">
+              <div class="totals">共{{total}}条</div>
+              <p class="total-dc" @click="customerExport">
+                  <img src="@/assets/images/EXCEL.png" alt="">
+                  <span class="excel">导出EXCEL</span>
+              </p>
+              </div> -->
+              <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+              <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+              <div class="item-jf-titel">暂无相关数据</div>
+              <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+              </div>
+              <skeleton v-if="isSkeleton"></skeleton>
+      
+              <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
+                  <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
+                              v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
+                              :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
+                              ref="theOwnerListTable">
+          
+                      <el-table-column type="index" label="排名" :fixed="tableColumnFixed" width="60" :resizable="false">
+                      <template slot-scope="scope">
+                          <span>{{(queryParams.pageNum - 1) *queryParams.pageSize + scope.$index + 1}}</span>
+                      </template>
+                      </el-table-column>
+                      <el-table-column label="评价维度" prop="name2" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                      <el-table-column label="规则名称" prop="name5" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                      <el-table-column label="规则定义" prop="name1" :fixed="tableColumnFixed"  :resizable="false"></el-table-column>
+                      <el-table-column label="考核周期" prop="name3" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                      <el-table-column label="得分" prop="name6" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                  </el-table>
+              </div>
+              <div class="pagination clearfix" v-show="total>queryParams.pageSize">
+                  <el-pagination background :page-size="queryParams.pageSize" :current-page.sync="queryParams.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+                              :total="total">
+                  </el-pagination>
+              </div>
+          </div>
+      </template>
+  </div>
+
+</template>
+
+<script>
+  import '@/assets/styles/public.scss'
+  import '@/assets/styles/supplierlist.scss'
+  import mixin from '@/views/detail/party-a/mixins/mixin'
+
+  export default {
+    name: 'ratinglist',
+    mixins: [mixin],
+    data(){
+      return{
+        detailInfo:{},
+        showDetail:false,
+        formData: [
+          {
+            type: 1, fieldName: 'businessTypes', value: '',width:80, placeholder: '品类', uid: '', options: [
+              {name:'品类',value:1},
+              {name:'物资',value:2},
+              {name:'设备',value:3},
+              {name:'劳务分包',value:4},
+              {name:'专业分包',value:5},
+              {name:'专业服务',value:6},
+              {name:'租赁',value:7},
+            ],
+          },
+          { type: 5, fieldName: 'causeAction', value: '', placeholder: '评价周期',timeList: ['近一周', '近半月', '近一月', '自定义'],uid: '' },
+          { type: 3, fieldName: 'advisoryBodyName', value: '', placeholder: '项目名称关键字', uid: '',isword:'项目名称关键字',},
+          { type: 3, fieldName: 'advisoryBodyName', value: '', placeholder: '分供方名称', uid: '',isword:'分供方名称' },
+        ],
+        formData2: [
+          {
+            type: 1, fieldName: 'businessTypes', value: '',width:108, placeholder: '评价维度', uid: '', options: [
+              {name:'现场配合',value:1},
+              {name:'劳务分包',value:4},
+              {name:'专业分包',value:5},
+              {name:'专业服务',value:6},
+              {name:'租赁',value:7},
+            ],
+          },
+          { type: 5, fieldName: 'causeAction', value: '', placeholder: '考核周期',timeList: ['近一周', '近半月', '近一月', '自定义'],uid: '' },
+          { type: 3, fieldName: 'advisoryBodyName', value: '', placeholder: '规则名称', uid: '',isword:'规则名称' },
+        ],
+        queryParams: {
+          // customerId: this.companyId,
+          // customerName: this.companyName,
+
+          pageNum: 1,
+          pageSize: 10,
+        },
+        total: 19,
+        isSkeleton:false,
+        tableData:[
+          {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'物资-水泥及水',name3:'--',name4:'--',name5:'供应商准入（集采）99',name6:'100',name7:'118',name8:'118',name9:'114'},
+          {name1:'河南荣川实业有限公司',name2:'泥制品',name3:'100',name4:'--',name5:'供应商准入（集采）5',name6:'100',name7:'118',name8:'118',name9:'107'},
+          {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'物资-其他类',name3:'100',name4:'--',name5:'供应商准入（集采）19',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'北京九主澜商贸有限公司',name2:'物资-砼及外加剂',name3:'100',name4:'--',name5:'供应商准入（集采）1',name6:'100',name7:'105',name8:'109',name9:'107'},
+          {name1:'重庆拉瑞永固混凝土有限公司',name2:'物资-木材及制品',name3:'--',name4:'--',name5:'供应商准入（集采）3',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'山东乾途伟业建材有限公司',name2:'物资-砼及外加剂',name3:'100',name4:'--',name5:'供应商准入（集采）',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'厦门市集美区鸿铭建材有限公司',name2:'物资-其他类',name3:'--',name4:'--',name5:'供应商准入（集采）1',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'重庆匠伦家居用品有限公司',name2:'物资-砼及外加剂',name3:'106',name4:'--',name5:'供应商准入（集采）7',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'荆门市飞图混凝土有限公司',name2:'物资-木材及制币',name3:'--',name4:'--',name5:'供应商准入（集采）',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'重庆满煦商贸有限公司',name2:'物资-砼及外加剂',name3:'106',name4:'--',name5:'供应商准入（集采）',name6:'100',name7:'109',name8:'109',name9:'114'},
+          {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'物资-水泥及水',name3:'--',name4:'--',name5:'供应商准入（集采）99',name6:'100',name7:'118',name8:'118',name9:'114'},
+          {name1:'河南荣川实业有限公司',name2:'泥制品',name3:'100',name4:'--',name5:'供应商准入（集采）5',name6:'100',name7:'118',name8:'118',name9:'107'},
+          {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'物资-其他类',name3:'100',name4:'--',name5:'供应商准入（集采）19',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'北京九主澜商贸有限公司',name2:'物资-砼及外加剂',name3:'100',name4:'--',name5:'供应商准入（集采）1',name6:'100',name7:'105',name8:'109',name9:'107'},
+          {name1:'重庆拉瑞永固混凝土有限公司',name2:'物资-木材及制品',name3:'--',name4:'--',name5:'供应商准入（集采）3',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'山东乾途伟业建材有限公司',name2:'物资-砼及外加剂',name3:'100',name4:'--',name5:'供应商准入（集采）',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'厦门市集美区鸿铭建材有限公司',name2:'物资-其他类',name3:'--',name4:'--',name5:'供应商准入（集采）1',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'重庆匠伦家居用品有限公司',name2:'物资-砼及外加剂',name3:'106',name4:'--',name5:'供应商准入（集采）7',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'荆门市飞图混凝土有限公司',name2:'物资-木材及制币',name3:'--',name4:'--',name5:'供应商准入（集采）',name6:'100',name7:'109',name8:'109',name9:'107'},
+        ],
+        tableColumnFixed:false,
+      }
+    },
+    methods:{
+      viewDetail(obj){
+          this.detailInfo = obj
+          this.showDetail = true
+      },
+      handleSearch(){},
+      handleExcel() {
+
+      },
+      customerExport(){
+
+      },
+      setHeaderRow() {
+        return "owner-table-list-header";
+      },
+      setCellClass({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex == 1) {
+          return "enterprise-name-column";
+        }
+      },
+      setRowClass({ row, rowIndex }) {
+        return "enterprise-name-row";
+      },
+      handleCurrentChange(){
+
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .supplier1{
+      padding: 0;
+    }
+  .title_wrap{
+      border: none;
+  }
+  .detail-title{
+      border-radius: 4px 4px 0px 0px;
+      opacity: 1;
+      /* 自动布局 */
+      display: flex;
+      flex-direction: column;
+      padding: 16px;
+      gap: 16px;
+      background: #FFFFFF;
+      box-sizing: border-box;
+      /* 分割线 */
+      font-size: 14px;
+      color: rgba(35, 35, 35, 0.4);
+      .el-icon-arrow-right{
+          font-size: 12px;
+          margin: 4px;
+      }
+      .tip{
+          font-size: 12px;
+          color: rgba(35, 35, 35, 1);
+      }
+      img{
+          width: 28px;
+          height: 28px;
+          border-radius: 6px;
+          margin-right: 12px;
+      }
+      strong{
+          font-size: 16px;
+          color: rgba(35, 35, 35, 1);
+          font-weight: 700;
+      }
+      .label{
+          color: rgba(35, 35, 35, 0.8);
+          margin-right: 24px;
+      }
+    }
+  .table-supplier {
+    background: #ffffff;
+    border-radius: 4px;
+    padding: 16px;
+  .supdivider{
+    width: calc(100% + 32px);
+    margin-left: -16px;
+    margin-top: 8px;
+    margin-bottom: 16px;
+  }
+    ::v-deep .head-form-new {
+      .ability-total {
+        display: none !important;
+      }
+      .from-item .normal-search-container{
+        white-space: nowrap;
+        width: 134px;
+      }
+
+    }
+    input {
+      border: 1px solid #efefef;
+    }
+
+    ::v-deep .el-form-item {
+      margin-right: 8px !important;
+    }
+
+    .query-box {
+      margin: 10px 0 20px;
+    }
+
+    .cell-span {
+      display: inline-block;
+      position: relative;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 4;
+      cursor: pointer;
+
+      > span {
+        display: inline-block;
+        width: 37px;
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        background-color: #fff;
+        z-index: 1;
+      }
+    }
+
+    @import "@/assets/styles/search-common.scss";
+  }
+  .table-supplier2{
+      padding-top: 0;
+      margin-top: 0;
+  }
+</style>

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

+<template>
+    <div class="supplier supplier1 ">
+        <template v-if="!showDetail">
+            <div class="search-supplier">
+                <div class="title_wrap">
+                <div class="enterprise_title">
+                    履约评价
+                </div>
+                </div>
+            </div>
+            <div class="table-supplier table-supplier2">
+                <!--<el-divider class="supdivider"></el-divider>
+                <div class="total-title">
+                <div class="totals">共{{total}}条</div>
+                <p class="total-dc" @click="customerExport">
+                    <img src="@/assets/images/EXCEL.png" alt="">
+                    <span class="excel">导出EXCEL</span>
+                </p>
+                </div> -->
+                <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+                <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+                <div class="item-jf-titel">暂无相关数据</div>
+                <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+                </div>
+                <skeleton v-if="isSkeleton"></skeleton>
+        
+                <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
+                    <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
+                                v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
+                                :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
+                                ref="theOwnerListTable">
+            
+                        <el-table-column type="index" label="排名" :fixed="tableColumnFixed" width="60" :resizable="false">
+                        <template slot-scope="scope">
+                            <span>{{(queryParams.pageNum - 1) *queryParams.pageSize + scope.$index + 1}}</span>
+                        </template>
+                        </el-table-column>
+                        <el-table-column label="项目" prop="name1" :fixed="tableColumnFixed" width="310" :resizable="false"></el-table-column>
+                        <el-table-column label="品类" prop="name2" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="本月履约金额" prop="name5" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="本月履约得分" prop="name3" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="本年履约金额" prop="name5" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="操作" width="90">
+                            <template slot-scope="scope">
+                                <span style="color: #0081FF;cursor: pointer;" @click="viewDetail(scope.row)">详情</span>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+                <div class="pagination clearfix" v-show="total>queryParams.pageSize">
+                    <el-pagination background :page-size="queryParams.pageSize" :current-page.sync="queryParams.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+                                :total="total">
+                    </el-pagination>
+                </div>
+            </div>
+        </template>
+        <template v-else>
+            <div class="detail-title">
+                <div><span style="cursor: pointer;" @click="showDetail = false">履约评价列表</span><i class="el-icon-arrow-right"></i><span class="tip">详情</span></div>
+            </div>
+            <div class="table-supplier table-supplier2">
+                <head-form-new title="" :form-data="formData2" :query-params="queryParams" :total="0" :isExcel="false" 
+                            @handle-search="handleSearch" ref="searchFormNew" @handle-excel="handleExcel" />
+                <!--<el-divider class="supdivider"></el-divider>
+                <div class="total-title">
+                <div class="totals">共{{total}}条</div>
+                <p class="total-dc" @click="customerExport">
+                    <img src="@/assets/images/EXCEL.png" alt="">
+                    <span class="excel">导出EXCEL</span>
+                </p>
+                </div> -->
+                <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+                <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+                <div class="item-jf-titel">暂无相关数据</div>
+                <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+                </div>
+                <skeleton v-if="isSkeleton"></skeleton>
+        
+                <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
+                    <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
+                                v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
+                                :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
+                                ref="theOwnerListTable">
+            
+                        <el-table-column type="index" label="排名" :fixed="tableColumnFixed" width="60" :resizable="false">
+                        <template slot-scope="scope">
+                            <span>{{(queryParams.pageNum - 1) *queryParams.pageSize + scope.$index + 1}}</span>
+                        </template>
+                        </el-table-column>
+                        <el-table-column label="评价维度" prop="name2" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="规则名称" prop="name5" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="规则定义" prop="name1" :fixed="tableColumnFixed"  :resizable="false"></el-table-column>
+                        <el-table-column label="考核周期" prop="name3" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="得分" prop="name5" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                    </el-table>
+                </div>
+                <div class="pagination clearfix" v-show="total>queryParams.pageSize">
+                    <el-pagination background :page-size="queryParams.pageSize" :current-page.sync="queryParams.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+                                :total="total">
+                    </el-pagination>
+                </div>
+            </div>
+        </template>
+    </div>
+  
+  </template>
+  
+  <script>
+    import '@/assets/styles/public.scss'
+    import '@/assets/styles/supplierlist.scss'
+    import mixin from '@/views/detail/party-a/mixins/mixin'
+  
+    export default {
+      name: 'ratinglist',
+      mixins: [mixin],
+      data(){
+        return{
+          detailInfo:{},
+          showDetail:false,
+          formData: [
+            {
+              type: 1, fieldName: 'businessTypes', value: '',width:80, placeholder: '品类', uid: '', options: [
+                {name:'品类',value:1},
+                {name:'物资',value:2},
+                {name:'设备',value:3},
+                {name:'劳务分包',value:4},
+                {name:'专业分包',value:5},
+                {name:'专业服务',value:6},
+                {name:'租赁',value:7},
+              ],
+            },
+            { type: 5, fieldName: 'causeAction', value: '', placeholder: '评价周期',timeList: ['近一周', '近半月', '近一月', '自定义'],uid: '' },
+            { type: 3, fieldName: 'advisoryBodyName', value: '', placeholder: '项目名称关键字', uid: '',isword:'项目名称关键字',},
+            { type: 3, fieldName: 'advisoryBodyName', value: '', placeholder: '分供方名称', uid: '',isword:'分供方名称' },
+          ],
+          formData2: [
+            {
+              type: 1, fieldName: 'businessTypes', value: '',width:108, placeholder: '评价维度', uid: '', options: [
+                {name:'现场配合',value:1},
+                {name:'劳务分包',value:4},
+                {name:'专业分包',value:5},
+                {name:'专业服务',value:6},
+                {name:'租赁',value:7},
+              ],
+            },
+            { type: 5, fieldName: 'causeAction', value: '', placeholder: '考核周期',timeList: ['近一周', '近半月', '近一月', '自定义'],uid: '' },
+            { type: 3, fieldName: 'advisoryBodyName', value: '', placeholder: '规则名称', uid: '',isword:'规则名称' },
+          ],
+          queryParams: {
+            // customerId: this.companyId,
+            // customerName: this.companyName,
+  
+            pageNum: 1,
+            pageSize: 10,
+          },
+          total: 19,
+          isSkeleton:false,
+          tableData:[
+            {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'物资-水泥及水',name3:'--',name4:'--',name5:'4297031.99',name6:'100',name7:'118',name8:'118',name9:'114'},
+            {name1:'河南荣川实业有限公司',name2:'泥制品',name3:'100',name4:'--',name5:'363515.35',name6:'100',name7:'118',name8:'118',name9:'107'},
+            {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'物资-其他类',name3:'100',name4:'--',name5:'6317465.19',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'北京九主澜商贸有限公司',name2:'物资-砼及外加剂',name3:'100',name4:'--',name5:'1969555.1',name6:'100',name7:'105',name8:'109',name9:'107'},
+            {name1:'重庆拉瑞永固混凝土有限公司',name2:'物资-木材及制品',name3:'--',name4:'--',name5:'948239.73',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'山东乾途伟业建材有限公司',name2:'物资-砼及外加剂',name3:'100',name4:'--',name5:'941892.3',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'厦门市集美区鸿铭建材有限公司',name2:'物资-其他类',name3:'--',name4:'--',name5:'358583.61',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'重庆匠伦家居用品有限公司',name2:'物资-砼及外加剂',name3:'106',name4:'--',name5:'217844.57',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'荆门市飞图混凝土有限公司',name2:'物资-木材及制币',name3:'--',name4:'--',name5:'78707.09',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'重庆满煦商贸有限公司',name2:'物资-砼及外加剂',name3:'106',name4:'--',name5:'65403.78',name6:'100',name7:'109',name8:'109',name9:'114'},
+            {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'物资-水泥及水',name3:'--',name4:'--',name5:'4297031.99',name6:'100',name7:'118',name8:'118',name9:'114'},
+            {name1:'河南荣川实业有限公司',name2:'泥制品',name3:'100',name4:'--',name5:'363515.35',name6:'100',name7:'118',name8:'118',name9:'107'},
+            {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'物资-其他类',name3:'100',name4:'--',name5:'6317465.19',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'北京九主澜商贸有限公司',name2:'物资-砼及外加剂',name3:'100',name4:'--',name5:'1969555.1',name6:'100',name7:'105',name8:'109',name9:'107'},
+            {name1:'重庆拉瑞永固混凝土有限公司',name2:'物资-木材及制品',name3:'--',name4:'--',name5:'948239.73',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'山东乾途伟业建材有限公司',name2:'物资-砼及外加剂',name3:'100',name4:'--',name5:'941892.3',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'厦门市集美区鸿铭建材有限公司',name2:'物资-其他类',name3:'--',name4:'--',name5:'358583.61',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'重庆匠伦家居用品有限公司',name2:'物资-砼及外加剂',name3:'106',name4:'--',name5:'217844.57',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'荆门市飞图混凝土有限公司',name2:'物资-木材及制币',name3:'--',name4:'--',name5:'78707.09',name6:'100',name7:'109',name8:'109',name9:'107'},
+          ],
+          tableColumnFixed:false,
+        }
+      },
+      methods:{
+        viewDetail(obj){
+            this.detailInfo = obj
+            this.showDetail = true
+        },
+        handleSearch(){},
+        handleExcel() {
+  
+        },
+        customerExport(){
+  
+        },
+        setHeaderRow() {
+          return "owner-table-list-header";
+        },
+        setCellClass({ row, column, rowIndex, columnIndex }) {
+          if (columnIndex == 1) {
+            return "enterprise-name-column";
+          }
+        },
+        setRowClass({ row, rowIndex }) {
+          return "enterprise-name-row";
+        },
+        handleCurrentChange(){
+
+        }
+      }
+    }
+  </script>
+  
+  <style lang="scss" scoped>
+    .supplier1{
+      padding: 0;
+    }
+    .title_wrap{
+        border: none;
+    }
+    .detail-title{
+        border-radius: 4px 4px 0px 0px;
+        opacity: 1;
+        /* 自动布局 */
+        display: flex;
+        flex-direction: column;
+        padding: 16px;
+        gap: 16px;
+        background: #FFFFFF;
+        box-sizing: border-box;
+        /* 分割线 */
+        font-size: 14px;
+        color: rgba(35, 35, 35, 0.4);
+        .el-icon-arrow-right{
+            font-size: 12px;
+            margin: 4px;
+        }
+        .tip{
+            font-size: 12px;
+            color: rgba(35, 35, 35, 1);
+        }
+        img{
+            width: 28px;
+            height: 28px;
+            border-radius: 6px;
+            margin-right: 12px;
+        }
+        strong{
+            font-size: 16px;
+            color: rgba(35, 35, 35, 1);
+            font-weight: 700;
+        }
+        .label{
+            color: rgba(35, 35, 35, 0.8);
+            margin-right: 24px;
+        }
+      }
+    .table-supplier {
+      background: #ffffff;
+      border-radius: 4px;
+      padding: 16px;
+    .supdivider{
+      width: calc(100% + 32px);
+      margin-left: -16px;
+      margin-top: 8px;
+      margin-bottom: 16px;
+    }
+    ::v-deep .head-form-new {
+        .ability-total {
+          display: none !important;
+        }
+        .from-item .normal-search-container{
+          white-space: nowrap;
+          width: 134px;
+        }
+  
+      }
+      input {
+        border: 1px solid #efefef;
+      }
+  
+      ::v-deep .el-form-item {
+        margin-right: 8px !important;
+      }
+  
+      .query-box {
+        margin: 10px 0 20px;
+      }
+  
+      .cell-span {
+        display: inline-block;
+        position: relative;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 4;
+        cursor: pointer;
+  
+        > span {
+          display: inline-block;
+          width: 37px;
+          position: absolute;
+          right: 0;
+          bottom: 0;
+          background-color: #fff;
+          z-index: 1;
+        }
+      }
+  
+      @import "@/assets/styles/search-common.scss";
+    }
+    .table-supplier2{
+        padding-top: 0;
+        margin-top: 0;
+    }
+  </style>
+  
\ No newline at end of file

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

@@ -3,7 +3,7 @@
     <div class="app-container MonitoringDynamics">
       <div class="title_wrap">
         <div class="enterprise_title">
-          风险监控动态
+          司法风险监控动态
         </div>
       </div>
       <div class="search">
@@ -51,23 +51,6 @@
             </div>
           </div>
         </div>
-        <div class="search-item">
-          <div class="label">工商风险</div>
-          <div class="main-right">
-            <div class="select-popper">
-              <el-checkbox-group v-model="gsfx">
-                <el-checkbox label="不限" @change="changeGsfx('不限')">不限</el-checkbox>
-                <el-checkbox v-for="(i,index) in selectList1" :key="index" :label="i.dimensionName" @change="changeGsfx(i)">{{i.dimensionName}}</el-checkbox>
-              </el-checkbox-group>
-              <!--<span :class="{ color_text: gsfx.length }">工商风险{{gsfx.length > 0 ? gsfx.length:''}}<i class="el-icon-caret-bottom"></i></span>-->
-              <!--<el-select ref="tenderTypeSelect" v-model="gsfx" class="select-multiple" collapse-tags multiple placeholder="请选择">-->
-                <!--<el-option v-for="(i,index) in selectList1" :key="index" :label="i.dimensionName" :value="i.dimensionName">-->
-                  <!--<el-checkbox style="width: 100%;" :label="i.dimensionName" @change="changeGsfx(i)">{{i.dimensionName}}</el-checkbox>-->
-                <!--</el-option>-->
-              <!--</el-select>-->
-            </div>
-          </div>
-        </div>
         <div class="search-item">
           <div class="label">风险级别</div>
           <div class="main-right">
@@ -880,5 +863,19 @@
         padding: 24px 20px;
       }
     }
+    .title_wrap{
+        padding: 20px;
+        background-color: #FFFFFF;
+        border-bottom: 1px solid #e0e0e0;
+        .enterprise_title{
+          border-left: 2px solid #445781;
+          padding-left: 8px;
+          font-size: 16px;
+          height: 16px;
+          line-height: 16px;
+          font-weight: 700;
+          color: #232323;
+        }
+    }
   }
 </style>

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

+<template>
+  <!--监控动态-->
+    <div class="app-container MonitoringDynamics">
+      <div class="title_wrap">
+        <div class="enterprise_title">
+          工商风险监控动态
+        </div>
+      </div>
+      <div class="search">
+        <div class="search-item" style="line-height: 32px;margin-top: 0;padding-bottom: 8px;">
+          <div class="label">监控对象</div>
+          <el-input class="name" placeholder="请输入监控对象名称" v-model="companyName">
+            <el-button slot="append" @click="handleKeyword()">搜索</el-button>
+          </el-input>
+        </div>
+        <div class="search-item" style="margin-bottom: 25px">
+          <div class="label">更新时间</div>
+          <div class="checkbox">
+            <el-radio-group v-model="radio">
+              <el-radio v-for="item in radioList" @change="radioBtn" :label="item.type">{{item.label}}</el-radio>
+            </el-radio-group>
+            <el-date-picker
+              v-if="radio==6"
+              v-model="date"
+              type="daterange"
+              value-format="yyyy-MM-dd"
+              unlink-panels
+              size="small"
+              @change="changePicker"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期">
+            </el-date-picker>
+          </div>
+        </div>
+        <div class="search-item">
+          <div class="label">工商风险</div>
+          <div class="main-right">
+            <div class="select-popper">
+              <el-checkbox-group v-model="gsfx">
+                <el-checkbox label="不限" @change="changeGsfx('不限')">不限</el-checkbox>
+                <el-checkbox v-for="(i,index) in selectList1" :key="index" :label="i.dimensionName" @change="changeGsfx(i)">{{i.dimensionName}}</el-checkbox>
+              </el-checkbox-group>
+              <!--<span :class="{ color_text: gsfx.length }">工商风险{{gsfx.length > 0 ? gsfx.length:''}}<i class="el-icon-caret-bottom"></i></span>-->
+              <!--<el-select ref="tenderTypeSelect" v-model="gsfx" class="select-multiple" collapse-tags multiple placeholder="请选择">-->
+                <!--<el-option v-for="(i,index) in selectList1" :key="index" :label="i.dimensionName" :value="i.dimensionName">-->
+                  <!--<el-checkbox style="width: 100%;" :label="i.dimensionName" @change="changeGsfx(i)">{{i.dimensionName}}</el-checkbox>-->
+                <!--</el-option>-->
+              <!--</el-select>-->
+            </div>
+          </div>
+        </div>
+        <div class="search-item">
+          <div class="label">风险级别</div>
+          <div class="main-right">
+            <div class="checkbox">
+              <div class="checkbox-content-qx">
+                <el-checkbox v-model="checkFx" @change="checkFxjbBtn">全部</el-checkbox>
+              </div>
+              <el-checkbox-group v-model="fxjbType" class="keyword_checkbox" @change="checkFxjb1Btn">
+                <el-checkbox v-for="item in fxjb" :label="item.value" :key="item.label">{{item.label}}</el-checkbox>
+              </el-checkbox-group>
+            </div>
+          </div>
+        </div>
+
+      </div>
+      <div class="content">
+        <div class="total" v-if="tableDataTotal > 0  && !isSkeleton">共 {{tableDataTotal}} 条</div>
+        <div class="table-item">
+          <div v-if="tableDataTotal > 0  && !isSkeleton">
+            <el-table
+              :data="tableData"
+              element-loading-text="Loading"
+              border
+              highlight-current-row
+            >
+              <el-table-column label="序号" width="60" align="left" fixed>
+                <template slot-scope="scope">{{ queryParams.pageNum * queryParams.pageSize - queryParams.pageSize + scope.$index + 1 }}</template>
+              </el-table-column>
+              <el-table-column label="监控对象" prop="companyName" align="left" width="250"></el-table-column>
+              <el-table-column label="风险级别" prop="riskLevel" align="left" width="120"></el-table-column>
+              <el-table-column label="监控类型" prop="dimensionName" align="left" width="150"></el-table-column>
+              <el-table-column label="动态内容" prop="details" align="left">
+                <template slot-scope="scope">
+                  <div v-for="(item,index) in scope.row.Array" :key="index">
+                    <div>
+                      <span style="color: #999;">{{item.key}}：</span>
+                      <span>{{item.value}}</span>
+                    </div>
+                  </div>
+                </template>
+              </el-table-column>
+              <el-table-column label="更新时间" prop="createTime" align="left" width="150"></el-table-column>
+              <el-table-column
+                label="操作"
+                align="center"
+                width="150"
+              >
+                <template slot-scope="scope">
+                  <!---->
+                  <span v-if="scope.row.hasdetail" style="cursor: pointer;color:#0081FF;" @click="handleDetail(scope.row)">查看详情</span>
+                  <span v-else="scope.row.hasdetail" @click="handleDetail(scope.row)">查看详情</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <skeleton v-if="isSkeleton" style="padding: 16px"></skeleton>
+          <div class="empty" v-if="tableDataTotal === 0 && !isSkeleton">
+            <img class="img" src="@/assets/images/project/empty.png">
+            <div class="p1">暂未发现企业风险动态信息</div>
+            <!--<div class="p2">建议调整关键词或筛选条件，重新搜索</div>-->
+          </div>
+        </div>
+        <div class="pagination-box" v-if="tableDataTotal>queryParams.pageSize">
+          <el-pagination background :current-page="queryParams.pageNum" :page-size="queryParams.pageSize" :total="tableDataTotal" layout="prev, pager, next, jumper" @current-change="handleCurrentChange" @size-change="handleSizeChange" />
+        </div>
+      </div>
+      <el-dialog :visible.sync="dialogVisible" custom-class='dialog-claim' :title="title" width="720px" :close-on-click-modal="false">
+        <div class="dialog-content">
+          <template v-if="title=='开庭公告详情'">
+            <info-table class="info-tab" :list="defaultList0" :obj="detail" :labelWidth="labelWidth">
+              <template v-slot:relatedCompanies="row">
+                <p v-for="i in row.data.relatedCompanies">
+                  {{i.role}}:<br/>
+                  {{i.name}}
+                </p>
+              </template>
+            </info-table>
+          </template>
+          <template v-if="title=='失信被执行人详情'">
+            <info-table class="info-tab" :list="defaultList1" :obj="detail" :labelWidth="labelWidth"></info-table>
+          </template>
+          <template v-if="title=='法院公告详情'">
+            <info-table class="info-tab" :list="defaultList2" :obj="detail" :labelWidth="labelWidth"></info-table>
+          </template>
+          <template v-if="title=='经营异常详情'">
+            <info-table class="info-tab" :list="defaultList3" :obj="detail" :labelWidth="labelWidth"></info-table>
+          </template>
+          <template v-if="title=='股权冻结详情'">
+            <info-table class="info-tab" :list="defaultList4" :obj="detail" :labelWidth="labelWidth"></info-table>
+          </template>
+          <template v-if="title=='裁判文书详情'">
+            <info-table class="info-tab" :list="defaultList5" :obj="detail" :labelWidth="labelWidth">
+              <template v-slot:relatedCompanies="row">
+                <p v-for="i in row.data.relatedCompanies">
+                  {{i.role}}:<br/>
+                  {{i.name}}
+                </p>
+              </template>
+            </info-table>
+          </template>
+        </div>
+      </el-dialog>
+    </div>
+</template>
+
+<script>
+  import { v4 } from "uuid";
+  import {changeTime} from "@/assets/js/common.js"
+  import { dynamicPage,companyDetail,rulesSelect } from '@/api/monitoring/monitoring'
+  import InfoTable from '../detail/party-a/component/infoTable';
+  import skeleton from '../component/skeleton'
+  export default {
+    name: 'MonitoringDynamicsgs',
+    components: {
+      InfoTable,skeleton
+    },
+    data() {
+      return {
+        isSkeleton:true,
+        radio:null,
+        date:'',
+        radioList:[
+          {
+            type:null,
+            label:'全部'
+          },
+          {
+            type:1,
+            label:'今天'
+          },
+          {
+            type:2,
+            label:'近三天'
+          },
+          {
+            type:3,
+            label:'近一周'
+          },
+          {
+            type:4,
+            label:'近半月'
+          },
+          {
+            type:5,
+            label:'近一个月'
+          },
+          {
+            type:6,
+            label:'自定义日期'
+          },
+        ],
+        fxjb:[
+          {
+            value:'低风险',
+            label:'低风险'
+          },
+          {
+            value:'中风险',
+            label:'中风险'
+          },
+          {
+            value:'高风险',
+            label:'高风险'
+          },
+        ],
+        checkFx: true,
+        fxlxType:[],
+        jkType:[
+          {
+            value:'1',
+            label:'司法风险'
+          },
+          {
+            value:'2',
+            label:'工商变更'
+          },
+        ],
+        selectList:[],
+        selectList1:[],
+        sffx:[],
+        gsfx:[],
+        queryParams:{
+          pageNum:1,
+          pageSize:50,
+          condition:{}
+        },
+        type:[],
+        gsbgType:[],
+        companyName:'',
+        fxjbType:[],
+        inputID1: this.getUid(),
+        inputID2: this.getUid(),
+        tableData:[],
+        tableDataTotal:0,
+        dialogVisible:false,
+        labelWidth: 140,
+        //开庭公告详情
+        defaultList0:[
+          { name: '案由', prop: 'causeAction' },
+          { name: '案号', prop: 'caseNo' },
+          { name: '开庭时间', prop: 'hearingDate' },
+          { name: '承办部门', prop: 'department' },
+          { name: '审判长/主判人', prop: 'judge'},
+          { name: '当事人', prop: 'relatedCompanies',slot: true},
+          { name: '法院', prop: 'court'},
+          { name: '法庭', prop: 'tribunal'},
+          { name: '公告内容', prop: 'content', style: true },
+        ],
+        //失信被执行人详情
+        defaultList1:[
+          { name: '失信被执行人行为具体情形', prop: 'executionDesc', style: true  },
+          { name: '履行情况', prop: 'finalDuty' },
+          { name: '立案文号', prop: 'caseNumber' },
+          { name: '立案日期', prop: 'date' },
+          { name: '执行依据文号', prop: 'docNumber'},
+          { name: '执行法院', prop: 'court'},
+        ],
+        //法院公告详情
+        defaultList2:[
+          { name: '当事人', prop: 'people',style: true  },
+          { name: '身份', prop: 'role' },
+          { name: '公共类型', prop: 'type' },
+          { name: '公告日期', prop: 'date' },
+          { name: '公告法院', prop: 'court',style: true},
+          { name: '案由', prop: 'caseReason',style: true},
+        ],
+        //经营异常详情
+        defaultList3:[
+          { name: '列入日期', prop: 'inDate'},
+          { name: '移出日期', prop: 'outDate' },
+          { name: '列入经营异常原因', prop: 'outReason',style: true },
+          { name: '做出决定机关（移入）', prop: 'department' },
+          { name: '做出决定机关（移出）', prop: 'outDepartment'},
+          { name: '移出经营移除名录原因', prop: 'outReason',style: true},
+        ],
+        //股权冻结详情
+        defaultList4:[
+          { name: '执行法院', prop: 'executiveCourt'},
+          { name: '执行事项', prop: 'assistItem' },
+          { name: '执行裁定文书号', prop: 'adjudicateNo'},
+          { name: '执行通知文号', prop: 'number' },
+          { name: '被执行人', prop: 'beExecutedPerson'},
+          { name: '被执行人持有股权、其他投资权益数额', prop: 'amount'},
+          { name: '冻结期限自', prop: 'freezeStartDate'},
+          { name: '冻结期限至', prop: 'freezeEndDate'},
+          { name: '冻结期限', prop: 'freezeYearMonth'},
+          { name: '公示日期', prop: 'publicDate'},
+        ],
+        //裁判文书详情
+        defaultList5:[
+          { name: '案由', prop: 'causeAction'},
+          { name: '执行案号', prop: 'causeNo' },
+          { name: '身份', prop: 'role'},
+          { name: '当事人', prop: 'relatedCompanies',slot: true },
+          { name: '案件金额', prop: 'subAmount'},
+          { name: '判决日期', prop: 'date'},
+          { name: '判决结果', prop: 'judgeresult',style: true},
+        ],
+        title:'法院公告详情',
+        detail:{}
+      }
+    },
+    created() {
+      this.getPlaceholder()
+      this.querySubmit()
+      rulesSelect().then(res => {
+        this.selectList=res.data;
+        for(let i in res.data){
+          if(res.data[i].dimensionName === '司法风险'){
+            this.selectList=res.data[i].children
+          }
+          if(res.data[i].dimensionName === '工商风险'){
+            this.selectList1=res.data[i].children
+          }
+        }
+      })
+    },
+    methods: {
+      async querySubmit() {
+        let endTime = new Date()
+        let params={
+          pageNum:this.queryParams.pageNum,
+          pageSize:this.queryParams.pageSize,
+          condition:this.queryParams.condition
+        }
+        if(this.radio ===  1){
+          params.condition.beginTime=this.formatDate(endTime)
+          params.condition.endTime=this.formatDate(endTime)
+        }
+        if(this.companyName){
+          params.condition.companyName=this.companyName
+        }
+        if(this.fxjbType.length > 0){
+          params.condition.riskLevel=this.fxjbType
+        }else {
+          delete params.condition.riskLevel
+        }
+        let sffx = this.sffx
+        if(sffx.indexOf('不限')>-1){
+          sffx = []
+        }
+        let gsfx = this.gsfx
+        if(gsfx.indexOf('不限')>-1){
+          gsfx = []
+        }
+        if(sffx.length > 0 && gsfx.length > 0){
+          params.condition.riskType='司法风险,工商风险'
+          params.condition.dimension=this.sffx.concat(this.gsfx)
+        }
+        if(sffx.length > 0 && gsfx.length === 0){
+          params.condition.riskType='司法风险'
+          params.condition.dimension=this.sffx
+        }
+        if(sffx.length === 0 && gsfx.length > 0){
+          params.condition.riskType='工商风险'
+          params.condition.dimension=this.gsfx
+        }
+        if(sffx.length === 0 && gsfx.length === 0){
+          delete params.condition.riskType
+          delete params.condition.dimension
+        }
+        dynamicPage(params).then(res => {
+          this.isSkeleton = false;
+          this.tableData=res.rows;
+          this.tableDataTotal=res.total;
+          this.tableData.forEach(el => {
+            el.createTime = changeTime(el.createTime)
+            // 把动态内容从json字符串改为对象
+            el.details = JSON.parse(el.details)
+            // 对象转为键值对数组
+            let arr = Object.entries(el.details)
+            // 新建一个属性数组
+            el.Array = []
+            for(let [i,j] of arr){
+              el.Array.push({key:i,value:j})
+            }
+
+            let types = ['新增开庭公告','新增法院公告','新增裁判文书','新增经营异常','新增失信被执行人','新增股权冻结']
+            if(types.indexOf(el.dimensionName)>-1){
+              el.hasdetail = true
+            }else{
+              el.hasdetail = false
+            }
+
+          })
+        })
+      },
+      getDetail(name,id) {
+        companyDetail({dimensionName:name,sourceId:id}).then(res => {
+          console.log(res)
+          this.dialogVisible=true;
+          this.detail=res.data;
+        })
+      },
+      changeSffx(val) {
+        if(val == '不限')
+          this.sffx = ['不限']
+        else if(this.sffx.indexOf('不限')>-1){
+          this.sffx.splice(this.sffx.indexOf('不限'),1)
+        }
+        // if (this.sffx.indexOf(val.dimensionName) == -1) {
+        //   this.sffx.push(val.dimensionName)
+        // } else {
+        //   this.sffx.splice(this.sffx.indexOf(val.dimensionName), 1)
+        // }
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
+        this.querySubmit()
+      },
+      changeGsfx(val) {
+        if(val == '不限')
+          this.gsfx = ['不限']
+        else if(this.gsfx.indexOf('不限')>-1){
+          this.gsfx.splice(this.gsfx.indexOf('不限'),1)
+        }
+        // if (this.gsfx.indexOf(val.dimensionName) == -1) {
+        //   this.gsfx.push(val.dimensionName)
+        // } else {
+        //   this.gsfx.splice(this.gsfx.indexOf(val.dimensionName), 1)
+        // }
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
+        this.querySubmit()
+      },
+      checkFxjbBtn(val) {
+        this.fxjbType = [];
+        this.checkFx = true;
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
+        this.querySubmit()
+      },
+      checkFxjb1Btn(val){
+        if (val.length > 0) {
+          this.checkFx = false;
+        } else if (val.length == 0) {
+          this.checkFx = true;
+          this.fxjbType = [];
+        }
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
+        this.querySubmit()
+      },
+      handleDetail(item){
+        switch (item.dimensionName) {
+          case '新增开庭公告':
+            this.title='开庭公告详情'
+            this.getDetail(item.dimensionName,item.sourceId)
+            break;
+          case '新增法院公告':
+            this.title='法院公告详情'
+            this.getDetail(item.dimensionName,item.sourceId)
+            break;
+          case '新增裁判文书':
+            this.title='裁判文书详情'
+            this.getDetail(item.dimensionName,item.sourceId)
+            break;
+          case '新增经营异常':
+            this.title='经营异常详情'
+            this.getDetail(item.dimensionName,item.sourceId)
+            break;
+          case '新增失信被执行人':
+            this.title='失信被执行人详情'
+            this.getDetail(item.dimensionName,item.sourceId)
+            break;
+          case '新增股权冻结':
+            this.title='股权冻结详情'
+            this.getDetail(item.dimensionName,item.sourceId)
+            break;
+          default:
+            this.$message.success("暂无详情");
+            break;
+        }
+      },
+      handleKeyword(){
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
+        this.querySubmit()
+      },
+      radioBtn(val){
+        let endTime = new Date()
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
+        switch (val) {
+          case 1:
+            this.queryParams.condition.beginTime=this.formatDate(endTime)
+            this.queryParams.condition.endTime=this.formatDate(endTime)
+            this.querySubmit()
+            break;
+          case 2:
+            this.queryParams.condition.beginTime = this.formatDate(new Date(endTime.getTime() - 3600 * 1000 * 24 * 3))
+            this.queryParams.condition.endTime = this.formatDate(endTime)
+            this.querySubmit()
+            break;
+          case 3:
+            this.queryParams.condition.beginTime = this.formatDate(new Date(endTime.getTime() - 3600 * 1000 * 24 * 7))
+            this.queryParams.condition.endTime = this.formatDate(endTime)
+            this.querySubmit()
+            break;
+          case 4:
+            this.queryParams.condition.beginTime = this.formatDate(new Date(endTime.getTime() - 3600 * 1000 * 24 * 15))
+            this.queryParams.condition.endTime = this.formatDate(endTime)
+            this.querySubmit()
+            break;
+          case 5:
+            this.queryParams.condition.beginTime = this.formatDate(new Date(endTime.getTime() - 3600 * 1000 * 24 * 30))
+            this.queryParams.condition.endTime = this.formatDate(endTime)
+            this.querySubmit()
+            break;
+          case 6:
+            this.date=[]
+            break;
+          default:
+            this.queryParams.condition.beginTime=''
+            this.queryParams.condition.endTime=''
+            this.querySubmit()
+            break;
+        }
+      },
+      // 重置页数
+      handleSizeChange(val) {
+        this.queryParams.pageNum = 1
+        this.queryParams.pageSize = val
+        this.querySubmit()
+      },
+      // 跳转指定页数
+      handleCurrentChange(val) {
+        this.queryParams.pageNum = val
+        this.querySubmit()
+        window.scrollTo(0, 0);
+      },
+      // 时间选择改变后的回调
+      changePicker(value) {
+        if(value && value.length) {
+          this.queryParams.condition.beginTime = value[0]
+          this.queryParams.condition.endTime = value[1]
+        }
+        this.queryParams.pageNum=1
+        this.queryParams.pageSize=10
+        this.querySubmit()
+      },
+      // 时间格式化
+      formatDate(timeStr) {
+        let date = new Date(Number(timeStr));
+        let year = date.getFullYear();
+        let month = String(date.getMonth() + 1).padStart(2, 0);
+        let day = String(date.getDate()).padStart(2, 0);
+        return `${year}-${month}-${day}`;
+      },
+      async getPlaceholder() {
+        try {
+          await this.$nextTick();
+          const doms = document.querySelectorAll("[class*='select-adaptive-']");
+          if (doms?.length) {
+            doms.forEach(dom => {
+              const realStyles = window.getComputedStyle(dom);
+              const ipt = dom.querySelector("input");
+              const text = ipt.getAttribute("placeholder");
+              const textContainer = document.createElement("span");
+              textContainer.style.setProperty("visibility", "hidden");
+              textContainer.style.setProperty("display", "inline-block");
+              textContainer.style.setProperty("font-size", "14px");
+              const hasPadding = (parseInt(realStyles.paddingLeft) || parseInt(realStyles.paddingRight)) ? true : false;
+              hasPadding ? textContainer.style.setProperty("padding", realStyles.paddingRight) : null;
+              textContainer.style.setProperty("box-sizing", "border-box");
+              textContainer.textContent = text;
+              document.body.append(textContainer);
+              // 加上按钮宽度 以及按钮左外边距
+              let containerWidth = textContainer.offsetWidth + 30;
+              textContainer.remove();
+              dom.style.setProperty("width", `${containerWidth}px`);
+            });
+          }
+        } catch (error) {
+
+        }
+      },
+      iptAdaptive(uid, multiple = false, name) {
+        multiple ? this.multipleAdaptiveHandle(uid, name) : this.iptAdaptiveHandle(uid, name);
+      },
+      getUid() {
+        return v4();
+      },
+      // 多选处理
+      async multipleAdaptiveHandle(uid, name) {
+        try {
+          await this.$nextTick();
+          const dom = document.querySelector(`.select-adaptive-${uid}`);
+          const iptChild = dom.querySelector(".el-input__inner");
+          if (dom) {
+            const textContainer = document.createElement("span");
+            const textName = `text-${uid}`;
+            textContainer.classList.add(textName);
+            const selectChildren = dom.querySelectorAll(".el-tag");
+            if (selectChildren.length) {
+              let width = 0;
+              selectChildren.forEach(item => {
+                const text = item.textContent;
+                const itemInfo = window.getComputedStyle(item);
+                textContainer.style.setProperty("visibility", "hidden");
+                textContainer.style.setProperty("display", "inline-block");
+                textContainer.style.setProperty("font-size", "14px");
+                textContainer.style.setProperty("padding", itemInfo.padding);
+                textContainer.style.setProperty("box-sizing", "border-box");
+                textContainer.textContent = text;
+                document.body.append(textContainer);
+                width += textContainer.offsetWidth + parseInt(itemInfo.marginLeft) + parseInt(itemInfo.marginRight);
+                textContainer.remove();
+              });
+              dom.style.setProperty("width", `${width + 50}px`);
+              // this.handleSearch(name);
+              return;
+            }
+            textContainer.style.setProperty("visibility", "hidden");
+            textContainer.style.setProperty("display", "inline-block");
+            textContainer.style.setProperty("font-size", "14px");
+            textContainer.style.setProperty("padding", "0px 8px");
+            textContainer.style.setProperty("box-sizing", "border-box");
+            textContainer.textContent = iptChild.getAttribute("placeholder");
+            document.body.append(textContainer);
+            let containerWidth = textContainer.offsetWidth + 12 + 8;
+            // let containerWidth = 130;
+            textContainer.remove();
+            dom.style.setProperty("width", `${containerWidth}px`);
+            // this.handleSearch(name);
+          }
+
+        } catch (error) {
+          console.log(error);
+        }
+      },
+      // 单选处理
+      async iptAdaptiveHandle(uid, name) {
+        try {
+          await this.$nextTick();
+          const dom = document.querySelector(`.select-adaptive-${uid}`);
+          const realStyles = window.getComputedStyle(dom);
+          if (dom) {
+            const iptChild = dom.querySelector(".el-input__inner");
+            const textContainer = document.createElement("span");
+            const textName = `text-${uid}`;
+            textContainer.classList.add(textName);
+            textContainer.style.setProperty("visibility", "hidden");
+            textContainer.style.setProperty("display", "inline-block");
+            textContainer.style.setProperty("font-size", "14px");
+            const hasPadding = (parseInt(realStyles.paddingLeft) || parseInt(realStyles.paddingRight)) ? true : false;
+            hasPadding ? textContainer.style.setProperty("padding", "0px 8px") : null;
+            textContainer.style.setProperty("box-sizing", "border-box");
+            textContainer.textContent = iptChild.value ? iptChild.value : iptChild.getAttribute("placeholder");
+            document.body.append(textContainer);
+            let containerWidth = textContainer.offsetWidth + 50;
+
+            textContainer.remove();
+            dom.style.setProperty("width", `${containerWidth}px`);
+          }
+          // this.handleSearch(name);
+        } catch (error) {
+
+        }
+      },
+    }
+  }
+</script>
+<style lang="scss">
+  .el-select-dropdown__item.selected,
+  .el-select-dropdown.is-multiple .el-select-dropdown__item.selected::after{
+    color: #3181fa;
+    font-size: 0;
+  }
+</style>
+<style lang="scss" scoped>
+  .MonitoringDynamics{
+    .search{
+      background: #FFFFFF;
+      padding: 25px 16px;
+      border-radius: 4px;
+      .search-item{
+        display: -webkit-box;
+        align-items: flex-start;
+        line-height: 20px;
+        margin-top: 8px;
+      }
+      .label{
+        margin-right: 12px;
+        font-size: 14px;
+        color: rgba(35,35,35,0.8);
+      }
+      .color_text {
+        color: #0081ff;
+      }
+      ::v-deep .name{
+        width: 405px;
+        height: 32px;
+        margin-left: 12px;
+        border-radius: 2px;
+        border: 1px solid #DCDFE6;
+        .el-input__inner{
+          border: 0;
+          height: 32px;
+        }
+        .el-input-group__append{
+          border: 0;
+          background: #F5F5F5;
+          width: 60px;
+          color: #0081FF;
+          text-align: center;
+        }
+        .el-input-group__append:hover{
+          background:#F5F5F5;
+        }
+      }
+      .main-right {
+        width: calc(100% - 112px);
+        .select-popper {
+          text-align: center;
+          display: inline-block;
+          position: relative;
+          color: #333333;
+          font-size: 14px;
+          cursor: pointer;
+          margin: 0px 12px;
+          margin-bottom: 16px;
+        }
+
+        .select-popper .select-popper-img {
+          width: 24px;
+          height: 12px;
+          position: absolute;
+          top: -10px;
+          right: 2px;
+        }
+        .select-multiple {
+          position: absolute;
+          left: 0;
+          top: -6px;
+          opacity: 0;
+          line-height: 22px;
+          ::v-deep .el-input {
+            width: 100%;
+            line-height: 22px;
+            .el-input__inner {
+              color: rgba(35,35,35,0.8);
+              width: 100%;
+              height: 22px !important;
+            }
+          }
+          .el-tag__close.el-icon-close {
+            display: none;
+          }
+        }
+      }
+      .checkbox{
+        display: flex;
+        align-items: flex-start;
+        padding-left: 12px;
+        position: relative;
+        .checkbox-content-qx{
+          margin-right: 24px;
+        }
+        .keyword_checkbox{
+          ::v-deep .el-checkbox{
+            margin-right: 24px;
+          }
+        }
+        ::v-deep .el-radio{
+          color: rgba(35,35,35,0.8);
+        }
+        ::v-deep .el-checkbox__label{
+          color: rgba(35,35,35,0.8);
+        }
+        ::v-deep .el-checkbox{
+          margin-right: 10px;
+        }
+        ::v-deep .el-date-editor{
+          position: absolute;
+          left: 602px;
+          top: -7px
+        }
+        ::v-deep .el-select{
+          .el-input{
+            .el-input__inner{
+              height: 32px;
+              line-height: 32px;
+              border-radius: 4px;
+              border: 0;
+              padding-left: 0px;
+              padding-right: 8px;
+              &::placeholder{
+                color: rgba(35,35,35,0.8) !important;
+              }
+            }
+            .el-input__suffix{
+              top:2px;
+            }
+          }
+
+        }
+      }
+    }
+    .content{
+      background: #FFFFFF;
+      border-radius: 4px;
+      margin-top: 16px;
+      padding: 16px;
+      .total{
+        color: rgba(35,35,35,0.8);
+        font-size: 12px;
+        padding-bottom: 16px;
+        display: flex;
+        align-items: center;
+        &:before {
+          content: "";
+          display: inline-block;
+          width: 2px;
+          height: 2px;
+          background: rgba(35,35,35,.4);
+          margin-right: 4px;
+        }
+      }
+      .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;
+        }
+      }
+    }
+    ::v-deep .dialog-claim{
+      .el-dialog__header{
+        display: block;
+        padding:16px 20px;
+        border-bottom: 1px solid #EEEEEE;
+        font-size: 16px;
+        font-weight: 700;
+        color: #232323;
+      }
+      .el-dialog__body {
+        padding: 24px 20px;
+      }
+    }
+    .title_wrap{
+        padding: 20px;
+        background-color: #FFFFFF;
+        border-bottom: 1px solid #e0e0e0;
+        .enterprise_title{
+          border-left: 2px solid #445781;
+          padding-left: 8px;
+          font-size: 16px;
+          height: 16px;
+          line-height: 16px;
+          font-weight: 700;
+          color: #232323;
+        }
+    }
+  }
+</style>

dsk-operate-ui/src/views/projectCostLedger/component/infoTable.vue

+<!-- 表格组件 -->
+<template>
+  <div class="infoTable-container">
+    <h2 v-if="title !== '' && isSubTitle" class="infoTable-title">
+      {{ title }}
+    </h2>
+    <el-form class="infoTable-form" label-position="left">
+      <template v-for="(item, index) in list">
+        <el-form-item :style="item.span?{width: `${100/(24/item.span)}%`}:{}" :label="item.name" :label-width="labelWidth?labelWidth+'px':'130px'" :key="index" :class="[
+            { 'infoTable-form-view': item.style },
+            { 'infoTable-form-item': !item.style },
+            { 'infoTable-form-row': item.rowstyle }
+          ]">
+          <div>
+            <template v-if="item.slot === true">
+              <slot :name="item.prop" :data="obj"></slot>
+            </template>
+            <span v-else> {{  obj[item.prop] ?obj[item.prop] !==""?item.formatter?item.formatter(obj[item.prop]):obj[item.prop]:'-' :'-' }}</span>
+          </div>
+        </el-form-item>
+      </template>
+    </el-form>
+    <!--<div v-else class="no-data">-->
+      <!--<div class="no-data-box" v-if="show">-->
+        <!--<img :src="noData" alt="暂时没有找到相关数据" />-->
+        <!--<span>暂时没有找到相关数据</span>-->
+      <!--</div>-->
+    <!--</div>-->
+  </div>
+</template>
+
+<script>
+export default {
+  name: "InfoTable",
+  components: {
+
+  },
+  props: {
+    list: {
+      type: Array,
+      default: () => [],
+    },
+    title: {
+      type: String,
+      default: "",
+    },
+    obj: {
+      type: Object,
+      default: () => { }
+    },
+    labelWidth: {
+      type: Number,
+      default: null
+    },
+    isSubTitle: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      show:false,
+      // 当前移入单元格内容
+      noData: require("@/assets/images/detail/noData.png")
+    };
+  },
+  created() {
+  },
+  mounted(){
+    this.show = true;
+  },
+  methods: {
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.infoTable-container {
+  .infoTable-title {
+    font-size: 16px;
+    font-family: Microsoft YaHei-Bold, Microsoft YaHei;
+    font-weight: bold;
+    padding-left: 8px;
+    border-left: 2px solid #58637B;
+    color: #000000;
+    text-shadow: 0px 0px 10px rgba(0, 37, 106, 0.10000000149011612);
+    margin: 0 0 16px 0;
+  }
+  .infoTable-form {
+    display: flex;
+    flex-wrap: wrap;
+    border-left: 1px solid #e5e9f5;
+    border-top: 1px solid #e5e9f5;
+    border-collapse: collapse;
+    .infoTable-form-item {
+      width: 50%;
+      flex: auto;
+      margin-bottom: 0px;
+      border-right: 1px solid #e5e9f5;
+      border-bottom: 1px solid #e5e9f5;
+      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+      font-size: 13px;
+    }
+    .infoTable-form-view {
+      width: 100%;
+      flex: auto;
+      margin-bottom: 0px;
+      border-right: 1px solid #e5e9f5;
+      border-bottom: 1px solid #e5e9f5;
+      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+      font-size: 13px;
+    }
+    .infoTable-form-row {
+      width: 33%;
+      flex: auto;
+      margin-bottom: 0px;
+      border-right: 1px solid #e5e9f5;
+      border-bottom: 1px solid #e5e9f5;
+      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+      font-size: 13px;
+    }
+    ::v-deep .el-form-item__label {
+      height: 100%;
+      background-color: #F0F3FA;
+      padding: 8px 12px 8px 12px;
+      font-size: 13px;
+      font-weight: normal;
+      color: rgba(35,35,35,0.8);
+      display: flex;
+      align-items: center;
+      line-height: normal;
+    }
+    ::v-deep .el-form-item__content {
+      padding-left: 12px;
+      font-size: 13px;
+      color: #232323;
+    }
+    ::v-deep .el-form-item__content {
+      border-left: 1px solid #e5e9f5;
+      height: 100%;
+      display: flex;
+      align-items: center;
+    }
+    ::v-deep .el-col {
+      border-bottom: 1px solid #e5e9f5;
+    }
+  }
+  .no-data {
+    font-size: 14px;
+    font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+    font-weight: 400;
+    color: #999999;
+    text-shadow: 0px 0px 10px rgba(0, 37, 106, 0.10000000149011612);
+    max-width: 1200px;
+    height: 328px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: #ffffff;
+    border-radius: 0px 0px 0px 0px;
+    opacity: 1;
+    border: 1px solid #eeeeee;
+    .no-data-box {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      img {
+        width: 64px;
+        height: 79px;
+        margin-bottom: 16px;
+      }
+    }
+  }
+  ::v-deep .el-form-item__content {
+    line-height: 22px;
+    padding: 6px 4px;
+  }
+}
+</style>

dsk-operate-ui/src/views/projectCostLedger/detail/components/CostSummary/index.vue

@@ -2,11 +2,11 @@
   <div class="cost-summary-container">
     <!-- 按项目汇总  成本汇总切换 -->
     <div class="category-type-container">
-      <div class="category-list-item" v-for="(type, index) of categoryList" :key="type.value"
-        :class="{ 'is-current-category': currentCategory == type.value }" @click.stop="currentCategoryChange(type.value)">{{ type.label }}</div>
+      <el-button class="category-list-item" v-for="(type, index) of categoryList" :key="type.value" :disabled="type.disabled"
+        :class="{ 'is-current-category': currentCategory == type.value }" @click.stop="currentCategoryChange(type.value)">{{ type.label }}</el-button>
     </div>
     <!-- 成本菜单以及列表 -->
-    <div class="cost-summary-content-container">
+    <div class="cost-summary-content-container" v-if="!show">
       <!-- 左侧菜单 -->
       <div class="left-side-menu">
         <project-side-menu ref="projectSideMenu" :menuTree="menuTreeList" :menuOptions="menuOptions" :unique-opened="false"
@@ -45,6 +45,22 @@
           <el-form :model="dataForm" ref="costSummaryForm" :show-message="false" v-else-if="!tableLoading" class="feed-summary-form">
             <custom-table ref="costSummaryTable" :tableData="dataForm.tableDataList" :formColum="formColum" :max-height="true" :row-key="rowKey"
               :default-expand-all="true" :indent="8" :tableDataTotal="total" :paging="false" :cell-class-name="cellClassName">
+              <!-- 不含税成本合价 -->
+              <template slot="taxExclusiveTotal" slot-scope="scope">
+                {{$decimalFormat(scope.row.taxExclusiveTotal)}}
+              </template>
+              <!-- 成本税金合价 -->
+              <template slot="cbTaxesTotal" slot-scope="scope">
+                {{$decimalFormat(scope.row.cbTaxesTotal)}}
+              </template>
+              <!-- 含税成本合价 -->
+              <template slot="taxInclusiveTotal" slot-scope="scope">
+                {{$decimalFormat(scope.row.taxInclusiveTotal)}}
+              </template>
+              <!-- 含税成本平米指标 -->
+              <template slot="taxInclusivePmTarget" slot-scope="scope">
+                {{$decimalFormat(scope.row.taxInclusivePmTarget)}}
+              </template>
               <!-- 本月费用（含税） -->
               <template slot="taxInclusiveExpense" slot-scope="scope">
                 <!-- 本月费用（含税）编辑单元格 -->
@@ -53,6 +69,7 @@
                   <el-input placeholder="请输入" v-model="scope.row.taxInclusiveExpense" clearable
                     @input="v => editIptValueRectify(v, scope.row, 'taxInclusiveExpense')"></el-input>
                 </el-form-item>
+                <span v-else-if="!addActualCostEditStatus">{{$decimalFormat(scope.row.taxInclusiveExpense)}}</span>
               </template>
               <!-- 本月费用（不含税） -->
               <template slot="taxExclusiveExpense" slot-scope="scope">
@@ -61,6 +78,15 @@
                   <el-input placeholder="请输入" v-model="scope.row.taxExclusiveExpense" clearable
                     @input="v => editIptValueRectify(v, scope.row, 'taxExclusiveExpense')"></el-input>
                 </el-form-item>
+                <span v-else-if="!addActualCostEditStatus">{{$decimalFormat(scope.row.taxExclusiveExpense)}}</span>
+              </template>
+              <!-- 截止本月费用（含税） -->
+              <template slot="taxInclusiveExpenseTotal" slot-scope="scope">
+                {{$decimalFormat(scope.row.taxInclusiveExpenseTotal)}}
+              </template>
+              <!-- 截止本月费用（不含税） -->
+              <template slot="taxExclusiveExpenseTotal" slot-scope="scope">
+                {{$decimalFormat(scope.row.taxExclusiveExpenseTotal)}}
               </template>
             </custom-table>
           </el-form>
@@ -68,6 +94,13 @@
       </div>
     </div>
 
+    <div class="no-data">
+      <div class="no-data-box" v-if="show">
+        <img :src="noData" alt="暂未获取物料数据（每月20号获取）" />
+        <span>暂未获取物料数据（每月20号获取）</span>
+      </div>
+    </div>
+
     <!-- 锁定前提示 -->
     <lock-cost-tip v-model="lockCostTipDialog" :tip-content="lockCostTipDialogContent" @ok="okLock"
       @update:lockCostTipDialog="lockCostTipDialogClose"></lock-cost-tip>
@@ -147,15 +180,18 @@ export default {
       callback();
     };
     return {
+      noData: require("@/assets/images/detail/noData.png"),
       // 当前分类 1 按项目汇总 2 成本汇总
       currentCategory: 1,
       categoryList: [
         {
           label: "按项目汇总",
+          disabled:false,
           value: 1
         },
         {
           label: "成本科目汇总",
+          disabled:false,
           value: 2
         },
       ],
@@ -173,16 +209,16 @@ export default {
       formColum: [
         { label: '序号', prop: "number", minWidth: "80", uid: v4(), fixed: "left" },
         { label: '名称', prop: "cbName", width: "303", uid: v4(), showOverflowTooltip: true, fixed: "left" },
-        { label: '不含税成本合价', prop: "taxExclusiveTotal", width: "182", uid: v4() },
-        { label: '成本税金合价', prop: "cbTaxesTotal", width: "182", uid: v4() },
-        { label: '含税成本合价', prop: "taxInclusiveTotal", width: "182", uid: v4() },
+        { label: '不含税成本合价', prop: "taxExclusiveTotal", width: "182", uid: v4(), slot: true },
+        { label: '成本税金合价', prop: "cbTaxesTotal", width: "182", uid: v4(), slot: true },
+        { label: '含税成本合价', prop: "taxInclusiveTotal", width: "182", uid: v4(), slot: true },
         { label: '成本占比', prop: "cbProportion", width: "182", uid: v4() },
-        { label: '含税成本平米指标', prop: "taxInclusivePmTarget", width: "182", uid: v4() },
+        { label: '含税成本平米指标', prop: "taxInclusivePmTarget", width: "182", uid: v4(), slot: true },
         { label: '备注', prop: "remark", width: "182", uid: v4() },
         { label: '本月费用（含税）', prop: "taxInclusiveExpense", width: "182", uid: v4(), slot: true },
         { label: '本月费用（不含税）', prop: "taxExclusiveExpense", width: "182", uid: v4(), slot: true },
-        { label: '截止本月费用（含税）', prop: "taxInclusiveExpenseTotal", width: "182", uid: v4() },
-        { label: '截止本月费用（不含税）', prop: "taxExclusiveExpenseTotal", width: "182", uid: v4() },
+        { label: '截止本月费用（含税）', prop: "taxInclusiveExpenseTotal", width: "182", uid: v4(), slot: true },
+        { label: '截止本月费用（不含税）', prop: "taxExclusiveExpenseTotal", width: "182", uid: v4(), slot: true },
       ],
       monthList: [],
       // 源数据月份
@@ -224,12 +260,20 @@ export default {
         ]
       },
       // 竖向滚动条最后的位置
-      lastScrollTop: 0
+      lastScrollTop: 0,
+      show:false,
     };
   },
   //可访问data属性
   created() {
-    this.init(this.comProjectDetailInfo);
+    const { projectId, cbStage } = this.comProjectDetailInfo;
+    if (!projectId) return;
+    const params = {
+      projectId,
+      cbStage,
+      cbType: this.currentCategory
+    };
+    this.getCostSummaryMenuTree(params);
   },
   //计算集
   computed: {
@@ -263,7 +307,7 @@ export default {
     includeNowMonth(time) {
       return this.originMonthList.find(item => item.expenseDate == time);
     },
-    // 按项目汇总 按成本科目汇总 
+    // 按项目汇总 按成本科目汇总
     currentCategoryChange(category) {
       if (category == this.currentCategory) return;
       this.currentCategory = category;
@@ -291,7 +335,7 @@ export default {
           cbStage,
           cbType: this.currentCategory
         };
-        await this.getCostSummaryMenuTree(params);
+        // await this.getCostSummaryMenuTree(params);
         await this.getCostSummaryMonthList(params, saveReset);
         await this.getLockMonthList(params);
         await this.initDefaultSetting(resetDate, saveReset);
@@ -355,10 +399,43 @@ export default {
       }
       return params;
     },
+    async getMenuTree(params) {
+      try {
+        const result = await getCostSummaryMenuTreeApi(params);
+        if (result.code == 200 && result.data instanceof Array) {
+          const _tempArray = result.data;
+          const _tempMenu = {
+            id: 0,
+            cbName: this.currentCategory == 1 ? "成本汇总" : "房建类成本科目",
+            children: _tempArray
+          };
+          this.menuTreeList = _tempArray.length ? [_tempMenu] : [];
+        }
+      } catch (error) {
+
+      }
+    },
     async getCostSummaryMenuTree(params) {
       try {
         const result = await getCostSummaryMenuTreeApi(params);
         if (result.code == 200 && result.data instanceof Array) {
+          if(this.projectDetailInfo.cbStage === 3 && this.currentCategory === 1){
+            if(result.data.length === 0){
+              this.currentCategory=2;
+              this.categoryList[0].disabled=true;
+              const { projectId, cbStage } = this.comProjectDetailInfo;
+              const params = {
+                projectId,
+                cbStage,
+                cbType: this.currentCategory
+              };
+              this.getMenuTree(params);
+              return this.init(this.comProjectDetailInfo);
+            }
+          }
+          if(result.data.length === 0){
+            this.show=true;
+          }
           const _tempArray = result.data;
           const _tempMenu = {
             id: 0,
@@ -366,6 +443,7 @@ export default {
             children: _tempArray
           };
           this.menuTreeList = _tempArray.length ? [_tempMenu] : [];
+          this.init(this.comProjectDetailInfo);
         }
       } catch (error) {
 
@@ -833,7 +911,7 @@ export default {
     .category-list-item {
       height: 32px;
       padding: 0px 20px;
-      color: #303133;
+      /*color: #303133;*/
       font-size: 12px;
       font-weight: 400;
       border-radius: 4px;
@@ -844,6 +922,7 @@ export default {
       align-items: center;
       cursor: pointer;
       transition: all 0.3s;
+      margin: 0;
 
       &:nth-of-type(2n - 1) {
         border-right: unset !important;
@@ -1059,5 +1138,32 @@ export default {
       }
     }
   }
+
+  .no-data {
+    font-size: 14px;
+    font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+    font-weight: 400;
+    color: #999999;
+    text-shadow: 0px 0px 10px rgba(0, 37, 106, 0.10000000149011612);
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: #ffffff;
+    border-radius: 0px 0px 0px 0px;
+    opacity: 1;
+    border: 1px solid #eeeeee;
+    .no-data-box {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      img {
+        width: 64px;
+        height: 79px;
+        margin-bottom: 16px;
+      }
+    }
+  }
 }
 </style>

dsk-operate-ui/src/views/projectCostLedger/detail/components/DirectCost/index.vue

@@ -44,12 +44,34 @@
                 <el-table-column prop="cbSubject" label="成本科目" width="130"></el-table-column>
                 <el-table-column prop="tenderControlUnitPrice" label="招标控制单价" width="120"></el-table-column>
                 <el-table-column prop="tenderControlSumPrice" label="招标控制合价" width="120"></el-table-column>
-                <el-table-column prop="excludeTaxCbUnitPrice" label="不含税成本单价" width="122"></el-table-column>
-                <el-table-column prop="excludeTaxCbSumPrice" label="不含税成本合计" width="122"></el-table-column>
-                <el-table-column prop="cbTaxSum" label="成本税金合计" width="120"></el-table-column>
-                <el-table-column prop="includeTaxCbUnitPrice" label="含税成本单价" width="120"></el-table-column>
-                <el-table-column prop="includeTaxCbSumPrice" label="含税成本合价" width="120"></el-table-column>
-                <el-table-column prop="sumPriceDeviation" label="合价偏差" width="120"></el-table-column>
+                <el-table-column prop="excludeTaxCbUnitPrice" label="不含税成本单价" width="122">
+
+                </el-table-column>
+                <el-table-column prop="excludeTaxCbSumPrice" label="不含税成本合计" width="122">
+                  <template slot-scope="scope">
+                    {{$decimalFormat(scope.row.excludeTaxCbSumPrice)}}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="cbTaxSum" label="成本税金合计" width="120">
+                  <template slot-scope="scope">
+                    {{$decimalFormat(scope.row.cbTaxSum)}}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="includeTaxCbUnitPrice" label="含税成本单价" width="120">
+                  <template slot-scope="scope">
+                    {{$decimalFormat(scope.row.includeTaxCbUnitPrice)}}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="includeTaxCbSumPrice" label="含税成本合价" width="120">
+                  <template slot-scope="scope">
+                    {{$decimalFormat(scope.row.includeTaxCbSumPrice)}}
+                  </template>
+                </el-table-column>
+                <el-table-column prop="sumPriceDeviation" label="合价偏差" width="120">
+                  <template slot-scope="scope">
+                    {{$decimalFormat(scope.row.sumPriceDeviation)}}
+                  </template>
+                </el-table-column>
               </el-table-column>
               <el-table-column label="盈亏率" width="100" prop="profitLossRatio"></el-table-column>
               <el-table-column label="标准费用项" width="100" prop="standardCbItem"></el-table-column>

dsk-operate-ui/src/views/projectCostLedger/detail/components/EngineeringInformation/index.vue

@@ -43,7 +43,7 @@
   </div>
 </template>
 <script>
-  import InfoTable from '../../../../component/infoTable';
+  import InfoTable from '../../../component/infoTable';
   import { getCbProjectInfo } from "@/api/projectCostLedger";
 export default {
   name: "projectInformation",
@@ -237,7 +237,6 @@ export default {
       try {
         const result = await getCbProjectInfo(params);
         if (result.code == 200) {
-          console.log(result.data)
           this.forInfo=result.data;
         }
       } catch (error) {

dsk-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/components/editDialog.vue

+<template>
+  <el-dialog title="修改工程量" :visible="comPushProjectUseDialog" width="480px" class="push-project-use-dialog"
+    @close="dialogClose" @open="dialogOpen" :close-on-click-modal="false" :destroy-on-close="true">
+    <div class="dialog-body-content">
+      <el-form :model="pushForm" ref="pushForm" :rules="rules" class="push-form">
+        <el-form-item label="分包项目名称">
+          <el-input :value="pushForm.projectName" :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item label="成本科目">
+          <el-input :value="pushForm.cbSubjectName" :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item label="名称">
+          <el-input :value="pushForm.cbName" :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item label="编码">
+          <el-input :value="pushForm.companyNo" :disabled="true"></el-input>
+        </el-form-item>
+        <el-form-item label="IPM本月工程量" prop="ipmProjectCode">
+          <el-input v-model="pushForm.quantities" :disabled="true"></el-input>
+        </el-form-item>
+        <!-- 修改后工程量-->
+        <el-form-item label="修改后工程量" prop="pushQuantities">
+          <el-input v-model="pushForm.pushQuantities" placeholder="请填写需要展示的工程量"></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <!-- 底部按钮 -->
+    <div class="dialog-footer-content">
+      <div class="footer-btn cancel-submit" @click="cancelSubmit">取消</div>
+      <div class="footer-btn ok-submit" @click="pushResult">确定修改</div>
+    </div>
+  </el-dialog>
+</template>
+<script>
+import { subtract, targetIsNegative, add } from "@/utils/decimal";
+import { cloneDeep } from 'lodash-es';
+export default {
+  name: "pushProjectUseDialog",
+  model: {
+    prop: "pushProjectUseDialog",
+    event: "close"
+  },
+  props: {
+    pushProjectUseDialog: {
+      type: Boolean,
+      default: false
+    },
+    isEntityMaterials: {
+      type: Boolean,
+      default: false
+    },
+    rowData: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  watch: {
+    pushProjectUseDialog: {
+      handler(newValue, oldValue) {
+        this.comPushProjectUseDialog = newValue;
+      }
+    },
+    rowData: {
+      handler(newValue, oldValue) {
+        const _temp = newValue ? newValue : {};
+        this.pushForm = cloneDeep({ ...this.pushForm, ..._temp });
+      }
+    }
+  },
+  data() {
+    return {
+      comPushProjectUseDialog: this.pushProjectUseDialog,
+      pushForm: {
+        id: "",
+        pushQuantities: "",
+        cbSubjectName: "",
+        cbName: "",
+        companyNo: "",
+        quantities: "",
+        projectName: "",
+      },
+      rules: {
+        pushQuantities: [
+          { required: true, trigger: ["blur", "change"], message: "请填写需要展示的工程量", whitespace: true }
+        ]
+      }
+    };
+  },
+  //可访问data属性
+  created() {
+
+  },
+  //计算集
+  computed: {
+
+  },
+  //方法集
+  methods: {
+    // 验证需推送工程量
+    pushQuantitiesValidator(maxValue) {
+      return [{
+        trigger: ['blur', 'change'], validator: (rule, value, callback) => {
+          const reg = /^(?!0\d)(?!0+$)(?!0*\.0*$)\d+(\.\d+)?$/;
+          if (!reg.test(value)) return callback(new Error("请输入正确的工程量"));
+          const _maxValue = maxValue ? maxValue : 0;
+          if (targetIsNegative(subtract(_maxValue, value))) return callback(new Error("注：推送工程量不得大于实际产生的总工程量"));
+          callback();
+        }
+      }];
+    },
+    clearValidate() {
+      const form = this.$refs["pushForm"];
+      if (form) form.clearValidate();
+    },
+    dialogClose() {
+      this.$emit("dialogClose");
+      this.pushForm = this.$options.data.call(this).pushForm;
+      this.clearValidate();
+      this.$emit("close", false);
+    },
+    dialogOpen() {
+
+    },
+    cancelSubmit() {
+      this.comPushProjectUseDialog = false;
+    },
+    //推送工程量
+    pushResult() {
+      this.$refs["pushForm"].validate(flag => {
+        if (flag) {
+          const { id, pushQuantities } = cloneDeep(this.pushForm);
+          this.$emit("submitEditData", {
+            id,
+            pushQuantities,
+          });
+        }
+      });
+    }
+  },
+}
+</script>
+<style lang="scss" scoped>
+.push-project-use-dialog {
+  ::v-deep .el-dialog {
+    margin-top: 0px !important;
+    margin: 0px;
+    position: absolute;
+    left: 50%;
+    top: 50%;
+    transform: translate(-50%, -50%);
+
+    .el-dialog__header {
+      height: 56px;
+      padding: 0px 20px;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      border-bottom: 1px solid #eeeeee;
+      border-top-left-radius: 4px;
+      border-top-right-radius: 4px;
+
+      .el-dialog__title {
+        color: #232323;
+        font-size: 16px;
+        font-weight: bold;
+      }
+
+      .el-dialog__headerbtn {
+        position: static;
+        width: 16px;
+        height: 16px;
+      }
+    }
+
+    .el-dialog__body {
+      padding: 0px;
+
+      .dialog-body-content {
+        padding: 24px 20px;
+        box-sizing: border-box;
+
+        .push-form {
+          .el-form-item {
+            &.is-error {
+              margin-bottom: 33px;
+            }
+
+            margin-bottom: 16px;
+            display: flex;
+            align-items: center;
+
+            .el-form-item__label {
+              width: 98px;
+              min-width: 98px;
+              line-height: 20px;
+              color: rgba(35, 35, 35, 0.8);
+              font-weight: 350;
+              font-size: 14px;
+              text-align: right;
+              padding-right: 0px;
+              margin-right: 16px;
+              white-space: nowrap;
+            }
+            .el-form-item__content {
+              width: 100%;
+              line-height: 32px;
+
+              .el-input {
+                &.is-disabled {
+                  .el-input__inner {
+                    background: #fff;
+                    color: rgba(35, 35, 35, 0.8);
+                  }
+                }
+              }
+
+              .el-input__inner {
+                line-height: 32px;
+                height: 32px;
+                border-radius: 2px;
+                padding: 0px 7px;
+
+                ::placeholder {
+                  color: #c0c4cc !important;
+                }
+              }
+            }
+          }
+        }
+      }
+
+      .dialog-footer-content {
+        padding: 16px 20px;
+        box-sizing: border-box;
+        border-top: 1px solid #eeeeee;
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+
+        .footer-btn {
+          height: 32px;
+          padding: 0px 16px;
+          font-size: 14px;
+          font-weight: 350;
+          box-sizing: border-box;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          border-radius: 4px;
+          cursor: pointer;
+
+          &.cancel-submit {
+            color: rgba(35, 35, 35, 0.8);
+            background: #fff;
+            border: 1px solid #dcdfe6;
+            margin-right: 12px;
+          }
+
+          &.ok-submit {
+            color: #fff;
+            background: #0081ff;
+          }
+        }
+      }
+    }
+  }
+}
+</style>

dsk-operate-ui/src/views/projectCostLedger/detail/components/FeedSummary/index.vue

 <template>
   <div class="feed-summary-container">
-    <div class="feed-summary-inner">
+    <div v-if="!show" class="feed-summary-inner">
       <div class="left-side-menu">
         <project-side-menu ref="projectSideMenu" :menuTree="menuTreeList" :menuOptions="menuOptions" :unique-opened="false"
           :default-active="currentNodeName" @select="menuSelect">
@@ -21,6 +21,10 @@
               <el-option v-for="item in monthList" :key="item.value" :label="item.label" :value="item.value">
               </el-option>
             </el-select>
+            <el-select v-model="isOutPlanCostCombinedPrice" placeholder="成本控制情况" class="project-month-select-options" @change="priceChange" clearable style="margin-left: 16px;">
+              <el-option label="超出计划成本" value="超出计划成本"></el-option>
+              <el-option label="未超出计划成本" value="未超出计划成本"></el-option>
+            </el-select>
           </div>
           <div class="project-table-list-haeder-right">
             <!-- 实体工程材料单位换算 -->
@@ -37,14 +41,45 @@
           <dsk-skeleton v-if="tableLoading"></dsk-skeleton>
           <!-- 非实体工程材料列表 -->
           <el-form :model="dataForm" ref="feedSummaryForm" :show-message="false" v-else-if="!isEntityMaterials" class="feed-summary-form">
-            <custom-table :tableData="dataForm.tableDataList" :formColum="formColum" :max-height="true" :tableDataTotal="total" :paging="false"
-              :cell-class-name="cellClassName">
+            <custom-table :tableData="dataForm.tableDataList" :formColum="formColum" :max-height="true" :tableDataTotal="total" :paging="false" v-if="total > 0 && !tableLoading"
+                          :header-cell-class-name="headerCellClassName" :cell-class-name="cellClassName">
               <template slot="action-field-bar" slot-scope="scope">
-                <div class="project-action-field-bar" v-if="rowCanEditInput(scope.rowIndex,hasTarget)">
-                  <span class="push-project-use" :class="{'is-emty-quantities' : rowHasLastPush(scope.rowIndex)}"
-                    @click="!rowHasLastPush(scope.rowIndex) ? pushProjectUse(scope.row) : ''">推送工程量</span>
+                <div class="project-action-field-bar">
+                  <span class="push-project-use" @click="pushProjectUse(scope.row)" :class="{'is-emty-quantities' : rowHasLastPush(scope.rowIndex)}">修改工程量</span>
                 </div>
-                <span v-else>-</span>
+                <!--<div class="project-action-field-bar" v-if="rowCanEditInput(scope.rowIndex,hasTarget)">-->
+                  <!--<span class="push-project-use" :class="{'is-emty-quantities' : rowHasLastPush(scope.rowIndex)}"-->
+                    <!--@click="!rowHasLastPush(scope.rowIndex) ? pushProjectUse(scope.row) : ''">修改工程量</span>-->
+                <!--</div>-->
+                <!--<span v-else>-</span>-->
+              </template>
+              <template slot="guidePrice" slot-scope="scope">
+                {{$decimalFormat(scope.row.guidePrice)}}
+              </template>
+              <template slot="bidUnitPrice" slot-scope="scope">
+                {{$decimalFormat(scope.row.bidUnitPrice)}}
+              </template>
+              <template slot="unitPriceDifference" slot-scope="scope">
+                {{$decimalFormat(scope.row.unitPriceDifference)}}
+              </template>
+              <template slot="quantity" slot-scope="scope">
+                {{$decimalFormat(scope.row.quantity)}}
+              </template>
+              <template slot="combinedPrice" slot-scope="scope">
+                {{$decimalFormat(scope.row.combinedPrice)}}
+              </template>
+              <template slot="combinedPriceTax" slot-scope="scope">
+                {{$decimalFormat(scope.row.combinedPriceTax)}}
+              </template>
+              <template slot="totalQuantities" slot-scope="scope">
+                {{$decimalFormat(scope.row.totalQuantities)}}
+              </template>
+              <template slot="pushQuantities" slot-scope="scope">
+                {{$decimalFormat(scope.row.pushQuantities)}}
+              </template>
+              <template slot="actualCombinedPrice" slot-scope="scope">
+                <div v-if="scope.row.isActualGreaterThanPlan" style="color:#FF204E;">{{$decimalFormat(scope.row.actualCombinedPrice)}}</div>
+                <div v-else>{{$decimalFormat(scope.row.actualCombinedPrice)}}</div>
               </template>
               <!-- 本月工程量 -->
               <template slot="quantities" slot-scope="scope">
@@ -54,6 +89,10 @@
                   <el-input placeholder="请输入" v-model="scope.row.quantities" clearable
                     @input="v => statisticsSum(v,'quantities',scope.row)"></el-input>
                 </el-form-item>
+                <div v-else-if="!addActualCostEditStatus">
+                  <div v-if="scope.row.pushQuantities" style="color:#FF204E;">{{$decimalFormat(scope.row.quantities)}}</div>
+                  <div v-else>{{$decimalFormat(scope.row.quantities)}}</div>
+                </div>
               </template>
               <!-- 本月采购单价 -->
               <template slot="purchaseUnitPrice" slot-scope="scope">
@@ -63,6 +102,7 @@
                   <el-input placeholder="请输入" v-model="scope.row.purchaseUnitPrice" clearable
                     @input="v => statisticsSum(v,'purchaseUnitPrice',scope.row)"></el-input>
                 </el-form-item>
+                <span v-else-if="!addActualCostEditStatus">{{$decimalFormat(scope.row.purchaseUnitPrice)}}</span>
               </template>
             </custom-table>
           </el-form>
@@ -76,12 +116,43 @@
                   @click="parseFloat(scope.row.quantities) ? pushProjectUse(scope.row) : ''">推送物资</span>
               </div>
             </template>
+            <template slot="guidePrice" slot-scope="scope">
+              {{$decimalFormat(scope.row.guidePrice)}}
+            </template>
+            <template slot="bidUnitPrice" slot-scope="scope">
+              {{$decimalFormat(scope.row.bidUnitPrice)}}
+            </template>
+            <template slot="unitPriceDifference" slot-scope="scope">
+              {{$decimalFormat(scope.row.unitPriceDifference)}}
+            </template>
+            <template slot="quantity" slot-scope="scope">
+              {{$decimalFormat(scope.row.quantity)}}
+            </template>
+            <template slot="combinedPrice" slot-scope="scope">
+              {{$decimalFormat(scope.row.combinedPrice)}}
+            </template>
+            <template slot="combinedPriceTax" slot-scope="scope">
+              {{$decimalFormat(scope.row.combinedPriceTax)}}
+            </template>
+            <template slot="totalQuantities" slot-scope="scope">
+              {{$decimalFormat(scope.row.totalQuantities)}}
+            </template>
+            <template slot="conversionQuantities" slot-scope="scope">
+              {{$decimalFormat(scope.row.conversionQuantities)}}
+            </template>
           </entity-materials-table>
 
         </div>
       </div>
     </div>
 
+    <div class="no-data">
+      <div class="no-data-box" v-if="show">
+        <img :src="noData" alt="暂未获取物料数据（每月20号获取）" />
+        <span>暂未获取物料数据（每月20号获取）</span>
+      </div>
+    </div>
+
     <!-- 填写实际成本触发 -->
     <add-actual-cost v-model="showAddActualCost" :project-create-time="projectDetailInfo.createTime" @timeSelect="timeSelect"></add-actual-cost>
 
@@ -89,6 +160,9 @@
     <push-project-use-dialog v-model="pushProjectUseDialog" :is-entity-materials="isEntityMaterials" :row-data="pushProjectUseTemp"
       @dialogClose="dialogClose" @submitPushData="submitPushData"></push-project-use-dialog>
 
+    <edit-Dialog v-model="editDialog" :row-data="pushProjectUseTemp"
+      @dialogClose="editDialogClose" @submitEditData="submitEditData"></edit-Dialog>
+
     <!-- 单位换算弹窗 -->
     <unit-conversion v-if="showUnitConversion" :isVisible="showUnitConversion" :dataList="unitConversionList"
       @refresh="handleDialogVisible()"></unit-conversion>
@@ -97,7 +171,7 @@
 </template>
 <script>
 import ProjectSideMenu from "@/views/projectCostLedger/detail/components/ProjectSideMenu";
-import { getFeedSummaryMenuTreeApi, getFeedSummaryMonthListApi, getFeedSummaryListApi, getFeedSummaryConversionNotice, updateFeedSummaryRowsApi, pushFeedSummaryRowsApi } from "@/api/projectCostLedger";
+import { getFeedSummaryMenuTreeApi, getFeedSummaryMonthListApi, getFeedSummaryListApi, getFeedSummaryConversionNotice, updateFeedSummaryRowsApi, pushFeedSummaryRowsApi,editEngineeringQuantityApi } from "@/api/projectCostLedger";
 import DskTableHeaderSetting from "@/components/DskTableHeaderSetting";
 import DskSkeleton from "@/components/DskSkeleton";
 import CustomTable from "@/components/CustomTable";
@@ -105,6 +179,7 @@ import EntityMaterialsTable from "@/components/CustomTable";
 import AddActualCost from "./components/AddActualCost";
 import unitConversion from "./components/unitConversion";
 import PushProjectUseDialog from "./components/PushProjectUseDialog";
+import editDialog from "./components/editDialog";
 import { v4 } from 'uuid';
 import dayjs from "dayjs";
 import { cloneDeep } from "lodash-es";
@@ -171,7 +246,8 @@ export default {
     DskSkeleton,
     AddActualCost,
     unitConversion,
-    PushProjectUseDialog
+    PushProjectUseDialog,
+    editDialog
   },
   data() {
     const amountCheckValidator = (rule, value, callback) => {
@@ -183,6 +259,8 @@ export default {
       callback();
     };
     return {
+      noData: require("@/assets/images/detail/noData.png"),
+      show:false,
       menuOptions: {
         nodeName: "name",
         nodeValue: "name",
@@ -206,25 +284,26 @@ export default {
         { label: '甲供材料说明', prop: "materialDescription", width: "137", uid: v4() },
         {
           label: '计划成本', prop: "jhcb", align: "center", uid: v4(), children: [
-            { label: '指导价格', prop: "guidePrice", minWidth: "81", uid: v4() },
-            { label: '投标选用单价（不含税）', prop: "bidUnitPrice", minWidth: "179", uid: v4() },
-            { label: '单价差额', prop: "unitPriceDifference", minWidth: "81", uid: v4() },
-            { label: '数量', prop: "quantity", minWidth: "150", uid: v4() },
-            { label: '合价（不含税）', prop: "combinedPrice", minWidth: "150", uid: v4() },
-            { label: '合价（含税）', prop: "combinedPriceTax", minWidth: "150", uid: v4() },
+            { label: '指导价格', prop: "guidePrice", minWidth: "81", uid: v4(), slot: true },
+            { label: '投标选用单价（不含税）', prop: "bidUnitPrice", minWidth: "179", uid: v4(), slot: true },
+            { label: '单价差额', prop: "unitPriceDifference", minWidth: "81", uid: v4(), slot: true },
+            { label: '数量', prop: "quantity", minWidth: "150", uid: v4(), slot: true },
+            { label: '合价（不含税）', prop: "combinedPrice", minWidth: "150", uid: v4(), slot: true },
+            { label: '合价（含税）', prop: "combinedPriceTax", minWidth: "150", uid: v4(), slot: true },
             { label: '品牌名称', prop: "brandName", minWidth: "81", uid: v4() },
             { label: '投标选用来源', prop: "bidSource", minWidth: "109", uid: v4() },
           ]
         },
         {
           label: '实际成本', prop: "sjcb", align: "center", uid: v4(), children: [
-            { label: '本月工程量', prop: "quantities", minWidth: "160", uid: v4(), slot: true },
+            { label: 'IPM本月工程量', prop: "quantities", minWidth: "160", uid: v4(), slot: true },
             { label: '截止本月工程量', prop: "totalQuantities", minWidth: "160", uid: v4(), slot: true },
             { label: '本月采购单价', prop: "purchaseUnitPrice", minWidth: "160", uid: v4(), slot: true },
+            { label: '合价（不含税）', prop: "actualCombinedPrice", minWidth: "150", uid: v4(), slot: true },
             { label: '填写时间', prop: "createTime", minWidth: "160", uid: v4(), slot: true },
           ]
         },
-        { label: '推送工程量', prop: "pushQuantities", width: "95", uid: v4() },
+        { label: '修改后工程量', prop: "pushQuantities", width: "110", uid: v4(), slot: true },
         { label: '备注', prop: "remark", width: "115", uid: v4(), slot: true },
         { label: '操作', prop: "action-field-bar", width: "99", uid: v4(), fixed: "right" },
       ],
@@ -242,12 +321,12 @@ export default {
         { label: '甲供材料说明', prop: "materialDescription", width: "137", uid: v4() },
         {
           label: '计划成本', prop: "jhcb", align: "center", uid: v4(), children: [
-            { label: '指导价格', prop: "guidePrice", minWidth: "81", uid: v4() },
-            { label: '投标选用单价（不含税）', prop: "bidUnitPrice", minWidth: "179", uid: v4() },
-            { label: '单价差额', prop: "unitPriceDifference", minWidth: "81", uid: v4() },
-            { label: '数量', prop: "quantity", minWidth: "150", uid: v4() },
-            { label: '合价（不含税）', prop: "combinedPrice", minWidth: "150", uid: v4() },
-            { label: '合价（含税）', prop: "combinedPriceTax", minWidth: "150", uid: v4() },
+            { label: '指导价格', prop: "guidePrice", minWidth: "81", uid: v4(), slot: true },
+            { label: '投标选用单价（不含税）', prop: "bidUnitPrice", minWidth: "179", uid: v4(), slot: true },
+            { label: '单价差额', prop: "unitPriceDifference", minWidth: "81", uid: v4(), slot: true },
+            { label: '数量', prop: "quantity", minWidth: "150", uid: v4(), slot: true },
+            { label: '合价（不含税）', prop: "combinedPrice", minWidth: "150", uid: v4(), slot: true },
+            { label: '合价（含税）', prop: "combinedPriceTax", minWidth: "150", uid: v4(), slot: true },
             { label: '品牌名称', prop: "brandName", minWidth: "81", uid: v4() },
             { label: '投标选用来源', prop: "bidSource", minWidth: "109", uid: v4() },
           ]
@@ -271,6 +350,8 @@ export default {
       recordDate: "",
       // 历史查询月份
       oldRecordDate: "",
+      //是否超出计划成本合价
+      isOutPlanCostCombinedPrice:'',
       // 当前选中子菜单的父类名称
       currentParentName: "",
       // 当前选中的成本科目
@@ -291,16 +372,17 @@ export default {
       lastScrollTop: 0,
       // 推送工程量弹窗
       pushProjectUseDialog: false,
-      // 推送工程量数据缓存
+      //修改工程量弹窗
+      editDialog: false,
+      // 修改工程量数据缓存
       pushProjectUseTemp: {
         id: "",
         pushQuantities: "",
-        ipmProjectCode: "",
-        ipmContractCode: "",
-        ipmBizCode: "",
-        totalQuantities: "",
+        cbSubjectName: "",
+        cbName: "",
+        companyNo: "",
+        quantities: "",
         projectName: "",
-        ipmProjectNo: ""
       },
       checkRules: {
         amountCheck: [
@@ -407,7 +489,8 @@ export default {
         if (list.code == 200 && list.data instanceof Array) {
           const _temp = list.data;
           // 计算总和
-          if (this.hasTarget && _temp.length) {
+          // if (this.hasTarget && _temp.length) {
+          if (_temp.length) {
             const row = this.countRowParams(_temp, statisticsPropNames);
             _temp.unshift(row);
           }
@@ -450,6 +533,9 @@ export default {
     async getFeedSummaryMenuTree(params) {
       try {
         const result = await getFeedSummaryMenuTreeApi(params);
+        if(result.data.length === 0){
+          this.show=true;
+        }
         if (result.code == 200 && result.data instanceof Array) {
           const _tempArray = result.data;
           this.menuTreeList = _tempArray;
@@ -511,6 +597,15 @@ export default {
       // 获取列表数据
       this.getFeedSummaryList(params);
     },
+    priceChange(value){
+      // 请求列表参数
+      const params = this.createRequestConditions();
+      if(value){
+        params["isOutPlanCostCombinedPrice"] = this.isOutPlanCostCombinedPrice === '超出计划成本' ? true : false;
+      }
+      // 获取列表数据
+      this.getFeedSummaryList(params);
+    },
     async menuSelect(currentId, currentTemp) {
       this.resetEditStatus();
       this.currentNodeName = currentId;
@@ -637,7 +732,7 @@ export default {
       }, 0);
       return sum;
     },
-    // 当前行是否可编辑
+    // // 当前行是否可编辑
     rowCanEditInput(index, hasTarget) {
       // 不为id 0 或 不是劳务分包跟专业分包
       return index != 0 || !hasTarget;
@@ -689,23 +784,25 @@ export default {
         this.lastScrollTop = table.scrollTop;
       }
     },
-    // 推送工程用量
+    // 修改工程用量
     pushProjectUse(row) {
+      console.log(row)
       if (!row.actualId) return;
       // 打开推送推送弹窗
       const _temp = {
         ...this.pushProjectUseTemp, ...{
           id: row.actualId,
           projectName: this.projectDetailInfo.projectName,
-          totalQuantities: row.totalQuantities,
-          pushQuantities: "",
-          ipmProjectCode: this.projectDetailInfo.ipmProjectNo,
-          ipmContractCode: "",
-          ipmBizCode: ""
+          cbSubjectName: row.cbSubjectName,
+          cbName: row.cbName,
+          companyNo: row.companyNo,
+          quantities: row.quantities,
+          pushQuantities: '',
         }
       };
       this.pushProjectUseTemp = _temp;
-      this.pushProjectUseDialog = true;
+      // this.pushProjectUseDialog = true;
+      this.editDialog = true;
     },
     // 推送工程用量弹窗关闭
     dialogClose() {
@@ -719,6 +816,22 @@ export default {
 
       }
     },
+    // 修改工程用量弹窗关闭
+    editDialogClose() {
+      this.editDialog = this.$options.data.call(this).pushProjectUseTemp;
+    },
+    // 确定修改
+    async submitEditData(pushForm) {
+      try {
+        const result = await editEngineeringQuantityApi(pushForm);
+        console.log(result)
+        if(result.code === 200){
+          this.editDialog=false
+        }
+      } catch (error) {
+
+      }
+    },
     differentCompare() {
       const originData = this.originTableDataList;
       /**
@@ -805,13 +918,22 @@ export default {
       }
     },
     cellClassName({ row, column, rowIndex, columnIndex }) {
-      // console.log(column);
       const { property } = column;
+      // let arr = ['sjcb','quantities','totalQuantities','purchaseUnitPrice','createTime']
+      // if(arr.includes(column.property)){
+      //   return 'tored'
+      // }else
       if (editPropNames.includes(property)) {
         return `can-edit-column-${property}`;
       }
       return "";
     },
+    headerCellClassName({column}){
+      // let arr = ['sjcb','quantities','totalQuantities','purchaseUnitPrice','createTime']
+      // if(arr.includes(column.property)){
+      //   return 'tored'
+      // }
+    },
     //关闭单位换算弹窗
     handleDialogVisible() {
       this.showUnitConversion = false;
@@ -824,6 +946,9 @@ export default {
   width: 100%;
   height: 100%;
 
+  ::v-deep .tored{
+    background: rgb(255,236,236) !important;
+  }
   .feed-summary-inner {
     width: 100%;
     height: 100%;
@@ -975,5 +1100,32 @@ export default {
       }
     }
   }
+
+  .no-data {
+    font-size: 14px;
+    font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+    font-weight: 400;
+    color: #999999;
+    text-shadow: 0px 0px 10px rgba(0, 37, 106, 0.10000000149011612);
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: #ffffff;
+    border-radius: 0px 0px 0px 0px;
+    opacity: 1;
+    border: 1px solid #eeeeee;
+    .no-data-box {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      img {
+        width: 64px;
+        height: 79px;
+        margin-bottom: 16px;
+      }
+    }
+  }
 }
 </style>

dsk-operate-ui/src/views/projectCostLedger/detail/components/FieldExpenses/index.vue

 <template>
   <div class="field-expenses-container">
-    <div class="field-expenses-inner">
+    <div v-if="!show" class="field-expenses-inner">
       <div class="left-side-menu">
         <project-side-menu ref="projectSideMenu" :menuTree="menuTreeList" :menuOptions="menuOptions" :unique-opened="false" v-model="currentNodeValue"
           @select="menuSelect">
@@ -27,10 +27,40 @@
           <dsk-skeleton v-if="tableLoading"></dsk-skeleton>
           <custom-table v-else-if="!tableLoading" :tableData="dataForm.tableDataList" :formColum="formColum" :max-height="true"
             :tableDataTotal="total" :paging="false">
+            <template slot="expenseValue" slot-scope="scope">
+              {{$decimalFormat(scope.row.expenseValue)}}
+            </template>
+            <template slot="byfy" slot-scope="scope">
+              {{$decimalFormat(scope.row.byfy)}}
+            </template>
+            <template slot="jzbyzfy" slot-scope="scope">
+              {{$decimalFormat(scope.row.jzbyzfy)}}
+            </template>
+            <template slot="cbCount" slot-scope="scope">
+              {{$decimalFormat(scope.row.cbCount)}}
+            </template>
+            <template slot="unitPrice" slot-scope="scope">
+              {{$decimalFormat(scope.row.unitPrice)}}
+            </template>
+            <template slot="excludeTaxSumPrice" slot-scope="scope">
+              {{$decimalFormat(scope.row.excludeTaxSumPrice)}}
+            </template>
+            <template slot="includeTaxSumPrice" slot-scope="scope">
+              {{$decimalFormat(scope.row.includeTaxSumPrice)}}
+            </template>
+            <template slot="engineeringVolume" slot-scope="scope">
+              {{$decimalFormat(scope.row.engineeringVolume)}}
+            </template>
           </custom-table>
         </div>
       </div>
     </div>
+    <div class="no-data">
+      <div class="no-data-box" v-if="show">
+        <img :src="noData" alt="暂未获取物料数据（每月20号获取）" />
+        <span>暂未获取物料数据（每月20号获取）</span>
+      </div>
+    </div>
   </div>
 </template>
 <script>
@@ -83,6 +113,7 @@ export default {
   },
   data() {
     return {
+      noData: require("@/assets/images/detail/noData.png"),
       menuOptions: {
         nodeName: "menuName",
         nodeValue: "fileId",
@@ -98,20 +129,20 @@ export default {
       formColumOptions: {
         "现场经费": [
           { label: '名称', prop: "expenseName", minWidth: "175", uid: v4(), showOverflowTooltip: true },
-          { label: '数量', prop: "expenseValue", width: "175", uid: v4() },
+          { label: '数量', prop: "expenseValue", width: "175", uid: v4(), slot: true },
           { label: '占比', prop: "proportion", width: "175", uid: v4() },
-          { label: '本月费用', prop: "byfy", minWidth: "175", uid: v4() },
-          { label: '截至本月总费用', prop: "jzbyzfy", minWidth: "175", uid: v4() },
+          { label: '本月费用', prop: "byfy", minWidth: "175", uid: v4(), slot: true },
+          { label: '截至本月总费用', prop: "jzbyzfy", minWidth: "175", uid: v4(), slot: true },
         ],
         "其他费用(包含建设其他费)": [
           { label: '序号', prop: "number", width: "60", fixed: false, uid: v4() },
           { label: '名称', prop: "expenseName", width: "121", uid: v4(), showOverflowTooltip: true },
           { label: '单位', prop: "unit", width: "121", uid: v4() },
-          { label: '成本数量', prop: "cbCount", width: "121", uid: v4() },
+          { label: '成本数量', prop: "cbCount", width: "121", uid: v4(), slot: true },
           { label: '使用时间', prop: "useTime", width: "129", uid: v4() },
-          { label: '公司单价', prop: "unitPrice", width: "129", uid: v4() },
-          { label: '目标成本合价（不含税）', prop: "excludeTaxSumPrice", width: "180", uid: v4() },
-          { label: '目标成本合价（含税）', prop: "includeTaxSumPrice", width: "180", uid: v4() },
+          { label: '公司单价', prop: "unitPrice", width: "129", uid: v4(), slot: true },
+          { label: '目标成本合价（不含税）', prop: "excludeTaxSumPrice", width: "180", uid: v4(), slot: true },
+          { label: '目标成本合价（含税）', prop: "includeTaxSumPrice", width: "180", uid: v4(), slot: true },
           { label: '备注', prop: "remark", width: "384", uid: v4(), showOverflowTooltip: true },
           { label: '成本科目', prop: "cbSubject", width: "129", uid: v4() },
           { label: '税金类型', prop: "taxType", width: "129", uid: v4() },
@@ -122,30 +153,30 @@ export default {
           { label: '序号', prop: "number", width: "60", fixed: false, uid: v4() },
           { label: '名称', prop: "expenseName", minWidth: "121", uid: v4(), showOverflowTooltip: true },
           { label: '单位', prop: "unit", width: "121", uid: v4() },
-          { label: '成本数量', prop: "cbCount", width: "121", uid: v4() },
+          { label: '成本数量', prop: "cbCount", width: "121", uid: v4(), slot: true },
           { label: '使用时间', prop: "useTime", width: "121", uid: v4() },
-          { label: '公司单价', prop: "unitPrice", width: "121", uid: v4() },
-          { label: '目标成本合价（不含税）', prop: "excludeTaxSumPrice", width: "180", uid: v4() },
-          { label: '目标成本合价（含税）', prop: "includeTaxSumPrice", width: "180", uid: v4() },
+          { label: '公司单价', prop: "unitPrice", width: "121", uid: v4(), slot: true },
+          { label: '目标成本合价（不含税）', prop: "excludeTaxSumPrice", width: "180", uid: v4(), slot: true },
+          { label: '目标成本合价（含税）', prop: "includeTaxSumPrice", width: "180", uid: v4(), slot: true },
           { label: '成本科目', prop: "cbSubject", width: "121", uid: v4() },
           { label: '税金类型', prop: "taxType", width: "121", uid: v4() },
-          { label: '本月费用', prop: "byfy", width: "121", uid: v4() },
-          { label: '截止本月总费用', prop: "jzbyzfy", width: "128", uid: v4() },
+          { label: '本月费用', prop: "byfy", width: "121", uid: v4(), slot: true },
+          { label: '截止本月总费用', prop: "jzbyzfy", width: "128", uid: v4(), slot: true },
         ],
         "现场管理费": [
           { label: '序号', prop: "number", width: "60", fixed: false, uid: v4() },
           { label: '名称', prop: "expenseName", minWidth: "121", uid: v4(), showOverflowTooltip: true },
           { label: '单位', prop: "unit", width: "121", uid: v4() },
-          { label: '工程量', prop: "engineeringVolume", width: "121", uid: v4() },
+          { label: '工程量', prop: "engineeringVolume", width: "121", uid: v4(), slot: true },
           { label: '增值税税率', prop: "addedTaxRate", width: "121", uid: v4() },
-          { label: '不含税单价（元）', prop: "unitPrice", width: "180", uid: v4() },
-          { label: '不含税合价（元）', prop: "excludeTaxSumPrice", width: "180", uid: v4() },
-          { label: '含税合价（元）', prop: "includeTaxSumPrice", width: "180", uid: v4() },
+          { label: '不含税单价（元）', prop: "unitPrice", width: "180", uid: v4(), slot: true },
+          { label: '不含税合价（元）', prop: "excludeTaxSumPrice", width: "180", uid: v4(), slot: true },
+          { label: '含税合价（元）', prop: "includeTaxSumPrice", width: "180", uid: v4(), slot: true },
           { label: '备注', prop: "remark", width: "121", uid: v4() },
           { label: '成本科目', prop: "cbSubject", width: "121", uid: v4() },
           { label: '税金类型', prop: "taxType", width: "121", uid: v4() },
-          { label: '本月费用', prop: "byfy", width: "121", uid: v4() },
-          { label: '截止本月总费用', prop: "jzbyzfy", width: "128", uid: v4() },
+          { label: '本月费用', prop: "byfy", width: "121", uid: v4(), slot: true },
+          { label: '截止本月总费用', prop: "jzbyzfy", width: "128", uid: v4(), slot: true },
         ]
       },
       // 已记录月份集合
@@ -165,7 +196,8 @@ export default {
       dataForm: {
         // 数据列表源数据
         tableDataList: [],
-      }
+      },
+      show:false,
     };
   },
   //可访问data属性
@@ -284,6 +316,9 @@ export default {
     async getFieldExpensesMenuTree(projectId) {
       try {
         const result = await getFieldExpensesMenuTreeApi(projectId);
+        if(result.data.length === 0){
+          this.show=true;
+        }
         if (result.code == 200 && result.data instanceof Array) {
           let _tempArray = result.data;
           _tempArray = _tempArray.sort((before, after) => {
@@ -495,5 +530,31 @@ export default {
       }
     }
   }
+  .no-data {
+    font-size: 14px;
+    font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+    font-weight: 400;
+    color: #999999;
+    text-shadow: 0px 0px 10px rgba(0, 37, 106, 0.10000000149011612);
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: #ffffff;
+    border-radius: 0px 0px 0px 0px;
+    opacity: 1;
+    border: 1px solid #eeeeee;
+    .no-data-box {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      img {
+        width: 64px;
+        height: 79px;
+        margin-bottom: 16px;
+      }
+    }
+  }
 }
 </style>

dsk-operate-ui/src/views/projectCostLedger/detail/components/MeasureItems/index.vue

 <template>
   <div class="feed-summary-container">
-    <div class="feed-summary-inner">
+    <div v-if="!show" class="feed-summary-inner">
       <div class="left-side-menu">
         <project-side-menu ref="profitloss" :menuTree="menuTreeList" :menuOptions="menuOptions" :unique-opened="false" v-model="defaultActive"
           @select="select">
@@ -19,9 +19,10 @@
           <el-button v-if="!isall && !isinput" type="primary" size="small" @click="addcost">添加实际成本</el-button>
           <el-button v-if="!isall && isinput" type="primary" size="small" @click="addinputs">保存</el-button>
         </div>
+        <dsk-skeleton v-if="tableLoading"></dsk-skeleton>
         <!--汇总-->
         <div class="meafixed-table" v-if="isall">
-          <el-table element-loading-text="Loading" :data="tableData" row-key="id" v-horizontal-scroll="'hover'" default-expand-all :max-height="tableHeight"
+          <el-table element-loading-text="Loading" :data="tableData" row-key="id" v-horizontal-scroll="'hover'" default-expand-all :max-height="tableHeight" v-if="tableData.length > 0 &&!tableLoading"
             :tree-props="{children: 'children', hasChildren: 'hasChildren'}" border highlight-current-row :cell-class-name="tored" :header-cell-class-name="tored"
             :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}">
             <el-table-column label="序号" width="60" align="left" type="index"></el-table-column>
@@ -44,6 +45,7 @@
           <el-table element-loading-text="Loading" ref="edittable" :data="tableData" row-key="id"
                     :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
                     v-horizontal-scroll="'hover'"  :max-height="tableHeight"
+                    v-if="tableData.length > 0 &&!tableLoading"
                     :tree-props="{children: 'children', hasChildren: 'hasChildren'}" border highlight-current-row
                     :cell-class-name="tored1" :header-cell-class-name="tored1">
             <el-table-column label="序号" width="60" align="left" type="index" fixed="left"></el-table-column>
@@ -92,7 +94,17 @@
             <el-table-column label="税金类型" width="130" prop="taxType">
               <template slot-scope="scope">{{scope.row.taxType || '--'}}</template>
             </el-table-column>
-
+            <el-table-column label="本月工程量" width="130" prop="projectVolume">
+              <template slot-scope="scope">
+                <template v-if="isinput">
+                  <el-input @blur="projectValue" v-model="scope.row.projectVolume "></el-input>
+                </template>
+                <template v-else>{{scope.row.projectVolume || '--'}}</template>
+              </template>
+            </el-table-column>
+            <el-table-column label="截止本月工程量" width="130" prop="currentProjectVolume">
+              <template slot-scope="scope">{{scope.row.suncurrentProjectVolume || '--'}}</template>
+            </el-table-column>
             <el-table-column label="本月成本发生比例" width="150" prop="monthCostRate">
               <template slot-scope="scope">
                 <template v-if="isinput">
@@ -102,34 +114,28 @@
               </template>
             </el-table-column>
             <el-table-column label="成本合价" width="130" prop="costEffective">
-              <template slot-scope="scope">{{scope.row.costEffective || '--'}}</template>
-            </el-table-column>
-            <el-table-column label="本月工程量" width="130" prop="projectVolume">
               <template slot-scope="scope">
                 <template v-if="isinput">
-                  <el-input v-model="scope.row.projectVolume "></el-input>
+                  <el-input v-model="scope.row.costEffective "></el-input>
                 </template>
-                <template v-else>{{scope.row.projectVolume || '--'}}</template>
+                <template v-else>{{scope.row.costEffective || '--'}}</template>
               </template>
             </el-table-column>
-            <el-table-column label="截止本月工程量" width="130" prop="currentProjectVolume">
-              <template slot-scope="scope">{{scope.row.suncurrentProjectVolume || '--'}}</template>
-            </el-table-column>
-            <el-table-column label="本月推送工程量" width="130" prop="submitProjectVolume">
-              <template slot-scope="scope">{{scope.row.submitProjectVolume || '--'}}</template>
-            </el-table-column>
+            <!--<el-table-column label="本月推送工程量" width="130" prop="submitProjectVolume">-->
+              <!--<template slot-scope="scope">{{scope.row.submitProjectVolume || '&#45;&#45;'}}</template>-->
+            <!--</el-table-column>-->
 
             <el-table-column label="备注" width="130" prop="remarks">
               <template slot-scope="scope">{{scope.row.remarks || '--'}}</template>
             </el-table-column>
-            <el-table-column label="是否推送" width="130">
-              <template slot-scope="scope">{{scope.row.pushTime?'是':'否'}}</template>
-            </el-table-column>
-            <el-table-column label="操作" width="130" fixed="right">
-              <template slot-scope="scope">
-                <span class="wordprimary" @click="pushwork(scope.row)">推送工程量</span>
-              </template>
-            </el-table-column>
+            <!--<el-table-column label="是否推送" width="130">-->
+              <!--<template slot-scope="scope">{{scope.row.pushTime?'是':'否'}}</template>-->
+            <!--</el-table-column>-->
+            <!--<el-table-column label="操作" width="130" fixed="right">-->
+              <!--<template slot-scope="scope">-->
+                <!--<span class="wordprimary" @click="pushwork(scope.row)">推送工程量</span>-->
+              <!--</template>-->
+            <!--</el-table-column>-->
           </el-table>
         </div>
 
@@ -190,6 +196,12 @@
       </el-dialog>
 
     </div>
+    <div class="no-data">
+      <div class="no-data-box" v-if="show">
+        <img :src="noData" alt="暂未获取物料数据（每月20号获取）" />
+        <span>暂未获取物料数据（每月20号获取）</span>
+      </div>
+    </div>
   </div>
 </template>
 <script>
@@ -204,7 +216,7 @@
     saveBatch
   } from '@/api/projectCostLedger'
   import { cloneDeep } from 'lodash-es'
-
+  import DskSkeleton from "@/components/DskSkeleton";
   export default {
   name: "MeasureItems",
   props: {
@@ -235,10 +247,14 @@
     }
   },
   components: {
-    ProjectSideMenu
+    ProjectSideMenu,
+    DskSkeleton
   },
   data() {
     return {
+      noData: require("@/assets/images/detail/noData.png"),
+      // 加载数据列表
+      tableLoading: true,
       pickerOptions: {
         disabledDate(time) {
           let istrue = true;
@@ -267,20 +283,59 @@
       cbVisible:false,
       chooseDate:"",
       isinput:false,//是否填写
-      tableHeight: window.innerHeight - 355
+      tableHeight: window.innerHeight - 355,
+      nowheight:null,
+      resizeTimer:null,
+      show:false,
     };
   },
   //可访问data属性
   created() {
     this.init(this.comProjectId);
-    // this.createResizeObserver();
+    this.getHeight()
   },
   //计算集
-  computed: {
-
-  },
-  //方法集
-  methods: {
+  computed: {},
+    beforeDestroy() {
+      this.clearResizeTimer()
+      if (this.observer) {
+        this.observer.disconnect()
+      }
+    },
+    //方法集
+    methods: {
+      projectValue(){
+        // for(var i=0; i<this.tableData.length; i++){
+        //   let value=0
+        //   for(var j=0; j<this.tableData[i].children.length; j++){
+        //     value+=Number(this.tableData[i].children[j].projectVolume)
+        //   }
+        //   this.tableData[i].projectVolume=value
+        //   console.log(value)
+        // }
+      },
+      async getHeight(list){
+      this.nowheight = new ResizeObserver(entries => {
+        this.clearResizeTimer();
+        this.resizeTimer = setTimeout(() => {
+          this.maxHeight();
+        }, 1000);
+      });
+      await this.$nextTick();
+      this.nowheight.observe(document.querySelector('.profitloss'));
+    },
+    maxHeight(){
+      const domhei = document.querySelector('.profitloss').offsetHeight - 36 - 16 - 32
+      const conhei = document.querySelector('.meafixed-table').offsetHeight - 32
+      // const height = window.getComputedStyle(dom).height;
+      console.log(domhei)
+      this.tableHeight = domhei
+      // console.log(height)
+    },
+    clearResizeTimer() {
+      clearTimeout(this.resizeTimer);
+      this.resizeTimer = null;
+    },
     getGDT(){
       let gdt = document.querySelector('.el-table__body-wrapper')
       let w1 = document.querySelector('.el-table__fixed-right-patch')
@@ -356,32 +411,39 @@
       this.getDatas(menuPath)
     },
     async getDatas(menuPath){
-      let param = {
-        projectId: this.projectId,
-        id: this.id,
-        month: this.expenseDate
-      };
-      if (menuPath == 0) {//费用汇总
-        this.isall = true;
-        // const formData = new FormData();
-        // formData.append("projectId", this.projectId);
-        // formData.append("month", this.expenseDate);
-        // const res = await getSummarydata(formData);
-        // this.tableData = res.data;
-      } else {//各个子项
-        this.isall = false;
-        // const res = await getCostMeasureslist(param);
-        // this.tableData = res.data;
+      try {
+        let param = {
+          projectId: this.projectId,
+          id: this.id,
+          month: this.expenseDate
+        };
+        this.tableLoading = true;
+        if (menuPath == 0) {//费用汇总
+          this.isall = true;
+          // const formData = new FormData();
+          // formData.append("projectId", this.projectId);
+          // formData.append("month", this.expenseDate);
+          // const res = await getSummarydata(formData);
+          // this.tableData = res.data;
+        } else {//各个子项
+          this.isall = false;
+          // const res = await getCostMeasureslist(param);
+          // this.tableData = res.data;
+        }
+        const res = await getCostMeasureslist(param);
+        this.tableData = res.data;
+        this.isinput = false
+        // await this.$nextTick()
+        this.$nextTick(()=>{
+          setTimeout(()=>{
+            this.getGDT()
+          },500)
+        })
+      } catch (error) {
+        console.log(error);
+      } finally {
+        this.tableLoading = false;
       }
-      const res = await getCostMeasureslist(param);
-      this.tableData = res.data;
-      this.isinput = false
-      // await this.$nextTick()
-      this.$nextTick(()=>{
-      setTimeout(()=>{
-      this.getGDT()
-  },500)
-      })
     },
     async init(detail = '') {
       try {
@@ -391,12 +453,17 @@
         this.getactualMonths();
       } catch (error) {
 
+      } finally {
+        this.tableLoading = false;
       }
     },
     async getFeedSummaryMenuTree(params) {
       try {
         const result = await getMeasureslist(params);
         if (result.code == 200) {
+          if(result.data.length === 0){
+            this.show=true;
+          }
           let arr = {};
           arr.itemContent = '措施费';
           arr.id = 0;
@@ -504,6 +571,18 @@
   width: 100%;
   height: 100%;
 
+  .meafixed-table{
+    // 解决拖拽表格滚动条，错位问题
+    ::v-deep .el-table__header-wrapper{
+      padding-right: 16px!important; // 滚动条宽度
+    }
+    ::v-deep .el-table--border th.el-table__cell.gutter:last-of-type {
+      display: block!important;
+      width: 16px!important;
+    }
+  }
+
+
   ::v-deep .tored{
     /*background: rgb(255,236,236) !important;*/
   }
@@ -525,6 +604,34 @@
       padding: 16px;
     }
   }
+
+  .no-data {
+    font-size: 14px;
+    font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+    font-weight: 400;
+    color: #999999;
+    text-shadow: 0px 0px 10px rgba(0, 37, 106, 0.10000000149011612);
+    width: 100%;
+    height: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: #ffffff;
+    border-radius: 0px 0px 0px 0px;
+    opacity: 1;
+    border: 1px solid #eeeeee;
+    .no-data-box {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      img {
+        width: 64px;
+        height: 79px;
+        margin-bottom: 16px;
+      }
+    }
+  }
+
   .search {
     display: flex;
     justify-content: space-between;

dsk-operate-ui/src/views/projectCostLedger/detail/components/OtherProjects/index.vue

@@ -39,6 +39,7 @@
             :tableLoading="tableLoading"
             :tableData="tableData1"
             :forData="forData1"
+            :indexFixed="true"
             :MaxPage=500
             :tableDataTotal="tableDataTotal1"
             :queryParams="queryParams"
@@ -96,7 +97,7 @@ export default {
         {label: '占比', prop: 'proportion', slot: true},
       ],
       forData1: [
-        {label: '清单内容', prop: 'itemContent',minWidth:'220'},
+        {label: '清单内容', prop: 'itemContent',minWidth:'220', fixed: "left"},
         {label: '工作内容、做法/规格型号/施工现场配置说明', prop: 'workContent',minWidth:'302'},
         {label: '单位', prop: 'unit',minWidth:'115'},
         {label: '不含税单价', prop: 'unitPriceExcludingTax',minWidth:'115'},

dsk-operate-ui/src/views/projectCostLedger/detail/components/ProfitLoss/index.vue

 <template>
   <div class="feed-summary-container">
-    <div class="feed-summary-inner">
+    <div class="feed-summary-inner" v-if="!show">
       <div class="left-side-menu">
         <project-side-menu ref="profitloss" :menuTree="menuTreeList" :menuOptions="menuOptions" :unique-opened="false" v-model="defaultActive" @select="select">
           <template slot="盈亏分析对比-1">
@@ -19,6 +19,7 @@
             >
           </el-date-picker>
         </div>
+        <dsk-skeleton v-if="tableLoading"></dsk-skeleton>
         <div class="table-item">
           <el-table
             element-loading-text="Loading"
@@ -28,6 +29,7 @@
             default-expand-all
             :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
             border
+            v-if="!tableLoading"
             highlight-current-row
             :max-height="tableHeight"
           >
@@ -36,51 +38,61 @@
               <template slot-scope="scope">{{scope.row.cbName || '--'}}</template>
             </el-table-column>
             <el-table-column label="招标控制价" align="center">
-              <el-table-column label="招标控制价合价" width="180" prop="tenderSumPrice"><template slot-scope="scope">{{scope.row.tenderSumPrice || '--'}}</template></el-table-column>
-              <el-table-column label="不含税招标合价" width="180" prop="tenderSumPrice"><template slot-scope="scope">{{scope.row.tenderSumPrice || '--'}}</template></el-table-column>
-              <el-table-column label="含税招标合价" width="180" prop="taxIncludeTenderSumPrice"><template slot-scope="scope">{{scope.row.taxIncludeTenderSumPrice || '--'}}</template></el-table-column>
+              <el-table-column label="招标控制价合价" width="180" prop="tenderSumPrice">
+                <template slot-scope="scope">{{changevalue(scope.row.tenderSumPrice)}}</template>
+              </el-table-column>
+              <el-table-column label="不含税招标合价" width="180" prop="taxExcludeTenderSumPrice">
+                <template slot-scope="scope">{{changevalue(scope.row.taxExcludeTenderSumPrice)}}</template>
+              </el-table-column>
+              <el-table-column label="含税招标合价" width="180" prop="taxIncludeTenderSumPrice"><template slot-scope="scope">{{changevalue(scope.row.taxIncludeTenderSumPrice)}}</template></el-table-column>
             </el-table-column>
             <el-table-column label="投标报价" align="center">
-              <el-table-column label="投标报价合价" width="180" prop="bidSumPrice"><template slot-scope="scope">{{scope.row.bidSumPrice || '--'}}</template></el-table-column>
-              <el-table-column label="不含税投标合价" width="180" prop="taxExcludeBidSumPrice"><template slot-scope="scope">{{scope.row.taxExcludeBidSumPrice || '--'}}</template></el-table-column>
-              <el-table-column label="含税投标合价" width="180" prop="taxIncludebBidSumPrice"><template slot-scope="scope">{{scope.row.taxIncludebBidSumPrice || '--'}}</template></el-table-column>
+              <el-table-column label="投标报价合价" width="180" prop="bidSumPrice"><template slot-scope="scope">{{changevalue(scope.row.bidSumPrice)}}</template></el-table-column>
+              <el-table-column label="不含税投标合价" width="180" prop="taxExcludeBidSumPrice"><template slot-scope="scope">{{changevalue(scope.row.taxExcludeBidSumPrice)}}</template></el-table-column>
+              <el-table-column label="含税投标合价" width="180" prop="taxIncludebBidSumPrice"><template slot-scope="scope">{{changevalue(scope.row.taxIncludebBidSumPrice)}}</template></el-table-column>
             </el-table-column>
             <el-table-column label="成本汇总" align="center">
-              <el-table-column label="不含税成本合价" width="180" prop="taxExclusiveTotal"><template slot-scope="scope">{{scope.row.taxExclusiveTotal || '--'}}</template></el-table-column>
-              <el-table-column label="成本税金合价" width="180" prop="cbTaxesTotal"><template slot-scope="scope">{{scope.row.cbTaxesTotal || '--'}}</template></el-table-column>
-              <el-table-column label="含税成本合价" width="180" prop="taxInclusiveTotal"><template slot-scope="scope">{{scope.row.taxInclusiveTotal || '--'}}</template></el-table-column>
+              <el-table-column label="不含税成本合价" width="180" prop="taxExclusiveTotal"><template slot-scope="scope">{{changevalue(scope.row.taxExclusiveTotal)}}</template></el-table-column>
+              <el-table-column label="成本税金合价" width="180" prop="cbTaxesTotal"><template slot-scope="scope">{{changevalue(scope.row.cbTaxesTotal)}}</template></el-table-column>
+              <el-table-column label="含税成本合价" width="180" prop="taxInclusiveTotal"><template slot-scope="scope">{{changevalue(scope.row.taxInclusiveTotal)}}</template></el-table-column>
             </el-table-column>
             <el-table-column label="造价指标（元/㎡）" align="center">
-              <el-table-column label="招标控制价" width="180" prop="costTender"><template slot-scope="scope">{{scope.row.costTender || '--'}}</template></el-table-column>
-              <el-table-column label="投标报价" width="180" prop="costBid"><template slot-scope="scope">{{scope.row.costBid || '--'}}</template></el-table-column>
-              <el-table-column label="成本" width="180" prop="costExpense"><template slot-scope="scope">{{scope.row.costExpense || '--'}}</template></el-table-column>
+              <el-table-column label="招标控制价" width="180" prop="costTender"><template slot-scope="scope">{{changevalue(scope.row.costTender )}}</template></el-table-column>
+              <el-table-column label="投标报价" width="180" prop="costBid"><template slot-scope="scope">{{changevalue(scope.row.costBid )}}</template></el-table-column>
+              <el-table-column label="成本" width="180" prop="costExpense"><template slot-scope="scope">{{changevalue(scope.row.costExpense)}}</template></el-table-column>
             </el-table-column>
-            <el-table-column label="含税成本占比" width="180" prop="taxInclusiveExpenseProportion"><template slot-scope="scope">{{scope.row.taxInclusiveExpenseProportion || '--'}}</template></el-table-column>
+            <el-table-column label="含税成本占比" width="180" prop="taxInclusiveExpenseProportion"><template slot-scope="scope">{{changevalue(scope.row.taxInclusiveExpenseProportion)}}</template></el-table-column>
             <el-table-column label="控制盈亏对比情况" align="center">
-              <el-table-column label="含税合价偏差" width="180" prop="tenderSumPriceDeviation"><template slot-scope="scope">{{scope.row.tenderSumPriceDeviation || '--'}}</template></el-table-column>
-              <el-table-column label="含税盈亏率" width="180" prop="tenderProfitLossRatio"><template slot-scope="scope">{{scope.row.tenderProfitLossRatio || '--'}}</template></el-table-column>
+              <el-table-column label="含税合价偏差" width="180" prop="tenderSumPriceDeviation"><template slot-scope="scope">{{changevalue(scope.row.tenderSumPriceDeviation )}}</template></el-table-column>
+              <el-table-column label="含税盈亏率" width="180" prop="tenderProfitLossRatio"><template slot-scope="scope">{{changevalue(scope.row.tenderProfitLossRatio)}}</template></el-table-column>
             </el-table-column>
             <el-table-column label="投标报价盈亏对比情况" align="center">
-              <el-table-column label="含税合价偏差" width="180" prop="bidSumPriceDeviation"><template slot-scope="scope">{{scope.row.bidSumPriceDeviation || '--'}}</template></el-table-column>
-              <el-table-column label="含税盈亏率" width="180" prop="bidProfitLossRatio"><template slot-scope="scope">{{scope.row.bidProfitLossRatio || '--'}}</template></el-table-column>
+              <el-table-column label="含税合价偏差" width="180" prop="bidSumPriceDeviation"><template slot-scope="scope">{{changevalue(scope.row.bidSumPriceDeviation)}}</template></el-table-column>
+              <el-table-column label="含税盈亏率" width="180" prop="bidProfitLossRatio"><template slot-scope="scope">{{changevalue(scope.row.bidProfitLossRatio )}}</template></el-table-column>
             </el-table-column>
             <el-table-column label="实际成本费用" align="center">
-              <el-table-column label="本月费用（含税）" width="180" prop="taxInclusiveExpense"><template slot-scope="scope">{{scope.row.taxInclusiveExpense || '--'}}</template></el-table-column>
-              <el-table-column label="本月费用（不含税）" width="180" prop="taxExclusiveExpense"><template slot-scope="scope">{{scope.row.taxExclusiveExpense || '--'}}</template></el-table-column>
-              <el-table-column label="截至本月费用（含税）" width="180" prop="sumTaxInclusiveExpense"><template slot-scope="scope">{{scope.row.sumTaxInclusiveExpense || '--'}}</template></el-table-column>
-              <el-table-column label="截至本月费用（不含税）" width="180" prop="sumTaxExclusiveExpense"><template slot-scope="scope">{{scope.row.sumTaxExclusiveExpense || '--'}}</template></el-table-column>
+              <el-table-column label="本月费用（含税）" width="180" prop="taxInclusiveExpense"><template slot-scope="scope">{{changevalue(scope.row.taxInclusiveExpense)}}</template></el-table-column>
+              <el-table-column label="本月费用（不含税）" width="180" prop="taxExclusiveExpense"><template slot-scope="scope">{{changevalue(scope.row.taxExclusiveExpense)}}</template></el-table-column>
+              <el-table-column label="截至本月费用（含税）" width="180" prop="sumTaxInclusiveExpense"><template slot-scope="scope">{{changevalue(scope.row.sumTaxInclusiveExpense)}}</template></el-table-column>
+              <el-table-column label="截至本月费用（不含税）" width="180" prop="sumTaxExclusiveExpense"><template slot-scope="scope">{{changevalue(scope.row.sumTaxExclusiveExpense)}}</template></el-table-column>
             </el-table-column>
           </el-table>
         </div>
 
       </div>
     </div>
+    <div class="no-data">
+      <div class="no-data-box" v-if="show">
+        <img :src="noData" alt="暂未获取物料数据（每月20号获取）" />
+        <span>暂未获取物料数据（每月20号获取）</span>
+      </div>
+    </div>
   </div>
 </template>
 <script>
   import ProjectSideMenu from '@/views/projectCostLedger/detail/components/ProjectSideMenu'
   import { getAnalysislist, getProfitLossMenuTreeApi } from '@/api/projectCostLedger'
-
+  import DskSkeleton from "@/components/DskSkeleton";
   export default {
     name: "orifitloss",
     props: {
@@ -113,10 +125,14 @@
       }
     },
     components: {
-      ProjectSideMenu
+      ProjectSideMenu,
+      DskSkeleton
     },
     data() {
       return {
+        // 加载数据列表
+        tableLoading: true,
+        noData: require("@/assets/images/detail/noData.png"),
         pickerOptions: {
           // disabledDate(time) {
           //   let istrue = true
@@ -138,7 +154,8 @@
         id: 0,
         expenseDate:'',
         tableData:[],
-        tableHeight: window.innerHeight - 355
+        tableHeight: window.innerHeight - 355,
+        show:false,
       };
     },
     //可访问data属性
@@ -154,17 +171,27 @@
     },
     //方法集
     methods: {
+      changevalue(value){
+        let str = parseFloat(value)?value:'--'
+        return str
+      },
       select(menuPath){
-        this.id = menuPath
-        this.defaultActive = menuPath
-        let param = {
-          id:this.id,
-          expenseDate:this.expenseDate
+        try {
+          this.tableLoading = true;
+          this.id = menuPath
+          this.defaultActive = menuPath
+          let param = {
+            id:this.id,
+            expenseDate:this.expenseDate
+          }
+          getAnalysislist(param).then(res=>{
+            this.tableData = res.data
+          })
+        } catch (error) {
+
+        } finally {
+          this.tableLoading = false;
         }
-        console.log(param)
-        getAnalysislist(param).then(res=>{
-          this.tableData = res.data
-        })
       },
       async init(detail = {}) {
         try {
@@ -177,12 +204,17 @@
           });
         } catch (error) {
 
+        } finally {
+          this.tableLoading = false;
         }
       },
       async getFeedSummaryMenuTree(params) {
         try {
           const result = await getProfitLossMenuTreeApi(params);
           if (result.code == 200) {
+            if(result.data.length === 0){
+              this.show=true;
+            }
             let arr = {}
             arr.cbName = '盈亏分析对比'
             arr.id = 0
@@ -233,5 +265,31 @@
         }
       }
     }
+    .no-data {
+      font-size: 14px;
+      font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+      font-weight: 400;
+      color: #999999;
+      text-shadow: 0px 0px 10px rgba(0, 37, 106, 0.10000000149011612);
+      width: 100%;
+      height: 100%;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      background: #ffffff;
+      border-radius: 0px 0px 0px 0px;
+      opacity: 1;
+      border: 1px solid #eeeeee;
+      .no-data-box {
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        img {
+          width: 64px;
+          height: 79px;
+          margin-bottom: 16px;
+        }
+      }
+    }
   }
 </style>

dsk-operate-ui/src/views/projectCostLedger/detail/components/ProjectSideMenu/ProjectMenuItem.vue

@@ -60,7 +60,11 @@ export default {
   //计算集
   computed: {
     checkHasChidren() {
-      return !!(this.menuItem && this.menuItem?.children?.length);
+      let state=false
+      if(this.menuItem?.children){
+        state=this.menuItem?.children[0].nodeName ? true : false
+      }
+      return !!(this.menuItem && this.menuItem?.children?.length && state);
     },
   },
   //方法集

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

@@ -83,46 +83,54 @@ export default {
         {
           value: "basicEngineeringInformation",
           name: "工程项目信息",
+          disabled:false,
           id: v4()
         },
         {
           value: "directCost",
           name: "直接费成本",
+          disabled:false,
           cbType: 0,
           id: v4()
         },
         {
           value: "feedSummary",
           name: "工料汇总",
+          disabled:false,
           cbType: 1,
           id: v4()
         },
         {
           name: "措施项目",
           value: "measureItem",
+          disabled:false,
           cbType: 2,
           id: v4()
         },
         {
           name: "其他项目",
           value: "otherItems",
+          disabled:false,
           cbType: 3,
           id: v4()
         },
         {
           name: "现场经费",
           value: "fieldExpenses",
+          disabled:false,
           cbType: 4,
           id: v4()
         },
         {
           name: "成本汇总",
           value: "cost",
+          disabled:false,
           cbType: 5,
           id: v4()
         },
         {
           name: "盈亏分析对比",
+          disabled:false,
           value: "profitAndLoss",
           cbType: 1,
           id: v4()
@@ -205,6 +213,10 @@ export default {
         if (detail.code == 200 && detail.data) {
           if (detail.data.id) detail.data["projectId"] = detail.data.id;
           this.detailInfo = detail.data;
+          if(this.detailInfo.cbStage === 3){
+            this.toggleTabs[1].disabled=true;
+            this.toggleTabs[4].disabled=true;
+          }
         }
       } catch (error) {
         console.log(error);

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

@@ -37,7 +37,7 @@
       <div class="table-project">
         <div class="table-item-jf1" v-if="total == 0 && !isSkeleton">
           <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
-          <div class="item-jf-titel">暂无数据，点击按钮导入项目成本数据</div>
+          <div class="item-jf-titel">暂无数据，点击按钮新增项目成本数据</div>
           <el-button type="primary" class="jf-btn" size="small" @click="addPro">新增项目</el-button>
         </div>
         <div style="padding: 16px;" v-if="isSkeleton">
@@ -47,7 +47,7 @@
           <div class="total-title">
             <div class="totals">共{{total}}条</div>
             <div class="btns">
-              <div class="btn btn_primary h32" @click="addPro">导入项目</div>
+              <div class="btn btn_primary h32" @click="addPro">新增项目</div>
               <div class="btn btn_default h32" @click="getcgx">草稿箱 ({{cgxtotal}})</div>
             </div>
           </div>
@@ -73,13 +73,13 @@
                     <el-tooltip placement="top" v-if="scope.row.projectText.length>26">
                       <div slot="content">{{scope.row.projectText}}</div>
                       <div class="renling">
-                        <router-link v-if="scope.row.projectFileStatus==2" :to="`/projectCostLedger/detail?projectId=${scope.row.id}`" tag="a"
+                        <router-link v-if="scope.row.projectFileStatus==2 || scope.row.cbStage ===3" :to="`/projectCostLedger/detail?projectId=${scope.row.id}`" tag="a"
                                      class="wordprimary" v-html="scope.row.projectName"></router-link>
                         <span v-else v-html="scope.row.projectName||'--'"></span>
                       </div>
                     </el-tooltip>
                     <div class="renling" v-else>
-                      <router-link v-if="scope.row.projectFileStatus==2" :to="`/projectCostLedger/detail?projectId=${scope.row.id}`" tag="a"
+                      <router-link v-if="scope.row.projectFileStatus==2 || scope.row.cbStage ===3" :to="`/projectCostLedger/detail?projectId=${scope.row.id}`" tag="a"
                                    class="wordprimary" v-html="scope.row.projectName"></router-link>
                       <span v-else v-html="scope.row.projectName||'--'"></span>
                     </div>
@@ -90,7 +90,8 @@
               </el-table-column>
               <el-table-column label="项目状态" prop="customerCode"  width="100" :resizable="false">
                 <template slot-scope="scope">
-                  <template v-for="item in ztStagelist">
+                  <span v-if="scope.row.cbStage ===3 || scope.row.cbStage ==='3'">--</span>
+                  <template v-else v-for="item in ztStagelist">
                     <template v-if="item.dictValue == scope.row.projectFileStatus">
                      <span class="zts" :class="'zt'+scope.row.projectFileStatus">{{item.dictLabel}}</span>
                     </template>
@@ -112,7 +113,7 @@
                   <div v-else class="renling">{{scope.row.projectFileName||"--"}}</div>
                 </template>
               </el-table-column>
-              <el-table-column label="成本阶段" prop="customerCode"  width="90" :resizable="false">
+              <el-table-column label="成本阶段" prop="customerCode"  width="110" :resizable="false">
                 <template slot-scope="scope">
                   <template v-for="item in cbStagelist">
                     <template v-if="item.dictValue == scope.row.cbStage">{{item.dictLabel}}</template>
@@ -120,6 +121,9 @@
                 </template>
               </el-table-column>
               <el-table-column label="上传人" prop="updateBy"  width="140" :resizable="false">
+                <template slot-scope="scope">
+                  {{scope.row.updateBy||"--"}}
+                </template>
               </el-table-column>
 
               <el-table-column label="上传时间" min-width="180" :resizable="false">
@@ -171,7 +175,7 @@
           <span>{{protitle}}</span>
         </div>
         <el-form class="popform" label-width="97px" :model="queryParam" :rules="rules" ref="ruleForm">
-          <el-form-item label="项目名称" class="row">
+          <el-form-item label="项目名称" class="row" prop="projectName">
             <el-input type="text" v-model="queryParam.projectName" placeholder="请输入完整的项目名称"></el-input>
           </el-form-item>
           <el-form-item label="IPM项目编码" class="row">
@@ -189,7 +193,7 @@
             </el-select>
           </el-form-item>
         </el-form >
-        <div class="popbot">
+        <div class="popbot" >
           <div class="btn btn_cancel h32" @click="dialogVisible = false">取消</div>
           <div class="btn btn_primary h32" v-if="isedit && !ischeck" @click="savepro">保存</div>
           <div class="btn btn_primary h32" v-if="isedit && ischeck" @click="changepro">下一步，导入数据</div>
@@ -219,7 +223,7 @@
                 <span>{{scope.row.projectName||'--'}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="成本阶段" width="105px">
+            <el-table-column label="成本阶段" width="110px">
               <template slot-scope="scope">
                 <div v-for="(item,index) in cbStagelist" :key="index+11">
                   <span v-if="scope.row.cbStage == item.dictValue">{{item.dictLabel}}</span>
@@ -289,6 +293,7 @@
       },
       rules:{
         cbStage:[{ required: true, message: '请选择成本阶段！', trigger: 'blur' },],
+        projectName:[{ required: true, message: '请输入项目名称', trigger: 'blur' },],
       },
       isupload:false,
       tableData:[{}],

dsk-operate-ui/src/views/supplier/disablelist.vue

+<template>
+    <div class="supplier">
+        <template v-if="!showDetail">
+            <div class="search-supplier">
+                <div class="title_wrap">
+                <div class="enterprise_title">
+                    供应商内部禁用列表
+                </div>
+                </div>
+            </div>
+            <div class="table-supplier table-supplier2">
+                <head-form-new title="" :form-data="formData" :query-params="queryParams" :total="0" :isExcel="false"
+                            @handle-search="handleSearch" ref="searchFormNew" @handle-excel="handleExcel" />
+                <!--<el-divider class="supdivider"></el-divider>
+                <div class="total-title">
+                <div class="totals">共{{total}}条</div>
+                <p class="total-dc" @click="customerExport">
+                    <img src="@/assets/images/EXCEL.png" alt="">
+                    <span class="excel">导出EXCEL</span>
+                </p>
+                </div> -->
+                <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+                <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+                <div class="item-jf-titel">暂无相关数据</div>
+                <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+                </div>
+                <skeleton v-if="isSkeleton"></skeleton>
+        
+                <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
+                    <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
+                  v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
+                  :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
+                  ref="theOwnerListTable" :row-key="'customerKey'">
+            
+                        <el-table-column type="index" label="序号" :fixed="tableColumnFixed" width="60" :resizable="false">
+                        <template slot-scope="scope">
+                            <span>{{(queryParams.pageNum - 1) *queryParams.pageSize + scope.$index + 1}}</span>
+                        </template>
+                        </el-table-column>
+                        <el-table-column label="分供方名称" prop="name1" :fixed="tableColumnFixed" width="310" :resizable="false"></el-table-column>
+                        <el-table-column label="分供方分类" prop="name2" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="所属组织" prop="name1" :fixed="tableColumnFixed" width="310" :resizable="false"></el-table-column>
+                        <el-table-column label="分供方ID" prop="name5" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="账号" prop="name3" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="联系人" prop="name4" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="联系人电话" prop="name5" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="生效时间" prop="name6" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="禁用至" prop="name6" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="解除状态" prop="name66" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="操作" width="90" fixed="right">
+                            <template slot-scope="scope">
+                                <span style="color: #0081FF;cursor: pointer;" @click="viewDetail(scope.row)">详情</span>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+                <div class="pagination clearfix" v-show="total>queryParams.pageSize">
+                    <el-pagination background :page-size="queryParams.pageSize" :current-page.sync="queryParams.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+                                :total="total">
+                    </el-pagination>
+                </div>
+            </div>
+        </template>
+        <template v-else>
+            <div class="detail-title">
+                <div><span style="cursor: pointer;" @click="showDetail = false">供应商内部禁用</span><i class="el-icon-arrow-right"></i><span class="tip">详情</span></div>
+                <div class="search-supplier">
+                  <div class="title_wrap title_wrap1">
+                  <div class="enterprise_title">
+                      供应商内部禁用列表
+                  </div>
+                  </div>
+              </div>
+              <info-table class="info-tab"  :list="defaultList" :obj="detailInfo" :labelWidth="140"></info-table>
+            </div>
+            
+        </template>
+    </div>
+  
+  </template>
+  
+  <script>
+    import '@/assets/styles/public.scss'
+    import '@/assets/styles/supplierlist.scss'
+    import mixin from '@/views/detail/party-a/mixins/mixin'
+    import InfoTable from '../detail/party-a/component/infoTable';
+  
+    export default {
+      name: 'ratinglist',
+      components: {InfoTable},
+      mixins: [mixin],
+      data(){
+        return{
+          detailInfo:{},
+          showDetail:false,
+          formData: [
+            {
+              type: 1, fieldName: 'businessTypes', value: '',width:108, placeholder: '分供方分类', uid: '', options: [
+                {name:'品类',value:1},
+                {name:'物资',value:2},
+                {name:'设备',value:3},
+                {name:'劳务分包',value:4},
+                {name:'专业分包',value:5},
+                {name:'专业服务',value:6},
+                {name:'租赁',value:7},
+              ],
+            },
+            { type: 3, fieldName: 'advisoryBodyName', value: '', placeholder: '分供方名称', uid: '',isword:'分供方名称' },
+          ],
+          defaultList: [
+            { name: '分供方', prop: 'name1' },
+            { name: '所属组织', prop: 'name1' },
+            { name: '禁用分类', prop: 'name2' },
+            { name: '禁用至', prop: 'name6' },
+            { name: '生效时间', prop: 'name6' },
+            { name: '申请人', prop: 'name4' },
+            { name: '申请时间', prop: 'name6' },
+          ],
+          queryParams: {
+            // customerId: this.companyId,
+            // customerName: this.companyName,
+  
+            pageNum: 1,
+            pageSize: 10,
+          },
+          total: 19,
+          isSkeleton:false,
+          tableData:[
+            {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'物资-水泥及水',name3:'456362',name4:'郑丽青',name5:'429799',name6:'2022-05-13',name66:'禁用',name7:'118',name8:'118',name9:'114'},
+            {name1:'河南荣川实业有限公司',name2:'泥制品',name3:'100',name4:'郑青',name5:'36355',name6:'2022-01-23',name66:'禁用',name7:'118',name8:'118',name9:'107'},
+            {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'物资-其他类',name3:'100',name4:'郑丽',name5:'631719',name6:'2022-05-23',name66:'禁用',name7:'109',name8:'109',name9:'107'},
+            {name1:'北京九主澜商贸有限公司',name2:'物资-砼及外加剂',name3:'100',name4:'郑丽青',name5:'19691',name6:'2022-01-23',name66:'禁用',name7:'105',name8:'109',name9:'107'},
+            {name1:'重庆拉瑞永固混凝土有限公司',name2:'物资-木材及制品',name3:'456362',name4:'郑丽青',name5:'94823',name6:'2022-05-21',name66:'禁用',name7:'109',name8:'109',name9:'107'},
+            {name1:'山东乾途伟业建材有限公司',name2:'物资-砼及外加剂',name3:'100',name4:'郑丽青',name5:'9418',name6:'2022-05-23',name66:'禁用',name7:'109',name8:'109',name9:'107'},
+            {name1:'厦门市集美区鸿铭建材有限公司',name2:'物资-其他类',name3:'456362',name4:'郑丽青',name5:'35851',name6:'2022-05-23',name66:'禁用',name7:'109',name8:'109',name9:'107'},
+            {name1:'重庆匠伦家居用品有限公司',name2:'物资-砼及外加剂',name3:'106',name4:'郑丽青',name5:'21787',name6:'2022-05-23',name66:'禁用',name7:'109',name8:'109',name9:'107'},
+            {name1:'荆门市飞图混凝土有限公司',name2:'物资-木材及制币',name3:'456362',name4:'郑丽青',name5:'7870',name6:'2022-05-23',name66:'禁用',name7:'109',name8:'109',name9:'107'},
+            {name1:'重庆满煦商贸有限公司',name2:'物资-砼及外加剂',name3:'106',name4:'郑丽青',name5:'6540',name6:'2022-05-23',name66:'禁用',name7:'109',name8:'109',name9:'114'},
+            {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'物资-水泥及水',name3:'456362',name4:'郑丽青',name5:'429799',name6:'2022-05-23',name66:'禁用',name7:'118',name8:'118',name9:'114'},
+            {name1:'河南荣川实业有限公司',name2:'泥制品',name3:'100',name4:'郑丽青',name5:'36355',name6:'2022-05-23',name66:'禁用',name7:'118',name8:'118',name9:'107'},
+            {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'物资-其他类',name3:'100',name4:'郑丽青',name5:'631719',name6:'2022-05-23',name66:'禁用',name7:'109',name8:'109',name9:'107'},
+            {name1:'北京九主澜商贸有限公司',name2:'物资-砼及外加剂',name3:'100',name4:'郑丽青',name5:'19691',name6:'2022-05-23',name66:'禁用',name7:'105',name8:'109',name9:'107'},
+            {name1:'重庆拉瑞永固混凝土有限公司',name2:'物资-木材及制品',name3:'456362',name4:'郑丽青',name5:'94823',name6:'2022-05-23',name66:'禁用',name7:'109',name8:'109',name9:'107'},
+            {name1:'山东乾途伟业建材有限公司',name2:'物资-砼及外加剂',name3:'100',name4:'郑丽青',name5:'9418',name6:'2022-05-23',name66:'禁用',name7:'109',name8:'109',name9:'107'},
+            {name1:'厦门市集美区鸿铭建材有限公司',name2:'物资-其他类',name3:'456362',name4:'郑丽青',name5:'35851',name6:'2022-05-23',name66:'禁用',name7:'109',name8:'109',name9:'107'},
+            {name1:'重庆匠伦家居用品有限公司',name2:'物资-砼及外加剂',name3:'106',name4:'郑丽青',name5:'21787',name6:'2022-05-23',name66:'禁用',name7:'109',name8:'109',name9:'107'},
+            {name1:'荆门市飞图混凝土有限公司',name2:'物资-木材及制币',name3:'456362',name4:'郑丽青',name5:'7870',name6:'2022-05-23',name66:'禁用',name7:'109',name8:'109',name9:'107'},
+          ],
+          tableColumnFixed:false,
+        }
+      },
+      methods:{
+        viewDetail(obj){
+            this.detailInfo = obj
+            this.showDetail = true
+        },
+        handleSearch(){},
+        handleExcel() {
+  
+        },
+        customerExport(){
+  
+        },
+        setHeaderRow() {
+          return "owner-table-list-header";
+        },
+        setCellClass({ row, column, rowIndex, columnIndex }) {
+          if (columnIndex == 1) {
+            return "enterprise-name-column";
+          }
+        },
+        setRowClass({ row, rowIndex }) {
+          return "enterprise-name-row";
+        },
+        handleCurrentChange(){
+
+        }
+      }
+    }
+  </script>
+  
+  <style lang="scss" scoped>
+    ::v-deep .el-form-item__label{
+      height: 40px!important;
+    }
+    .title_wrap{
+        border: none;
+    }
+    .title_wrap1{
+      padding: 0;
+    }
+    .detail-title{
+        border-radius: 4px 4px 0px 0px;
+        opacity: 1;
+        /* 自动布局 */
+        display: flex;
+        flex-direction: column;
+        padding: 16px;
+        gap: 16px;
+        background: #FFFFFF;
+        box-sizing: border-box;
+        /* 分割线 */
+        border: 1px solid #EEEEEE;
+        font-size: 14px;
+        color: rgba(35, 35, 35, 0.4);
+        .el-icon-arrow-right{
+            font-size: 12px;
+            margin: 4px;
+        }
+        .tip{
+            font-size: 12px;
+            color: rgba(35, 35, 35, 1);
+        }
+        img{
+            width: 28px;
+            height: 28px;
+            border-radius: 6px;
+            margin-right: 12px;
+        }
+        strong{
+            font-size: 16px;
+            color: rgba(35, 35, 35, 1);
+            font-weight: 700;
+        }
+        .label{
+            color: rgba(35, 35, 35, 0.8);
+            margin-right: 24px;
+        }
+      }
+    .table-supplier {
+      background: #ffffff;
+      border-radius: 4px;
+      padding: 16px;
+    .supdivider{
+      width: calc(100% + 32px);
+      margin-left: -16px;
+      margin-top: 8px;
+      margin-bottom: 16px;
+    }
+      ::v-deep .head-form-new {
+        .ability-total {
+          display: none !important;
+        }
+        .from-item .normal-search-container{
+          white-space: nowrap;
+          width: 134px;
+        }
+  
+      }
+      input {
+        border: 1px solid #efefef;
+      }
+  
+      ::v-deep .el-form-item {
+        margin-right: 8px !important;
+      }
+  
+      .query-box {
+        margin: 10px 0 20px;
+      }
+  
+      .cell-span {
+        display: inline-block;
+        position: relative;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 4;
+        cursor: pointer;
+  
+        > span {
+          display: inline-block;
+          width: 37px;
+          position: absolute;
+          right: 0;
+          bottom: 0;
+          background-color: #fff;
+          z-index: 1;
+        }
+      }
+  
+      @import "@/assets/styles/search-common.scss";
+    }
+    .table-supplier2{
+        padding-top: 0;
+        margin-top: 0;
+    }
+  </style>
+  
\ No newline at end of file

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

+
+<template>
+  <div class="overview">
+    <div class="search-supplier m-16">
+      <div class="title_wrap">
+        <div class="enterprise_title">
+          供应商风险动态
+        </div>
+      </div>
+      <div class="evalist">
+        <div>
+          <div class="eva1">供应商风险总数</div>
+          <div class="eva2">1200</div>
+          <div class="eva3">近一月<span>新增+374</span></div>
+          <div class="eva4">昨日<span>减少-21</span></div>
+        </div>
+        <div>
+          <div class="eva1">司法诉讼</div>
+          <div class="eva2">200</div>
+          <div class="eva3">近一月<span>新增+374</span></div>
+          <div class="eva4">昨日<span>减少-21</span></div>
+        </div>
+        <div>
+          <div class="eva1">经营预警</div>
+          <div class="eva2">400</div>
+          <div class="eva3">近一月<span>新增+374</span></div>
+          <div class="eva4">昨日<span>减少-21</span></div>
+        </div>
+        <div>
+          <div class="eva1">行政处罚</div>
+          <div class="eva2">400</div>
+          <div class="eva3">近一月<span>新增+374</span></div>
+          <div class="eva4">昨日<span>减少-21</span></div>
+        </div>
+        <div>
+          <div class="eva1">不良行为</div>
+          <div class="eva2">400</div>
+          <div class="eva3">近一月<span>新增+374</span></div>
+          <div class="eva4">昨日<span>减少-21</span></div>
+        </div>
+        <div>
+          <div class="eva1">涉诉限用/禁用</div>
+          <div class="eva2">400</div>
+          <div class="eva3">近一月<span>新增+374</span></div>
+          <div class="eva4">昨日<span>减少-21</span></div>
+        </div>
+      </div>
+    </div>
+
+    <div class="content1 m-16">
+      <div class="cont-left">
+        <div class="title_wrap">
+          <div class="cont_title">
+            风险类型分布
+            <div class="select">
+              <el-select v-model="value1" filterable class="form-content-width  same-select-com" placeholder="供应商类型" :class="[`select-adaptive-${inputID1}`]" :popper-append-to-body='false'>
+                <el-option v-for="(item, index) in gyslxList" :key="index" :label="item.label" :value="item.value" />
+              </el-select>
+              <custom-time-select :timeList="timeList" v-model="time" :class="[`select-adaptive-${inputID}`]" timeValue=""
+                                  placeholder="动态时间" @handle-search="iptAdaptive(inputID,'','changeSelect')" />
+            </div>
+          </div>
+        </div>
+        <div class="charts-div">
+          <div id="fb-echarts"  style="height: 300px;"></div>
+          <div style="margin: 0 16px">
+            <el-table
+              :data="fxList"
+              height="241"
+              border
+              highlight-current-row
+            >
+              <el-table-column label="序号" width="60" align="left">
+                <template slot-scope="scope">
+                  <span>{{scope.$index + 1}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="风险类型" prop="type"></el-table-column>
+              <el-table-column label="供应商数量" prop="number"></el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </div>
+      <div class="cont-right">
+        <div class="title_wrap">
+          <div class="cont_title">
+            风险类型趋势
+            <div class="select">
+              <el-select v-model="value2" filterable class="form-content-width  same-select-com" placeholder="供应商类型" :class="[`select-adaptive-${inputID1}`]" :popper-append-to-body='false'>
+                <el-option v-for="(item, index) in gyslxList" :key="index" :label="item.label" :value="item.value" />
+              </el-select>
+              <!--<el-select v-model="value3" filterable class="form-content-width  same-select-com" placeholder="展示方式" :class="[`select-adaptive-${inputID1}`]" :popper-append-to-body='false'>-->
+                <!--<el-option v-for="(item, index) in gyslxList" :key="index" :label="item.label" :value="item.value" />-->
+              <!--</el-select>-->
+            </div>
+          </div>
+        </div>
+        <div class="charts-div">
+          <div id="wz-echarts"  style="height: 300px;"></div>
+          <div style="margin: 0 16px">
+            <el-table
+              :data="fxqsList"
+              height="241"
+              border
+              highlight-current-row
+            >
+              <el-table-column label="序号" width="60" align="left">
+                <template slot-scope="scope">
+                  <span>{{scope.$index + 1}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="年月" prop="date"></el-table-column>
+              <el-table-column label="司法诉讼" prop="number1"></el-table-column>
+              <el-table-column label="经营预警" prop="number2"></el-table-column>
+              <el-table-column label="行政处罚" prop="number3"></el-table-column>
+              <el-table-column label="不良行为" prop="number4"></el-table-column>
+              <el-table-column label="涉诉限用/禁用" prop="number5"></el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="content2 m-16">
+      <div class="title_wrap">
+        <div class="cont_title">
+          供应商风险列表
+          <div class="select">
+            <el-select v-model="value4" filterable class="form-content-width  same-select-com" placeholder="供应商类型" :class="[`select-adaptive-${inputID1}`]" :popper-append-to-body='false'>
+              <el-option v-for="(item, index) in gyslxList" :key="index" :label="item.label" :value="item.value" />
+            </el-select>
+            <custom-time-select :timeList="timeList" v-model="time1" :class="[`select-adaptive-${inputID}`]" timeValue=""
+                                placeholder="动态时间" @handle-search="iptAdaptive(inputID,'','changeSelect')" />
+          </div>
+        </div>
+      </div>
+      <div class="table-item" style="padding: 16px;">
+        <el-table
+          element-loading-text="Loading"
+          maxHeight="840"
+          :data="tableData"
+          row-key="id"
+          default-expand-all
+          border
+          highlight-current-row
+        >
+          <el-table-column label="序号" width="60" align="left" fixed="left">
+            <template slot-scope="scope">
+              <span>{{scope.$index + 1}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="供应商名称" min-width="350" prop="name"></el-table-column>
+          <el-table-column label="风险总数" prop="fxsl"></el-table-column>
+          <el-table-column label="司法风险" prop="sffx"></el-table-column>
+          <el-table-column label="经营预警" prop="jyyj"></el-table-column>
+          <el-table-column label="行政处罚" prop="xzcf"></el-table-column>
+          <el-table-column label="不良行为" prop="blxw"></el-table-column>
+          <el-table-column label="涉诉限用/禁用" prop="ss"></el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <div class="content3 m-16">
+      <div class="title_wrap">
+        <div class="enterprise_title">
+          供应商基本情况
+        </div>
+      </div>
+      <div class="evalist">
+        <div>
+          <div class="eva1">供应商总数</div>
+          <div class="eva2">1200</div>
+        </div>
+        <div>
+          <div class="eva1">专业分包</div>
+          <div class="eva2">200</div>
+        </div>
+        <div>
+          <div class="eva1">机械施工</div>
+          <div class="eva2">300</div>
+        </div>
+        <div>
+          <div class="eva1">物资设备</div>
+          <div class="eva2">400</div>
+        </div>
+        <div>
+          <div class="eva1">劳务分包企业</div>
+          <div class="eva2">200</div>
+        </div>
+        <div>
+          <div class="eva1">劳务分包队伍</div>
+          <div class="eva2">100</div>
+        </div>
+      </div>
+    </div>
+
+    <div class="content4 m-16">
+      <div class="cont-left">
+        <div class="title_wrap">
+          <div class="cont_title">
+            供应商地区分布分布
+            <div class="select">
+              <el-select v-model="value5" filterable class="form-content-width  same-select-com" placeholder="供应商类型" :class="[`select-adaptive-${inputID1}`]" :popper-append-to-body='false'>
+                <el-option v-for="(item, index) in gyslxList" :key="index" :label="item.label" :value="item.value" />
+              </el-select>
+            </div>
+          </div>
+        </div>
+        <div class="charts-div">
+          <div id="dqfb-echarts"  style="height: 350px;"></div>
+          <div style="margin: 0 16px">
+            <el-table
+              :data="viewData"
+              height="192"
+              border
+              highlight-current-row
+            >
+              <el-table-column label="序号" width="60" align="left">
+                <template slot-scope="scope">
+                  <span>{{scope.$index + 1}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="地区" prop="name"></el-table-column>
+              <el-table-column label="供应商数量" prop="quantity"></el-table-column>
+              <el-table-column label="履约金额（亿）" prop="money"></el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </div>
+      <div class="cont-right">
+        <div class="title_wrap">
+          <div class="cont_title">
+            供应商准入/淘汰趋势
+          </div>
+        </div>
+        <div class="charts-div">
+          <div id="qs-echarts"  style="height: 350px;"></div>
+          <div style="margin: 0 16px">
+            <el-table
+              :data="qsList"
+              height="192"
+              border
+              highlight-current-row
+            >
+              <el-table-column label="序号" width="60" align="left">
+                <template slot-scope="scope">
+                  <span>{{scope.$index + 1}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="年月日" prop="date"></el-table-column>
+              <el-table-column label="准入供应商" prop="number1"></el-table-column>
+              <el-table-column label="淘汰供应商" prop="number2"></el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="content5 m-16">
+      <div class="cont-left">
+        <div class="title_wrap">
+          <div class="cont_title">
+            供应商行业分布
+          </div>
+        </div>
+        <div class="charts-div">
+          <div id="hyfb-echarts"  style="height: 350px;"></div>
+          <div style="margin: 0 16px">
+            <el-table
+              :data="hyfbList"
+              height="192"
+              border
+              highlight-current-row
+            >
+              <el-table-column label="序号" width="60" align="left">
+                <template slot-scope="scope">
+                  <span>{{scope.$index + 1}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="行业" prop="name"></el-table-column>
+              <el-table-column label="供应商数量" width="130" prop="number"></el-table-column>
+              <el-table-column label="履约金额（亿）" width="130" prop="money"></el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </div>
+      <div class="cont-right">
+        <div class="title_wrap">
+          <div class="cont_title">
+            供应商股份评级
+            <div class="select">
+              <el-select v-model="value6" filterable class="form-content-width  same-select-com" placeholder="供应商类型" :class="[`select-adaptive-${inputID1}`]" :popper-append-to-body='false'>
+                <el-option v-for="(item, index) in gyslxList" :key="index" :label="item.label" :value="item.value" />
+              </el-select>
+            </div>
+          </div>
+        </div>
+        <div class="charts-div">
+          <div id="gfpj-echarts"  style="height: 350px;"></div>
+          <div style="margin: 0 16px">
+            <el-table
+              :data="gfpjList"
+              height="192"
+              border
+              highlight-current-row
+            >
+              <el-table-column label="序号" width="60" align="left">
+                <template slot-scope="scope">
+                  <span>{{scope.$index + 1}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="股份评级" prop="type"></el-table-column>
+              <el-table-column label="供应商数量" prop="number"></el-table-column>
+              <el-table-column label="履约金额（亿）" prop="money"></el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="content6 m-16">
+      <div class="cont-left">
+        <div class="title_wrap">
+          <div class="cont_title">
+            供应商中标次数排名
+          </div>
+        </div>
+        <div class="charts-div">
+          <div id="zbcs-echarts"  style="height: 350px;"></div>
+          <div style="margin: 0 16px">
+            <el-table
+              :data="wzData"
+              height="192"
+              border
+              highlight-current-row
+            >
+              <el-table-column label="序号" width="60" align="left">
+                <template slot-scope="scope">
+                  <span>{{scope.$index + 1}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="供应商名称" prop="name"></el-table-column>
+              <el-table-column label="投标次数" width="130" prop="money"></el-table-column>
+              <el-table-column label="中标次数" width="130" prop="score"></el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </div>
+      <div class="cont-right">
+        <div class="title_wrap">
+          <div class="cont_title">
+            供应商履约金额分布统计
+            <div class="select">
+              <el-select v-model="value7" filterable class="form-content-width  same-select-com" placeholder="供应商类型" :class="[`select-adaptive-${inputID1}`]" :popper-append-to-body='false'>
+                <el-option v-for="(item, index) in gyslxList" :key="index" :label="item.label" :value="item.value" />
+              </el-select>
+            </div>
+          </div>
+        </div>
+        <div class="charts-div">
+          <div id="jefb-echarts"  style="height: 350px;"></div>
+          <div style="margin: 0 16px">
+            <el-table
+              :data="jefbList"
+              height="192"
+              border
+              highlight-current-row
+            >
+              <el-table-column label="序号" width="60" align="left">
+                <template slot-scope="scope">
+                  <span>{{scope.$index + 1}}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="履约金额范围" prop="type"></el-table-column>
+              <el-table-column label="供应商数量" prop="number"></el-table-column>
+            </el-table>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+</template>
+
+<script>
+  import '@/assets/styles/public.scss'
+  import '@/assets/styles/supplierlist.scss'
+  import mixin from '@/views/detail/party-a/mixins/mixin'
+  import CustomTimeSelect from '../../component/CustomTimeSelect'
+  import { v4 } from "uuid"
+  import * as echarts from 'echarts'
+  import '@/assets/lib/china.js'
+  export default {
+    name: 'overview',
+    mixins: [mixin],
+    components:{CustomTimeSelect},
+    data(){
+      return{
+        wzData:[
+          {
+            name:'北京宏盛兴达装饰设计有限责任公司',
+            money:'772',
+            score:'118'
+          },
+          {
+            name:'重庆宏力嘉商贸有限公司',
+            money:'245',
+            score:'114'
+          },
+          {
+            name:'都江堰市宏发节能砖厂',
+            money:'832',
+            score:'102'
+          },
+          {
+            name:'重庆展鹏门业有限公司',
+            money:'132',
+            score:'92'
+          },
+          {
+            name:'海南奥利格新型建',
+            money:'132',
+            score:'82'
+          },
+          {
+            name:'莱晟达(烟台)环保材料科',
+            money:'132',
+            score:'78'
+          },
+          {
+            name:'中建蓉成建材成都有限公司',
+            money:'132',
+            score:'72'
+          },
+          {
+            name:'北京京首建混凝土搅拌站有限公司',
+            money:'132',
+            score:'62'
+          },
+          {
+            name:'重庆越尚建材有限公司',
+            money:'83',
+            score:'11'
+          },
+          {
+            name:'北京京首建混凝土搅拌站有限公司',
+            money:'684',
+            score:'25'
+          },
+        ],
+        timeList: ['昨天','近三天', '近七天', '近半月', '自定义'],
+        time:'',
+        time1:'',
+        inputID: this.getUid(),
+        inputID1:this.getUid(),
+
+        gyslxList:[
+          {
+            label:'劳务分包',
+            value:'劳务分包'
+          },
+          {
+            label:'专业分包',
+            value:'专业分包'
+          },
+          {
+            label:'专业服务',
+            value:'专业服务'
+          },
+          {
+            label:'设备',
+            value:'设备'
+          },
+          {
+            label:'租赁',
+            value:'租赁'
+          },
+          {
+            label:'物资',
+            value:'物资'
+          },
+        ],
+        value1:'',
+        value2:'',
+        value3:'',
+        value4:'',
+        value5:'',
+        value6:'',
+        value7:'',
+
+        zkfsList:[
+          {
+            label:'按天展示',
+            value:'按天展示'
+          },
+          {
+            label:'按周展示',
+            value:'按周展示'
+          },
+          {
+            label:'按月展示',
+            value:'按月展示'
+          },
+          {
+            label:'按年展示',
+            value:'按年展示'
+          },
+        ],
+
+        fxList:[
+          {
+            type:'司法诉讼',
+            number:'1200'
+          },
+          {
+            type:'经营预警',
+            number:'500'
+          },
+          {
+            type:'行政处罚',
+            number:'300'
+          },
+          {
+            type:'不良行为',
+            number:'200'
+          },
+          {
+            type:'涉诉限用/禁用',
+            number:'100'
+          },
+        ],
+        lxList:[
+          {
+            type:'司法诉讼',
+            number:'1200',
+            date:'1月',
+          },
+          {
+            type:'经营预警',
+            number:'500',
+            date:'2月',
+          },
+          {
+            type:'行政处罚',
+            number:'300',
+            date:'3月',
+          },
+          {
+            type:'不良行为',
+            number:'200',
+            date:'4月',
+          },
+          {
+            type:'涉诉限用/禁用',
+            number:'100',
+            date:'5月',
+          },
+        ],
+
+        tableData:[
+          {
+            name:'北京宁盛伟业建筑工程机械设备租赁有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'北京森桦建业防水工程有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'北京致用恒力建筑材料检测有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'北京振兴万源建筑工程有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'北京天罡星机械设备租赁有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'河南省天地建筑防水工程有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'重庆尔安机电设备工程有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'山东鸿华建筑安装工程有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'江苏地基工程有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'信邦建设集团有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'华诚博远钢结构有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'江苏金祥建设工程有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'浙江精工钢结构集团有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'北京洪雨建设工程有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'北京中城华远建设集团有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'德州亚太集团有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'浙江中南绿建科技集团有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'中国石油化工股份有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'中国石油天然气股份有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+          {
+            name:'中国建筑股份有限公司',
+            fxsl:'27',
+            sffx:'85',
+            jyyj:'77',
+            xzcf:'77',
+            blxw:'75',
+            ss:'43',
+          },
+        ],
+
+        fxqsList:[
+          {
+            date:'1月',
+            number1:'87',
+            number2:'5',
+            number3:'3',
+            number4:'12',
+            number5:'9',
+          },
+          {
+            date:'2月',
+            number1:'47',
+            number2:'5',
+            number3:'3',
+            number4:'12',
+            number5:'9',
+          },
+          {
+            date:'3月',
+            number1:'67',
+            number2:'5',
+            number3:'3',
+            number4:'5',
+            number5:'2',
+          },
+          {
+            date:'4月',
+            number1:'37',
+            number2:'6',
+            number3:'14',
+            number4:'4',
+            number5:'9',
+          },
+          {
+            date:'5月',
+            number1:'67',
+            number2:'46',
+            number3:'3',
+            number4:'8',
+            number5:'17',
+          },
+          {
+            date:'6月',
+            number1:'47',
+            number2:'16',
+            number3:'3',
+            number4:'12',
+            number5:'2',
+          },
+          {
+            date:'7月',
+            number1:'37',
+            number2:'11',
+            number3:'6',
+            number4:'8',
+            number5:'19',
+          },
+          {
+            date:'8月',
+            number1:'48',
+            number2:'26',
+            number3:'9',
+            number4:'7',
+            number5:'23',
+          },
+          {
+            date:'9月',
+            number1:'47',
+            number2:'16',
+            number3:'7',
+            number4:'12',
+            number5:'9',
+          },
+          {
+            date:'10月',
+            number1:'75',
+            number2:'56',
+            number3:'4',
+            number4:'12',
+            number5:'11',
+          },
+          {
+            date:'11月',
+            number1:'23',
+            number2:'6',
+            number3:'13',
+            number4:'12',
+            number5:'16',
+          },
+          {
+            date:'12月',
+            number1:'67',
+            number2:'46',
+            number3:'26',
+            number4:'12',
+            number5:'9',
+          },
+        ],
+        viewData:[
+          {
+            name:'河南省',
+            quantity:'1230',
+            money:12.00,
+          },
+          {
+            name:'北京',
+            quantity:'2230',
+            money:20.90,
+          },
+          {
+            name:'四川省',
+            quantity:'230',
+            money:4.00,
+          },
+          {
+            name:'河北省',
+            quantity:'130',
+            money:4.00,
+          },
+          {
+            name:'广东省',
+            quantity:'1000',
+            money:10.00,
+          },
+          {
+            name:'重庆',
+            quantity:'100',
+            money:10.00,
+          },
+          {
+            name:'江苏省',
+            quantity:'200',
+            money:10.00,
+          },
+          {
+            name:'青海省',
+            quantity:'1230',
+            money:12.00,
+          },
+          {
+            name:'甘肃省',
+            quantity:'2230',
+            money:20.90,
+          },
+          {
+            name:'云南省',
+            quantity:'230',
+            money:4.00,
+          },
+        ],
+        qsList:[
+          {
+            date:'1月',
+            number1:'87',
+            number2:'26'
+          },
+          {
+            date:'2月',
+            number1:'47',
+            number2:'16'
+          },
+          {
+            date:'3月',
+            number1:'67',
+            number2:'26'
+          },
+          {
+            date:'4月',
+            number1:'37',
+            number2:'12'
+          },
+          {
+            date:'5月',
+            number1:'67',
+            number2:'46'
+          },
+          {
+            date:'6月',
+            number1:'47',
+            number2:'16'
+          },
+          {
+            date:'7月',
+            number1:'37',
+            number2:'11'
+          },
+          {
+            date:'8月',
+            number1:'48',
+            number2:'26'
+          },
+          {
+            date:'9月',
+            number1:'47',
+            number2:'16'
+          },
+          {
+            date:'10月',
+            number1:'75',
+            number2:'56'
+          },
+          {
+            date:'11月',
+            number1:'23',
+            number2:'6'
+          },
+          {
+            date:'12月',
+            number1:'67',
+            number2:'46'
+          },
+        ],
+
+        hyfbList:[
+          {
+            name:'批发和零售业',
+            number:'832',
+            money:'102'
+          },
+          {
+            name:'房屋建筑业',
+            number:'772',
+            money:'118'
+          },
+          {
+            name:'制造业',
+            number:'345',
+            money:'114'
+          },
+          {
+            name:'交通运输',
+            number:'342',
+            money:'92'
+          },
+          {
+            name:'农、林、牧、渔',
+            number:'232',
+            money:'82'
+          },
+          {
+            name:'供应商行业名称六',
+            number:'132',
+            money:'78'
+          },
+          {
+            name:'供应商行业名称七',
+            number:'132',
+            money:'72'
+          },
+          {
+            name:'供应商行业名称八',
+            number:'132',
+            money:'62'
+          },
+          {
+            name:'供应商行业名称九',
+            number:'83',
+            money:'11'
+          },
+          {
+            name:'供应商行业名称十',
+            number:'84',
+            money:'25'
+          },
+        ],
+        gfpjList:[
+          {
+            type:'物资优质',
+            number:'23',
+            money:'12.00'
+          },
+          {
+            type:'专业分包优质',
+            number:'33',
+            money:'22.00'
+          },
+          {
+            type:'设备优质',
+            number:'43',
+            money:'12.00'
+          },
+          {
+            type:'专业服务优质',
+            number:'8',
+            money:'11.00'
+          },
+          {
+            type:'劳务优质',
+            number:'12',
+            money:'27.00'
+          },
+        ],
+        jefbList:[
+          {
+            type:'100万以下',
+            number:'23'
+          },
+          {
+            type:'100万~500万',
+            number:'34'
+          },
+          {
+            type:'500万-1000万',
+            number:'45'
+          },
+          {
+            type:'1000万-5000万',
+            number:'21'
+          },
+          {
+            type:'5000万~1亿',
+            number:'5'
+          },
+        ],
+
+      }
+    },
+    created() {
+      this.$nextTick(()=>{
+        this.initChart(this.fxList)
+        this.initChart1(this.fxqsList)
+        this.initChart3()
+        this.initChart4(this.qsList)
+        this.initChart5(this.hyfbList)
+        this.initChart6(this.gfpjList)
+        this.initChart7(this.wzData)
+        this.initChart8(this.jefbList)
+
+        // this.initChart1(this.wzData)
+        // this.initChart2(this.wzData)
+        // this.initChart3(this.wzData)
+        // this.initChart4(this.wzData)
+        // this.initChart5(this.wzData)
+      })
+    },
+    methods:{
+      getUid() {
+        return v4();
+      },
+      changeSelect(){
+
+      },
+      initChart(data) {
+        var list=[];
+        for(var i=0;i<data.length;i++){
+          var obj={};
+          obj.name=data[i].type;
+          obj.value=data[i].number;
+          list.push(obj)
+        }
+        let myChart = echarts.init(document.getElementById("fb-echarts"))
+        let option = {
+          tooltip: {
+            trigger: 'item',
+          },
+          legend: {
+            show:false,
+            type: 'scroll',
+            orient: 'vertical',
+            right: 10,
+            top: 20,
+            bottom: 20,
+            data: list,
+          },
+          color:['#FF3C3C', '#0081FF', '#12C0C7','#0CBC6D','#FFAB44'],
+          series: [
+            {
+              type: 'pie',
+              radius: '55%',
+              center: ['50%', '50%'],
+              data: list,
+              emphasis: {
+                itemStyle: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)'
+                }
+              }
+            }
+          ]
+        };
+        myChart.setOption(option);
+        window.addEventListener("resize", function () {
+          myChart.resize();//图表跟随页面大小变化宽度
+        });
+      },
+      initChart1(data) {
+        let myChart = echarts.init(document.getElementById("wz-echarts"))
+        let option ={
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              type: 'line',
+              label: {
+                backgroundColor: '#FFFFFF'
+              }
+            }
+          },
+          xAxis: {
+            type: 'category',
+            boundaryGap: false,
+            axisLabel: {
+              show: true,
+              interval: 0
+            },
+            data: data.map(item => item.date),
+          },
+          yAxis: {
+            type: 'value',
+          },
+          grid: {
+            top:30,
+            left:50,
+            right:40,
+            bottom:60,
+          },
+          color:['#0081FF', '#0CBC6D', '#FF3C3C', '#FFAB44', '#12C0C7'],
+          series: [
+            {
+              name: '司法诉讼',
+              type: 'line',
+              symbolSize:0,
+              data: data.map(item => item.number1)
+            },
+            {
+              name: '经营预警',
+              type: 'line',
+              symbolSize:0,
+              data: data.map(item => item.number2)
+            },
+            {
+              name: '行政处罚',
+              type: 'line',
+              symbolSize:0,
+              data: data.map(item => item.number3)
+            },
+            {
+              name: '不良行为',
+              type: 'line',
+              symbolSize:0,
+              data: data.map(item => item.number4)
+            },
+            {
+              name: '涉诉限用/禁用',
+              type: 'line',
+              symbolSize:0,
+              data: data.map(item => item.number5)
+            },
+          ]
+        }
+        myChart.setOption(option);
+        window.addEventListener("resize", function () {
+          myChart.resize();//图表跟随页面大小变化宽度
+        });
+      },
+
+      //中国地图
+      initChart3(){
+        let myChart = echarts.init(document.getElementById("dqfb-echarts"))
+        // 指定图表的配置项和数据
+        // 绘制图表
+        let data =[]
+        this.viewData.length>0&&this.viewData.map(item=>{
+          data.push({value:Number(item.quantity),name:item.name,money:item.money})
+        })
+        let option = {
+          tooltip: {
+            trigger: 'item',
+            show: true,
+            formatter: function(params) {
+              console.log(params)
+              return `<span style="color:rgba(35, 35, 35, 1);font-size:14px;">${params.name}</span><br>
+            <span style="color:#3D3D3D;font-size:12px;">供应商数量</span><span style="color:#3D3D3D;font-size:12px;font-weight:700;">  ${params.value}</span><br>
+            <span style="color:#3D3D3D;font-size:12px;">履约金额（亿）</span><span style="color:#3D3D3D;font-size:12px;font-weight:700;">  ${params.data.money}</span><br>
+            `
+            }
+          },
+          // 左侧小导航图标
+          visualMap: {
+            show: false,
+            x: 'left',
+            y: 'center',
+            min: 0,
+            max: 830000,
+            color: ['#D1E6FF']
+          },
+          selectedMode: 'single',
+          series: [{
+            name: '地图',
+            type: 'map',
+            mapType: 'china',
+            roam: false,
+            zoom: 1.2,
+            label: {
+              normal: {
+                show: false, // 省份名称
+              },
+
+            },
+            itemStyle: {
+              normal: { // 未选中状态
+                // areaColor: 'red', // 南沙诸岛背景颜色
+                borderColor: '#FFFFFF',
+                label: {
+                  show: true// 显示名称
+                }
+              },
+              emphasis: { // 也是选中样式
+                areaColor: '#0081FF',
+              }
+            },
+            data: data
+          }]
+        }
+        myChart.setOption(option);
+        window.addEventListener("resize", function () {
+          myChart.resize();//图表跟随页面大小变化宽度
+        });
+      },
+      initChart4(data) {
+        let myChart = echarts.init(document.getElementById("qs-echarts"))
+        let option ={
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              type: 'line',
+              label: {
+                backgroundColor: '#FFFFFF'
+              }
+            }
+          },
+          xAxis: {
+            type: 'category',
+            boundaryGap: false,
+            axisLabel: {
+              show: true,
+              interval: 0
+            },
+            data: data.map(item => item.date),
+          },
+          yAxis: {
+            type: 'value',
+          },
+          grid: {
+            top:30,
+            left:50,
+            right:40,
+            bottom:60,
+          },
+          color:['#FF3C3C', '#0081FF'],
+          series: [
+            {
+              name: '淘汰供应商',
+              type: 'line',
+              symbolSize:0,
+              areaStyle: {
+                color: {
+                  type: 'linear',
+                  x: 0,
+                  y: 0,
+                  x2: 0,
+                  y2: 1,
+                  colorStops: [{
+                    offset: 0, color: 'rgba(255, 60, 60, 0.2)'
+                  }, {
+                    offset: 1, color: 'rgba(255, 60, 60, 0)'
+                  } ],
+                  global: false
+                }
+              },
+              data: data.map(item => item.number2)
+            },
+            {
+              name: '准入供应商',
+              type: 'line',
+              symbolSize:0,
+              areaStyle: {
+                color: {
+                  type: 'linear',
+                  x: 0,
+                  y: 0,
+                  x2: 0,
+                  y2: 1,
+                  colorStops: [{
+                    offset: 0, color: 'rgba(0, 129, 255, 0.2)'
+                  }, {
+                    offset: 1, color: 'rgba(0, 129, 255, 0)'
+                  } ],
+                  global: false
+                }
+              },
+              data: data.map(item => item.number1)
+            },
+          ]
+        }
+        myChart.setOption(option);
+        window.addEventListener("resize", function () {
+          myChart.resize();//图表跟随页面大小变化宽度
+        });
+      },
+
+      initChart5(data) {
+        let myChart = echarts.init(document.getElementById("hyfb-echarts"))
+        let option = {
+          // 坐标轴
+          grid: {
+            top: "10%",
+            left: "4%",
+            right: "3%",
+            bottom: "4%",
+            containLabel: true, //是否包含坐标轴的文字
+          },
+          // 鼠标hover出现的提示框组件
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              type: 'shadow',
+            },
+            backgroundColor: '#FFFFFF',
+            borderWidth: 0,
+            textStyle: {
+              color: '#232323',
+              fontSize: 14,
+            },
+          },
+          xAxis: [
+            //x轴数据设置
+            {
+              type: "value",
+            },
+          ],
+          yAxis: [
+            {
+              type: "category",
+              data: data.map(item => item.name),
+              axisTick: { show: false },
+              inverse:true,
+              axisLine:{
+                // color: '#DCDFE6',
+                lineStyle: {
+                  color: '#DCDFE6',//左边线的颜色
+                },
+              },
+              axisLabel:{
+                textStyle:{
+                  color: '#232323cc'
+                }
+              }
+            },
+          ],
+          series: [
+            {
+              name: '供应商数量',
+              data: data.map(item => item.number),
+              type: "bar",
+              barWidth: 12,
+              barGap: 0.5,
+              itemStyle: {
+                color: '#0081FF',
+              }
+            },
+          ],
+        };
+        myChart.setOption(option);
+        window.addEventListener("resize", function () {
+          myChart.resize();//图表跟随页面大小变化宽度
+        });
+      },
+      initChart6(data) {
+        var list=[];
+        for(var i=0;i<data.length;i++){
+          var obj={};
+          obj.name=data[i].type;
+          obj.value=data[i].number;
+          list.push(obj)
+        }
+        let myChart = echarts.init(document.getElementById("gfpj-echarts"))
+        let option = {
+          tooltip: {
+            trigger: 'item',
+          },
+          legend: {
+            show:false,
+            type: 'scroll',
+            orient: 'vertical',
+            right: 10,
+            top: 20,
+            bottom: 20,
+            data: list,
+          },
+          color:['#FF3C3C', '#0081FF', '#12C0C7','#0CBC6D','#FFAB44'],
+          series: [
+            {
+              type: 'pie',
+              radius: '55%',
+              center: ['50%', '50%'],
+              data: list,
+              emphasis: {
+                itemStyle: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)'
+                }
+              }
+            }
+          ]
+        };
+        myChart.setOption(option);
+        window.addEventListener("resize", function () {
+          myChart.resize();//图表跟随页面大小变化宽度
+        });
+      },
+      initChart7(data) {
+        let myChart = echarts.init(document.getElementById("zbcs-echarts"))
+        let option = {
+          // 坐标轴
+          grid: {
+            top: "10%",
+            left: "4%",
+            right: "3%",
+            bottom: "4%",
+            containLabel: true, //是否包含坐标轴的文字
+          },
+          // 鼠标hover出现的提示框组件
+          tooltip: {
+            trigger: 'axis',
+            axisPointer: {
+              type: 'shadow',
+            },
+            backgroundColor: '#FFFFFF',
+            borderWidth: 0,
+            textStyle: {
+              color: '#232323',
+              fontSize: 14,
+            },
+          },
+          xAxis: [
+            //x轴数据设置
+            {
+              type: "value",
+            },
+          ],
+          yAxis: [
+            {
+              type: "category",
+              data: data.map(item => item.name),
+              axisTick: { show: false },
+              axisLine:{
+                // color: '#DCDFE6',
+                lineStyle: {
+                  color: '#DCDFE6',//左边线的颜色
+                },
+              },
+              axisLabel:{
+                textStyle:{
+                  color: '#232323cc'
+                }
+              }
+            },
+          ],
+          series: [
+            {
+              name: '履约加权得分',
+              data: data.map(item => item.score),
+              type: "bar",
+              barWidth: 12,
+              barGap: 0.5,
+              itemStyle: {
+                color: '#0081FF',
+              }
+            },
+          ],
+        };
+        myChart.setOption(option);
+        window.addEventListener("resize", function () {
+          myChart.resize();//图表跟随页面大小变化宽度
+        });
+      },
+      initChart8(data) {
+        var list=[];
+        for(var i=0;i<data.length;i++){
+          var obj={};
+          obj.name=data[i].type;
+          obj.value=data[i].number;
+          list.push(obj)
+        }
+        let myChart = echarts.init(document.getElementById("jefb-echarts"))
+        let option = {
+          tooltip: {
+            trigger: 'item',
+          },
+          legend: {
+            show:false,
+            type: 'scroll',
+            orient: 'vertical',
+            right: 10,
+            top: 20,
+            bottom: 20,
+            data: list,
+          },
+          color:['#FF3C3C', '#0081FF', '#12C0C7','#0CBC6D','#FFAB44'],
+          series: [
+            {
+              type: 'pie',
+              radius: '55%',
+              center: ['50%', '50%'],
+              data: list,
+              emphasis: {
+                itemStyle: {
+                  shadowBlur: 10,
+                  shadowOffsetX: 0,
+                  shadowColor: 'rgba(0, 0, 0, 0.5)'
+                }
+              }
+            }
+          ]
+        };
+        myChart.setOption(option);
+        window.addEventListener("resize", function () {
+          myChart.resize();//图表跟随页面大小变化宽度
+        });
+      },
+
+
+      iptAdaptive(uid, multiple = false, name) {
+        multiple ? this.multipleAdaptiveHandle(uid, name) : this.iptAdaptiveHandle(uid, name);
+      },
+      //单选
+      async iptAdaptiveHandle(uid, name) {
+        try {
+          await this.$nextTick();
+          const dom = document.querySelector(`.select-adaptive-${uid}`);
+          const realStyles = window.getComputedStyle(dom);
+          if (dom) {
+            const iptChild = dom.querySelector(".el-input__inner");
+            const textContainer = document.createElement("span");
+            const textName = `text-${uid}`;
+            textContainer.classList.add(textName);
+            textContainer.style.setProperty("visibility", "hidden");
+            textContainer.style.setProperty("display", "inline-block");
+            textContainer.style.setProperty("font-size", "14px");
+            const hasPadding = (parseInt(realStyles.paddingLeft) || parseInt(realStyles.paddingRight)) ? true : false;
+            hasPadding ? textContainer.style.setProperty("padding", "0px 8px") : null;
+            textContainer.style.setProperty("box-sizing", "border-box");
+            textContainer.textContent = iptChild.value ? iptChild.value : iptChild.getAttribute("placeholder");
+            document.body.append(textContainer);
+            let containerWidth = textContainer.offsetWidth + 50;
+            textContainer.remove();
+            dom.style.setProperty("width", `${containerWidth}px`);
+          }
+          this.handleSearch(name);
+        } catch (error) {
+
+        }
+      },
+      async multipleAdaptiveHandle(){
+
+      },
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .overview{
+    .enterprise_title{
+      position: relative;
+    }
+    .select{
+      position: absolute;
+      right: 0;
+      top:-10px;
+      display: flex;
+    }
+    .custom-time-select1 {
+      width: 110px !important;
+      ::v-deep .el-input__inner{
+        border: 0;
+        &::placeholder {
+          color: rgba(35, 35, 35, 0.8) !important;
+        }
+      }
+    }
+
+    .evalist{
+      background: #fff;
+      display: flex;
+      padding: 12px 10px;
+      justify-content: space-around;
+      >div{
+        margin: 0 6px;
+        border: 1px solid #DCDFE6;
+        height: 136px;
+        width: calc(16.66% - 12px);
+        text-align: center;
+        border-radius: 4px;
+        .eva1{
+          font-size: 16px;
+          font-weight: 500;
+        }
+        .eva2{
+          padding-top: 8px;
+          padding-bottom: 10px;
+          font-size: 24px;
+        }
+        .eva3{
+          color: rgba(35, 35, 35, 0.6);
+          font-size: 14px;
+          line-height: 22px;
+          span{
+            color: #FF3C3C;
+            margin-left: 8px;
+          }
+        }
+        .eva4{
+          color: rgba(35, 35, 35, 0.6);
+          font-size: 14px;
+          line-height: 22px;
+          span{
+            color: #0CBC6D;
+            margin-left: 8px;
+          }
+        }
+      }
+    }
+
+    .content3{
+      .evalist{
+        >div{
+          height: 76px;
+          .eva1{
+            padding-top: 10px;
+          }
+          .eva2{
+            padding-top: 6px;
+            padding-bottom: 0;
+            font-size: 24px;
+          }
+        }
+      }
+    }
+
+    .content1,.content4,.content5,.content6{
+      display: flex;
+      height: 612px;
+      .cont-left{
+        width: 49.5%;
+        background: #ffffff;
+        margin-right: 1%;
+      }
+      .cont-right{
+        width: 49.5%;
+        background: #ffffff;
+      }
+    }
+
+    ::v-deep .el-select{
+      color: rgba(35, 35, 35, 0.8);
+      .el-input__inner{
+        border: 0;
+        &::placeholder {
+          color: rgba(35, 35, 35, 0.8) !important;
+        }
+      }
+    }
+    .form-content-width{
+      width: 116px;
+    }
+    .cont_title{
+      padding-left: 8px;
+      font-size: 16px;
+      height: 16px;
+      line-height: 16px;
+      font-weight: 700;
+      color: #232323;
+      position: relative;
+    }
+    .content2{
+      background: #ffffff;
+    }
+
+
+    ::v-deep .el-table--border .el-table__cell {
+      padding: 8px 0;
+    }
+    ::v-deep .custom-time-select1{
+      .options-block{
+        /*<!--left: -30px;-->*/
+        right:0;
+      }
+      .picker-block{
+        .el-picker-panel.el-date-range-picker.el-popper{
+          left: -680px !important;
+          top:144px !important;
+        }
+      }
+    }
+  }
+  .m-b16{
+    margin-bottom: 16px;
+  }
+  .m-16{
+    margin: 16px;
+  }
+  .yj-supplier{
+    background: #ffffff;
+    .yj-main{
+      display: flex;
+      height: 512px;
+      overflow: hidden;
+      margin-top: 16px;
+      .yj-title{
+        color: #232323;
+        font-size: 14px;
+        line-height: 24px;
+        margin-bottom: 8px;
+        font-weight: 600;
+        span{
+          color: #FF3C3C;
+        }
+      }
+      .yi-cont{
+        width: 48%;
+        margin: 0 1%;
+      }
+      .yj-list{
+        border-radius: 4px 4px 4px 4px;
+        border: 1px solid #DCDFE6;
+        overflow-y: auto;
+        height: 448px;
+        padding: 12px 8px;
+        font-size: 14px;
+        color: #232323;
+        line-height: 22px;
+        .time{
+          font-size: 12px;
+          color: rgba(35,35,35,0.6);
+          margin-top: 8px;
+        }
+      }
+
+      ::v-deep .el-timeline{
+        .el-timeline-item{
+          margin-bottom: 8px;
+          padding-bottom: 0;
+        }
+        .el-timeline-item__wrapper{
+          padding-left:16px;
+        }
+        .el-timeline-item__tail{
+          top: 12px;
+          height: calc(100% - 18px);
+        }
+        .el-timeline-item__node{
+          background-color:#ffffff;
+          border: 2px solid #FF3C3C;
+        }
+        .el-timeline-item__node--normal{
+          left: 1px;
+          width: 8px;
+          height: 8px;
+          top: 2px;
+        }
+        .el-timeline-item:last-child .el-timeline-item__tail{
+          display: block;
+        }
+      }
+    }
+  }
+
+  .charts-supplier{
+    background: #ffffff;
+    .charts-main {
+      display: flex;
+      flex-wrap: wrap;
+      overflow: hidden;
+      padding-top:16px;
+      .charts-cont{
+        width: 48%;
+        margin: 0 1%;
+        margin-bottom: 24px;
+        .charts-title{
+          font-size: 14px;
+          color: #232323;
+          line-height: 24px;
+          margin-bottom: 8px;
+          font-weight: 600;
+        }
+      }
+      .charts-div{
+        height: 560px;
+        border-radius: 4px 4px 4px 4px;
+        border: 1px solid #DCDFE6;
+      }
+    }
+  }
+</style>

dsk-operate-ui/src/views/supplier/supplierRating/overview.vue

@@ -831,7 +831,7 @@
         });
       },
       iptAdaptive(uid, multiple = false, name) {
-       multiple ? this.multipleAdaptiveHandle(uid, name) : this.iptAdaptiveHandle(uid, name);
+        multiple ? this.multipleAdaptiveHandle(uid, name) : this.iptAdaptiveHandle(uid, name);
       },
       //单选
       async iptAdaptiveHandle(uid, name) {

dsk-operate-ui/src/views/supplier/supplierRating/ratelist/creditRate.vue

+<template>
+  <div class="supplier">
+      <template v-if="!showDetail">
+          <div class="search-supplier">
+              <div class="title_wrap">
+              <div class="enterprise_title">
+                  信用评价列表
+              </div>
+              </div>
+          </div>
+          <div class="table-supplier table-supplier2">
+              <head-form-new title="" :form-data="formData" :query-params="queryParams" :total="0" :isExcel="false"
+                          @handle-search="handleSearch" ref="searchFormNew" @handle-excel="handleExcel" />
+              <!--<el-divider class="supdivider"></el-divider>
+              <div class="total-title">
+              <div class="totals">共{{total}}条</div>
+              <p class="total-dc" @click="customerExport">
+                  <img src="@/assets/images/EXCEL.png" alt="">
+                  <span class="excel">导出EXCEL</span>
+              </p>
+              </div> -->
+              <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+              <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+              <div class="item-jf-titel">暂无相关数据</div>
+              <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+              </div>
+              <skeleton v-if="isSkeleton"></skeleton>
+      
+              <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
+                  <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
+                              v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
+                              :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
+                              ref="theOwnerListTable">
+          
+                      <el-table-column type="index" label="排名" :fixed="tableColumnFixed" width="60" :resizable="false">
+                      <template slot-scope="scope">
+                          <span>{{(queryParams.pageNum - 1) *queryParams.pageSize + scope.$index + 1}}</span>
+                      </template>
+                      </el-table-column>
+                      <el-table-column label="供应商名称" prop="name1" :fixed="tableColumnFixed" width="310" :resizable="false"></el-table-column>
+                      <el-table-column label="所诉组织" prop="name1" :fixed="tableColumnFixed" width="310" :resizable="false"></el-table-column>
+                      <el-table-column label="品类" prop="name2" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                      <el-table-column label="当前信用得分" prop="name3" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                      <el-table-column label="来源" prop="name5" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                      <el-table-column label="操作" width="90">
+                          <template slot-scope="scope">
+                              <span style="color: #0081FF;cursor: pointer;" @click="viewDetail(scope.row)">详情</span>
+                          </template>
+                      </el-table-column>
+                  </el-table>
+              </div>
+              <div class="pagination clearfix" v-show="total>queryParams.pageSize">
+                  <el-pagination background :page-size="queryParams.pageSize" :current-page.sync="queryParams.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+                              :total="total">
+                  </el-pagination>
+              </div>
+          </div>
+      </template>
+      <template v-else>
+          <div class="detail-title">
+              <div><span style="cursor: pointer;" @click="showDetail = false">信用评价列表</span><i class="el-icon-arrow-right"></i><span class="tip">详情</span></div>
+              <div>
+                  <img src="@/assets/images/enterprise.png" alt=""><strong>{{ detailInfo.name1 }}</strong>
+              </div>
+              <div>
+                  <span>分供方所属组织：</span><span class="label">{{ detailInfo.name1 }}</span>
+                  <span>评价品类：</span><span class="label">{{ detailInfo.name2 }}</span>
+                  <span>评价周期：</span><span class="label">{{ detailInfo.name2 }}</span>
+              </div>
+          </div>
+          <div class="table-supplier">
+              <head-form-new title="" :form-data="formData2" :query-params="queryParams" :total="0" :isExcel="false"
+                          @handle-search="handleSearch" ref="searchFormNew" @handle-excel="handleExcel" />
+              <!--<el-divider class="supdivider"></el-divider>
+              <div class="total-title">
+              <div class="totals">共{{total}}条</div>
+              <p class="total-dc" @click="customerExport">
+                  <img src="@/assets/images/EXCEL.png" alt="">
+                  <span class="excel">导出EXCEL</span>
+              </p>
+              </div> -->
+              <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+              <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+              <div class="item-jf-titel">暂无相关数据</div>
+              <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+              </div>
+              <skeleton v-if="isSkeleton"></skeleton>
+      
+              <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
+                  <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
+                              v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
+                              :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
+                              ref="theOwnerListTable">
+          
+                      <el-table-column type="index" label="排名" :fixed="tableColumnFixed" width="60" :resizable="false">
+                      <template slot-scope="scope">
+                          <span>{{(queryParams.pageNum - 1) *queryParams.pageSize + scope.$index + 1}}</span>
+                      </template>
+                      </el-table-column>
+                      <el-table-column label="评价维度" prop="name2" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                      <el-table-column label="规则名称" prop="name5" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                      <el-table-column label="规则定义" prop="name1" :fixed="tableColumnFixed"  :resizable="false"></el-table-column>
+                      <el-table-column label="考核周期" prop="name3" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                      <el-table-column label="得分" prop="name6" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                  </el-table>
+              </div>
+              <div class="pagination clearfix" v-show="total>queryParams.pageSize">
+                  <el-pagination background :page-size="queryParams.pageSize" :current-page.sync="queryParams.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+                              :total="total">
+                  </el-pagination>
+              </div>
+          </div>
+      </template>
+  </div>
+
+</template>
+
+<script>
+  import '@/assets/styles/public.scss'
+  import '@/assets/styles/supplierlist.scss'
+  import mixin from '@/views/detail/party-a/mixins/mixin'
+
+  export default {
+    name: 'ratinglist',
+    mixins: [mixin],
+    data(){
+      return{
+        detailInfo:{},
+        showDetail:false,
+        formData: [
+          {
+            type: 1, fieldName: 'businessTypes', value: '',width:80, placeholder: '品类', uid: '', options: [
+              {name:'品类',value:1},
+              {name:'物资',value:2},
+              {name:'设备',value:3},
+              {name:'劳务分包',value:4},
+              {name:'专业分包',value:5},
+              {name:'专业服务',value:6},
+              {name:'租赁',value:7},
+            ],
+          },
+          { type: 5, fieldName: 'causeAction', value: '', placeholder: '评价周期',timeList: ['近一周', '近半月', '近一月', '自定义'],uid: '' },
+          { type: 3, fieldName: 'advisoryBodyName', value: '', placeholder: '项目名称关键字', uid: '',isword:'项目名称关键字',},
+          { type: 3, fieldName: 'advisoryBodyName', value: '', placeholder: '分供方名称', uid: '',isword:'分供方名称' },
+        ],
+        formData2: [
+          {
+            type: 1, fieldName: 'businessTypes', value: '',width:108, placeholder: '评价维度', uid: '', options: [
+              {name:'现场配合',value:1},
+              {name:'劳务分包',value:4},
+              {name:'专业分包',value:5},
+              {name:'专业服务',value:6},
+              {name:'租赁',value:7},
+            ],
+          },
+          { type: 5, fieldName: 'causeAction', value: '', placeholder: '考核周期',timeList: ['近一周', '近半月', '近一月', '自定义'],uid: '' },
+          { type: 3, fieldName: 'advisoryBodyName', value: '', placeholder: '规则名称', uid: '',isword:'规则名称' },
+        ],
+        queryParams: {
+          // customerId: this.companyId,
+          // customerName: this.companyName,
+
+          pageNum: 1,
+          pageSize: 10,
+        },
+        total: 19,
+        isSkeleton:false,
+        tableData:[
+          {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'物资-水泥及水',name3:'--',name4:'--',name5:'供应商准入（集采）99',name6:'100',name7:'118',name8:'118',name9:'114'},
+          {name1:'河南荣川实业有限公司',name2:'泥制品',name3:'100',name4:'--',name5:'供应商准入（集采）5',name6:'100',name7:'118',name8:'118',name9:'107'},
+          {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'物资-其他类',name3:'100',name4:'--',name5:'供应商准入（集采）19',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'北京九主澜商贸有限公司',name2:'物资-砼及外加剂',name3:'100',name4:'--',name5:'供应商准入（集采）1',name6:'100',name7:'105',name8:'109',name9:'107'},
+          {name1:'重庆拉瑞永固混凝土有限公司',name2:'物资-木材及制品',name3:'--',name4:'--',name5:'供应商准入（集采）3',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'山东乾途伟业建材有限公司',name2:'物资-砼及外加剂',name3:'100',name4:'--',name5:'供应商准入（集采）',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'厦门市集美区鸿铭建材有限公司',name2:'物资-其他类',name3:'--',name4:'--',name5:'供应商准入（集采）1',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'重庆匠伦家居用品有限公司',name2:'物资-砼及外加剂',name3:'106',name4:'--',name5:'供应商准入（集采）7',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'荆门市飞图混凝土有限公司',name2:'物资-木材及制币',name3:'--',name4:'--',name5:'供应商准入（集采）',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'重庆满煦商贸有限公司',name2:'物资-砼及外加剂',name3:'106',name4:'--',name5:'供应商准入（集采）',name6:'100',name7:'109',name8:'109',name9:'114'},
+          {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'物资-水泥及水',name3:'--',name4:'--',name5:'供应商准入（集采）99',name6:'100',name7:'118',name8:'118',name9:'114'},
+          {name1:'河南荣川实业有限公司',name2:'泥制品',name3:'100',name4:'--',name5:'供应商准入（集采）5',name6:'100',name7:'118',name8:'118',name9:'107'},
+          {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'物资-其他类',name3:'100',name4:'--',name5:'供应商准入（集采）19',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'北京九主澜商贸有限公司',name2:'物资-砼及外加剂',name3:'100',name4:'--',name5:'供应商准入（集采）1',name6:'100',name7:'105',name8:'109',name9:'107'},
+          {name1:'重庆拉瑞永固混凝土有限公司',name2:'物资-木材及制品',name3:'--',name4:'--',name5:'供应商准入（集采）3',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'山东乾途伟业建材有限公司',name2:'物资-砼及外加剂',name3:'100',name4:'--',name5:'供应商准入（集采）',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'厦门市集美区鸿铭建材有限公司',name2:'物资-其他类',name3:'--',name4:'--',name5:'供应商准入（集采）1',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'重庆匠伦家居用品有限公司',name2:'物资-砼及外加剂',name3:'106',name4:'--',name5:'供应商准入（集采）7',name6:'100',name7:'109',name8:'109',name9:'107'},
+          {name1:'荆门市飞图混凝土有限公司',name2:'物资-木材及制币',name3:'--',name4:'--',name5:'供应商准入（集采）',name6:'100',name7:'109',name8:'109',name9:'107'},
+        ],
+        tableColumnFixed:false,
+      }
+    },
+    methods:{
+      viewDetail(obj){
+          this.detailInfo = obj
+          this.showDetail = true
+      },
+      handleSearch(){},
+      handleExcel() {
+
+      },
+      customerExport(){
+
+      },
+      setHeaderRow() {
+        return "owner-table-list-header";
+      },
+      setCellClass({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex == 1) {
+          return "enterprise-name-column";
+        }
+      },
+      setRowClass({ row, rowIndex }) {
+        return "enterprise-name-row";
+      },
+      handleCurrentChange(){
+
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .title_wrap{
+      border: none;
+  }
+  .detail-title{
+      height: 130px;
+      border-radius: 4px 4px 0px 0px;
+      opacity: 1;
+      /* 自动布局 */
+      display: flex;
+      flex-direction: column;
+      padding: 16px;
+      gap: 16px;
+      background: #FFFFFF;
+      box-sizing: border-box;
+      /* 分割线 */
+      border: 1px solid #EEEEEE;
+      font-size: 14px;
+      color: rgba(35, 35, 35, 0.4);
+      .el-icon-arrow-right{
+          font-size: 12px;
+          margin: 4px;
+      }
+      .tip{
+          font-size: 12px;
+          color: rgba(35, 35, 35, 1);
+      }
+      img{
+          width: 28px;
+          height: 28px;
+          border-radius: 6px;
+          margin-right: 12px;
+      }
+      strong{
+          font-size: 16px;
+          color: rgba(35, 35, 35, 1);
+          font-weight: 700;
+      }
+      .label{
+          color: rgba(35, 35, 35, 0.8);
+          margin-right: 24px;
+      }
+    }
+  .table-supplier {
+    background: #ffffff;
+    border-radius: 4px;
+    padding: 16px;
+  .supdivider{
+    width: calc(100% + 32px);
+    margin-left: -16px;
+    margin-top: 8px;
+    margin-bottom: 16px;
+  }
+    ::v-deep .head-form-new {
+      .ability-total {
+        display: none !important;
+      }
+      .from-item .normal-search-container{
+        white-space: nowrap;
+        width: 134px;
+      }
+
+    }
+    input {
+      border: 1px solid #efefef;
+    }
+
+    ::v-deep .el-form-item {
+      margin-right: 8px !important;
+    }
+
+    .query-box {
+      margin: 10px 0 20px;
+    }
+
+    .cell-span {
+      display: inline-block;
+      position: relative;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      display: -webkit-box;
+      -webkit-box-orient: vertical;
+      -webkit-line-clamp: 4;
+      cursor: pointer;
+
+      > span {
+        display: inline-block;
+        width: 37px;
+        position: absolute;
+        right: 0;
+        bottom: 0;
+        background-color: #fff;
+        z-index: 1;
+      }
+    }
+
+    @import "@/assets/styles/search-common.scss";
+  }
+  .table-supplier2{
+      padding-top: 0;
+      margin-top: 0;
+  }
+</style>

dsk-operate-ui/src/views/supplier/supplierRating/ratelist/honourAgreement.vue

+<template>
+    <div class="supplier">
+        <template v-if="!showDetail">
+            <div class="search-supplier">
+                <div class="title_wrap">
+                <div class="enterprise_title">
+                    供应商履约评价列表
+                </div>
+                </div>
+            </div>
+            <div class="table-supplier table-supplier2">
+                <head-form-new title="" :form-data="formData" :query-params="queryParams" :total="0" :isExcel="false"
+                            @handle-search="handleSearch" ref="searchFormNew" @handle-excel="handleExcel" />
+                <!--<el-divider class="supdivider"></el-divider>
+                <div class="total-title">
+                <div class="totals">共{{total}}条</div>
+                <p class="total-dc" @click="customerExport">
+                    <img src="@/assets/images/EXCEL.png" alt="">
+                    <span class="excel">导出EXCEL</span>
+                </p>
+                </div> -->
+                <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+                <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+                <div class="item-jf-titel">暂无相关数据</div>
+                <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+                </div>
+                <skeleton v-if="isSkeleton"></skeleton>
+        
+                <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
+                    <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
+                                v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
+                                :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
+                                ref="theOwnerListTable">
+            
+                        <el-table-column type="index" label="排名" :fixed="tableColumnFixed" width="60" :resizable="false">
+                        <template slot-scope="scope">
+                            <span>{{(queryParams.pageNum - 1) *queryParams.pageSize + scope.$index + 1}}</span>
+                        </template>
+                        </el-table-column>
+                        <el-table-column label="分供方名称" prop="name1" :fixed="tableColumnFixed" width="310" :resizable="false"></el-table-column>
+                        <el-table-column label="项目" prop="name1" :fixed="tableColumnFixed" width="310" :resizable="false"></el-table-column>
+                        <el-table-column label="品类" prop="name2" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="本月履约金额" prop="name5" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="本月履约得分" prop="name3" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="本年履约金额" prop="name5" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="操作" width="90">
+                            <template slot-scope="scope">
+                                <span style="color: #0081FF;cursor: pointer;" @click="viewDetail(scope.row)">详情</span>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+                <div class="pagination clearfix" v-show="total>queryParams.pageSize">
+                    <el-pagination background :page-size="queryParams.pageSize" :current-page.sync="queryParams.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+                                :total="total">
+                    </el-pagination>
+                </div>
+            </div>
+        </template>
+        <template v-else>
+            <div class="detail-title">
+                <div><span style="cursor: pointer;" @click="showDetail = false">履约评价列表</span><i class="el-icon-arrow-right"></i><span class="tip">详情</span></div>
+                <div>
+                    <img src="@/assets/images/enterprise.png" alt=""><strong>{{ detailInfo.name1 }}</strong>
+                </div>
+                <div>
+                    <span>分供方所属组织：</span><span class="label">{{ detailInfo.name1 }}</span>
+                    <span>评价品类：</span><span class="label">{{ detailInfo.name2 }}</span>
+                    <span>评价周期：</span><span class="label">{{ detailInfo.name2 }}</span>
+                </div>
+            </div>
+            <div class="table-supplier">
+                <head-form-new title="" :form-data="formData2" :query-params="queryParams" :total="0" :isExcel="false"
+                            @handle-search="handleSearch" ref="searchFormNew" @handle-excel="handleExcel" />
+                <!--<el-divider class="supdivider"></el-divider>
+                <div class="total-title">
+                <div class="totals">共{{total}}条</div>
+                <p class="total-dc" @click="customerExport">
+                    <img src="@/assets/images/EXCEL.png" alt="">
+                    <span class="excel">导出EXCEL</span>
+                </p>
+                </div> -->
+                <div class="table-item-jf table-item-jf1 empty-table" v-if="total == 0 && !isSkeleton">
+                <img class="item-jf-img" src="@/assets/images/kong.png" alt="">
+                <div class="item-jf-titel">暂无相关数据</div>
+                <div class="item-jf-text">抱歉，暂无数据，试试更换搜索条件吧</div>
+                </div>
+                <skeleton v-if="isSkeleton"></skeleton>
+        
+                <div class="table-item-jf table-item" v-if="!isSkeleton&&tableData.length>0">
+                    <el-table :data="tableData" :header-cell-style="{ background:'#f0f3fa',color: 'rgba(35,35,35,0.8)'}"
+                                v-sticky-header.always="{offsetTop : '-16px',offsetBottom : '-15px'}" class="table-item1 fixed-table" border highlight-current-row
+                                :header-row-class-name="setHeaderRow" :cell-class-name="setCellClass" :row-class-name="setRowClass" :header-cell-class-name="setCellClass"
+                                ref="theOwnerListTable">
+            
+                        <el-table-column type="index" label="排名" :fixed="tableColumnFixed" width="60" :resizable="false">
+                        <template slot-scope="scope">
+                            <span>{{(queryParams.pageNum - 1) *queryParams.pageSize + scope.$index + 1}}</span>
+                        </template>
+                        </el-table-column>
+                        <el-table-column label="评价维度" prop="name2" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="规则名称" prop="name5" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="规则定义" prop="name1" :fixed="tableColumnFixed"  :resizable="false"></el-table-column>
+                        <el-table-column label="考核周期" prop="name3" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                        <el-table-column label="得分" prop="name5" :fixed="tableColumnFixed" :resizable="false"></el-table-column>
+                    </el-table>
+                </div>
+                <div class="pagination clearfix" v-show="total>queryParams.pageSize">
+                    <el-pagination background :page-size="queryParams.pageSize" :current-page.sync="queryParams.pageNum" @current-change="handleCurrentChange" layout="prev, pager, next"
+                                :total="total">
+                    </el-pagination>
+                </div>
+            </div>
+        </template>
+    </div>
+  
+  </template>
+  
+  <script>
+    import '@/assets/styles/public.scss'
+    import '@/assets/styles/supplierlist.scss'
+    import mixin from '@/views/detail/party-a/mixins/mixin'
+  
+    export default {
+      name: 'ratinglist',
+      mixins: [mixin],
+      data(){
+        return{
+          detailInfo:{},
+          showDetail:false,
+          formData: [
+            {
+              type: 1, fieldName: 'businessTypes', value: '',width:80, placeholder: '品类', uid: '', options: [
+                {name:'品类',value:1},
+                {name:'物资',value:2},
+                {name:'设备',value:3},
+                {name:'劳务分包',value:4},
+                {name:'专业分包',value:5},
+                {name:'专业服务',value:6},
+                {name:'租赁',value:7},
+              ],
+            },
+            { type: 5, fieldName: 'causeAction', value: '', placeholder: '评价周期',timeList: ['近一周', '近半月', '近一月', '自定义'],uid: '' },
+            { type: 3, fieldName: 'advisoryBodyName', value: '', placeholder: '项目名称关键字', uid: '',isword:'项目名称关键字',},
+            { type: 3, fieldName: 'advisoryBodyName', value: '', placeholder: '分供方名称', uid: '',isword:'分供方名称' },
+          ],
+          formData2: [
+            {
+              type: 1, fieldName: 'businessTypes', value: '',width:108, placeholder: '评价维度', uid: '', options: [
+                {name:'现场配合',value:1},
+                {name:'劳务分包',value:4},
+                {name:'专业分包',value:5},
+                {name:'专业服务',value:6},
+                {name:'租赁',value:7},
+              ],
+            },
+            { type: 5, fieldName: 'causeAction', value: '', placeholder: '考核周期',timeList: ['近一周', '近半月', '近一月', '自定义'],uid: '' },
+            { type: 3, fieldName: 'advisoryBodyName', value: '', placeholder: '规则名称', uid: '',isword:'规则名称' },
+          ],
+          queryParams: {
+            // customerId: this.companyId,
+            // customerName: this.companyName,
+  
+            pageNum: 1,
+            pageSize: 10,
+          },
+          total: 19,
+          isSkeleton:false,
+          tableData:[
+            {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'物资-水泥及水',name3:'--',name4:'--',name5:'4297031.99',name6:'100',name7:'118',name8:'118',name9:'114'},
+            {name1:'河南荣川实业有限公司',name2:'泥制品',name3:'100',name4:'--',name5:'363515.35',name6:'100',name7:'118',name8:'118',name9:'107'},
+            {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'物资-其他类',name3:'100',name4:'--',name5:'6317465.19',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'北京九主澜商贸有限公司',name2:'物资-砼及外加剂',name3:'100',name4:'--',name5:'1969555.1',name6:'100',name7:'105',name8:'109',name9:'107'},
+            {name1:'重庆拉瑞永固混凝土有限公司',name2:'物资-木材及制品',name3:'--',name4:'--',name5:'948239.73',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'山东乾途伟业建材有限公司',name2:'物资-砼及外加剂',name3:'100',name4:'--',name5:'941892.3',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'厦门市集美区鸿铭建材有限公司',name2:'物资-其他类',name3:'--',name4:'--',name5:'358583.61',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'重庆匠伦家居用品有限公司',name2:'物资-砼及外加剂',name3:'106',name4:'--',name5:'217844.57',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'荆门市飞图混凝土有限公司',name2:'物资-木材及制币',name3:'--',name4:'--',name5:'78707.09',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'重庆满煦商贸有限公司',name2:'物资-砼及外加剂',name3:'106',name4:'--',name5:'65403.78',name6:'100',name7:'109',name8:'109',name9:'114'},
+            {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'物资-水泥及水',name3:'--',name4:'--',name5:'4297031.99',name6:'100',name7:'118',name8:'118',name9:'114'},
+            {name1:'河南荣川实业有限公司',name2:'泥制品',name3:'100',name4:'--',name5:'363515.35',name6:'100',name7:'118',name8:'118',name9:'107'},
+            {name1:'莱晟达(烟台)环保材料科技有限公司',name2:'物资-其他类',name3:'100',name4:'--',name5:'6317465.19',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'北京九主澜商贸有限公司',name2:'物资-砼及外加剂',name3:'100',name4:'--',name5:'1969555.1',name6:'100',name7:'105',name8:'109',name9:'107'},
+            {name1:'重庆拉瑞永固混凝土有限公司',name2:'物资-木材及制品',name3:'--',name4:'--',name5:'948239.73',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'山东乾途伟业建材有限公司',name2:'物资-砼及外加剂',name3:'100',name4:'--',name5:'941892.3',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'厦门市集美区鸿铭建材有限公司',name2:'物资-其他类',name3:'--',name4:'--',name5:'358583.61',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'重庆匠伦家居用品有限公司',name2:'物资-砼及外加剂',name3:'106',name4:'--',name5:'217844.57',name6:'100',name7:'109',name8:'109',name9:'107'},
+            {name1:'荆门市飞图混凝土有限公司',name2:'物资-木材及制币',name3:'--',name4:'--',name5:'78707.09',name6:'100',name7:'109',name8:'109',name9:'107'},
+          ],
+          tableColumnFixed:false,
+        }
+      },
+      methods:{
+        viewDetail(obj){
+            this.detailInfo = obj
+            this.showDetail = true
+        },
+        handleSearch(){},
+        handleExcel() {
+  
+        },
+        customerExport(){
+  
+        },
+        setHeaderRow() {
+          return "owner-table-list-header";
+        },
+        setCellClass({ row, column, rowIndex, columnIndex }) {
+          if (columnIndex == 1) {
+            return "enterprise-name-column";
+          }
+        },
+        setRowClass({ row, rowIndex }) {
+          return "enterprise-name-row";
+        },
+        handleCurrentChange(){
+
+        }
+      }
+    }
+  </script>
+  
+  <style lang="scss" scoped>
+    .title_wrap{
+        border: none;
+    }
+    .detail-title{
+        height: 130px;
+        border-radius: 4px 4px 0px 0px;
+        opacity: 1;
+        /* 自动布局 */
+        display: flex;
+        flex-direction: column;
+        padding: 16px;
+        gap: 16px;
+        background: #FFFFFF;
+        box-sizing: border-box;
+        /* 分割线 */
+        border: 1px solid #EEEEEE;
+        font-size: 14px;
+        color: rgba(35, 35, 35, 0.4);
+        .el-icon-arrow-right{
+            font-size: 12px;
+            margin: 4px;
+        }
+        .tip{
+            font-size: 12px;
+            color: rgba(35, 35, 35, 1);
+        }
+        img{
+            width: 28px;
+            height: 28px;
+            border-radius: 6px;
+            margin-right: 12px;
+        }
+        strong{
+            font-size: 16px;
+            color: rgba(35, 35, 35, 1);
+            font-weight: 700;
+        }
+        .label{
+            color: rgba(35, 35, 35, 0.8);
+            margin-right: 24px;
+        }
+      }
+    .table-supplier {
+      background: #ffffff;
+      border-radius: 4px;
+      padding: 16px;
+    .supdivider{
+      width: calc(100% + 32px);
+      margin-left: -16px;
+      margin-top: 8px;
+      margin-bottom: 16px;
+    }
+      ::v-deep .head-form-new {
+        .ability-total {
+          display: none !important;
+        }
+        .from-item .normal-search-container{
+          white-space: nowrap;
+          width: 134px;
+        }
+  
+      }
+      input {
+        border: 1px solid #efefef;
+      }
+  
+      ::v-deep .el-form-item {
+        margin-right: 8px !important;
+      }
+  
+      .query-box {
+        margin: 10px 0 20px;
+      }
+  
+      .cell-span {
+        display: inline-block;
+        position: relative;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        display: -webkit-box;
+        -webkit-box-orient: vertical;
+        -webkit-line-clamp: 4;
+        cursor: pointer;
+  
+        > span {
+          display: inline-block;
+          width: 37px;
+          position: absolute;
+          right: 0;
+          bottom: 0;
+          background-color: #fff;
+          z-index: 1;
+        }
+      }
+  
+      @import "@/assets/styles/search-common.scss";
+    }
+    .table-supplier2{
+        padding-top: 0;
+        margin-top: 0;
+    }
+  </style>
+  
\ No newline at end of file