diff --git a/backend/src/main/java/io/dataease/auth/api/dto/CurrentUserDto.java b/backend/src/main/java/io/dataease/auth/api/dto/CurrentUserDto.java
index ab279d815d..9bc1ac61e3 100644
--- a/backend/src/main/java/io/dataease/auth/api/dto/CurrentUserDto.java
+++ b/backend/src/main/java/io/dataease/auth/api/dto/CurrentUserDto.java
@@ -1,6 +1,7 @@
 package io.dataease.auth.api.dto;
 
 import io.dataease.auth.entity.SysUserEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -11,7 +12,9 @@ import java.util.List;
 @NoArgsConstructor
 public class CurrentUserDto extends SysUserEntity implements Serializable {
 
+    @ApiModelProperty("角色集合")
     private List<CurrentRoleDto> roles;
 
+    @ApiModelProperty("权限集合")
     private List<String> permissions;
 }
diff --git a/backend/src/main/java/io/dataease/auth/config/F2CRealm.java b/backend/src/main/java/io/dataease/auth/config/F2CRealm.java
index 1f0ee7e60d..c7a46650b6 100644
--- a/backend/src/main/java/io/dataease/auth/config/F2CRealm.java
+++ b/backend/src/main/java/io/dataease/auth/config/F2CRealm.java
@@ -2,18 +2,17 @@ package io.dataease.auth.config;
 
 import io.dataease.auth.api.dto.CurrentRoleDto;
 import io.dataease.auth.api.dto.CurrentUserDto;
+import io.dataease.auth.entity.ASKToken;
 import io.dataease.auth.entity.JWTToken;
 import io.dataease.auth.entity.SysUserEntity;
 import io.dataease.auth.entity.TokenInfo;
+import io.dataease.auth.handler.ApiKeyHandler;
 import io.dataease.auth.service.AuthUserService;
 import io.dataease.auth.util.JWTUtils;
 import io.dataease.commons.utils.BeanUtils;
 import io.dataease.commons.utils.LogUtil;
 import io.dataease.listener.util.CacheUtils;
-import org.apache.shiro.authc.AuthenticationException;
-import org.apache.shiro.authc.AuthenticationInfo;
-import org.apache.shiro.authc.AuthenticationToken;
-import org.apache.shiro.authc.SimpleAuthenticationInfo;
+import org.apache.shiro.authc.*;
 import org.apache.shiro.authz.AuthorizationInfo;
 import org.apache.shiro.authz.SimpleAuthorizationInfo;
 import org.apache.shiro.realm.AuthorizingRealm;
@@ -37,7 +36,7 @@ public class F2CRealm extends AuthorizingRealm {
 
     @Override
     public boolean supports(AuthenticationToken token) {
-        return token instanceof JWTToken;
+        return token instanceof JWTToken || token instanceof ASKToken;
     }
 
     //验证资源权限
@@ -56,12 +55,27 @@ public class F2CRealm extends AuthorizingRealm {
 
     @Override
     protected AuthenticationInfo doGetAuthenticationInfo(AuthenticationToken auth) throws AuthenticationException {
+
+        if (auth instanceof ASKToken) {
+
+            Object accessKey = auth.getPrincipal();
+            Object signature = auth.getCredentials();
+            Long userId = ApiKeyHandler.getUser(accessKey.toString(), signature.toString());
+
+            SysUserEntity userEntity = userWithId(userId);
+            CurrentUserDto currentUserDto = queryCacheUserDto(userEntity);
+            return new SimpleAuthenticationInfo(currentUserDto, signature, "f2cReam");
+        }
+
+
+
         try {
             CacheUtils.get("lic_info", "lic");
         }catch (Exception e) {
             LogUtil.error(e);
             throw new AuthenticationException("lic error");
         }
+
         TokenInfo tokenInfo = null;
         String token = null;
         try {
@@ -78,13 +92,14 @@ public class F2CRealm extends AuthorizingRealm {
             throw new AuthenticationException("token invalid");
         }
         // 使用缓存
-        SysUserEntity user = authUserService.getUserById(userId);
+        /*SysUserEntity user = authUserService.getUserById(userId);
         if (user == null) {
             throw new AuthenticationException("User didn't existed!");
         }
         if (user.getEnabled()==0) {
             throw new AuthenticationException("User is valid!");
-        }
+        }*/
+        SysUserEntity user = userWithId(userId);
         String pass = null;
         try {
             pass = user.getPassword();
@@ -94,6 +109,29 @@ public class F2CRealm extends AuthorizingRealm {
         if (! JWTUtils.verify(token, tokenInfo, pass)) {
             throw new AuthenticationException("Username or password error");
         }
+        /*// 使用缓存
+        List<CurrentRoleDto> currentRoleDtos = authUserService.roleInfos(user.getUserId());
+        // 使用缓存
+        List<String> permissions = authUserService.permissions(user.getUserId());
+        CurrentUserDto currentUserDto = BeanUtils.copyBean(new CurrentUserDto(), user);
+        currentUserDto.setRoles(currentRoleDtos);
+        currentUserDto.setPermissions(permissions);*/
+        CurrentUserDto currentUserDto = queryCacheUserDto(user);
+        return new SimpleAuthenticationInfo(currentUserDto, token, "f2cReam");
+    }
+
+    public SysUserEntity userWithId(Long userId) {
+        SysUserEntity user = authUserService.getUserById(userId);
+        if (user == null) {
+            throw new AuthenticationException("User didn't existed!");
+        }
+        if (user.getEnabled()==0) {
+            throw new AuthenticationException("User is valid!");
+        }
+        return user;
+    }
+
+    public CurrentUserDto queryCacheUserDto(SysUserEntity user) {
         // 使用缓存
         List<CurrentRoleDto> currentRoleDtos = authUserService.roleInfos(user.getUserId());
         // 使用缓存
@@ -101,6 +139,6 @@ public class F2CRealm extends AuthorizingRealm {
         CurrentUserDto currentUserDto = BeanUtils.copyBean(new CurrentUserDto(), user);
         currentUserDto.setRoles(currentRoleDtos);
         currentUserDto.setPermissions(permissions);
-        return new SimpleAuthenticationInfo(currentUserDto, token, "f2cReam");
+        return currentUserDto;
     }
 }
diff --git a/backend/src/main/java/io/dataease/auth/config/ShiroConfig.java b/backend/src/main/java/io/dataease/auth/config/ShiroConfig.java
index a3d6e190de..764aefb3f3 100644
--- a/backend/src/main/java/io/dataease/auth/config/ShiroConfig.java
+++ b/backend/src/main/java/io/dataease/auth/config/ShiroConfig.java
@@ -51,6 +51,7 @@ public class ShiroConfig {
         filterMap.put("jwt", new JWTFilter());
         filterMap.put("logout", new F2CLogoutFilter());
         filterMap.put("link", new F2CLinkFilter());
+        filterMap.put("doc", new F2CDocFilter());
         factoryBean.setSecurityManager(securityManager);
         factoryBean.setLoginUrl("/login");
         factoryBean.setUnauthorizedUrl("/login");
diff --git a/backend/src/main/java/io/dataease/auth/entity/ASKToken.java b/backend/src/main/java/io/dataease/auth/entity/ASKToken.java
new file mode 100644
index 0000000000..4112fe197e
--- /dev/null
+++ b/backend/src/main/java/io/dataease/auth/entity/ASKToken.java
@@ -0,0 +1,25 @@
+package io.dataease.auth.entity;
+
+import org.apache.shiro.authc.AuthenticationToken;
+
+public class ASKToken implements AuthenticationToken {
+
+    private String accessKey;
+
+    private String signature;
+
+    public ASKToken(String accessKey, String signature) {
+        this.accessKey = accessKey;
+        this.signature = signature;
+    }
+
+    @Override
+    public Object getPrincipal() {
+        return accessKey;
+    }
+
+    @Override
+    public Object getCredentials() {
+        return signature;
+    }
+}
diff --git a/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java b/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java
index 1bed1ac17b..2eb61eb0b4 100644
--- a/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java
+++ b/backend/src/main/java/io/dataease/auth/entity/SysUserEntity.java
@@ -1,6 +1,7 @@
 package io.dataease.auth.entity;
 
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.io.Serializable;
 
@@ -8,23 +9,33 @@ import java.io.Serializable;
 
 public class SysUserEntity implements Serializable {
 
+    @ApiModelProperty(hidden = true)
     private Long userId;
 
+    @ApiModelProperty("账号")
     private String username;
 
+    @ApiModelProperty("姓名")
     private String nickName;
 
+    @ApiModelProperty("组织ID")
     private Long deptId;
 
+    @ApiModelProperty(hidden = true)
     private String password;
 
+    @ApiModelProperty("状态")
     private Integer enabled;
 
+    @ApiModelProperty("邮箱")
     private String email;
 
+    @ApiModelProperty("电话")
     private String phone;
 
+    @ApiModelProperty(hidden = true)
     private String language;
 
+    @ApiModelProperty(hidden = true)
     private Boolean isAdmin;
 }
diff --git a/backend/src/main/java/io/dataease/auth/filter/F2CDocFilter.java b/backend/src/main/java/io/dataease/auth/filter/F2CDocFilter.java
new file mode 100644
index 0000000000..022180c4b3
--- /dev/null
+++ b/backend/src/main/java/io/dataease/auth/filter/F2CDocFilter.java
@@ -0,0 +1,26 @@
+package io.dataease.auth.filter;
+
+import org.apache.shiro.web.filter.authc.AnonymousFilter;
+
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+public class F2CDocFilter extends AnonymousFilter {
+
+    @Override
+    protected boolean onPreHandle(ServletRequest request, ServletResponse response, Object mappedValue) {
+        HttpServletRequest req = (HttpServletRequest) request;
+        String path = "/deApi";
+        try {
+            req.getRequestDispatcher(path).forward(req, response);
+        } catch (ServletException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return true;
+    }
+}
diff --git a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
index ba23292a7a..3077a338a5 100644
--- a/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
+++ b/backend/src/main/java/io/dataease/auth/filter/JWTFilter.java
@@ -1,8 +1,10 @@
 package io.dataease.auth.filter;
 
+import io.dataease.auth.entity.ASKToken;
 import io.dataease.auth.entity.JWTToken;
 import io.dataease.auth.entity.SysUserEntity;
 import io.dataease.auth.entity.TokenInfo;
+import io.dataease.auth.handler.ApiKeyHandler;
 import io.dataease.auth.service.AuthUserService;
 import io.dataease.auth.util.JWTUtils;
 import io.dataease.commons.utils.CommonBeanFactory;
@@ -48,6 +50,18 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
     @Override
     protected boolean executeLogin(ServletRequest request, ServletResponse response) throws Exception {
         HttpServletRequest httpServletRequest = (HttpServletRequest) request;
+
+
+        if (ApiKeyHandler.isApiKeyCall(httpServletRequest)) {
+            // Long userId = ApiKeyHandler.getUser(httpServletRequest);
+
+            ASKToken askToken = ApiKeyHandler.buildToken(httpServletRequest);
+
+            // UsernamePasswordToken usernamePasswordToken = new UsernamePasswordToken(userId.toString(), ApiKeyHandler.random);
+            getSubject(request, response).login(askToken);
+            return true;
+        }
+
         String authorization = httpServletRequest.getHeader("Authorization");
         if (StringUtils.startsWith(authorization, "Basic")) {
             return false;
@@ -72,7 +86,10 @@ public class JWTFilter extends BasicHttpAuthenticationFilter {
      */
     @Override
     protected boolean isAccessAllowed(ServletRequest request, ServletResponse response, Object mappedValue) {
-        if (isLoginAttempt(request, response)) {
+        // 先判断是不是api调用
+        HttpServletRequest hRequest = (HttpServletRequest) request;
+
+        if (isLoginAttempt(request, response) || ApiKeyHandler.isApiKeyCall(hRequest)) {
             try {
                 boolean loginSuccess = executeLogin(request, response);
                 return loginSuccess;
diff --git a/backend/src/main/java/io/dataease/auth/handler/ApiKeyHandler.java b/backend/src/main/java/io/dataease/auth/handler/ApiKeyHandler.java
new file mode 100644
index 0000000000..bd0a0e35a4
--- /dev/null
+++ b/backend/src/main/java/io/dataease/auth/handler/ApiKeyHandler.java
@@ -0,0 +1,88 @@
+package io.dataease.auth.handler;
+
+import io.dataease.auth.entity.ASKToken;
+import io.dataease.commons.utils.CodingUtil;
+import io.dataease.plugins.config.SpringContextUtil;
+import io.dataease.plugins.xpack.ukey.dto.request.XpackUkeyDto;
+import io.dataease.plugins.xpack.ukey.service.UkeyXpackService;
+import org.apache.commons.lang3.StringUtils;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.UUID;
+
+public class ApiKeyHandler {
+
+    public static final String API_ACCESS_KEY = "accessKey";
+
+    public static final String API_SIGNATURE = "signature";
+
+
+    public static String random = UUID.randomUUID().toString() + UUID.randomUUID().toString();
+
+    public static Long getUser(HttpServletRequest request) {
+        if (request == null) {
+            return null;
+        }
+        return getUser(request.getHeader(API_ACCESS_KEY), request.getHeader(API_SIGNATURE));
+    }
+
+    public static ASKToken buildToken(HttpServletRequest request) {
+        if (request == null) {
+            return null;
+        }
+        String accessKey = request.getHeader(API_ACCESS_KEY);
+        String signature = request.getHeader(API_SIGNATURE);
+        ASKToken askToken = new ASKToken(accessKey, signature);
+        return askToken;
+    }
+
+    public static Boolean isApiKeyCall(HttpServletRequest request) {
+        if (request == null) {
+            return false;
+        }
+        if (StringUtils.isBlank(request.getHeader(API_ACCESS_KEY)) || StringUtils.isBlank(request.getHeader(API_SIGNATURE))) {
+            return false;
+        }
+        return true;
+    }
+
+    public static XpackUkeyDto ukey(String accessKey) {
+        UkeyXpackService ukeyXpackService = SpringContextUtil.getBean(UkeyXpackService.class);
+        XpackUkeyDto userKey = ukeyXpackService.getUserKey(accessKey);
+        return userKey;
+    }
+
+    public static Long getUser(String accessKey, String signature) {
+        if (StringUtils.isBlank(accessKey) || StringUtils.isBlank(signature)) {
+            return null;
+        }
+        XpackUkeyDto userKey = ukey(accessKey);
+        if (userKey == null) {
+            throw new RuntimeException("invalid accessKey");
+        }
+        String signatureDecrypt;
+        try {
+            signatureDecrypt = CodingUtil.aesDecrypt(signature, userKey.getSecretKey(), accessKey);
+        } catch (Throwable t) {
+            throw new RuntimeException("invalid signature");
+        }
+        String[] signatureArray = StringUtils.split(StringUtils.trimToNull(signatureDecrypt), "|");
+        if (signatureArray.length < 2) {
+            throw new RuntimeException("invalid signature");
+        }
+        if (!StringUtils.equals(accessKey, signatureArray[0])) {
+            throw new RuntimeException("invalid signature");
+        }
+        long signatureTime = 0l;
+        try {
+            signatureTime = Long.valueOf(signatureArray[signatureArray.length - 1]).longValue();
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+        if (Math.abs(System.currentTimeMillis() - signatureTime) > 1800000) {
+            //签名30分钟超时
+            throw new RuntimeException("expired signature");
+        }
+        return userKey.getUserId();
+    }
+}
diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java
index 07eccc92c1..e141cc1b62 100644
--- a/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java
+++ b/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java
@@ -43,9 +43,11 @@ public class ExtAuthServiceImpl implements ExtAuthService {
     @Override
     public AuthURD resourceTarget(String resourceId) {
         AuthURD authURD = new AuthURD();
-        SysAuthExample example = new SysAuthExample();
+        /*SysAuthExample example = new SysAuthExample();
         example.createCriteria().andAuthSourceEqualTo(resourceId);
-        List<SysAuth> sysAuths = sysAuthMapper.selectByExample(example);
+        List<SysAuth> sysAuths = sysAuthMapper.selectByExample(example);*/
+        List<SysAuth> sysAuths = extAuthMapper.queryByResource(resourceId);
+
         Map<String, List<SysAuth>> authMap = sysAuths.stream().collect(Collectors.groupingBy(SysAuth::getAuthTargetType));
         if (!CollectionUtils.isEmpty(authMap.get("user"))) {
             authURD.setUserIds(authMap.get("user").stream().map(item -> Long.parseLong(item.getAuthTarget())).collect(Collectors.toList()));
diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
index a6cdf4ec83..c12a511e21 100644
--- a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
+++ b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
@@ -20,7 +20,8 @@ public class ShiroServiceImpl implements ShiroService {
         // 配置过滤:不会被拦截的链接 -> 放行 start ----------------------------------------------------------
         // 放行Swagger2页面，需要放行这些
 
-        filterChainDefinitionMap.put("/doc.html",ANON);
+        filterChainDefinitionMap.put("/doc.html**","doc");
+        filterChainDefinitionMap.put("/deApi**",ANON);
         filterChainDefinitionMap.put("/swagger-ui.html",ANON);
         filterChainDefinitionMap.put("/swagger-ui/**",ANON);
         filterChainDefinitionMap.put("/swagger/**",ANON);
diff --git a/backend/src/main/java/io/dataease/base/domain/SysMsgChannel.java b/backend/src/main/java/io/dataease/base/domain/SysMsgChannel.java
index 0ca1830b37..2bae1b3142 100644
--- a/backend/src/main/java/io/dataease/base/domain/SysMsgChannel.java
+++ b/backend/src/main/java/io/dataease/base/domain/SysMsgChannel.java
@@ -1,12 +1,17 @@
 package io.dataease.base.domain;
 
 import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class SysMsgChannel implements Serializable {
+
+    @ApiModelProperty("消息渠道ID")
     private Long msgChannelId;
 
+    @ApiModelProperty("消息渠道名称")
     private String channelName;
 
     private static final long serialVersionUID = 1L;
diff --git a/backend/src/main/java/io/dataease/base/domain/SysMsgSetting.java b/backend/src/main/java/io/dataease/base/domain/SysMsgSetting.java
index 6d86ed720f..49862f077e 100644
--- a/backend/src/main/java/io/dataease/base/domain/SysMsgSetting.java
+++ b/backend/src/main/java/io/dataease/base/domain/SysMsgSetting.java
@@ -1,18 +1,25 @@
 package io.dataease.base.domain;
 
 import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class SysMsgSetting implements Serializable {
+    @ApiModelProperty(hidden = true)
     private Long msgSettingId;
 
+    @ApiModelProperty("订阅用户ID")
     private Long userId;
 
+    @ApiModelProperty("订阅类型ID")
     private Long typeId;
 
+    @ApiModelProperty("订阅渠道ID")
     private Long channelId;
 
+    @ApiModelProperty("订阅状态ID")
     private Boolean enable;
 
     private static final long serialVersionUID = 1L;
diff --git a/backend/src/main/java/io/dataease/base/domain/SysMsgType.java b/backend/src/main/java/io/dataease/base/domain/SysMsgType.java
index fd27679478..97262451b5 100644
--- a/backend/src/main/java/io/dataease/base/domain/SysMsgType.java
+++ b/backend/src/main/java/io/dataease/base/domain/SysMsgType.java
@@ -1,18 +1,26 @@
 package io.dataease.base.domain;
 
 import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class SysMsgType implements Serializable {
+
+    @ApiModelProperty("消息类型ID")
     private Long msgTypeId;
 
+    @ApiModelProperty("上级类型ID")
     private Long pid;
 
+    @ApiModelProperty("消息类型名称")
     private String typeName;
 
+    @ApiModelProperty(hidden = true)
     private String router;
 
+    @ApiModelProperty(hidden = true)
     private String callback;
 
     private static final long serialVersionUID = 1L;
diff --git a/backend/src/main/java/io/dataease/base/domain/SysUser.java b/backend/src/main/java/io/dataease/base/domain/SysUser.java
index 8f62905999..6ebfbcf4d3 100644
--- a/backend/src/main/java/io/dataease/base/domain/SysUser.java
+++ b/backend/src/main/java/io/dataease/base/domain/SysUser.java
@@ -1,40 +1,58 @@
 package io.dataease.base.domain;
 
 import java.io.Serializable;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class SysUser implements Serializable {
+    @ApiModelProperty(value = "用户ID" , allowEmptyValue = false, position = 0)
     private Long userId;
 
+    @ApiModelProperty(value = "组织ID" , allowEmptyValue = false, position = 7)
     private Long deptId;
 
+    @ApiModelProperty(value = "账号" , required = true)
     private String username;
 
+    @ApiModelProperty(value = "姓名" , required = true, position = 2)
     private String nickName;
 
+    @ApiModelProperty(value = "性别" ,allowableValues = "男,女", allowEmptyValue = true, position = 5)
     private String gender;
 
+    @ApiModelProperty(value = "电话" , allowEmptyValue = true, position = 1)
     private String phone;
 
+    @ApiModelProperty(value = "邮箱" , required = true, position = 3)
     private String email;
 
+    @ApiModelProperty(value = "密码" , required = true, position = 4)
     private String password;
 
+    @ApiModelProperty(hidden = true)
     private Boolean isAdmin;
 
+    @ApiModelProperty(value = "状态" , allowableValues = "1,0", required = true, position = 6)
     private Long enabled;
 
+    @ApiModelProperty(hidden = true)
     private String createBy;
 
+    @ApiModelProperty(hidden = true)
     private String updateBy;
 
+    @ApiModelProperty(hidden = true)
     private Long pwdResetTime;
 
+    @ApiModelProperty(hidden = true)
     private Long createTime;
 
+    @ApiModelProperty(hidden = true)
     private Long updateTime;
 
+    @ApiModelProperty(hidden = true)
     private String language;
 
     private static final long serialVersionUID = 1L;
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.java
index fe7d57a75b..9e987aa586 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.java
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.java
@@ -1,6 +1,7 @@
 package io.dataease.base.mapper.ext;
 
 
+import io.dataease.base.domain.SysAuth;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -12,6 +13,6 @@ public interface ExtAuthMapper {
 
     List<Long> queryUserIdWithDeptIds(@Param("deptIds") List<Long> deptIds);
 
-
+    List<SysAuth> queryByResource(@Param("resourceId") String resourceId);
     // Set<Long> queryUserIdWithRD(@Param("roleIds") List<Long> roleIds, @Param("deptIds") List<Long> deptIds);
 }
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.xml
index 991709ff3b..8e961576f2 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.xml
@@ -23,5 +23,12 @@
     </select>
 
 
+    <select id="queryByResource" resultMap="io.dataease.base.mapper.SysAuthMapper.BaseResultMap" >
+        select a.*
+        from sys_auth a left join sys_auth_detail b on a.id = b.auth_id
+        where a.auth_source = #{resourceId} and  b.privilege_value = 1
+    </select>
+
+
 
 </mapper>
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewLinkageMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewLinkageMapper.java
index 82cea4163a..96ac3fe6a6 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewLinkageMapper.java
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewLinkageMapper.java
@@ -1,15 +1,19 @@
 package io.dataease.base.mapper.ext;
 
 import io.dataease.base.domain.DatasetTableField;
+import io.dataease.dto.LinkageInfoDTO;
 import io.dataease.dto.PanelViewLinkageDTO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 public interface ExtPanelViewLinkageMapper {
 
     List<PanelViewLinkageDTO> getViewLinkageGather(@Param("panelId") String panelId,@Param("sourceViewId") String sourceViewId,@Param("targetViewIds") List<String> targetViewIds);
 
+    List<LinkageInfoDTO> getPanelAllLinkageInfo(@Param("panelId") String panelId);
+
     List<DatasetTableField> queryTableField(@Param("table_id") String tableId);
 
     void deleteViewLinkage(@Param("panelId") String panelId,@Param("sourceViewId") String sourceViewId);
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewLinkageMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewLinkageMapper.xml
index f81e6c76ea..fb47e5fe23 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewLinkageMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewLinkageMapper.xml
@@ -24,6 +24,14 @@
         </collection>
     </resultMap>
 
+
+    <resultMap id="AllLinkageMap" type="io.dataease.dto.LinkageInfoDTO">
+        <result column="sourceInfo" jdbcType="VARCHAR" property="sourceInfo"/>
+        <collection property="targetInfoList" ofType="String">
+            <result column="targetInfo" jdbcType="VARCHAR"/>
+        </collection>
+    </resultMap>
+
     <select id="getViewLinkageGather" resultMap="LinkageGatherMap">
         SELECT
         chart_view.`name` as 'targetViewName',
@@ -78,4 +86,16 @@
             (#{menu.menuId},#{menu.title},#{menu.pid},#{menu.subCount},#{menu.permission},#{menu.hidden},ifnull(#{menu.hidden},0))
         </foreach>
     </insert>
+
+    <select id="getPanelAllLinkageInfo" resultMap="AllLinkageMap">
+      SELECT
+        distinct
+        CONCAT( panel_view_linkage.source_view_id, '#', panel_view_linkage_field.source_field ) AS 'sourceInfo',
+        CONCAT( panel_view_linkage.target_view_id, '#', panel_view_linkage_field.target_field ) AS 'targetInfo'
+        FROM
+            panel_view_linkage
+            LEFT JOIN panel_view_linkage_field ON panel_view_linkage.id = panel_view_linkage_field.linkage_id
+        WHERE
+            panel_view_linkage.panel_id = #{panelId}
+    </select>
 </mapper>
diff --git a/backend/src/main/java/io/dataease/commons/condition/LicStatusCondition.java b/backend/src/main/java/io/dataease/commons/condition/LicStatusCondition.java
new file mode 100644
index 0000000000..50e906db95
--- /dev/null
+++ b/backend/src/main/java/io/dataease/commons/condition/LicStatusCondition.java
@@ -0,0 +1,32 @@
+package io.dataease.commons.condition;
+
+import io.dataease.commons.license.DefaultLicenseService;
+import io.dataease.commons.license.F2CLicenseResponse;
+import io.dataease.commons.utils.CommonBeanFactory;
+import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.context.annotation.Condition;
+import org.springframework.context.annotation.ConditionContext;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+
+
+
+public class LicStatusCondition implements Condition {
+
+    @Override
+    public boolean matches(ConditionContext conditionContext, AnnotatedTypeMetadata annotatedTypeMetadata) {
+        // BeanDefinitionRegistry registry = conditionContext.getRegistry();
+
+        // DefaultLicenseService defaultLicenseService = conditionContext.getBeanFactory().getBean(DefaultLicenseService.class);
+
+        DefaultLicenseService defaultLicenseService = CommonBeanFactory.getBean(DefaultLicenseService.class);
+
+        /*if (null == defaultLicenseService) {
+            registry.registerBeanDefinition();
+        }*/
+        if (ObjectUtils.isNotEmpty(defaultLicenseService)) {
+            F2CLicenseResponse f2CLicenseResponse = defaultLicenseService.validateLicense();
+            return F2CLicenseResponse.Status.valid == f2CLicenseResponse.getStatus();
+        }
+        return false;
+    }
+}
diff --git a/backend/src/main/java/io/dataease/commons/license/DefaultLicenseService.java b/backend/src/main/java/io/dataease/commons/license/DefaultLicenseService.java
index 07a651d3b3..f79f9afc54 100644
--- a/backend/src/main/java/io/dataease/commons/license/DefaultLicenseService.java
+++ b/backend/src/main/java/io/dataease/commons/license/DefaultLicenseService.java
@@ -3,6 +3,7 @@ package io.dataease.commons.license;
 import com.google.gson.Gson;
 import io.dataease.base.domain.License;
 import io.dataease.commons.exception.DEException;
+import io.dataease.commons.utils.LogUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -31,6 +32,7 @@ public class DefaultLicenseService {
         command.add(licenseKey);
         try{
             execCommand(result, command);
+            LogUtil.info("read lic content is : " + result.toString());
             F2CLicenseResponse f2CLicenseResponse = new Gson().fromJson(result.toString(), F2CLicenseResponse.class);
             if(f2CLicenseResponse.getStatus() != F2CLicenseResponse.Status.valid){
                 return f2CLicenseResponse;
@@ -43,6 +45,7 @@ public class DefaultLicenseService {
             }
             return f2CLicenseResponse;
         }catch (Exception e){
+            e.printStackTrace();
             return F2CLicenseResponse.invalid(e.getMessage());
         }
     }
diff --git a/backend/src/main/java/io/dataease/commons/utils/CodingUtil.java b/backend/src/main/java/io/dataease/commons/utils/CodingUtil.java
index d377fafcfd..4bdea0e469 100644
--- a/backend/src/main/java/io/dataease/commons/utils/CodingUtil.java
+++ b/backend/src/main/java/io/dataease/commons/utils/CodingUtil.java
@@ -7,6 +7,7 @@ import javax.crypto.*;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import java.security.MessageDigest;
+import java.util.UUID;
 
 /**
  * 加密解密工具
@@ -153,6 +154,17 @@ public class CodingUtil {
         }
     }
 
+    /*public static String getSignature(String accessKey, String secretKey) throws Exception {
+        return aesEncrypt(accessKey + "|" + UUID.randomUUID().toString() + "|" + System.currentTimeMillis(), secretKey, accessKey);
+    }
+
+    public static void main(String[] args) throws Exception{
+        String accessKey = "gnPFmtAsdLhUEWPA";
+        String secretKey = "TfK5FGUle0KRfJJJ";
+        String signature = getSignature(accessKey, secretKey);
+        System.out.println(signature);
+    }*/
+
     public static String secretKey() {
         try {
             KeyGenerator keyGen = KeyGenerator.getInstance("AES");
diff --git a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
index 4419056510..63448318e1 100644
--- a/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
+++ b/backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java
@@ -19,6 +19,8 @@ import org.xml.sax.helpers.XMLReaderFactory;
 
 import java.io.InputStream;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * @author y
@@ -248,6 +250,13 @@ public class ExcelXlsxReader extends DefaultHandler {
             String value = this.getDataValue(lastIndex.trim(), "");//根据索引值获取对应的单元格值
 
             if (preRef == null) {
+                String regEx="[^0-9]";
+                Pattern p = Pattern.compile(regEx);
+                Matcher m = p.matcher(ref);
+                if(curCol < Integer.valueOf(m.replaceAll("").trim()) -1 ){
+                    cellList.add(curCol, "");
+                    curCol++;
+                }
                 preRef = ref;
             }
             //补全单元格之间的空单元格
@@ -256,12 +265,16 @@ public class ExcelXlsxReader extends DefaultHandler {
             }else if (!ref.equals(preRef)) {
                 int len = countNullCell(ref, preRef);
                 for (int i = 0; i < len; i++) {
-                    cellList.add(curCol, "");
-                    curCol++;
+                    if(curCol < this.fields.size()){
+                        cellList.add(curCol, "");
+                        curCol++;
+                    }
                 }
             }
 
-            cellList.add(curCol, value);
+            if(curCol < this.fields.size()){
+                cellList.add(curCol, value);
+            }
             curCol++;
             //如果里面某个单元格含有值，则标识该行不为空行
             if (value != null && !"".equals(value)) {
@@ -414,6 +427,9 @@ public class ExcelXlsxReader extends DefaultHandler {
             if(CollectionUtils.isEmpty(this.getFields())){
                 throw new RuntimeException(Translator.get("i18n_excel_header_empty"));
             }
+            if(curCol >= this.fields.size()){
+                return thisStr;
+            }
             if(curRow==2){
                 this.getFields().get(curCol).setFieldType(type);
             }else {
diff --git a/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java b/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java
index c8174f6e31..e696452ad3 100644
--- a/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java
+++ b/backend/src/main/java/io/dataease/config/Knife4jConfiguration.java
@@ -1,13 +1,10 @@
 package io.dataease.config;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.github.xiaoymin.knife4j.spring.extension.OpenApiExtensionResolver;
+import io.dataease.commons.condition.LicStatusCondition;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.http.HttpHeaders;
+import org.springframework.context.annotation.*;
 import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
 import springfox.documentation.builders.*;
 import springfox.documentation.oas.annotations.EnableOpenApi;
@@ -15,6 +12,8 @@ import springfox.documentation.service.*;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spi.service.contexts.SecurityContext;
 import springfox.documentation.spring.web.plugins.Docket;
+
+import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -29,6 +28,7 @@ public class Knife4jConfiguration {
     private String version;
 
 
+
     @Autowired
     public Knife4jConfiguration(OpenApiExtensionResolver openApiExtensionResolver) {
         this.openApiExtensionResolver = openApiExtensionResolver;
@@ -64,6 +64,12 @@ public class Knife4jConfiguration {
         return defaultApi("系统管理", "io.dataease.controller.sys");
     }
 
+    /*@Bean(value = "pluginsApi")
+    @Conditional(LicStatusCondition.class)
+    public Docket pluginsApi() {
+        return defaultApi("插件管理", "io.dataease.plugins.server");
+    }*/
+
 
     private ApiInfo apiInfo(){
         return new ApiInfoBuilder()
@@ -77,7 +83,9 @@ public class Knife4jConfiguration {
 
     private Docket defaultApi(String groupName, String packageName) {
         List<SecurityScheme> securitySchemes=new ArrayList<>();
-        securitySchemes.add(apiKey());
+        securitySchemes.add(accessKey());
+        securitySchemes.add(signature());
+
         List<SecurityContext> securityContexts = new ArrayList<>();
         securityContexts.add(securityContext());
 
@@ -100,8 +108,12 @@ public class Knife4jConfiguration {
                 .build();
     }
 
-    private ApiKey apiKey() {
-        return new ApiKey("Authorization", "Authorization", "header");
+    private ApiKey accessKey() {
+        return new ApiKey("accessKey", "accessKey", "header");
+    }
+
+    private ApiKey signature() {
+        return new ApiKey("signature", "signature", "header");
     }
 
 
@@ -109,7 +121,12 @@ public class Knife4jConfiguration {
         AuthorizationScope authorizationScope = new AuthorizationScope("global", "accessEverything");
         AuthorizationScope[] authorizationScopes = new AuthorizationScope[1];
         authorizationScopes[0] = authorizationScope;
-        return CollectionUtil.newArrayList(new SecurityReference("Authorization", authorizationScopes));
+
+        List<SecurityReference> results = new ArrayList<>();
+        results.add(new SecurityReference("accessKey", authorizationScopes));
+        results.add(new SecurityReference("signature", authorizationScopes));
+
+        return results;
     }
 
 }
diff --git a/backend/src/main/java/io/dataease/controller/IndexController.java b/backend/src/main/java/io/dataease/controller/IndexController.java
index 7a48d8f564..19c83d007f 100644
--- a/backend/src/main/java/io/dataease/controller/IndexController.java
+++ b/backend/src/main/java/io/dataease/controller/IndexController.java
@@ -1,13 +1,21 @@
 package io.dataease.controller;
 
+import io.dataease.commons.license.DefaultLicenseService;
+import io.dataease.commons.license.F2CLicenseResponse;
+import io.dataease.exception.DataEaseException;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import javax.annotation.Resource;
+
 @Controller
 @RequestMapping
 public class IndexController {
 
+    @Resource
+    private DefaultLicenseService defaultLicenseService;
+
     @GetMapping(value = "/")
     public String index() {
         return "index.html";
@@ -28,5 +36,18 @@ public class IndexController {
         return "test.html";
     }
 
+    @GetMapping("/deApi")
+    public String deApi() {
+        F2CLicenseResponse f2CLicenseResponse = defaultLicenseService.validateLicense();
+        switch (f2CLicenseResponse.getStatus()) {
+            case valid:
+                return "doc.html";
+            default:
+                // DataEaseException.throwException("Invalid License.");
+                return "nolic.html";
+        }
+        // return "index.html";
+    }
+
 
 }
diff --git a/backend/src/main/java/io/dataease/controller/panel/PanelViewLinkageController.java b/backend/src/main/java/io/dataease/controller/panel/PanelViewLinkageController.java
index b74b33a97f..c994a835f7 100644
--- a/backend/src/main/java/io/dataease/controller/panel/PanelViewLinkageController.java
+++ b/backend/src/main/java/io/dataease/controller/panel/PanelViewLinkageController.java
@@ -9,6 +9,7 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -39,5 +40,10 @@ public class PanelViewLinkageController {
     }
 
 
+    @ApiOperation("获取当前仪表板所有联动信息")
+    @GetMapping("/getPanelAllLinkageInfo/{panelId}")
+    public Map<String, List<String>> getPanelAllLinkageInfo(@PathVariable String panelId){
+        return panelViewLinkageService.getPanelAllLinkageInfo(panelId);
+    }
 
 }
diff --git a/backend/src/main/java/io/dataease/controller/request/chart/ChartDrillRequest.java b/backend/src/main/java/io/dataease/controller/request/chart/ChartDrillRequest.java
new file mode 100644
index 0000000000..c5537b9d4a
--- /dev/null
+++ b/backend/src/main/java/io/dataease/controller/request/chart/ChartDrillRequest.java
@@ -0,0 +1,15 @@
+package io.dataease.controller.request.chart;
+
+import io.dataease.dto.chart.ChartDimensionDTO;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author gin
+ * @Date 2021/8/10 12:25 下午
+ */
+@Data
+public class ChartDrillRequest {
+    private List<ChartDimensionDTO> dimensionList;
+}
diff --git a/backend/src/main/java/io/dataease/controller/request/chart/ChartExtRequest.java b/backend/src/main/java/io/dataease/controller/request/chart/ChartExtRequest.java
index 3806316bd6..edf9a5e9d7 100644
--- a/backend/src/main/java/io/dataease/controller/request/chart/ChartExtRequest.java
+++ b/backend/src/main/java/io/dataease/controller/request/chart/ChartExtRequest.java
@@ -13,4 +13,8 @@ import java.util.List;
 @Setter
 public class ChartExtRequest {
     private List<ChartExtFilterRequest> filter;
+
+    //联动过滤条件
+    private List<ChartExtFilterRequest> linkageFilters;
+    private List<ChartDrillRequest> drill;
 }
diff --git a/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java b/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java
index 421aaafa25..38ee1745f5 100644
--- a/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java
+++ b/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java
@@ -4,14 +4,14 @@ import io.dataease.base.domain.SysDept;
 import io.dataease.commons.utils.BeanUtils;
 import io.dataease.controller.ResultHolder;
 import io.dataease.controller.sys.base.BaseGridRequest;
-import io.dataease.controller.sys.request.DeptCreateRequest;
+/*import io.dataease.controller.sys.request.DeptCreateRequest;
 import io.dataease.controller.sys.request.DeptDeleteRequest;
-import io.dataease.controller.sys.request.DeptStatusRequest;
+import io.dataease.controller.sys.request.DeptStatusRequest;*/
 import io.dataease.controller.sys.response.DeptNodeResponse;
 import io.dataease.controller.sys.response.DeptTreeNode;
 import io.dataease.service.sys.DeptService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+/*import io.swagger.annotations.ApiOperation;*/
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -46,7 +46,6 @@ public class SysDeptController extends ResultHolder {
     @PostMapping("/search")
     public List<DeptNodeResponse> search(@RequestBody BaseGridRequest request){
         List<SysDept> nodes = deptService.nodesTreeByCondition(request);
-        //List<SysDept> nodes = deptService.nodesByPid(pid);
         List<DeptNodeResponse> nodeResponses = nodes.stream().map(node -> {
             DeptNodeResponse deptNodeResponse = BeanUtils.copyBean(new DeptNodeResponse(), node);
             deptNodeResponse.setHasChildren(node.getSubCount() > 0);
@@ -57,14 +56,14 @@ public class SysDeptController extends ResultHolder {
         return nodeResponses;
     }
 
-    @ApiOperation("查询部门")
+    /*@ApiOperation("查询部门")
     @PostMapping("/root")
     public ResultHolder rootData(){
         List<SysDept> root = deptService.nodesByPid(null);
         return success(root);
-    }
+    }*/
 
-    @ApiOperation("新增部门")
+    /*@ApiOperation("新增部门")
     @PostMapping("/create")
     public void create(@RequestBody DeptCreateRequest dept){
         deptService.add(dept);
@@ -84,7 +83,7 @@ public class SysDeptController extends ResultHolder {
     @PostMapping("/updateStatus")
     public void updateStatus(@RequestBody DeptStatusRequest request){
         deptService.updateStatus(request);
-    }
+    }*/
 
     @PostMapping("/nodesByDeptId/{deptId}")
     public List<DeptTreeNode> nodesByDeptId(@PathVariable("deptId") Long deptId){
diff --git a/backend/src/main/java/io/dataease/controller/sys/SysRoleController.java b/backend/src/main/java/io/dataease/controller/sys/SysRoleController.java
index 38ab9ead04..5ba5cca08e 100644
--- a/backend/src/main/java/io/dataease/controller/sys/SysRoleController.java
+++ b/backend/src/main/java/io/dataease/controller/sys/SysRoleController.java
@@ -1,30 +1,30 @@
 package io.dataease.controller.sys;
 
 
-import com.github.pagehelper.Page;
+/*import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import io.dataease.base.domain.SysRole;
 import io.dataease.commons.utils.PageUtils;
 import io.dataease.commons.utils.Pager;
 import io.dataease.controller.sys.base.BaseGridRequest;
-import io.dataease.controller.sys.request.RoleMenusRequest;
+import io.dataease.controller.sys.request.RoleMenusRequest;*/
 import io.dataease.controller.sys.response.RoleUserItem;
 import io.dataease.service.sys.SysRoleService;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+/*import io.swagger.annotations.ApiOperation;*/
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import java.util.List;
-@ApiIgnore
+/*@ApiIgnore
 @RestController
 @RequiredArgsConstructor
 @Api(tags = "系统：角色管理")
 @RequestMapping("/api/role")
-public class SysRoleController {
-
+public class SysRoleController {*/
+    /*
     @Resource
     private SysRoleService sysRoleService;
 
@@ -74,4 +74,5 @@ public class SysRoleController {
     public List<RoleUserItem> all(){
         return sysRoleService.allRoles();
     }
-}
+     */
+/*}*/
diff --git a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java
index 08fa39bd9b..daf98f1796 100644
--- a/backend/src/main/java/io/dataease/controller/sys/SysUserController.java
+++ b/backend/src/main/java/io/dataease/controller/sys/SysUserController.java
@@ -12,7 +12,9 @@ import io.dataease.controller.sys.base.BaseGridRequest;
 import io.dataease.controller.sys.request.SysUserCreateRequest;
 import io.dataease.controller.sys.request.SysUserPwdRequest;
 import io.dataease.controller.sys.request.SysUserStateRequest;
+import io.dataease.controller.sys.response.RoleUserItem;
 import io.dataease.controller.sys.response.SysUserGridResponse;
+import io.dataease.service.sys.SysRoleService;
 import io.dataease.service.sys.SysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -32,6 +34,9 @@ public class SysUserController {
     @Resource
     private SysUserService sysUserService;
 
+    @Resource
+    private SysRoleService sysRoleService;
+
     @ApiOperation("查询用户")
     @PostMapping("/userGrid/{goPage}/{pageSize}")
     public Pager<List<SysUserGridResponse>> userGrid(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody BaseGridRequest request) {
@@ -68,26 +73,27 @@ public class SysUserController {
         sysUserService.updateStatus(request);
     }
 
-    @ApiOperation("用户更新密码")
+    @ApiOperation("更新当前用户密码")
     @PostMapping("/updatePwd")
     public void updatePwd(@RequestBody SysUserPwdRequest request){
 
         sysUserService.updatePwd(request);
     }
-    @ApiOperation("管理员更新密码")
+    @ApiOperation("更新指定用户密码")
     @PostMapping("/adminUpdatePwd")
     public void adminUpdatePwd(@RequestBody SysUserPwdRequest request){
         sysUserService.adminUpdatePwd(request);
     }
 
 
-    @ApiOperation("个人信息")
+    @ApiOperation("当前用户信息")
     @PostMapping("/personInfo")
     public CurrentUserDto personInfo() {
         CurrentUserDto user = AuthUtils.getUser();
         return user;
     }
 
+    @ApiIgnore
     @ApiOperation("更新个人信息")
     @PostMapping("/updatePersonInfo")
     public void updatePersonInfo(@RequestBody SysUserCreateRequest request){
@@ -104,4 +110,10 @@ public class SysUserController {
             }
         });
     }
+
+    @ApiOperation("查询所有角色")
+    @PostMapping("/all")
+    public List<RoleUserItem> all(){
+        return sysRoleService.allRoles();
+    }
 }
diff --git a/backend/src/main/java/io/dataease/controller/sys/base/BaseGridRequest.java b/backend/src/main/java/io/dataease/controller/sys/base/BaseGridRequest.java
index 7ad000f0a8..0e645dab29 100644
--- a/backend/src/main/java/io/dataease/controller/sys/base/BaseGridRequest.java
+++ b/backend/src/main/java/io/dataease/controller/sys/base/BaseGridRequest.java
@@ -1,6 +1,7 @@
 package io.dataease.controller.sys.base;
 
 import io.dataease.base.mapper.ext.query.GridExample;
+import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.collections.CollectionUtils;
 
 import java.io.Serializable;
@@ -9,6 +10,7 @@ import java.util.List;
 
 public class BaseGridRequest implements Serializable {
 
+    @ApiModelProperty("查询条件")
     private List<ConditionEntity> conditions;
 
     public List<ConditionEntity> getConditions() {
@@ -27,6 +29,7 @@ public class BaseGridRequest implements Serializable {
         this.orders = orders;
     }
 
+    @ApiModelProperty("排序描述")
     private List<String> orders;
 
     public GridExample convertExample(){
diff --git a/backend/src/main/java/io/dataease/controller/sys/base/ConditionEntity.java b/backend/src/main/java/io/dataease/controller/sys/base/ConditionEntity.java
index 0da0774c41..304cfcf588 100644
--- a/backend/src/main/java/io/dataease/controller/sys/base/ConditionEntity.java
+++ b/backend/src/main/java/io/dataease/controller/sys/base/ConditionEntity.java
@@ -1,5 +1,6 @@
 package io.dataease.controller.sys.base;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -7,10 +8,13 @@ import java.io.Serializable;
 @Data
 public class ConditionEntity implements Serializable {
 
+    @ApiModelProperty(value = "字段")
     private String field;
 
+    @ApiModelProperty(value = "操作符")
     private String operator;
 
+    @ApiModelProperty(value = "字段值")
     private Object value;
 
 }
diff --git a/backend/src/main/java/io/dataease/controller/sys/request/BatchSettingRequest.java b/backend/src/main/java/io/dataease/controller/sys/request/BatchSettingRequest.java
index f318e7f1dd..1da1a41e2f 100644
--- a/backend/src/main/java/io/dataease/controller/sys/request/BatchSettingRequest.java
+++ b/backend/src/main/java/io/dataease/controller/sys/request/BatchSettingRequest.java
@@ -1,5 +1,6 @@
 package io.dataease.controller.sys.request;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -7,10 +8,10 @@ import java.util.List;
 
 @Data
 public class BatchSettingRequest implements Serializable {
-
+    @ApiModelProperty("消息类型ID集合")
     private List<Long> typeIds;
-
+    @ApiModelProperty("消息类型ID")
     private Long channelId;
-
+    @ApiModelProperty("订阅状态")
     private Boolean enable;
 }
diff --git a/backend/src/main/java/io/dataease/controller/sys/request/MsgRequest.java b/backend/src/main/java/io/dataease/controller/sys/request/MsgRequest.java
index 30f55e4093..3645287be2 100644
--- a/backend/src/main/java/io/dataease/controller/sys/request/MsgRequest.java
+++ b/backend/src/main/java/io/dataease/controller/sys/request/MsgRequest.java
@@ -1,5 +1,6 @@
 package io.dataease.controller.sys.request;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -10,9 +11,12 @@ public class MsgRequest implements Serializable {
 
     private static final long serialVersionUID = 1920091635946508658L;
 
+    @ApiModelProperty("消息类型ID")
     private Long type;
 
+    @ApiModelProperty("是否订阅")
     private Boolean status;
 
+    @ApiModelProperty("排序描述")
     private List<String> orders;
 }
diff --git a/backend/src/main/java/io/dataease/controller/sys/request/MsgSettingRequest.java b/backend/src/main/java/io/dataease/controller/sys/request/MsgSettingRequest.java
index 68ac29e79c..3e59a31efb 100644
--- a/backend/src/main/java/io/dataease/controller/sys/request/MsgSettingRequest.java
+++ b/backend/src/main/java/io/dataease/controller/sys/request/MsgSettingRequest.java
@@ -1,6 +1,7 @@
 package io.dataease.controller.sys.request;
 
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -8,7 +9,9 @@ import java.io.Serializable;
 @Data
 public class MsgSettingRequest implements Serializable {
 
+    @ApiModelProperty("消息类型ID")
     private Long typeId;
 
+    @ApiModelProperty("消息渠道ID")
     private Long channelId;
 }
diff --git a/backend/src/main/java/io/dataease/controller/sys/request/SysUserCreateRequest.java b/backend/src/main/java/io/dataease/controller/sys/request/SysUserCreateRequest.java
index e5d24f98f4..8f1149ead6 100644
--- a/backend/src/main/java/io/dataease/controller/sys/request/SysUserCreateRequest.java
+++ b/backend/src/main/java/io/dataease/controller/sys/request/SysUserCreateRequest.java
@@ -1,13 +1,16 @@
 package io.dataease.controller.sys.request;
 
 import io.dataease.base.domain.SysUser;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.ArrayList;
 import java.util.List;
 
 @Data
 public class SysUserCreateRequest extends SysUser {
 
+    @ApiModelProperty(value = "角色ID集合", required = true, position = 7)
     private List<Long> roleIds;
 
 }
diff --git a/backend/src/main/java/io/dataease/controller/sys/request/SysUserPwdRequest.java b/backend/src/main/java/io/dataease/controller/sys/request/SysUserPwdRequest.java
index 2627deeede..7f8c2aa3f1 100644
--- a/backend/src/main/java/io/dataease/controller/sys/request/SysUserPwdRequest.java
+++ b/backend/src/main/java/io/dataease/controller/sys/request/SysUserPwdRequest.java
@@ -1,6 +1,7 @@
 package io.dataease.controller.sys.request;
 
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -8,9 +9,13 @@ import java.io.Serializable;
 @Data
 public class SysUserPwdRequest implements Serializable {
 
+    @ApiModelProperty(value = "用户ID", required = true)
     private Long userId;
+    @ApiModelProperty(value = "旧密码(密文)", required = true)
     private String password;
+    @ApiModelProperty(hidden = true)
     private String repeatPassword;
+    @ApiModelProperty(value = "新密码(明文)", required = true)
     private String newPassword;
 
 
diff --git a/backend/src/main/java/io/dataease/controller/sys/request/SysUserStateRequest.java b/backend/src/main/java/io/dataease/controller/sys/request/SysUserStateRequest.java
index 4a2fd9ef8c..379eb14d47 100644
--- a/backend/src/main/java/io/dataease/controller/sys/request/SysUserStateRequest.java
+++ b/backend/src/main/java/io/dataease/controller/sys/request/SysUserStateRequest.java
@@ -1,5 +1,6 @@
 package io.dataease.controller.sys.request;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -7,7 +8,9 @@ import java.io.Serializable;
 @Data
 public class SysUserStateRequest implements Serializable {
 
+    @ApiModelProperty(value = "用户ID", required = true)
     private Long userId;
 
+    @ApiModelProperty(value = "状态", required = true, allowableValues = "1,0")
     private Long enabled;
 }
diff --git a/backend/src/main/java/io/dataease/controller/sys/response/SettingTreeNode.java b/backend/src/main/java/io/dataease/controller/sys/response/SettingTreeNode.java
index bbbd574c00..74d3f6a718 100644
--- a/backend/src/main/java/io/dataease/controller/sys/response/SettingTreeNode.java
+++ b/backend/src/main/java/io/dataease/controller/sys/response/SettingTreeNode.java
@@ -1,6 +1,7 @@
 package io.dataease.controller.sys.response;
 
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -11,9 +12,12 @@ public class SettingTreeNode implements Serializable {
 
     private static final long serialVersionUID = -2416283978185545199L;
 
+    @ApiModelProperty("消息类型ID")
     private Long id;
 
+    @ApiModelProperty("消息类型名称")
     private String name;
 
+    @ApiModelProperty("子节点")
     private List<SettingTreeNode> children;
 }
diff --git a/backend/src/main/java/io/dataease/datasource/constants/DatasourceTypes.java b/backend/src/main/java/io/dataease/datasource/constants/DatasourceTypes.java
index fcaf060a42..3724c7f8ea 100644
--- a/backend/src/main/java/io/dataease/datasource/constants/DatasourceTypes.java
+++ b/backend/src/main/java/io/dataease/datasource/constants/DatasourceTypes.java
@@ -3,6 +3,7 @@ package io.dataease.datasource.constants;
 public enum DatasourceTypes {
     excel("excel", "excel", "", "", "", "", ""),
     mysql("mysql", "mysql", "com.mysql.jdbc.Driver", "`", "`", "'", "'"),
+    pg("pg", "pg", "org.postgresql.Driver", "\"", "\"", "\"", "\""),
     sqlServer("sqlServer", "sqlServer", "com.microsoft.sqlserver.jdbc.SQLServerDriver", "\"", "\"", "\"", "\""),
     doris("doris", "doris", "com.mysql.jdbc.Driver", "`", "`", "", ""),
     oracle("oracle", "oracle", "oracle.jdbc.driver.OracleDriver", "\"", "\"", "\"", "\"");
diff --git a/backend/src/main/java/io/dataease/datasource/dto/JdbcDTO.java b/backend/src/main/java/io/dataease/datasource/dto/JdbcDTO.java
index 4f5c6b822a..e22657cdf0 100644
--- a/backend/src/main/java/io/dataease/datasource/dto/JdbcDTO.java
+++ b/backend/src/main/java/io/dataease/datasource/dto/JdbcDTO.java
@@ -12,5 +12,6 @@ public class JdbcDTO {
     private String username;
     private String password;
     private String dataBase;
+    private String schema;
     private String dataSourceType = "jdbc";
 }
diff --git a/backend/src/main/java/io/dataease/datasource/dto/OracleConfigration.java b/backend/src/main/java/io/dataease/datasource/dto/OracleConfigration.java
index 6cebb06f13..6323791f90 100644
--- a/backend/src/main/java/io/dataease/datasource/dto/OracleConfigration.java
+++ b/backend/src/main/java/io/dataease/datasource/dto/OracleConfigration.java
@@ -9,7 +9,6 @@ public class OracleConfigration extends JdbcDTO {
 
     private String driver = "oracle.jdbc.driver.OracleDriver";
     private String connectionType;
-    private String schema;
 
     public String getJdbc() {
         // 连接参数先写死，后边要把编码、时区等参数放到数据源的设置中
diff --git a/backend/src/main/java/io/dataease/datasource/dto/PgConfigration.java b/backend/src/main/java/io/dataease/datasource/dto/PgConfigration.java
new file mode 100644
index 0000000000..3258c575c0
--- /dev/null
+++ b/backend/src/main/java/io/dataease/datasource/dto/PgConfigration.java
@@ -0,0 +1,19 @@
+package io.dataease.datasource.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class PgConfigration extends JdbcDTO {
+
+    private String driver = "org.postgresql.Driver";
+
+    public String getJdbc() {
+        // 连接参数先写死，后边要把编码、时区等参数放到数据源的设置中
+        return "jdbc:postgresql://HOSTNAME:PORT/DATABASE"
+                .replace("HOSTNAME", getHost())
+                .replace("PORT", getPort().toString())
+                .replace("DATABASE", getDataBase());
+    }
+}
\ No newline at end of file
diff --git a/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java b/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java
index 1cbe90c83a..7282704586 100644
--- a/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java
+++ b/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java
@@ -8,7 +8,6 @@ import lombok.Setter;
 @Setter
 public class SqlServerConfigration extends JdbcDTO {
     private String driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
-    private String schema;
 
     public String getJdbc(){
         return "jdbc:sqlserver://HOSTNAME:PORT;DatabaseName=DATABASE".replace("HOSTNAME", getHost()).replace("PORT", getPort().toString()).replace("DATABASE", getDataBase());
diff --git a/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java b/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java
index 12e30186df..e53caacbc9 100644
--- a/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java
+++ b/backend/src/main/java/io/dataease/datasource/provider/JdbcProvider.java
@@ -3,10 +3,7 @@ package io.dataease.datasource.provider;
 import com.google.gson.Gson;
 import com.mchange.v2.c3p0.ComboPooledDataSource;
 import io.dataease.datasource.constants.DatasourceTypes;
-import io.dataease.datasource.dto.MysqlConfigration;
-import io.dataease.datasource.dto.OracleConfigration;
-import io.dataease.datasource.dto.SqlServerConfigration;
-import io.dataease.datasource.dto.TableFiled;
+import io.dataease.datasource.dto.*;
 import io.dataease.datasource.request.DatasourceRequest;
 import io.dataease.exception.DataEaseException;
 import io.dataease.i18n.Translator;
@@ -309,7 +306,7 @@ public class JdbcProvider extends DatasourceProvider {
             resultSet.close();
             ps.close();
         } catch (Exception e) {
-            DataEaseException.throwException(Translator.get("i18n_datasource_connect_error") + e.getMessage());
+            DataEaseException.throwException(e.getMessage());
         } finally {
             if(con != null){con.close();}
         }
@@ -433,6 +430,12 @@ public class JdbcProvider extends DatasourceProvider {
                 props.put( "oracle.net.CONNECT_TIMEOUT" , "5000") ;
 //                props.put( "oracle.jdbc.ReadTimeout" , "5000" ) ;
                 break;
+            case pg:
+                PgConfigration pgConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), PgConfigration.class);
+                username = pgConfigration.getUsername();
+                password = pgConfigration.getPassword();
+                driver = pgConfigration.getDriver();
+                jdbcurl = pgConfigration.getJdbc();
             default:
                 break;
         }
@@ -477,6 +480,13 @@ public class JdbcProvider extends DatasourceProvider {
                 dataSource.setPassword(oracleConfigration.getPassword());
                 dataSource.setJdbcUrl(oracleConfigration.getJdbc());
                 break;
+            case pg:
+                PgConfigration pgConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), PgConfigration.class);
+                dataSource.setUser(pgConfigration.getUsername());
+                dataSource.setDriverClass(pgConfigration.getDriver());
+                dataSource.setPassword(pgConfigration.getPassword());
+                dataSource.setJdbcUrl(pgConfigration.getJdbc());
+                break;
             default:
                 break;
         }
@@ -494,6 +504,9 @@ public class JdbcProvider extends DatasourceProvider {
             case sqlServer:
                 SqlServerConfigration sqlServerConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), SqlServerConfigration.class);
                 return sqlServerConfigration.getDataBase();
+            case pg:
+                PgConfigration pgConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), PgConfigration.class);
+                return pgConfigration.getDataBase();
             default:
                 return null;
         }
@@ -517,6 +530,12 @@ public class JdbcProvider extends DatasourceProvider {
                     throw new Exception(Translator.get("i18n_schema_is_empty"));
                 }
                 return "select table_name, owner from all_tables where owner='" + oracleConfigration.getSchema() + "'";
+            case pg:
+                PgConfigration pgConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), PgConfigration.class);
+                if(StringUtils.isEmpty(pgConfigration.getSchema())){
+                    throw new Exception(Translator.get("i18n_schema_is_empty"));
+                }
+                return "SELECT tablename FROM  pg_tables WHERE  tablename NOT LIKE 'pg%' AND tablename NOT LIKE 'sql_%' AND schemaname='SCHEMA' ;".replace("SCHEMA", pgConfigration.getSchema());
             default:
                 return "show tables;";
         }
@@ -529,6 +548,8 @@ public class JdbcProvider extends DatasourceProvider {
                 return "select * from all_users";
             case sqlServer:
                 return "select name from sys.schemas;";
+            case pg:
+                return "SELECT nspname FROM pg_namespace;";
             default:
                 return "show tables;";
         }
diff --git a/backend/src/main/java/io/dataease/datasource/provider/ProviderFactory.java b/backend/src/main/java/io/dataease/datasource/provider/ProviderFactory.java
index 88a720571a..d780399648 100644
--- a/backend/src/main/java/io/dataease/datasource/provider/ProviderFactory.java
+++ b/backend/src/main/java/io/dataease/datasource/provider/ProviderFactory.java
@@ -28,6 +28,8 @@ public class ProviderFactory implements ApplicationContextAware {
                 return context.getBean("jdbc", DatasourceProvider.class);
             case sqlServer:
                 return context.getBean("jdbc", DatasourceProvider.class);
+            case pg:
+                return context.getBean("jdbc", DatasourceProvider.class);
             default:
                 return context.getBean("jdbc", DatasourceProvider.class);
         }
@@ -42,6 +44,8 @@ public class ProviderFactory implements ApplicationContextAware {
                 return context.getBean("dorisQuery", QueryProvider.class);
             case sqlServer:
                 return context.getBean("sqlserverQuery", QueryProvider.class);
+            case pg:
+                return context.getBean("pgQuery", QueryProvider.class);
             case oracle:
                 return context.getBean("oracleQuery", QueryProvider.class);
             default:
diff --git a/backend/src/main/java/io/dataease/dto/LinkageInfoDTO.java b/backend/src/main/java/io/dataease/dto/LinkageInfoDTO.java
new file mode 100644
index 0000000000..d1f915b042
--- /dev/null
+++ b/backend/src/main/java/io/dataease/dto/LinkageInfoDTO.java
@@ -0,0 +1,31 @@
+package io.dataease.dto;
+
+import java.util.List;
+
+/**
+ * Author: wangjiahao
+ * Date: 8/10/21
+ * Description:
+ */
+public class LinkageInfoDTO {
+
+    private String sourceInfo;
+
+    private List<String> targetInfoList;
+
+    public String getSourceInfo() {
+        return sourceInfo;
+    }
+
+    public void setSourceInfo(String sourceInfo) {
+        this.sourceInfo = sourceInfo;
+    }
+
+    public List<String> getTargetInfoList() {
+        return targetInfoList;
+    }
+
+    public void setTargetInfoList(List<String> targetInfoList) {
+        this.targetInfoList = targetInfoList;
+    }
+}
diff --git a/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java b/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java
index 2a48769ef6..a431983eb6 100644
--- a/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java
+++ b/backend/src/main/java/io/dataease/dto/chart/ChartViewDTO.java
@@ -1,9 +1,11 @@
 package io.dataease.dto.chart;
 
 import io.dataease.base.domain.ChartViewWithBLOBs;
+import io.dataease.controller.request.chart.ChartExtFilterRequest;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,4 +22,8 @@ public class ChartViewDTO extends ChartViewWithBLOBs {
     private Boolean isLeaf;
     private String pid;
     private String sql;
+
+    private boolean drill;
+
+    private List<ChartExtFilterRequest> drillFilters;
 }
diff --git a/backend/src/main/java/io/dataease/plugins/server/PluginCommonServer.java b/backend/src/main/java/io/dataease/plugins/server/PluginCommonServer.java
index fd75f0d08a..225542842f 100644
--- a/backend/src/main/java/io/dataease/plugins/server/PluginCommonServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/PluginCommonServer.java
@@ -8,6 +8,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
 import javax.servlet.http.HttpServletResponse;
 import java.io.BufferedInputStream;
 import java.io.IOException;
@@ -17,6 +19,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicReference;
 
+@ApiIgnore
 @RestController
 @RequestMapping("/api/pluginCommon")
 public class PluginCommonServer {
diff --git a/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java b/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java
index 4a6c0bb6f1..e58fe09995 100644
--- a/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java
@@ -11,14 +11,19 @@ import io.dataease.plugins.xpack.dept.dto.request.XpackMoveDept;
 import io.dataease.plugins.xpack.dept.dto.response.XpackDeptTreeNode;
 import io.dataease.plugins.xpack.dept.dto.response.XpackSysDept;
 import io.dataease.plugins.xpack.dept.service.DeptXpackService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
 import java.util.List;
 import java.util.stream.Collectors;
-
+@Api(tags = "xpack：部门管理")
 @RequestMapping("/plugin/dept")
 @RestController
 public class XDeptServer {
 
+    @ApiOperation("查询子节点")
     @PostMapping("/childNodes/{pid}")
     public List<DeptNodeResponse> childNodes(@PathVariable("pid") Long pid){
         DeptXpackService deptService = SpringContextUtil.getBean(DeptXpackService.class);
@@ -33,6 +38,7 @@ public class XDeptServer {
         return nodeResponses;
     }
 
+    @ApiOperation("搜索组织树")
     @PostMapping("/search")
     public List<DeptNodeResponse> search(@RequestBody XpackGridRequest request){
         DeptXpackService deptService = SpringContextUtil.getBean(DeptXpackService.class);
@@ -47,6 +53,7 @@ public class XDeptServer {
         return nodeResponses;
     }
 
+    @ApiIgnore
     @PostMapping("/root")
     public  List<XpackSysDept> rootData(){
         DeptXpackService deptService = SpringContextUtil.getBean(DeptXpackService.class);
@@ -54,18 +61,21 @@ public class XDeptServer {
         return nodes;
     }
 
+    @ApiOperation("创建")
     @PostMapping("/create")
     public int create(@RequestBody XpackCreateDept dept){
         DeptXpackService deptService = SpringContextUtil.getBean(DeptXpackService.class);
         return deptService.add(dept);
     }
 
+    @ApiOperation("删除")
     @PostMapping("/delete")
     public void delete(@RequestBody List<XpackDeleteDept> requests){
         DeptXpackService deptService = SpringContextUtil.getBean(DeptXpackService.class);
         deptService.batchDelete(requests);
     }
 
+    @ApiOperation("更新")
     @PostMapping("/update")
     public int update(@RequestBody XpackCreateDept dept){
         DeptXpackService deptService = SpringContextUtil.getBean(DeptXpackService.class);
@@ -73,12 +83,15 @@ public class XDeptServer {
     }
 
 
+    @ApiIgnore
+    @ApiOperation("删除")
     @PostMapping("/nodesByDeptId/{deptId}")
     public List<XpackDeptTreeNode> nodesByDeptId(@PathVariable("deptId") Long deptId){
         DeptXpackService deptService = SpringContextUtil.getBean(DeptXpackService.class);
         return deptService.searchTree(deptId);
     }
 
+    @ApiOperation("移动")
     @PostMapping("/move")
     public void move(@RequestBody XpackMoveDept xpackMoveDept){
         DeptXpackService deptService = SpringContextUtil.getBean(DeptXpackService.class);
diff --git a/backend/src/main/java/io/dataease/plugins/server/XRoleServer.java b/backend/src/main/java/io/dataease/plugins/server/XRoleServer.java
index 97905e18c5..b9493a0e62 100644
--- a/backend/src/main/java/io/dataease/plugins/server/XRoleServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/XRoleServer.java
@@ -10,14 +10,19 @@ import io.dataease.plugins.config.SpringContextUtil;
 import io.dataease.plugins.xpack.role.dto.response.XpackRoleDto;
 import io.dataease.plugins.xpack.role.dto.response.XpackRoleItemDto;
 import io.dataease.plugins.xpack.role.service.RoleXpackService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
+@Api(tags = "xpack：角色管理")
 @RequestMapping("/plugin/role")
 @RestController
 public class XRoleServer {
 
 
+    @ApiOperation("新增角色")
     @PostMapping("/create")
     public void create(@RequestBody XpackRoleDto role){
         RoleXpackService roleXpackService = SpringContextUtil.getBean(RoleXpackService.class);
@@ -25,6 +30,7 @@ public class XRoleServer {
     }
 
 
+    @ApiOperation("删除角色")
     @PostMapping("/delete/{roleId}")
     public void delete(@PathVariable("roleId") Long roleId){
         RoleXpackService roleXpackService = SpringContextUtil.getBean(RoleXpackService.class);
@@ -32,12 +38,14 @@ public class XRoleServer {
     }
 
 
+    @ApiOperation("更新角色")
     @PostMapping("/update")
     public void update(@RequestBody XpackRoleDto role){
         RoleXpackService roleXpackService = SpringContextUtil.getBean(RoleXpackService.class);
         roleXpackService.update(role);
     }
 
+    @ApiOperation("分页查询")
     @PostMapping("/roleGrid/{goPage}/{pageSize}")
     public Pager<List<XpackRoleDto>> roleGrid(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody XpackGridRequest request) {
         RoleXpackService roleXpackService = SpringContextUtil.getBean(RoleXpackService.class);
@@ -46,6 +54,7 @@ public class XRoleServer {
         return listPager;
     }
 
+    @ApiIgnore
     @PostMapping("/all")
     public List<XpackRoleItemDto> all() {
         RoleXpackService roleXpackService = SpringContextUtil.getBean(RoleXpackService.class);
diff --git a/backend/src/main/java/io/dataease/provider/QueryProvider.java b/backend/src/main/java/io/dataease/provider/QueryProvider.java
index 4c56399036..b3f4ad5a8a 100644
--- a/backend/src/main/java/io/dataease/provider/QueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/QueryProvider.java
@@ -1,10 +1,15 @@
 package io.dataease.provider;
 
+import com.google.gson.Gson;
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.Datasource;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
+import io.dataease.datasource.dto.JdbcDTO;
+import io.dataease.datasource.dto.SqlServerConfigration;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
+import io.dataease.dto.sqlObj.SQLObj;
+import io.dataease.provider.pg.PgConstants;
 
 import java.util.List;
 
@@ -30,15 +35,15 @@ public abstract class QueryProvider {
 
     public abstract String createQuerySQLAsTmpWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup);
 
-    public abstract String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList);
+    public abstract String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds);
 
     public abstract String getSQLAsTmp(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList);
 
-    public abstract String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack);
+    public abstract String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds);
 
     public abstract String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack);
 
-    public abstract String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble);
+    public abstract String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds);
 
     public abstract String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble);
 
@@ -59,7 +64,15 @@ public abstract class QueryProvider {
 
     public abstract String wrapSql(String sql);
 
-    public abstract String createRawQuerySQL(String table, List<DatasetTableField> fields);
+    public abstract String createRawQuerySQL(String table, List<DatasetTableField> fields, Datasource ds);
 
     public abstract String createRawQuerySQLAsTmp(String sql, List<DatasetTableField> fields);
+
+    public void setSchema(SQLObj tableObj, Datasource ds){
+        if(ds != null){
+            String schema = new Gson().fromJson(ds.getConfiguration(), JdbcDTO.class).getSchema();
+            schema = String.format( PgConstants.KEYWORD_TABLE, schema);
+            tableObj.setTableName(schema + "." + tableObj.getTableName());
+        }
+    }
 }
diff --git a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
index 8a411a6de6..f7638fe8c9 100644
--- a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
@@ -174,7 +174,7 @@ public class DorisQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) {
+    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(DorisConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
@@ -281,11 +281,11 @@ public class DorisQueryProvider extends QueryProvider {
 
     @Override
     public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) {
-        return getSQL("(" + sql + ")", xAxis, yAxis, customFilter, extFilterRequestList);
+        return getSQL("(" + sql + ")", xAxis, yAxis, customFilter, extFilterRequestList, null);
     }
 
     @Override
-    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) {
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(DorisConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
@@ -395,11 +395,11 @@ public class DorisQueryProvider extends QueryProvider {
 
     @Override
     public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) {
-        return getSQLStack("(" + table + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack);
+        return getSQLStack("(" + table + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack, null);
     }
 
     @Override
-    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble) {
+    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(DorisConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
@@ -509,7 +509,7 @@ public class DorisQueryProvider extends QueryProvider {
 
     @Override
     public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble) {
-        return getSQLScatter("(" + table + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble);
+        return getSQLScatter("(" + table + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble, null);
     }
 
     @Override
@@ -605,7 +605,7 @@ public class DorisQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String createRawQuerySQL(String table, List<DatasetTableField> fields) {
+    public String createRawQuerySQL(String table, List<DatasetTableField> fields, Datasource ds) {
         String[] array = fields.stream().map(f -> {
             StringBuilder stringBuilder = new StringBuilder();
             stringBuilder.append("`").append(f.getDataeaseName()).append("` AS ").append(f.getDataeaseName());
@@ -616,7 +616,7 @@ public class DorisQueryProvider extends QueryProvider {
 
     @Override
     public String createRawQuerySQLAsTmp(String sql, List<DatasetTableField> fields) {
-        return createRawQuerySQL(" (" + sqlFix(sql) + ") AS tmp ", fields);
+        return createRawQuerySQL(" (" + sqlFix(sql) + ") AS tmp ", fields, null);
     }
 
     private String sqlFix(String sql) {
diff --git a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
index 5702a9a68d..7d95965a19 100644
--- a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
@@ -165,7 +165,7 @@ public class MysqlQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) {
+    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MySQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
@@ -273,11 +273,11 @@ public class MysqlQueryProvider extends QueryProvider {
 
     @Override
     public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) {
-        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList);
+        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList, null);
     }
 
     @Override
-    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) {
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MySQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
@@ -387,11 +387,11 @@ public class MysqlQueryProvider extends QueryProvider {
 
     @Override
     public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) {
-        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack);
+        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack, null);
     }
 
     @Override
-    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble) {
+    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MySQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
@@ -501,7 +501,7 @@ public class MysqlQueryProvider extends QueryProvider {
 
     @Override
     public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble) {
-        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble);
+        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble, null);
     }
 
     @Override
@@ -597,7 +597,7 @@ public class MysqlQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String createRawQuerySQL(String table, List<DatasetTableField> fields) {
+    public String createRawQuerySQL(String table, List<DatasetTableField> fields, Datasource ds) {
         String[] array = fields.stream().map(f -> {
             StringBuilder stringBuilder = new StringBuilder();
             if (f.getDeExtractType() == 4) { // 处理 tinyint
@@ -612,7 +612,7 @@ public class MysqlQueryProvider extends QueryProvider {
 
     @Override
     public String createRawQuerySQLAsTmp(String sql, List<DatasetTableField> fields) {
-        return createRawQuerySQL(" (" + sqlFix(sql) + ") AS tmp ", fields);
+        return createRawQuerySQL(" (" + sqlFix(sql) + ") AS tmp ", fields, null);
     }
 
     public String transMysqlFilterTerm(String term) {
diff --git a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
index 02af808450..138a2cac52 100644
--- a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
@@ -199,7 +199,7 @@ public class OracleQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) {
+    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(OracleConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(OracleConstants.ALIAS_FIX, String.format(TABLE_ALIAS_PREFIX, 0)))
@@ -306,11 +306,11 @@ public class OracleQueryProvider extends QueryProvider {
 
     @Override
     public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) {
-        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList);
+        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList, null);
     }
 
     @Override
-    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) {
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(OracleConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(OracleConstants.ALIAS_FIX, String.format(TABLE_ALIAS_PREFIX, 0)))
@@ -420,11 +420,11 @@ public class OracleQueryProvider extends QueryProvider {
 
     @Override
     public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) {
-        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack);
+        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack, null);
     }
 
     @Override
-    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble) {
+    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(OracleConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(OracleConstants.ALIAS_FIX, String.format(TABLE_ALIAS_PREFIX, 0)))
@@ -534,7 +534,7 @@ public class OracleQueryProvider extends QueryProvider {
 
     @Override
     public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble) {
-        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble);
+        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble, null);
     }
 
     @Override
@@ -629,7 +629,7 @@ public class OracleQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String createRawQuerySQL(String table, List<DatasetTableField> fields) {
+    public String createRawQuerySQL(String table, List<DatasetTableField> fields, Datasource ds) {
         String[] array = fields.stream().map(f -> {
             StringBuilder stringBuilder = new StringBuilder();
             stringBuilder.append(" \"").append(f.getOriginName()).append("\"");
@@ -640,7 +640,7 @@ public class OracleQueryProvider extends QueryProvider {
 
     @Override
     public String createRawQuerySQLAsTmp(String sql, List<DatasetTableField> fields) {
-        return createRawQuerySQL(" (" + sqlFix(sql) + ") DE_TMP ", fields);
+        return createRawQuerySQL(" (" + sqlFix(sql) + ") DE_TMP ", fields, null);
     }
 
     public String transMysqlFilterTerm(String term) {
diff --git a/backend/src/main/java/io/dataease/provider/pg/PgConstants.java b/backend/src/main/java/io/dataease/provider/pg/PgConstants.java
new file mode 100644
index 0000000000..e9f9555ae3
--- /dev/null
+++ b/backend/src/main/java/io/dataease/provider/pg/PgConstants.java
@@ -0,0 +1,43 @@
+package io.dataease.provider.pg;
+
+import io.dataease.provider.SQLConstants;
+
+import static io.dataease.datasource.constants.DatasourceTypes.pg;
+
+/**
+ * @Author gin
+ * @Date 2021/7/8 7:22 下午
+ */
+public class PgConstants extends SQLConstants {
+    public static final String KEYWORD_TABLE = pg.getKeywordPrefix() + "%s" + pg.getKeywordSuffix();
+
+    public static final String KEYWORD_FIX = "%s." + pg.getKeywordPrefix() + "%s" + pg.getKeywordSuffix();
+
+    public static final String UNIX_TIMESTAMP = "floor(extract(epoch from(( %s - timestamp '1970-01-01 00:00:00')*1000))) ";
+
+    public static final String DATE_FORMAT = "to_char(%s, %s)";
+
+    public static final String FROM_UNIXTIME = "to_timestamp(%s)";
+
+    public static final String CAST = "CAST(%s AS %s)";
+
+    public static final String DEFAULT_DATE_FORMAT = "'YYYY-MM-DD HH24:MI:SS'";
+
+    public static final String DEFAULT_INT_FORMAT = "numeric(18,0)";
+
+    public static final String DEFAULT_FLOAT_FORMAT = "numeric(18,2)";
+
+    public static final String WHERE_VALUE_NULL = "(NULL,'')";
+
+    public static final String WHERE_VALUE_VALUE = "'%s'";
+
+    public static final String AGG_COUNT = "COUNT(*)";
+
+    public static final String AGG_FIELD = "%s(%s)";
+
+    public static final String WHERE_BETWEEN = "'%s' AND '%s'";
+
+    public static final String BRACKETS = "(%s)";
+
+
+}
diff --git a/backend/src/main/java/io/dataease/provider/pg/PgQueryProvider.java b/backend/src/main/java/io/dataease/provider/pg/PgQueryProvider.java
new file mode 100644
index 0000000000..eecb57b2d2
--- /dev/null
+++ b/backend/src/main/java/io/dataease/provider/pg/PgQueryProvider.java
@@ -0,0 +1,922 @@
+package io.dataease.provider.pg;
+
+import com.google.gson.Gson;
+import io.dataease.base.domain.DatasetTableField;
+import io.dataease.base.domain.DatasetTableFieldExample;
+import io.dataease.base.domain.Datasource;
+import io.dataease.base.mapper.DatasetTableFieldMapper;
+import io.dataease.commons.constants.DeTypeConstants;
+import io.dataease.controller.request.chart.ChartExtFilterRequest;
+import io.dataease.datasource.dto.JdbcDTO;
+import io.dataease.datasource.dto.PgConfigration;
+import io.dataease.datasource.dto.SqlServerConfigration;
+import io.dataease.dto.chart.ChartCustomFilterDTO;
+import io.dataease.dto.chart.ChartViewFieldDTO;
+import io.dataease.dto.sqlObj.SQLObj;
+import io.dataease.provider.QueryProvider;
+import io.dataease.provider.SQLConstants;
+import io.dataease.provider.sqlserver.SqlServerSQLConstants;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+import org.stringtemplate.v4.ST;
+import org.stringtemplate.v4.STGroup;
+import org.stringtemplate.v4.STGroupFile;
+
+import javax.annotation.Resource;
+import java.text.MessageFormat;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
+
+
+
+@Service("pgQuery")
+public class PgQueryProvider extends QueryProvider {
+    @Resource
+    private DatasetTableFieldMapper datasetTableFieldMapper;
+
+    @Override
+    public Integer transFieldType(String field) {
+        field = field.toLowerCase();
+        switch (field) {
+            case "bpchar":
+            case "varchar":
+            case "text":
+            case "tsquery":
+            case "tsvector":
+            case "uuid":
+            case "xml":
+            case "json":
+            case "bit":
+            case "jsonb":
+            case "cidr":
+            case "inet":
+            case "macaddr":
+            case "txid_snapshot":
+            case "box":
+            case "circle":
+            case "line":
+            case "lseg":
+            case "path":
+            case "point":
+            case "polygon":
+            case "bool":
+            case "interval":
+                return DeTypeConstants.DE_STRING;// 文本
+            case "date":
+            case "time":
+            case "timestamp":
+            case "timestamptz":
+                return DeTypeConstants.DE_TIME;// 时间
+            case "int2":
+            case "int4":
+            case "int8":
+            case "INTEGER":
+            case "BIGINT":
+                return DeTypeConstants.DE_INT;// 整型
+            case "numeric":
+            case "float4":
+            case "float8":
+            case "money":
+                return DeTypeConstants.DE_FLOAT;// 浮点
+//            case "bool":
+            case "TINYINT":
+                return DeTypeConstants.DE_BOOL;// 布尔
+            case "bytea":
+                return DeTypeConstants.DE_Binary;// 二进制
+            default:
+                return DeTypeConstants.DE_STRING;
+        }
+    }
+
+    @Override
+    public String createSQLPreview(String sql, String orderBy) {
+        return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp   " + " LIMIT 1000 offset 0";
+    }
+
+    @Override
+    public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds) {
+        SQLObj tableObj = SQLObj.builder()
+                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format( PgConstants.KEYWORD_TABLE, table))
+                .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
+                .build();
+
+        setSchema(tableObj,ds);
+        List<SQLObj> xFields = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(fields)) {
+            for (int i = 0; i < fields.size(); i++) {
+                DatasetTableField f = fields.get(i);
+                String originField;
+                if (ObjectUtils.isNotEmpty(f.getExtField()) && f.getExtField() == 2) {
+                    // 解析origin name中有关联的字段生成sql表达式
+                    originField = calcFieldRegex(f.getOriginName(), tableObj);
+                } else if (ObjectUtils.isNotEmpty(f.getExtField()) && f.getExtField() == 1) {
+                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), f.getOriginName());
+                } else {
+                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), f.getOriginName());
+                }
+                String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
+                String fieldName = "";
+                // 处理横轴字段
+                if (f.getDeExtractType() == DeTypeConstants.DE_TIME) {
+                    if (f.getDeType() == DeTypeConstants.DE_INT || f.getDeType() == DeTypeConstants.DE_FLOAT) {
+                        fieldName = String.format( PgConstants.UNIX_TIMESTAMP, originField);
+                    } else {
+                        fieldName = originField;
+                    }
+                } else if (f.getDeExtractType() == DeTypeConstants.DE_STRING) {
+                    if (f.getDeType() == DeTypeConstants.DE_INT) {
+                        fieldName = String.format( PgConstants.CAST, originField, PgConstants.DEFAULT_INT_FORMAT);
+                    } else if (f.getDeType() == DeTypeConstants.DE_FLOAT) {
+                        fieldName = String.format( PgConstants.CAST, originField, PgConstants.DEFAULT_FLOAT_FORMAT);
+                    } else if (f.getDeType() == DeTypeConstants.DE_TIME) {
+                        fieldName = String.format( PgConstants.CAST, originField, "timestamp");
+                    } else {
+                        fieldName = originField;
+                    }
+                } else {
+                    if (f.getDeType() == DeTypeConstants.DE_TIME) {
+                        String cast = String.format( PgConstants.CAST, originField,  "bigint");
+                        fieldName = String.format( PgConstants.FROM_UNIXTIME, cast );
+                    } else if (f.getDeType() == DeTypeConstants.DE_INT) {
+                        fieldName = String.format( PgConstants.CAST, originField, PgConstants.DEFAULT_INT_FORMAT);
+                    } else {
+                        fieldName = originField;
+                    }
+                }
+                xFields.add(SQLObj.builder()
+                        .fieldName(fieldName)
+                        .fieldAlias(fieldAlias)
+                        .build());
+            }
+        }
+
+        STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
+        ST st_sql = stg.getInstanceOf("previewSql");
+        st_sql.add("isGroup", isGroup);
+        if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
+        if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
+        return st_sql.render();
+    }
+
+    @Override
+    public String createQuerySQLAsTmp(String sql, List<DatasetTableField> fields, boolean isGroup) {
+        return createQuerySQL("(" + sqlFix(sql) + ")", fields, isGroup, null);
+    }
+
+    @Override
+    public String createQuerySQLWithPage(String table, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup, Datasource ds) {
+        return createQuerySQL(table, fields, isGroup, null) + " LIMIT " + realSize + " offset " + (page - 1) * pageSize;
+    }
+
+    @Override
+    public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds) {
+        return createQuerySQL(table, fields, isGroup, null) + " LIMIT " + limit + " offset 0";
+    }
+
+    @Override
+    public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup) {
+        return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT " + limit + " offset 0";
+    }
+
+    @Override
+    public String createQuerySQLAsTmpWithPage(String sql, List<DatasetTableField> fields, Integer page, Integer pageSize, Integer realSize, boolean isGroup) {
+        return createQuerySQLAsTmp(sql, fields, isGroup) + " LIMIT " + realSize + " offset " + (page - 1) * pageSize;
+    }
+
+    @Override
+    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds) {
+        SQLObj tableObj = SQLObj.builder()
+                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format( PgConstants.KEYWORD_TABLE, table))
+                .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
+                .build();
+        setSchema(tableObj,ds);
+        List<SQLObj> xFields = new ArrayList<>();
+        List<SQLObj> xWheres = new ArrayList<>();
+        List<SQLObj> xOrders = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(xAxis)) {
+            for (int i = 0; i < xAxis.size(); i++) {
+                ChartViewFieldDTO x = xAxis.get(i);
+                String originField;
+                if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 2) {
+                    // 解析origin name中有关联的字段生成sql表达式
+                    originField = calcFieldRegex(x.getOriginName(), tableObj);
+                } else if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 1) {
+                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
+                } else {
+                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
+                }
+                String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
+                // 处理横轴字段
+                xFields.add(getXFields(x, originField, fieldAlias));
+                // 处理横轴过滤
+//                xWheres.addAll(getXWheres(x, originField, fieldAlias));
+                // 处理横轴排序
+                if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) {
+                    xOrders.add(SQLObj.builder()
+                            .orderField(originField)
+                            .orderAlias(fieldAlias)
+                            .orderDirection(x.getSort())
+                            .build());
+                }
+            }
+        }
+        List<SQLObj> yFields = new ArrayList<>();
+        List<SQLObj> yWheres = new ArrayList<>();
+        List<SQLObj> yOrders = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(yAxis)) {
+            for (int i = 0; i < yAxis.size(); i++) {
+                ChartViewFieldDTO y = yAxis.get(i);
+                String originField;
+                if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 2) {
+                    // 解析origin name中有关联的字段生成sql表达式
+                    originField = calcFieldRegex(y.getOriginName(), tableObj);
+                } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) {
+                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
+                } else {
+                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
+                }
+                String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i);
+                // 处理纵轴字段
+                yFields.add(getYFields(y, originField, fieldAlias));
+                // 处理纵轴过滤
+                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                // 处理纵轴排序
+                if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
+                    yOrders.add(SQLObj.builder()
+                            .orderField(originField)
+                            .orderAlias(fieldAlias)
+                            .orderDirection(y.getSort())
+                            .build());
+                }
+            }
+        }
+        // 处理视图中字段过滤
+        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        // 处理仪表板字段过滤
+        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        // 构建sql所有参数
+        List<SQLObj> fields = new ArrayList<>();
+        fields.addAll(xFields);
+        fields.addAll(yFields);
+        List<SQLObj> wheres = new ArrayList<>();
+        wheres.addAll(xWheres);
+        if (customWheres != null) wheres.addAll(customWheres);
+        if (extWheres != null) wheres.addAll(extWheres);
+        List<SQLObj> groups = new ArrayList<>();
+        groups.addAll(xFields);
+        // 外层再次套sql
+        List<SQLObj> orders = new ArrayList<>();
+        orders.addAll(xOrders);
+        orders.addAll(yOrders);
+        List<SQLObj> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres);
+
+        STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
+        ST st_sql = stg.getInstanceOf("querySql");
+        if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
+        if (CollectionUtils.isNotEmpty(yFields)) st_sql.add("aggregators", yFields);
+        if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
+        if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
+        String sql = st_sql.render();
+
+        ST st = stg.getInstanceOf("querySql");
+        SQLObj tableSQL = SQLObj.builder()
+                .tableName(String.format( PgConstants.BRACKETS, sql))
+                .tableAlias(String.format(TABLE_ALIAS_PREFIX, 1))
+                .build();
+        if (CollectionUtils.isNotEmpty(aggWheres)) st.add("filters", aggWheres);
+        if (CollectionUtils.isNotEmpty(orders)) st.add("orders", orders);
+        if (ObjectUtils.isNotEmpty(tableSQL)) st.add("table", tableSQL);
+        return st.render();
+    }
+
+
+    @Override
+    public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) {
+        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList, null);
+    }
+
+    @Override
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds) {
+        SQLObj tableObj = SQLObj.builder()
+                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format( PgConstants.KEYWORD_TABLE, table))
+                .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
+                .build();
+        setSchema(tableObj,ds);
+        List<SQLObj> xFields = new ArrayList<>();
+        List<SQLObj> xWheres = new ArrayList<>();
+        List<SQLObj> xOrders = new ArrayList<>();
+        List<ChartViewFieldDTO> xList = new ArrayList<>();
+        xList.addAll(xAxis);
+        xList.addAll(extStack);
+        if (CollectionUtils.isNotEmpty(xList)) {
+            for (int i = 0; i < xList.size(); i++) {
+                ChartViewFieldDTO x = xList.get(i);
+                String originField;
+                if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 2) {
+                    // 解析origin name中有关联的字段生成sql表达式
+                    originField = calcFieldRegex(x.getOriginName(), tableObj);
+                } else if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 1) {
+                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
+                } else {
+                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
+                }
+                String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
+                // 处理横轴字段
+                xFields.add(getXFields(x, originField, fieldAlias));
+                // 处理横轴过滤
+//                xWheres.addAll(getXWheres(x, originField, fieldAlias));
+                // 处理横轴排序
+                if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) {
+                    xOrders.add(SQLObj.builder()
+                            .orderField(originField)
+                            .orderAlias(fieldAlias)
+                            .orderDirection(x.getSort())
+                            .build());
+                }
+            }
+        }
+        List<SQLObj> yFields = new ArrayList<>();
+        List<SQLObj> yWheres = new ArrayList<>();
+        List<SQLObj> yOrders = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(yAxis)) {
+            for (int i = 0; i < yAxis.size(); i++) {
+                ChartViewFieldDTO y = yAxis.get(i);
+                String originField;
+                if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 2) {
+                    // 解析origin name中有关联的字段生成sql表达式
+                    originField = calcFieldRegex(y.getOriginName(), tableObj);
+                } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) {
+                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
+                } else {
+                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
+                }
+                String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i);
+                // 处理纵轴字段
+                yFields.add(getYFields(y, originField, fieldAlias));
+                // 处理纵轴过滤
+                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                // 处理纵轴排序
+                if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
+                    yOrders.add(SQLObj.builder()
+                            .orderField(originField)
+                            .orderAlias(fieldAlias)
+                            .orderDirection(y.getSort())
+                            .build());
+                }
+            }
+        }
+        // 处理视图中字段过滤
+        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        // 处理仪表板字段过滤
+        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        // 构建sql所有参数
+        List<SQLObj> fields = new ArrayList<>();
+        fields.addAll(xFields);
+        fields.addAll(yFields);
+        List<SQLObj> wheres = new ArrayList<>();
+        wheres.addAll(xWheres);
+        if (customWheres != null) wheres.addAll(customWheres);
+        if (extWheres != null) wheres.addAll(extWheres);
+        List<SQLObj> groups = new ArrayList<>();
+        groups.addAll(xFields);
+        // 外层再次套sql
+        List<SQLObj> orders = new ArrayList<>();
+        orders.addAll(xOrders);
+        orders.addAll(yOrders);
+        List<SQLObj> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres);
+
+        STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
+        ST st_sql = stg.getInstanceOf("querySql");
+        if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
+        if (CollectionUtils.isNotEmpty(yFields)) st_sql.add("aggregators", yFields);
+        if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
+        if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
+        String sql = st_sql.render();
+
+        ST st = stg.getInstanceOf("querySql");
+        SQLObj tableSQL = SQLObj.builder()
+                .tableName(String.format( PgConstants.BRACKETS, sql))
+                .tableAlias(String.format(TABLE_ALIAS_PREFIX, 1))
+                .build();
+        if (CollectionUtils.isNotEmpty(aggWheres)) st.add("filters", aggWheres);
+        if (CollectionUtils.isNotEmpty(orders)) st.add("orders", orders);
+        if (ObjectUtils.isNotEmpty(tableSQL)) st.add("table", tableSQL);
+        return st.render();
+    }
+
+    @Override
+    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) {
+        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack, null);
+    }
+
+    @Override
+    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds) {
+        SQLObj tableObj = SQLObj.builder()
+                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format( PgConstants.KEYWORD_TABLE, table))
+                .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
+                .build();
+        setSchema(tableObj,ds);
+        List<SQLObj> xFields = new ArrayList<>();
+        List<SQLObj> xWheres = new ArrayList<>();
+        List<SQLObj> xOrders = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(xAxis)) {
+            for (int i = 0; i < xAxis.size(); i++) {
+                ChartViewFieldDTO x = xAxis.get(i);
+                String originField;
+                if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 2) {
+                    // 解析origin name中有关联的字段生成sql表达式
+                    originField = calcFieldRegex(x.getOriginName(), tableObj);
+                } else if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 1) {
+                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
+                } else {
+                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
+                }
+                String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
+                // 处理横轴字段
+                xFields.add(getXFields(x, originField, fieldAlias));
+                // 处理横轴过滤
+//                xWheres.addAll(getXWheres(x, originField, fieldAlias));
+                // 处理横轴排序
+                if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) {
+                    xOrders.add(SQLObj.builder()
+                            .orderField(originField)
+                            .orderAlias(fieldAlias)
+                            .orderDirection(x.getSort())
+                            .build());
+                }
+            }
+        }
+        List<SQLObj> yFields = new ArrayList<>();
+        List<SQLObj> yWheres = new ArrayList<>();
+        List<SQLObj> yOrders = new ArrayList<>();
+        List<ChartViewFieldDTO> yList = new ArrayList<>();
+        yList.addAll(yAxis);
+        yList.addAll(extBubble);
+        if (CollectionUtils.isNotEmpty(yList)) {
+            for (int i = 0; i < yList.size(); i++) {
+                ChartViewFieldDTO y = yList.get(i);
+                String originField;
+                if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 2) {
+                    // 解析origin name中有关联的字段生成sql表达式
+                    originField = calcFieldRegex(y.getOriginName(), tableObj);
+                } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) {
+                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
+                } else {
+                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
+                }
+                String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i);
+                // 处理纵轴字段
+                yFields.add(getYFields(y, originField, fieldAlias));
+                // 处理纵轴过滤
+                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                // 处理纵轴排序
+                if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
+                    yOrders.add(SQLObj.builder()
+                            .orderField(originField)
+                            .orderAlias(fieldAlias)
+                            .orderDirection(y.getSort())
+                            .build());
+                }
+            }
+        }
+        // 处理视图中字段过滤
+        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        // 处理仪表板字段过滤
+        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        // 构建sql所有参数
+        List<SQLObj> fields = new ArrayList<>();
+        fields.addAll(xFields);
+        fields.addAll(yFields);
+        List<SQLObj> wheres = new ArrayList<>();
+        wheres.addAll(xWheres);
+        if (customWheres != null) wheres.addAll(customWheres);
+        if (extWheres != null) wheres.addAll(extWheres);
+        List<SQLObj> groups = new ArrayList<>();
+        groups.addAll(xFields);
+        // 外层再次套sql
+        List<SQLObj> orders = new ArrayList<>();
+        orders.addAll(xOrders);
+        orders.addAll(yOrders);
+        List<SQLObj> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres);
+
+        STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
+        ST st_sql = stg.getInstanceOf("querySql");
+        if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
+        if (CollectionUtils.isNotEmpty(yFields)) st_sql.add("aggregators", yFields);
+        if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
+        if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
+        String sql = st_sql.render();
+
+        ST st = stg.getInstanceOf("querySql");
+        SQLObj tableSQL = SQLObj.builder()
+                .tableName(String.format( PgConstants.BRACKETS, sql))
+                .tableAlias(String.format(TABLE_ALIAS_PREFIX, 1))
+                .build();
+        if (CollectionUtils.isNotEmpty(aggWheres)) st.add("filters", aggWheres);
+        if (CollectionUtils.isNotEmpty(orders)) st.add("orders", orders);
+        if (ObjectUtils.isNotEmpty(tableSQL)) st.add("table", tableSQL);
+        return st.render();
+    }
+
+    @Override
+    public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble) {
+        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble, null);
+    }
+
+    @Override
+    public String searchTable(String table) {
+        return "SELECT table_name FROM information_schema.TABLES WHERE table_name ='" + table + "'";
+    }
+
+    @Override
+    public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) {
+        // 字段汇总 排序等
+        SQLObj tableObj = SQLObj.builder()
+                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format( PgConstants.KEYWORD_TABLE, table))
+                .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
+                .build();
+        List<SQLObj> yFields = new ArrayList<>();
+        List<SQLObj> yWheres = new ArrayList<>();
+        List<SQLObj> yOrders = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(yAxis)) {
+            for (int i = 0; i < yAxis.size(); i++) {
+                ChartViewFieldDTO y = yAxis.get(i);
+                String originField;
+                if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 2) {
+                    // 解析origin name中有关联的字段生成sql表达式
+                    originField = calcFieldRegex(y.getOriginName(), tableObj);
+                } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) {
+                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
+                } else {
+                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
+                }
+                String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i);
+                // 处理纵轴字段
+                yFields.add(getYFields(y, originField, fieldAlias));
+                // 处理纵轴过滤
+                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                // 处理纵轴排序
+                if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
+                    yOrders.add(SQLObj.builder()
+                            .orderField(originField)
+                            .orderAlias(fieldAlias)
+                            .orderDirection(y.getSort())
+                            .build());
+                }
+            }
+        }
+        // 处理视图中字段过滤
+        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        // 处理仪表板字段过滤
+        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        // 构建sql所有参数
+        List<SQLObj> fields = new ArrayList<>();
+        fields.addAll(yFields);
+        List<SQLObj> wheres = new ArrayList<>();
+        if (customWheres != null) wheres.addAll(customWheres);
+        if (extWheres != null) wheres.addAll(extWheres);
+        List<SQLObj> groups = new ArrayList<>();
+        // 外层再次套sql
+        List<SQLObj> orders = new ArrayList<>();
+        orders.addAll(yOrders);
+        List<SQLObj> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres);
+
+        STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
+        ST st_sql = stg.getInstanceOf("querySql");
+        if (CollectionUtils.isNotEmpty(yFields)) st_sql.add("aggregators", yFields);
+        if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
+        if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
+        String sql = st_sql.render();
+
+        ST st = stg.getInstanceOf("querySql");
+        SQLObj tableSQL = SQLObj.builder()
+                .tableName(String.format( PgConstants.BRACKETS, sql))
+                .tableAlias(String.format(TABLE_ALIAS_PREFIX, 1))
+                .build();
+        if (CollectionUtils.isNotEmpty(aggWheres)) st.add("filters", aggWheres);
+        if (CollectionUtils.isNotEmpty(orders)) st.add("orders", orders);
+        if (ObjectUtils.isNotEmpty(tableSQL)) st.add("table", tableSQL);
+        return st.render();
+    }
+
+    @Override
+    public String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) {
+        return getSQLSummary("(" + sqlFix(sql) + ")", yAxis, customFilter, extFilterRequestList);
+    }
+
+    @Override
+    public String wrapSql(String sql) {
+        sql = sql.trim();
+        if (sql.lastIndexOf(";") == (sql.length() - 1)) {
+            sql = sql.substring(0, sql.length() - 1);
+        }
+        String tmpSql = "SELECT * FROM (" + sql + ") AS tmp " + " LIMIT 0 ";
+        return tmpSql;
+    }
+
+    @Override
+    public String createRawQuerySQL(String table, List<DatasetTableField> fields, Datasource ds) {
+        String[] array = fields.stream().map(f -> {
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.append("\"").append(f.getOriginName()).append("\" AS ").append(f.getDataeaseName());
+            return stringBuilder.toString();
+        }).toArray(String[]::new);
+        if(ds != null){
+            String schema = new Gson().fromJson(ds.getConfiguration(), JdbcDTO.class).getSchema();
+            String tableWithSchema = String.format(SqlServerSQLConstants.KEYWORD_TABLE, schema) + "." + String.format(SqlServerSQLConstants.KEYWORD_TABLE, table);
+            return MessageFormat.format("SELECT {0} FROM {1}  ", StringUtils.join(array, ","), tableWithSchema);
+        }else {
+            return MessageFormat.format("SELECT {0} FROM {1}  ", StringUtils.join(array, ","), table);
+        }
+    }
+
+    @Override
+    public String createRawQuerySQLAsTmp(String sql, List<DatasetTableField> fields) {
+        return createRawQuerySQL(" (" + sqlFix(sql) + ") AS tmp ", fields, null);
+    }
+
+    public String transMysqlFilterTerm(String term) {
+        switch (term) {
+            case "eq":
+                return " = ";
+            case "not_eq":
+                return " <> ";
+            case "lt":
+                return " < ";
+            case "le":
+                return " <= ";
+            case "gt":
+                return " > ";
+            case "ge":
+                return " >= ";
+            case "in":
+                return " IN ";
+            case "not in":
+                return " NOT IN ";
+            case "like":
+                return " LIKE ";
+            case "not like":
+                return " NOT LIKE ";
+            case "null":
+                return " IN ";
+            case "not_null":
+                return " IS NOT NULL AND %s <> ''";
+            case "between":
+                return " BETWEEN ";
+            default:
+                return "";
+        }
+    }
+
+    public List<SQLObj> transCustomFilterList(SQLObj tableObj, List<ChartCustomFilterDTO> requestList) {
+        if (CollectionUtils.isEmpty(requestList)) {
+            return null;
+        }
+        List<SQLObj> list = new ArrayList<>();
+        for (ChartCustomFilterDTO request : requestList) {
+            DatasetTableField field = request.getField();
+            if (ObjectUtils.isEmpty(field)) {
+                continue;
+            }
+            String value = request.getValue();
+            String whereName = "";
+            String whereTerm = transMysqlFilterTerm(request.getTerm());
+            String whereValue = "";
+            String originName;
+            if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
+                // 解析origin name中有关联的字段生成sql表达式
+                originName = calcFieldRegex(field.getOriginName(), tableObj);
+            } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
+                originName = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
+            } else {
+                originName = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
+            }
+            if (field.getDeType() == 1 && field.getDeExtractType() != 1) {
+                String cast = String.format( PgConstants.CAST, originName,  "bigint");
+                whereName = String.format( PgConstants.FROM_UNIXTIME, cast);
+            } else {
+                whereName = originName;
+            }
+            if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) {
+                whereValue =  PgConstants.WHERE_VALUE_NULL;
+            } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) {
+                whereTerm = String.format(whereTerm, originName);
+            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) {
+                whereValue = "('" + StringUtils.join(value, "','") + "')";
+            } else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) {
+                whereValue = "'%" + value + "%'";
+            } else {
+                whereValue = String.format( PgConstants.WHERE_VALUE_VALUE, value);
+            }
+            list.add(SQLObj.builder()
+                    .whereField(whereName)
+                    .whereTermAndValue(whereTerm + whereValue)
+                    .build());
+        }
+        return list;
+    }
+
+    public List<SQLObj> transExtFilterList(SQLObj tableObj, List<ChartExtFilterRequest> requestList) {
+        if (CollectionUtils.isEmpty(requestList)) {
+            return null;
+        }
+        List<SQLObj> list = new ArrayList<>();
+        for (ChartExtFilterRequest request : requestList) {
+            List<String> value = request.getValue();
+            DatasetTableField field = request.getDatasetTableField();
+            if (CollectionUtils.isEmpty(value) || ObjectUtils.isEmpty(field)) {
+                continue;
+            }
+            String whereName = "";
+            String whereTerm = transMysqlFilterTerm(request.getOperator());
+            String whereValue = "";
+
+            String originName;
+            if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 2) {
+                // 解析origin name中有关联的字段生成sql表达式
+                originName = calcFieldRegex(field.getOriginName(), tableObj);
+            } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
+                originName = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
+            } else {
+                originName = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
+            }
+
+            if (field.getDeType() == 1 && field.getDeExtractType() != 1) {
+                String cast = String.format( PgConstants.CAST, originName,  "bigint");
+                whereName = String.format( PgConstants.FROM_UNIXTIME, cast);
+            } else {
+                whereName = originName;
+            }
+
+            if (StringUtils.containsIgnoreCase(request.getOperator(), "in")) {
+                whereValue = "('" + StringUtils.join(value, "','") + "')";
+            } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
+                whereValue = "'%" + value.get(0) + "%'";
+            } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
+                if (request.getDatasetTableField().getDeType() == 1) {
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
+                    String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
+                    whereValue = String.format( PgConstants.WHERE_BETWEEN, startTime, endTime);
+                } else {
+                    whereValue = String.format( PgConstants.WHERE_BETWEEN, value.get(0), value.get(1));
+                }
+            } else {
+                whereValue = String.format( PgConstants.WHERE_VALUE_VALUE, value.get(0));
+            }
+            list.add(SQLObj.builder()
+                    .whereField(whereName)
+                    .whereTermAndValue(whereTerm + whereValue)
+                    .build());
+        }
+        return list;
+    }
+
+    private String sqlFix(String sql) {
+        if (sql.lastIndexOf(";") == (sql.length() - 1)) {
+            sql = sql.substring(0, sql.length() - 1);
+        }
+        return sql;
+    }
+
+    private String transDateFormat(String dateStyle, String datePattern) {
+        String split = "-";
+        if (StringUtils.equalsIgnoreCase(datePattern, "date_sub")) {
+            split = "-";
+        } else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) {
+            split = "/";
+        }
+
+        switch (dateStyle) {
+            case "y":
+                return "'YYYY'";
+            case "y_M":
+                return "'YYYY" + split + "MM'";
+            case "y_M_d":
+                return "'YYYY" + split + "MM" + split + "DD'";
+            case "H_m_s":
+                return "'HH24:MI:SS'";
+            case "y_M_d_H_m":
+                return "'YYYY" + split + "MM" + split + "DD" + " HH24:MI'";
+            case "y_M_d_H_m_s":
+                return "'YYYY" + split + "MM" + split + "DD" + " HH24:MI:SS'";
+            default:
+                return "'YYYY-MM-DD HH24:MI:SS'";
+        }
+    }
+
+    private SQLObj getXFields(ChartViewFieldDTO x, String originField, String fieldAlias) {
+        String fieldName = "";
+        if (x.getDeExtractType() == DeTypeConstants.DE_TIME) {
+            if (x.getDeType() == 2 || x.getDeType() == 3) {
+                fieldName = String.format( PgConstants.UNIX_TIMESTAMP, originField);
+            } else if (x.getDeType() == DeTypeConstants.DE_TIME) {
+                String format = transDateFormat(x.getDateStyle(), x.getDatePattern());
+                fieldName = String.format( PgConstants.DATE_FORMAT, originField, format);
+            } else {
+                fieldName = originField;
+            }
+        } else {
+            if (x.getDeType() == DeTypeConstants.DE_TIME) {
+                String format = transDateFormat(x.getDateStyle(), x.getDatePattern());
+                if (x.getDeExtractType() == DeTypeConstants.DE_STRING) {
+                    fieldName = String.format( PgConstants.DATE_FORMAT, originField, format);
+                } else {
+                    String cast = String.format( PgConstants.CAST, originField,  "bigint");
+                    String from_unixtime = String.format( PgConstants.FROM_UNIXTIME, cast);
+                    fieldName = String.format( PgConstants.DATE_FORMAT, from_unixtime, format);
+                }
+            } else {
+                fieldName = originField;
+            }
+        }
+        return SQLObj.builder()
+                .fieldName(fieldName)
+                .fieldAlias(fieldAlias)
+                .build();
+    }
+
+    private SQLObj getYFields(ChartViewFieldDTO y, String originField, String fieldAlias) {
+        String fieldName = "";
+        if (StringUtils.equalsIgnoreCase(y.getOriginName(), "*")) {
+            fieldName =  PgConstants.AGG_COUNT;
+        } else if (SQLConstants.DIMENSION_TYPE.contains(y.getDeType())) {
+            fieldName = String.format( PgConstants.AGG_FIELD, y.getSummary(), originField);
+        } else {
+            if (StringUtils.equalsIgnoreCase(y.getSummary(), "avg") || StringUtils.containsIgnoreCase(y.getSummary(), "pop")) {
+                String cast = String.format( PgConstants.CAST, originField, y.getDeType() == DeTypeConstants.DE_INT ?  PgConstants.DEFAULT_INT_FORMAT :  PgConstants.DEFAULT_FLOAT_FORMAT);
+                String agg = String.format( PgConstants.AGG_FIELD, y.getSummary(), cast);
+                fieldName = String.format( PgConstants.CAST, agg,  PgConstants.DEFAULT_FLOAT_FORMAT);
+            } else {
+                String cast = String.format( PgConstants.CAST, originField, y.getDeType() == DeTypeConstants.DE_INT ?  PgConstants.DEFAULT_INT_FORMAT :  PgConstants.DEFAULT_FLOAT_FORMAT);
+                fieldName = String.format( PgConstants.AGG_FIELD, y.getSummary(), cast);
+            }
+        }
+        return SQLObj.builder()
+                .fieldName(fieldName)
+                .fieldAlias(fieldAlias)
+                .build();
+    }
+
+    private List<SQLObj> getYWheres(ChartViewFieldDTO y, String originField, String fieldAlias) {
+        List<SQLObj> list = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(y.getFilter()) && y.getFilter().size() > 0) {
+            y.getFilter().forEach(f -> {
+                String whereTerm = transMysqlFilterTerm(f.getTerm());
+                String whereValue = "";
+                // 原始类型不是时间，在de中被转成时间的字段做处理
+                if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) {
+                    whereValue =  PgConstants.WHERE_VALUE_NULL;
+                } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) {
+                    whereTerm = String.format(whereTerm, originField);
+                } else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) {
+                    whereValue = "('" + StringUtils.join(f.getValue(), "','") + "')";
+                } else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) {
+                    whereValue = "'%" + f.getValue() + "%'";
+                } else {
+                    whereValue = String.format( PgConstants.WHERE_VALUE_VALUE, f.getValue());
+                }
+                list.add(SQLObj.builder()
+                        .whereField(fieldAlias)
+                        .whereAlias(fieldAlias)
+                        .whereTermAndValue(whereTerm + whereValue)
+                        .build());
+            });
+        }
+        return list;
+    }
+
+    private String calcFieldRegex(String originField, SQLObj tableObj) {
+        originField = originField.replaceAll("[\\t\\n\\r]]", "");
+        // 正则提取[xxx]
+        String regex = "\\[(.*?)]";
+        Pattern pattern = Pattern.compile(regex);
+        Matcher matcher = pattern.matcher(originField);
+        Set<String> ids = new HashSet<>();
+        while (matcher.find()) {
+            String id = matcher.group(1);
+            ids.add(id);
+        }
+        if (CollectionUtils.isEmpty(ids)) {
+            return originField;
+        }
+        DatasetTableFieldExample datasetTableFieldExample = new DatasetTableFieldExample();
+        datasetTableFieldExample.createCriteria().andIdIn(new ArrayList<>(ids));
+        List<DatasetTableField> calcFields = datasetTableFieldMapper.selectByExample(datasetTableFieldExample);
+        for (DatasetTableField ele : calcFields) {
+            originField = originField.replaceAll("\\[" + ele.getId() + "]",
+                    String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), ele.getOriginName()));
+        }
+        return originField;
+    }
+}
diff --git a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java
index 2c8d0254ba..6820889473 100644
--- a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java
@@ -7,13 +7,13 @@ import io.dataease.base.domain.Datasource;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
 import io.dataease.commons.constants.DeTypeConstants;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
+import io.dataease.datasource.dto.JdbcDTO;
 import io.dataease.datasource.dto.SqlServerConfigration;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
 import io.dataease.provider.QueryProvider;
 import io.dataease.provider.SQLConstants;
-import io.dataease.provider.mysql.MySQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -91,10 +91,7 @@ public class SqlserverQueryProvider extends QueryProvider {
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(SqlServerSQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
-        if(ds != null){
-            String schema = new Gson().fromJson(ds.getConfiguration(), SqlServerConfigration.class).getSchema();
-            tableObj.setTableName(schema + "." + tableObj.getTableName());
-        }
+        setSchema(tableObj,ds);
 
         List<SQLObj> xFields = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(fields)) {
@@ -171,11 +168,12 @@ public class SqlserverQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) {
+    public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(SqlServerSQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
+        setSchema(tableObj,ds);
         List<SQLObj> xFields = new ArrayList<>();
         List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
@@ -263,15 +261,16 @@ public class SqlserverQueryProvider extends QueryProvider {
 
     @Override
     public String getSQLAsTmp(String sql, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) {
-        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList);
+        return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList, null);
     }
 
     @Override
-    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) {
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(SqlServerSQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
+        setSchema(tableObj,ds);
         List<SQLObj> xFields = new ArrayList<>();
         List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
@@ -380,15 +379,16 @@ public class SqlserverQueryProvider extends QueryProvider {
 
     @Override
     public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) {
-        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack);
+        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack, null);
     }
 
     @Override
-    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble) {
+    public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds) {
         SQLObj tableObj = SQLObj.builder()
-                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MySQLConstants.KEYWORD_TABLE, table))
+                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(SqlServerSQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
+        setSchema(tableObj,ds);
         List<SQLObj> xFields = new ArrayList<>();
         List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
@@ -400,9 +400,9 @@ public class SqlserverQueryProvider extends QueryProvider {
                     // 解析origin name中有关联的字段生成sql表达式
                     originField = calcFieldRegex(x.getOriginName(), tableObj);
                 } else if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 1) {
-                    originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
+                    originField = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
                 } else {
-                    originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
+                    originField = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
                 }
                 String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
                 // 处理横轴字段
@@ -433,9 +433,9 @@ public class SqlserverQueryProvider extends QueryProvider {
                     // 解析origin name中有关联的字段生成sql表达式
                     originField = calcFieldRegex(y.getOriginName(), tableObj);
                 } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) {
-                    originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
+                    originField = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
                 } else {
-                    originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
+                    originField = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
                 }
                 String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i);
                 // 处理纵轴字段
@@ -483,7 +483,7 @@ public class SqlserverQueryProvider extends QueryProvider {
 
         ST st = stg.getInstanceOf("querySql");
         SQLObj tableSQL = SQLObj.builder()
-                .tableName(String.format(MySQLConstants.BRACKETS, sql))
+                .tableName(String.format(SqlServerSQLConstants.BRACKETS, sql))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 1))
                 .build();
         if (CollectionUtils.isNotEmpty(aggWheres)) st.add("filters", aggWheres);
@@ -494,7 +494,7 @@ public class SqlserverQueryProvider extends QueryProvider {
 
     @Override
     public String getSQLAsTmpScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble) {
-        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble);
+        return getSQLScatter("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extBubble, null);
     }
 
     @Override
@@ -582,23 +582,24 @@ public class SqlserverQueryProvider extends QueryProvider {
     }
 
     @Override
-    public String createRawQuerySQL(String table, List<DatasetTableField> fields) {
+    public String createRawQuerySQL(String table, List<DatasetTableField> fields, Datasource ds) {
         String[] array = fields.stream().map(f -> {
             StringBuilder stringBuilder = new StringBuilder();
-//            if (f.getDeExtractType() == 4) { // 处理 tinyint
-//                stringBuilder.append("concat(`").append(f.getOriginName()).append("`,'') AS ").append(f.getDataeaseName());
-//            } else {
-//                stringBuilder.append("`").append(f.getOriginName()).append("` AS ").append(f.getDataeaseName());
-//            }
             stringBuilder.append("\"").append(f.getOriginName()).append("\" AS ").append(f.getDataeaseName());
             return stringBuilder.toString();
         }).toArray(String[]::new);
-        return MessageFormat.format("SELECT {0} FROM {1}", StringUtils.join(array, ","), table);
+        if(ds != null){
+            String schema = new Gson().fromJson(ds.getConfiguration(), JdbcDTO.class).getSchema();
+            String tableWithSchema = String.format(SqlServerSQLConstants.KEYWORD_TABLE, schema) + "." + String.format(SqlServerSQLConstants.KEYWORD_TABLE, table);
+            return MessageFormat.format("SELECT {0} FROM {1}  ", StringUtils.join(array, ","), tableWithSchema);
+        }else {
+            return MessageFormat.format("SELECT {0} FROM {1}  ", StringUtils.join(array, ","), table);
+        }
     }
 
     @Override
     public String createRawQuerySQLAsTmp(String sql, List<DatasetTableField> fields) {
-        return createRawQuerySQL(" (" + sqlFix(sql) + ") AS tmp ", fields);
+        return createRawQuerySQL(" (" + sqlFix(sql) + ") AS tmp ", fields, null);
     }
 
     public String transMysqlFilterTerm(String term) {
@@ -773,47 +774,6 @@ public class SqlserverQueryProvider extends QueryProvider {
         }
     }
 
-    private String transStringToDateFormat(String dateStyle, String datePattern, String originField) {
-        String split = "-";
-        if (StringUtils.equalsIgnoreCase(datePattern, "date_sub")) {
-            split = "-";
-        } else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) {
-            split = "/";
-        }
-        switch (dateStyle) {
-            case "y":
-                return "CONVERT(varchar(100), datepart(yy, " + "SELECT CONVERT(datetime, " +  originField + " ,120)" + "))";
-            case "y_M":
-                if(split.equalsIgnoreCase("-")){
-                    return "substring( convert(varchar," + "SELECT CONVERT(datetime, " +  originField + " ,120)" + ",120),1,7)";
-                }else {
-                    return "replace("+ "substring( convert(varchar," + "SELECT CONVERT(datetime, " +  originField + " ,120)" + ",120),1,7), '-','/')";
-                }
-            case "y_M_d":
-                if(split.equalsIgnoreCase("-")){
-                    return "CONVERT(varchar(100), " + "SELECT CONVERT(datetime, " +  originField + " ,120)" + ", 23)";
-                }else {
-                    return "CONVERT(varchar(100), " + "SELECT CONVERT(datetime, " +  originField + " ,120)" + ", 111)";
-                }
-            case "H_m_s":
-                return "CONVERT(varchar(100), " + "SELECT CONVERT(datetime, " +  originField + " ,120)" + ", 24)";
-            case "y_M_d_H_m":
-                if(split.equalsIgnoreCase("-")){
-                    return "substring( convert(varchar," + "SELECT CONVERT(datetime, " +  originField + " ,120)" + ",120),1,16)";
-                }else {
-                    return "replace("+ "substring( convert(varchar," + "SELECT CONVERT(datetime, " +  originField + " ,120)" + ",120),1,16), '-','/')";
-                }
-            case "y_M_d_H_m_s":
-                if(split.equalsIgnoreCase("-")){
-                    return "convert(varchar," + "SELECT CONVERT(datetime, " +  originField + " ,120)" + ",120)";
-                }else {
-                    return "replace("+ "convert(varchar," + "SELECT CONVERT(datetime, " +  originField + " ,120)" + ",120), '-','/')";
-                }
-            default:
-                return "convert(varchar," + "SELECT CONVERT(datetime, " +  originField + " ,120)" + ",120)";
-        }
-    }
-
     private SQLObj getXFields(ChartViewFieldDTO x, String originField, String fieldAlias) {
         String fieldName = "";
         if (x.getDeExtractType() == DeTypeConstants.DE_TIME) {
@@ -912,7 +872,7 @@ public class SqlserverQueryProvider extends QueryProvider {
         List<DatasetTableField> calcFields = datasetTableFieldMapper.selectByExample(datasetTableFieldExample);
         for (DatasetTableField ele : calcFields) {
             originField = originField.replaceAll("\\[" + ele.getId() + "]",
-                    String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), ele.getOriginName()));
+                    String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), ele.getOriginName()));
         }
         return originField;
     }
diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index 68fa644ab0..3ab743ceb9 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -11,19 +11,12 @@ import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.BeanUtils;
 import io.dataease.commons.utils.CommonBeanFactory;
 import io.dataease.commons.utils.LogUtil;
-import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.controller.request.chart.ChartExtRequest;
-import io.dataease.controller.request.chart.ChartGroupRequest;
-import io.dataease.controller.request.chart.ChartViewRequest;
-import io.dataease.controller.request.dataset.DataSetGroupRequest;
-import io.dataease.controller.request.dataset.DataSetTableRequest;
+import io.dataease.controller.request.chart.*;
 import io.dataease.datasource.provider.DatasourceProvider;
 import io.dataease.datasource.provider.ProviderFactory;
 import io.dataease.datasource.request.DatasourceRequest;
 import io.dataease.datasource.service.DatasourceService;
 import io.dataease.dto.chart.*;
-import io.dataease.dto.dataset.DataSetGroupDTO;
-import io.dataease.dto.dataset.DataSetTableDTO;
 import io.dataease.dto.dataset.DataSetTableUnionDTO;
 import io.dataease.dto.dataset.DataTableInfoDTO;
 import io.dataease.i18n.Translator;
@@ -197,6 +190,8 @@ public class ChartViewService {
         }.getType());
         List<ChartFieldCustomFilterDTO> fieldCustomFilter = new Gson().fromJson(view.getCustomFilter(), new TypeToken<List<ChartFieldCustomFilterDTO>>() {
         }.getType());
+        List<ChartViewFieldDTO> drill = new Gson().fromJson(view.getDrillFields(), new TypeToken<List<ChartViewFieldDTO>>() {
+        }.getType());
         List<ChartCustomFilterDTO> customFilter = new ArrayList<>();
         for (ChartFieldCustomFilterDTO ele : fieldCustomFilter) {
             List<ChartCustomFilterDTO> collect = ele.getFilter().stream().map(f -> {
@@ -225,6 +220,8 @@ public class ChartViewService {
 
         // 过滤来自仪表板的条件
         List<ChartExtFilterRequest> extFilterList = new ArrayList<>();
+
+        //组件过滤条件
         if (ObjectUtils.isNotEmpty(requestList.getFilter())) {
             for (ChartExtFilterRequest request : requestList.getFilter()) {
                 DatasetTableField datasetTableField = dataSetTableFieldsService.get(request.getFieldId());
@@ -241,6 +238,64 @@ public class ChartViewService {
             }
         }
 
+        //联动过滤条件联动条件全部加上
+        if (ObjectUtils.isNotEmpty(requestList.getLinkageFilters())) {
+            for (ChartExtFilterRequest request : requestList.getLinkageFilters()) {
+                DatasetTableField datasetTableField = dataSetTableFieldsService.get(request.getFieldId());
+                request.setDatasetTableField(datasetTableField);
+                if (StringUtils.equalsIgnoreCase(datasetTableField.getTableId(), view.getTableId())) {
+                    if (CollectionUtils.isNotEmpty(request.getViewIds())) {
+                        if (request.getViewIds().contains(view.getId())) {
+                            extFilterList.add(request);
+                        }
+                    } else {
+                        extFilterList.add(request);
+                    }
+                }
+            }
+        }
+
+        // 下钻
+        List<ChartExtFilterRequest> drillFilters = new ArrayList<>();
+        boolean isDrill = false;
+        List<ChartDrillRequest> drillRequest = requestList.getDrill();
+        if (CollectionUtils.isNotEmpty(drillRequest) && (drill.size() > drillRequest.size())) {
+            for (int i = 0; i < drillRequest.size(); i++) {
+                ChartDrillRequest request = drillRequest.get(i);
+                for (ChartDimensionDTO dto : request.getDimensionList()) {
+                    ChartViewFieldDTO chartViewFieldDTO = drill.get(i);
+                    // 将钻取值作为条件传递，将所有钻取字段作为xAxis并加上下一个钻取字段
+                    if (StringUtils.equalsIgnoreCase(dto.getId(), chartViewFieldDTO.getId())) {
+                        isDrill = true;
+                        DatasetTableField datasetTableField = dataSetTableFieldsService.get(dto.getId());
+                        ChartViewFieldDTO d = new ChartViewFieldDTO();
+                        BeanUtils.copyBean(d, datasetTableField);
+
+                        ChartExtFilterRequest drillFilter = new ChartExtFilterRequest();
+                        drillFilter.setFieldId(dto.getId());
+                        drillFilter.setValue(new ArrayList<String>() {{
+                            add(dto.getValue());
+                        }});
+                        drillFilter.setOperator("in");
+                        drillFilter.setDatasetTableField(datasetTableField);
+                        extFilterList.add(drillFilter);
+
+                        drillFilters.add(drillFilter);
+
+                        if (!checkDrillExist(xAxis, extStack, d, view)) {
+                            xAxis.add(d);
+                        }
+                        if (i == drillRequest.size() - 1) {
+                            ChartViewFieldDTO nextDrillField = drill.get(i + 1);
+                            if (!checkDrillExist(xAxis, extStack, nextDrillField, view)) {
+                                xAxis.add(nextDrillField);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
         // 获取数据集,需校验权限
         DatasetTable table = dataSetTableService.get(view.getTableId());
         if (ObjectUtils.isEmpty(table)) {
@@ -263,11 +318,11 @@ public class ChartViewService {
                 if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType())) {
                     datasourceRequest.setQuery(qp.getSQLSummary(dataTableInfoDTO.getTable(), yAxis, customFilter, extFilterList));
                 } else if (StringUtils.containsIgnoreCase(view.getType(), "stack")) {
-                    datasourceRequest.setQuery(qp.getSQLStack(dataTableInfoDTO.getTable(), xAxis, yAxis, customFilter, extFilterList, extStack));
+                    datasourceRequest.setQuery(qp.getSQLStack(dataTableInfoDTO.getTable(), xAxis, yAxis, customFilter, extFilterList, extStack, ds));
                 } else if (StringUtils.containsIgnoreCase(view.getType(), "scatter")) {
-                    datasourceRequest.setQuery(qp.getSQLScatter(dataTableInfoDTO.getTable(), xAxis, yAxis, customFilter, extFilterList, extBubble));
+                    datasourceRequest.setQuery(qp.getSQLScatter(dataTableInfoDTO.getTable(), xAxis, yAxis, customFilter, extFilterList, extBubble, ds));
                 } else {
-                    datasourceRequest.setQuery(qp.getSQL(dataTableInfoDTO.getTable(), xAxis, yAxis, customFilter, extFilterList));
+                    datasourceRequest.setQuery(qp.getSQL(dataTableInfoDTO.getTable(), xAxis, yAxis, customFilter, extFilterList, ds));
                 }
             } else if (StringUtils.equalsIgnoreCase(table.getType(), "sql")) {
                 if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType())) {
@@ -316,11 +371,11 @@ public class ChartViewService {
             if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType())) {
                 datasourceRequest.setQuery(qp.getSQLSummary(tableName, yAxis, customFilter, extFilterList));
             } else if (StringUtils.containsIgnoreCase(view.getType(), "stack")) {
-                datasourceRequest.setQuery(qp.getSQLStack(tableName, xAxis, yAxis, customFilter, extFilterList, extStack));
+                datasourceRequest.setQuery(qp.getSQLStack(tableName, xAxis, yAxis, customFilter, extFilterList, extStack, ds));
             } else if (StringUtils.containsIgnoreCase(view.getType(), "scatter")) {
-                datasourceRequest.setQuery(qp.getSQLScatter(tableName, xAxis, yAxis, customFilter, extFilterList, extBubble));
+                datasourceRequest.setQuery(qp.getSQLScatter(tableName, xAxis, yAxis, customFilter, extFilterList, extBubble, ds));
             } else {
-                datasourceRequest.setQuery(qp.getSQL(tableName, xAxis, yAxis, customFilter, extFilterList));
+                datasourceRequest.setQuery(qp.getSQL(tableName, xAxis, yAxis, customFilter, extFilterList, ds));
             }
             /*// 定时抽取使用缓存
             Object cache;
@@ -339,7 +394,9 @@ public class ChartViewService {
                 data = (List<String[]>) cache;
             }*/
             // 仪表板有参数不实用缓存
-            if (CollectionUtils.isNotEmpty(requestList.getFilter())) {
+            if (CollectionUtils.isNotEmpty(requestList.getFilter())
+                    || CollectionUtils.isNotEmpty(requestList.getLinkageFilters())
+                    || CollectionUtils.isNotEmpty(requestList.getDrill())) {
                 data = datasourceProvider.getData(datasourceRequest);
             } else {
                 try {
@@ -362,16 +419,16 @@ public class ChartViewService {
         // 图表组件可再扩展
         Map<String, Object> mapChart;
         if (StringUtils.containsIgnoreCase(view.getType(), "stack")) {
-            mapChart = transStackChartData(xAxis, yAxis, view, data, extStack);
+            mapChart = transStackChartData(xAxis, yAxis, view, data, extStack, isDrill);
         } else if (StringUtils.containsIgnoreCase(view.getType(), "scatter")) {
-            mapChart = transScatterData(xAxis, yAxis, view, data, extBubble);
+            mapChart = transScatterData(xAxis, yAxis, view, data, extBubble, isDrill);
         } else if (StringUtils.containsIgnoreCase(view.getType(), "radar")) {
-            mapChart = transRadarChartData(xAxis, yAxis, view, data);
+            mapChart = transRadarChartData(xAxis, yAxis, view, data, isDrill);
         } else if (StringUtils.containsIgnoreCase(view.getType(), "text")
                 || StringUtils.containsIgnoreCase(view.getType(), "gauge")) {
-            mapChart = transNormalChartData(xAxis, yAxis, view, data);
+            mapChart = transNormalChartData(xAxis, yAxis, view, data, isDrill);
         } else {
-            mapChart = transChartData(xAxis, yAxis, view, data);
+            mapChart = transChartData(xAxis, yAxis, view, data, isDrill);
         }
         // table组件，明细表，也用于导出数据
         Map<String, Object> mapTableNormal = transTableNormal(xAxis, yAxis, view, data, extStack);
@@ -383,9 +440,30 @@ public class ChartViewService {
         BeanUtils.copyBean(dto, view);
         dto.setData(map);
         dto.setSql(datasourceRequest.getQuery());
+
+        dto.setDrill(isDrill);
+        dto.setDrillFilters(drillFilters);
         return dto;
     }
 
+    private boolean checkDrillExist(List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> extStack, ChartViewFieldDTO dto, ChartViewWithBLOBs view) {
+        if (CollectionUtils.isNotEmpty(xAxis)) {
+            for (ChartViewFieldDTO x : xAxis) {
+                if (StringUtils.equalsIgnoreCase(x.getId(), dto.getId())) {
+                    return true;
+                }
+            }
+        }
+        if (StringUtils.containsIgnoreCase(view.getType(), "stack") && CollectionUtils.isNotEmpty(extStack)) {
+            for (ChartViewFieldDTO x : extStack) {
+                if (StringUtils.equalsIgnoreCase(x.getId(), dto.getId())) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
     /**
      * 避免缓存击穿
      * 虽然流量不一定能够达到击穿的水平
@@ -423,7 +501,7 @@ public class ChartViewService {
     }
 
     // 基础图形
-    private Map<String, Object> transChartData(List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, ChartViewWithBLOBs view, List<String[]> data) {
+    private Map<String, Object> transChartData(List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, ChartViewWithBLOBs view, List<String[]> data, boolean isDrill) {
         Map<String, Object> map = new HashMap<>();
 
         List<String> x = new ArrayList<>();
@@ -464,11 +542,15 @@ public class ChartViewService {
                 }
                 series.get(j).getData().add(axisChartDataDTO);
             }
-            for (int i = 0; i < xAxis.size(); i++) {
-                if (i == xAxis.size() - 1) {
-                    a.append(d[i]);
-                } else {
-                    a.append(d[i]).append("\n");
+            if (isDrill) {
+                a.append(d[xAxis.size() - 1]);
+            } else {
+                for (int i = 0; i < xAxis.size(); i++) {
+                    if (i == xAxis.size() - 1) {
+                        a.append(d[i]);
+                    } else {
+                        a.append(d[i]).append("\n");
+                    }
                 }
             }
             x.add(a.toString());
@@ -480,7 +562,7 @@ public class ChartViewService {
     }
 
     // 常规图形
-    private Map<String, Object> transNormalChartData(List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, ChartViewWithBLOBs view, List<String[]> data) {
+    private Map<String, Object> transNormalChartData(List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, ChartViewWithBLOBs view, List<String[]> data, boolean isDrill) {
         Map<String, Object> map = new HashMap<>();
 
         List<String> x = new ArrayList<>();
@@ -494,11 +576,15 @@ public class ChartViewService {
         }
         for (String[] d : data) {
             StringBuilder a = new StringBuilder();
-            for (int i = 0; i < xAxis.size(); i++) {
-                if (i == xAxis.size() - 1) {
-                    a.append(d[i]);
-                } else {
-                    a.append(d[i]).append("\n");
+            if (isDrill) {
+                a.append(d[xAxis.size() - 1]);
+            } else {
+                for (int i = 0; i < xAxis.size(); i++) {
+                    if (i == xAxis.size() - 1) {
+                        a.append(d[i]);
+                    } else {
+                        a.append(d[i]).append("\n");
+                    }
                 }
             }
             x.add(a.toString());
@@ -518,7 +604,7 @@ public class ChartViewService {
     }
 
     // radar图
-    private Map<String, Object> transRadarChartData(List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, ChartViewWithBLOBs view, List<String[]> data) {
+    private Map<String, Object> transRadarChartData(List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, ChartViewWithBLOBs view, List<String[]> data, boolean isDrill) {
         Map<String, Object> map = new HashMap<>();
 
         List<String> x = new ArrayList<>();
@@ -532,11 +618,15 @@ public class ChartViewService {
         }
         for (String[] d : data) {
             StringBuilder a = new StringBuilder();
-            for (int i = 0; i < xAxis.size(); i++) {
-                if (i == xAxis.size() - 1) {
-                    a.append(d[i]);
-                } else {
-                    a.append(d[i]).append("\n");
+            if (isDrill) {
+                a.append(d[xAxis.size() - 1]);
+            } else {
+                for (int i = 0; i < xAxis.size(); i++) {
+                    if (i == xAxis.size() - 1) {
+                        a.append(d[i]);
+                    } else {
+                        a.append(d[i]).append("\n");
+                    }
                 }
             }
             x.add(a.toString());
@@ -556,7 +646,7 @@ public class ChartViewService {
     }
 
     // 堆叠图
-    private Map<String, Object> transStackChartData(List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, ChartViewWithBLOBs view, List<String[]> data, List<ChartViewFieldDTO> extStack) {
+    private Map<String, Object> transStackChartData(List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, ChartViewWithBLOBs view, List<String[]> data, List<ChartViewFieldDTO> extStack, boolean isDrill) {
         Map<String, Object> map = new HashMap<>();
 
         List<String> x = new ArrayList<>();
@@ -570,11 +660,15 @@ public class ChartViewService {
             // 构建横轴
             for (String[] d : data) {
                 StringBuilder a = new StringBuilder();
-                for (int i = 0; i < xAxis.size(); i++) {
-                    if (i == xAxis.size() - 1) {
-                        a.append(d[i]);
-                    } else {
-                        a.append(d[i]).append("\n");
+                if (isDrill) {
+                    a.append(d[xAxis.size() - 1]);
+                } else {
+                    for (int i = 0; i < xAxis.size(); i++) {
+                        if (i == xAxis.size() - 1) {
+                            a.append(d[i]);
+                        } else {
+                            a.append(d[i]).append("\n");
+                        }
                     }
                 }
                 x.add(a.toString());
@@ -681,11 +775,15 @@ public class ChartViewService {
                     }
                     series.get(j).getData().add(axisChartDataDTO);
                 }
-                for (int i = 0; i < xAxis.size(); i++) {
-                    if (i == xAxis.size() - 1) {
-                        a.append(d[i]);
-                    } else {
-                        a.append(d[i]).append("\n");
+                if (isDrill) {
+                    a.append(d[xAxis.size() - 1]);
+                } else {
+                    for (int i = 0; i < xAxis.size(); i++) {
+                        if (i == xAxis.size() - 1) {
+                            a.append(d[i]);
+                        } else {
+                            a.append(d[i]).append("\n");
+                        }
                     }
                 }
                 x.add(a.toString());
@@ -698,7 +796,7 @@ public class ChartViewService {
     }
 
     // 散点图
-    private Map<String, Object> transScatterData(List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, ChartViewWithBLOBs view, List<String[]> data, List<ChartViewFieldDTO> extBubble) {
+    private Map<String, Object> transScatterData(List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, ChartViewWithBLOBs view, List<String[]> data, List<ChartViewFieldDTO> extBubble, boolean isDrill) {
         Map<String, Object> map = new HashMap<>();
 
         List<String> x = new ArrayList<>();
@@ -714,11 +812,15 @@ public class ChartViewService {
             String[] d = data.get(i1);
 
             StringBuilder a = new StringBuilder();
-            for (int i = 0; i < xAxis.size(); i++) {
-                if (i == xAxis.size() - 1) {
-                    a.append(d[i]);
-                } else {
-                    a.append(d[i]).append("\n");
+            if (isDrill) {
+                a.append(d[xAxis.size() - 1]);
+            } else {
+                for (int i = 0; i < xAxis.size(); i++) {
+                    if (i == xAxis.size() - 1) {
+                        a.append(d[i]);
+                    } else {
+                        a.append(d[i]).append("\n");
+                    }
                 }
             }
             x.add(a.toString());
diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index 6c90cb0491..c2bb860bb3 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -192,7 +192,7 @@ public class ExtractDataService {
                     dropDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId)));
                 } finally {
                     deleteFile("all_scope", datasetTableId);
-                    deleteFile(new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class).getData());
+//                    deleteFile(new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class).getData());
                 }
                 break;
 
@@ -437,28 +437,28 @@ public class ExtractDataService {
         String Column_Fields = "dataease_uuid  varchar(50), `";
         for (DatasetTableField datasetTableField : datasetTableFields) {
             Column_Fields = Column_Fields + datasetTableField.getDataeaseName() + "` ";
+            Integer size = datasetTableField.getSize() * 3;
+            if (datasetTableField.getSize() > 65533 || datasetTableField.getSize() * 3 > 65533) {
+                size = 65533;
+            }
             switch (datasetTableField.getDeExtractType()) {
                 case 0:
-                    if (datasetTableField.getSize() > 65533 || datasetTableField.getSize() * 3 > 65533) {
-                        Column_Fields = Column_Fields + "varchar(65533)" + ",`";
-                    } else {
-                        Column_Fields = Column_Fields + "varchar(lenth)".replace("lenth", String.valueOf(datasetTableField.getSize() * 3)) + ",`";
-                    }
+                    Column_Fields = Column_Fields + "varchar(lenth)".replace("lenth", String.valueOf(size)) + ",`";
                     break;
                 case 1:
-                    Column_Fields = Column_Fields + "varchar(lenth)".replace("lenth", String.valueOf(datasetTableField.getSize())) + ",`";
+                    Column_Fields = Column_Fields + "varchar(lenth)".replace("lenth", String.valueOf(size)) + ",`";
                     break;
                 case 2:
-                    Column_Fields = Column_Fields + "bigint(lenth)".replace("lenth", String.valueOf(datasetTableField.getSize())) + ",`";
+                    Column_Fields = Column_Fields + "bigint(lenth)".replace("lenth", String.valueOf(size)) + ",`";
                     break;
                 case 3:
                     Column_Fields = Column_Fields + "DOUBLE" + ",`";
                     break;
                 case 4:
-                    Column_Fields = Column_Fields + "TINYINT(lenth)".replace("lenth", String.valueOf(datasetTableField.getSize())) + ",`";
+                    Column_Fields = Column_Fields + "TINYINT(lenth)".replace("lenth", String.valueOf(size)) + ",`";
                     break;
                 default:
-                    Column_Fields = Column_Fields + "varchar(lenth)".replace("lenth", String.valueOf(datasetTableField.getSize())) + ",`";
+                    Column_Fields = Column_Fields + "varchar(lenth)".replace("lenth", String.valueOf(size)) + ",`";
                     break;
             }
         }
@@ -735,6 +735,14 @@ public class ExtractDataService {
                 inputStep = inputStep(transMeta, selectSQL);
                 udjcStep = udjc(datasetTableFields, DatasourceTypes.sqlServer);
                 break;
+            case pg:
+                PgConfigration pgConfigration = new Gson().fromJson(datasource.getConfiguration(), PgConfigration.class);
+                dataMeta = new DatabaseMeta("db", "POSTGRESQL", "Native", pgConfigration.getHost(), pgConfigration.getDataBase(), pgConfigration.getPort().toString(), pgConfigration.getUsername(), pgConfigration.getPassword());
+                transMeta.addDatabase(dataMeta);
+                selectSQL = getSelectSQL(extractType, datasetTable, datasource, datasetTableFields, selectSQL);
+                inputStep = inputStep(transMeta, selectSQL);
+                udjcStep = udjc(datasetTableFields, DatasourceTypes.pg);
+                break;
             case oracle:
                 OracleConfigration oracleConfigration = new Gson().fromJson(datasource.getConfiguration(), OracleConfigration.class);
                 if (oracleConfigration.getConnectionType().equalsIgnoreCase("serviceName")) {
@@ -795,7 +803,7 @@ public class ExtractDataService {
         if (extractType.equalsIgnoreCase("all_scope") && datasetTable.getType().equalsIgnoreCase("db")) {
             String tableName = new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class).getTable();
             QueryProvider qp = ProviderFactory.getQueryProvider(datasource.getType());
-            selectSQL = qp.createRawQuerySQL(tableName, datasetTableFields);
+            selectSQL = qp.createRawQuerySQL(tableName, datasetTableFields, datasource);
         }
 
         if (extractType.equalsIgnoreCase("all_scope") && datasetTable.getType().equalsIgnoreCase("sql")) {
@@ -879,12 +887,18 @@ public class ExtractDataService {
             outputFields[datasetTableFields.size()] = textFileField;
 
             textFileOutputMeta.setOutputFields(outputFields);
-        }else if (datasource.getType().equalsIgnoreCase(DatasourceTypes.sqlServer.name())){
+        }else if (datasource.getType().equalsIgnoreCase(DatasourceTypes.sqlServer.name()) || datasource.getType().equalsIgnoreCase(DatasourceTypes.pg.name())){
             TextFileField[] outputFields = new TextFileField[datasetTableFields.size() + 1];
             for(int i=0;i< datasetTableFields.size();i++){
                 TextFileField textFileField = new TextFileField();
                 textFileField.setName(datasetTableFields.get(i).getDataeaseName());
-                textFileField.setType("String");
+                if (datasetTableFields.get(i).getDeExtractType() == 1) {
+                    textFileField.setType("String");
+                    textFileField.setFormat("yyyy-MM-dd HH:mm:ss");
+                } else {
+                    textFileField.setType("String");
+                }
+
                 outputFields[i] = textFileField;
             }
             TextFileField textFileField = new TextFileField();
@@ -936,7 +950,6 @@ public class ExtractDataService {
         }
 
         tmp_code = tmp_code.replace("handleBinaryType", handleBinaryTypeCode);
-        
         UserDefinedJavaClassDef userDefinedJavaClassDef = new UserDefinedJavaClassDef(UserDefinedJavaClassDef.ClassType.TRANSFORM_CLASS, "Processor", tmp_code);
 
         userDefinedJavaClassDef.setActive(true);
@@ -1019,13 +1032,13 @@ public class ExtractDataService {
         }
     }
 
-    private static String handleBinaryType = "    \t\tif(\"FEILD\".equalsIgnoreCase(filed)){\n" +
+    private final static String handleBinaryType = "    \t\tif(\"FEILD\".equalsIgnoreCase(filed)){\n" +
             "           get(Fields.Out, filed).setValue(r, \"\");\n" +
             "           get(Fields.Out, filed).getValueMeta().setType(2);\n" +
             "     \t}";
 
 
-    private static String alterColumnTypeCode = "    if(\"FILED\".equalsIgnoreCase(filed)){\n" +
+    private final static String alterColumnTypeCode = "    if(\"FILED\".equalsIgnoreCase(filed)){\n" +
             "\t   if(tmp != null && tmp.equalsIgnoreCase(\"Y\")){\n" +
             "         get(Fields.Out, filed).setValue(r, 1);\n" +
             "         get(Fields.Out, filed).getValueMeta().setType(2);\n" +
@@ -1035,7 +1048,7 @@ public class ExtractDataService {
             "       }\n" +
             "     }\n";
 
-    private static String handleExcelIntColumn = " \t\tif(tmp != null && tmp.endsWith(\".0\")){\n" +
+    private final static String handleExcelIntColumn = " \t\tif(tmp != null && tmp.endsWith(\".0\")){\n" +
             "            try {\n" +
             "                Long.valueOf(tmp.substring(0, tmp.length()-2));\n" +
             "                get(Fields.Out, filed).setValue(r, tmp.substring(0, tmp.length()-2));\n" +
@@ -1043,14 +1056,14 @@ public class ExtractDataService {
             "            }catch (Exception e){}\n" +
             "        }";
 
-    private static String handleWraps = "        if(tmp != null && ( tmp.contains(\"\\r\") || tmp.contains(\"\\n\"))){\n" +
+    private final static String handleWraps = "        if(tmp != null && ( tmp.contains(\"\\r\") || tmp.contains(\"\\n\"))){\n" +
             "\t\t\ttmp = tmp.trim();\n" +
             "            tmp = tmp.replaceAll(\"\\r\",\" \");\n" +
             "            tmp = tmp.replaceAll(\"\\n\",\" \");\n" +
             "            get(Fields.Out, filed).setValue(r, tmp);\n" +
             "        } ";
 
-    private static String code = "import org.pentaho.di.core.row.ValueMetaInterface;\n" +
+    private final static String code = "import org.pentaho.di.core.row.ValueMetaInterface;\n" +
             "import java.util.List;\n" +
             "import java.io.File;\n" +
             "import java.security.MessageDigest;\n" +
diff --git a/backend/src/main/java/io/dataease/service/panel/PanelViewLinkageService.java b/backend/src/main/java/io/dataease/service/panel/PanelViewLinkageService.java
index 792ada85de..20447092a0 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelViewLinkageService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelViewLinkageService.java
@@ -8,6 +8,7 @@ import io.dataease.base.mapper.PanelViewLinkageMapper;
 import io.dataease.base.mapper.ext.ExtPanelViewLinkageMapper;
 import io.dataease.commons.utils.AuthUtils;
 import io.dataease.controller.request.panel.PanelLinkageRequest;
+import io.dataease.dto.LinkageInfoDTO;
 import io.dataease.dto.PanelViewLinkageDTO;
 import io.dataease.dto.PanelViewLinkageFieldDTO;
 import org.apache.commons.collections4.CollectionUtils;
@@ -89,19 +90,12 @@ public class PanelViewLinkageService {
                 });
 
             }
-
-
-
-
         }
+    }
 
-
-
-
-
-
-
-
+    public Map<String, List<String>> getPanelAllLinkageInfo(String panelId) {
+        List<LinkageInfoDTO> info = extPanelViewLinkageMapper.getPanelAllLinkageInfo(panelId);
+        return Optional.ofNullable(info).orElse(new ArrayList<>()).stream().collect(Collectors.toMap(LinkageInfoDTO::getSourceInfo,LinkageInfoDTO::getTargetInfoList));
     }
 
 }
diff --git a/backend/src/main/java/io/dataease/service/sys/SysRoleService.java b/backend/src/main/java/io/dataease/service/sys/SysRoleService.java
index a27649b558..558c0b7f96 100644
--- a/backend/src/main/java/io/dataease/service/sys/SysRoleService.java
+++ b/backend/src/main/java/io/dataease/service/sys/SysRoleService.java
@@ -1,38 +1,38 @@
 package io.dataease.service.sys;
 
 
-import io.dataease.base.domain.SysRole;
+/*import io.dataease.base.domain.SysRole;
 import io.dataease.base.domain.SysUsersRolesExample;
 import io.dataease.base.mapper.SysRoleMapper;
-import io.dataease.base.mapper.SysUsersRolesMapper;
+import io.dataease.base.mapper.SysUsersRolesMapper;*/
 import io.dataease.base.mapper.ext.ExtSysRoleMapper;
-import io.dataease.controller.sys.base.BaseGridRequest;
-import io.dataease.controller.sys.request.RoleMenusRequest;
+/*import io.dataease.controller.sys.base.BaseGridRequest;
+import io.dataease.controller.sys.request.RoleMenusRequest;*/
 import io.dataease.controller.sys.response.RoleUserItem;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+/*import org.springframework.transaction.annotation.Transactional;*/
 
 import javax.annotation.Resource;
-import java.util.HashMap;
+/*import java.util.HashMap;*/
 import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
+/*import java.util.Map;
+import java.util.stream.Collectors;*/
 
 @Service
 public class SysRoleService {
 
-    @Resource
-    private SysRoleMapper mapper;
+    /*@Resource
+    private SysRoleMapper mapper;*/
 
     @Resource
     private ExtSysRoleMapper extSysRoleMapper;
 
-    @Resource
-    private SysUsersRolesMapper sysUsersRolesMapper;
+    /*@Resource
+    private SysUsersRolesMapper sysUsersRolesMapper;*/
 
 
 
-    public int add(SysRole role){
+    /*public int add(SysRole role){
         Long now = System.currentTimeMillis();
         role.setCreateTime(now);
         role.setUpdateTime(now);
@@ -77,7 +77,7 @@ public class SysRoleService {
             return map;
         }).collect(Collectors.toList());
         return extSysRoleMapper.batchInsertRoleMenu(maps);
-    }
+    }*/
 
     public List<RoleUserItem> allRoles(){
         return extSysRoleMapper.queryAll();
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 14368c84d1..d4f4111a23 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -28,7 +28,7 @@ knife4j.enable=true
 knife4j.setting.enableFooter=false
 knife4j.setting.enableFooterCustom=false
 knife4j.setting.footerCustomContent=fit2cloud 1.0-b9
-knife4j.setting.enableSwaggerModels=false
+#knife4j.setting.enableSwaggerModels=false
 knife4j.setting.enableDocumentManage=false
 knife4j.setting.enableSearch=false
 knife4j.setting.enableOpenApi=false
diff --git a/frontend/public/nolic.html b/frontend/public/nolic.html
new file mode 100644
index 0000000000..89f3ecbc52
--- /dev/null
+++ b/frontend/public/nolic.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="zh">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width,initial-scale=1.0">
+  <link rel="shortcut icon" href="<%= BASE_URL %>favicon.ico">
+  <title>DataEase</title>
+</head>
+<body style="height: 100%;">
+<div id="nolic"></div>
+</body>
+</html>
diff --git a/frontend/src/api/panel/linkage.js b/frontend/src/api/panel/linkage.js
index 4a0f0ecc4a..6b0bd72fa6 100644
--- a/frontend/src/api/panel/linkage.js
+++ b/frontend/src/api/panel/linkage.js
@@ -18,3 +18,9 @@ export function saveLinkage(requestInfo) {
   })
 }
 
+export function getPanelAllLinkageInfo(panelId) {
+  return request({
+    url: '/linkage/getPanelAllLinkageInfo/' + panelId,
+    method: 'get'
+  })
+}
diff --git a/frontend/src/api/system/dept.js b/frontend/src/api/system/dept.js
index a371ee9998..b35bb78e67 100644
--- a/frontend/src/api/system/dept.js
+++ b/frontend/src/api/system/dept.js
@@ -17,29 +17,29 @@ export function loadTable(data) {
   })
 }
 
-export function addDept(data) {
-  return request({
-    url: '/api/dept/create',
-    method: 'post',
-    data
-  })
-}
+// export function addDept(data) {
+//   return request({
+//     url: '/api/dept/create',
+//     method: 'post',
+//     data
+//   })
+// }
 
-export function delDept(ids) {
-  return request({
-    url: '/api/dept/delete',
-    method: 'post',
-    data: ids
-  })
-}
+// export function delDept(ids) {
+//   return request({
+//     url: '/api/dept/delete',
+//     method: 'post',
+//     data: ids
+//   })
+// }
 
-export function editDept(data) {
-  return request({
-    url: '/api/dept/update',
-    method: 'post',
-    data
-  })
-}
+// export function editDept(data) {
+//   return request({
+//     url: '/api/dept/update',
+//     method: 'post',
+//     data
+//   })
+// }
 
 export function treeByDeptId(deptId) {
   return request({
@@ -48,4 +48,4 @@ export function treeByDeptId(deptId) {
   })
 }
 
-export default { addDept, delDept, editDept, getDeptTree, loadTable, treeByDeptId }
+// export default { addDept, delDept, editDept, getDeptTree, loadTable, treeByDeptId }
diff --git a/frontend/src/api/system/role.js b/frontend/src/api/system/role.js
index 07be60da4e..dd7326f889 100644
--- a/frontend/src/api/system/role.js
+++ b/frontend/src/api/system/role.js
@@ -1,57 +1,57 @@
-import request from '@/utils/request'
+// import request from '@/utils/request'
 
-export function allRoles() {
-  return request({
-    url: '/api/role/all',
-    method: 'post',
-    loading: true
-  })
-}
+// export function allRoles() {
+//   return request({
+//     url: '/api/user/all',
+//     method: 'post',
+//     loading: true
+//   })
+// }
 
-export function roleGrid(pageIndex, pageSize, data) {
-  return request({
-    url: '/api/role/roleGrid/' + pageIndex + '/' + pageSize,
-    method: 'post',
-    data,
-    loading: true
-  })
-}
+// export function roleGrid(pageIndex, pageSize, data) {
+//   return request({
+//     url: '/api/role/roleGrid/' + pageIndex + '/' + pageSize,
+//     method: 'post',
+//     data,
+//     loading: true
+//   })
+// }
 
-export function delRole(pid) {
-  return request({
-    url: '/api/role/delete/' + pid,
-    method: 'post'
-  })
-}
+// export function delRole(pid) {
+//   return request({
+//     url: '/api/role/delete/' + pid,
+//     method: 'post'
+//   })
+// }
 
-export function addRole(data) {
-  return request({
-    url: '/api/role/create',
-    method: 'post',
-    data
-  })
-}
+// export function addRole(data) {
+//   return request({
+//     url: '/api/role/create',
+//     method: 'post',
+//     data
+//   })
+// }
 
-export function editRole(data) {
-  return request({
-    url: '/api/role/update',
-    method: 'post',
-    data
-  })
-}
+// export function editRole(data) {
+//   return request({
+//     url: '/api/role/update',
+//     method: 'post',
+//     data
+//   })
+// }
 
-export function addRoleMenus(data) {
-  return request({
-    url: '/api/role/saveRolesMenus',
-    method: 'post',
-    data
-  })
-}
+// export function addRoleMenus(data) {
+//   return request({
+//     url: '/api/role/saveRolesMenus',
+//     method: 'post',
+//     data
+//   })
+// }
 
-export function menuIds(roleId) {
-  return request({
-    url: '/api/role/menuIds/' + roleId,
-    method: 'post'
-  })
-}
-export default { addRole, editRole, delRole, roleGrid, allRoles, addRoleMenus, menuIds }
+// export function menuIds(roleId) {
+//   return request({
+//     url: '/api/role/menuIds/' + roleId,
+//     method: 'post'
+//   })
+// }
+// export default { addRole, editRole, delRole, roleGrid, allRoles, addRoleMenus, menuIds }
diff --git a/frontend/src/api/system/user.js b/frontend/src/api/system/user.js
index fc23d2b260..f3db990e04 100644
--- a/frontend/src/api/system/user.js
+++ b/frontend/src/api/system/user.js
@@ -81,4 +81,12 @@ export const updatePersonPwd = (data) => {
   })
 }
 
-export default { editPassword, delUser, editUser, addUser, userLists, editStatus, persionInfo, updatePerson, updatePersonPwd }
+export const allRoles = () => {
+  return request({
+    url: '/api/user/all',
+    method: 'post',
+    loading: true
+  })
+}
+
+export default { editPassword, delUser, editUser, addUser, userLists, editStatus, persionInfo, updatePerson, updatePersonPwd, allRoles }
diff --git a/frontend/src/components/canvas/components/Editor/CanvasOptBar.vue b/frontend/src/components/canvas/components/Editor/CanvasOptBar.vue
new file mode 100644
index 0000000000..c927bbcf51
--- /dev/null
+++ b/frontend/src/components/canvas/components/Editor/CanvasOptBar.vue
@@ -0,0 +1,49 @@
+<template>
+  <div v-show="existLinkage" class="bar-main">
+    <div>
+      <el-button size="mini" type="info" @click="clearAllLinkage">清除所有联动</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+
+export default {
+  computed: {
+    existLinkage() {
+      let linkageFiltersCount = 0
+      this.componentData.forEach(item => {
+        if (item.linkageFilters && item.linkageFilters.length > 0) {
+          linkageFiltersCount++
+        }
+      })
+      return linkageFiltersCount
+    },
+    ...mapState([
+      'componentData'
+    ])
+  },
+  methods: {
+    clearAllLinkage() {
+      this.$store.commit('clearPanelLinkageInfo')
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .bar-main{
+    position: absolute;
+    right: 0px;
+    z-index: 10;
+    height: 20px;
+    border-radius:2px;
+    padding-left: 5px;
+    padding-right: 2px;
+    cursor:pointer!important;
+    opacity: 0.8;
+    /*background-color: #0a7be0;*/
+  }
+
+</style>
diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
index 4b6da3a6ea..88216e9e1a 100644
--- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
@@ -102,7 +102,6 @@ export default {
       })
     },
     elementMouseDown(e) {
-      debugger
       // private 设置当前组件数据及状态
       this.$store.commit('setClickComponentStatus', true)
       if (this.config.component !== 'v-text' && this.config.component !== 'rect-shape' && this.config.component !== 'de-input-search' && this.config.component !== 'de-number-range') {
diff --git a/frontend/src/components/canvas/components/Editor/Preview.vue b/frontend/src/components/canvas/components/Editor/Preview.vue
index 1fbc589005..d40a4ae3ed 100644
--- a/frontend/src/components/canvas/components/Editor/Preview.vue
+++ b/frontend/src/components/canvas/components/Editor/Preview.vue
@@ -3,6 +3,7 @@
     <el-row v-if="componentDataShow.length===0" style="height: 100%;" class="custom-position">
       {{ $t('panel.panelNull') }}
     </el-row>
+    <canvas-opt-bar />
     <ComponentWrapper
       v-for="(item, index) in componentDataInfo"
       :key="index"
@@ -39,9 +40,10 @@ import { deepCopy } from '@/components/canvas/utils/utils'
 import eventBus from '@/components/canvas/utils/eventBus'
 import elementResizeDetectorMaker from 'element-resize-detector'
 import UserViewDialog from '@/components/canvas/custom-component/UserViewDialog'
+import CanvasOptBar from '@/components/canvas/components/Editor/CanvasOptBar'
 
 export default {
-  components: { ComponentWrapper, UserViewDialog },
+  components: { ComponentWrapper, UserViewDialog, CanvasOptBar },
   model: {
     prop: 'show',
     event: 'change'
@@ -209,7 +211,6 @@ export default {
       this.$refs['userViewDialog'].exportExcel()
     },
     deselectCurComponent(e) {
-      debugger
       if (!this.isClickComponent) {
         this.$store.commit('setCurComponent', { component: null, index: null })
       }
diff --git a/frontend/src/components/canvas/components/Editor/SettingMenuTest.vue b/frontend/src/components/canvas/components/Editor/SettingMenuTest.vue
new file mode 100644
index 0000000000..7e1376cbcf
--- /dev/null
+++ b/frontend/src/components/canvas/components/Editor/SettingMenuTest.vue
@@ -0,0 +1,181 @@
+<template>
+  <div>
+    <div style="width: 100%;">
+      <el-dropdown trigger="click" @mouseup="handleMouseUp">
+        <el-button ref="trackButton" class="icon iconfont icon-shezhi">TEST</el-button>
+        <el-dropdown-menu>
+          <el-dropdown-item icon="el-icon-document-copy" @click.native="copy">{{ $t('panel.copy') }}</el-dropdown-item>
+          <el-dropdown-item icon="el-icon-delete" @click.native="deleteComponent">{{ $t('panel.delete') }}</el-dropdown-item>
+          <el-dropdown-item icon="el-icon-upload2" @click.native="topComponent">{{ $t('panel.topComponent') }}</el-dropdown-item>
+          <el-dropdown-item icon="el-icon-download" @click.native="bottomComponent">{{ $t('panel.bottomComponent') }}</el-dropdown-item>
+          <el-dropdown-item icon="el-icon-arrow-up" @click.native="upComponent">{{ $t('panel.upComponent') }}</el-dropdown-item>
+          <el-dropdown-item icon="el-icon-arrow-down" @click.native="downComponent">{{ $t('panel.downComponent') }}</el-dropdown-item>
+          <el-dropdown-item icon="el-icon-link" @click.native="linkageSetting">联动设置</el-dropdown-item>
+        </el-dropdown-menu>
+      </el-dropdown>
+    </div>
+  </div>
+</template>
+
+<script>
+import { mapState } from 'vuex'
+import bus from '@/utils/bus'
+import { getViewLinkageGather } from '@/api/panel/linkage'
+
+export default {
+  data() {
+    return {
+      copyData: null,
+      editFilter: [
+        'view',
+        'custom'
+      ]
+    }
+  },
+  computed: mapState([
+    'menuTop',
+    'menuLeft',
+    'menuShow',
+    'curComponent',
+    'componentData',
+    'canvasStyleData'
+  ]),
+  methods: {
+    trackButtonClick() {
+      this.$refs.trackButton.click()
+      this.$refs.trackButton.$el.click()
+    },
+    edit() {
+      // 编辑时临时保存 当前修改的画布
+      this.$store.dispatch('panel/setComponentDataTemp', JSON.stringify(this.componentData))
+      this.$store.dispatch('panel/setCanvasStyleDataTemp', JSON.stringify(this.canvasStyleData))
+      if (this.curComponent.type === 'view') {
+        this.$store.dispatch('chart/setViewId', null)
+        this.$store.dispatch('chart/setViewId', this.curComponent.propValue.viewId)
+        bus.$emit('PanelSwitchComponent', { name: 'ChartEdit', param: { 'id': this.curComponent.propValue.viewId, 'optType': 'edit' }})
+      }
+      if (this.curComponent.type === 'custom') {
+        bus.$emit('component-dialog-edit')
+      }
+
+      // 编辑样式组件
+
+      if (this.curComponent.type === 'v-text' || this.curComponent.type === 'rect-shape') {
+        bus.$emit('component-dialog-style')
+      }
+    },
+    lock() {
+      this.$store.commit('lock')
+    },
+
+    unlock() {
+      this.$store.commit('unlock')
+    },
+
+    // 点击菜单时不取消当前组件的选中状态
+    handleMouseUp() {
+      this.$store.commit('setClickComponentStatus', true)
+    },
+
+    cut() {
+      this.deleteCurCondition()
+      this.$store.commit('cut')
+    },
+
+    copy() {
+      this.$store.commit('copy')
+      this.paste()
+    },
+
+    paste() {
+      this.$store.commit('paste', true)
+      this.$store.commit('recordSnapshot')
+    },
+
+    deleteComponent() {
+      this.deleteCurCondition()
+      this.$store.commit('deleteComponent')
+      this.$store.commit('recordSnapshot')
+      this.$store.commit('setCurComponent', { component: null, index: null })
+    },
+
+    deleteCurCondition() {
+      if (this.curComponent.type === 'custom') {
+        this.$store.commit('removeViewFilter', this.curComponent.id)
+        bus.$emit('delete-condition', { componentId: this.curComponent.id })
+      }
+    },
+
+    upComponent() {
+      this.$store.commit('upComponent')
+      this.$store.commit('recordSnapshot')
+    },
+
+    downComponent() {
+      this.$store.commit('downComponent')
+      this.$store.commit('recordSnapshot')
+    },
+
+    topComponent() {
+      this.$store.commit('topComponent')
+      this.$store.commit('recordSnapshot')
+    },
+
+    bottomComponent() {
+      this.$store.commit('bottomComponent')
+      this.$store.commit('recordSnapshot')
+    },
+    linkageSetting() {
+      debugger
+      // sourceViewId 也加入查询
+      const targetViewIds = this.componentData.filter(item => item.type === 'view' && item.propValue && item.propValue.viewId)
+        .map(item => item.propValue.viewId)
+
+      // 获取当前仪表板当前视图联动信息
+      const requestInfo = {
+        'panelId': this.$store.state.panel.panelInfo.id,
+        'sourceViewId': this.curComponent.propValue.viewId,
+        'targetViewIds': targetViewIds
+      }
+      getViewLinkageGather(requestInfo).then(rsp => {
+        this.$store.commit('setLinkageInfo', rsp.data)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .contextmenu {
+    position: absolute;
+    z-index: 1000;
+
+    ul {
+      border: 1px solid #e4e7ed;
+      border-radius: 4px;
+      background-color: #fff;
+      box-shadow: 0 2px 12px 0 rgba(0,0,0,.1);
+      box-sizing: border-box;
+      margin: 5px 0;
+      padding: 6px 0;
+
+      li {
+        font-size: 14px;
+        padding: 0 20px;
+        position: relative;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        color: #606266;
+        height: 34px;
+        line-height: 34px;
+        box-sizing: border-box;
+        cursor: pointer;
+
+        &:hover {
+          background-color: #f5f7fa;
+        }
+      }
+    }
+  }
+</style>
diff --git a/frontend/src/components/canvas/components/Editor/ViewTrackBar.vue b/frontend/src/components/canvas/components/Editor/ViewTrackBar.vue
new file mode 100644
index 0000000000..998e339b02
--- /dev/null
+++ b/frontend/src/components/canvas/components/Editor/ViewTrackBar.vue
@@ -0,0 +1,55 @@
+<template>
+  <div>
+    <el-dropdown trigger="click">
+      <input id="input" ref="trackButton" type="button" hidden>
+      <el-dropdown-menu class="track-menu" :append-to-body="false">
+        <el-dropdown-item v-for="(item, key) in trackMenu" :key="key" @click.native="trackMenuClick(item)"><span class="menu-item">{{ i18n_map[item] }}</span></el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+  </div>
+</template>
+
+<script>
+
+export default {
+  props: {
+    trackMenu: {
+      type: Array,
+      required: true
+    }
+  },
+  data() {
+    return {
+      i18n_map: {
+        drill: this.$t('panel.drill'),
+        linkage: this.$t('panel.linkage')
+      }
+    }
+  },
+  computed: {
+  },
+  methods: {
+    trackButtonClick() {
+      this.$refs.trackButton.click()
+    },
+    trackMenuClick(menu) {
+      this.$emit('trackClick', menu)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+  .menu-item {
+    font-size: 12px;
+  }
+
+  ::v-deep ul {
+    width: 80px;
+  }
+
+  .track-menu {
+    border: #3a8ee6 1px solid;
+  }
+
+</style>
diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index 46412a47ad..f988791ad4 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -9,6 +9,9 @@
   >
     <!-- 网格线 -->
     <Grid v-if="canvasStyleData.auxiliaryMatrix&&!linkageSettingStatus" :matrix-style="matrixStyle" />
+
+    <!-- 仪表板联动清除按钮-->
+    <canvas-opt-bar />
     <!--页面组件列表展示-->
     <de-drag
       v-for="(item, index) in componentData"
@@ -156,8 +159,10 @@ import { changeStyleWithScale } from '@/components/canvas/utils/translate'
 import { deepCopy } from '@/components/canvas/utils/utils'
 import UserViewDialog from '@/components/canvas/custom-component/UserViewDialog'
 import DeOutWidget from '@/components/dataease/DeOutWidget'
+import CanvasOptBar from '@/components/canvas/components/Editor/CanvasOptBar'
+
 export default {
-  components: { Shape, ContextMenu, MarkLine, Area, Grid, DeDrag, UserViewDialog, DeOutWidget },
+  components: { Shape, ContextMenu, MarkLine, Area, Grid, DeDrag, UserViewDialog, DeOutWidget, CanvasOptBar },
   props: {
     isEdit: {
       type: Boolean,
diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue
index 0d1dd44a03..a4e3f4e5c0 100644
--- a/frontend/src/components/canvas/components/Toolbar.vue
+++ b/frontend/src/components/canvas/components/Toolbar.vue
@@ -101,8 +101,9 @@ import { commonStyle, commonAttr } from '@/components/canvas/custom-component/co
 import eventBus from '@/components/canvas/utils/eventBus'
 import { deepCopy } from '@/components/canvas/utils/utils'
 import { panelSave } from '@/api/panel/panel'
-import { saveLinkage } from '@/api/panel/linkage'
+import { saveLinkage, getPanelAllLinkageInfo } from '@/api/panel/linkage'
 import bus from '@/utils/bus'
+
 import {
   DEFAULT_COMMON_CANVAS_STYLE_STRING
 } from '@/views/panel/panel'
@@ -325,6 +326,10 @@ export default {
         linkageInfo: this.targetLinkageInfo
       }
       saveLinkage(request).then(rsp => {
+        // 刷新联动信息
+        getPanelAllLinkageInfo(this.$store.state.panel.panelInfo.id).then(rsp => {
+          this.$store.commit('setNowPanelTrackInfo', rsp.data)
+        })
         this.cancelLinkageSettingStatus()
       })
     },
diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index 00cf67d92c..f0ef6e4f13 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -16,9 +16,12 @@
         {{ $t('chart.chart_error_tips') }}
       </div>
     </div>
-    <chart-component v-if="requestStatus==='success'&&chart.type && !chart.type.includes('table') && !chart.type.includes('text')" :ref="element.propValue.id" class="chart-class" :chart="chart" />
+    <chart-component v-if="requestStatus==='success'&&chart.type && !chart.type.includes('table') && !chart.type.includes('text')" :ref="element.propValue.id" class="chart-class" :chart="chart" :track-menu="trackMenu" @onChartClick="chartClick" />
     <table-normal v-if="requestStatus==='success'&&chart.type && chart.type.includes('table')" :ref="element.propValue.id" :chart="chart" class="table-class" />
     <label-normal v-if="requestStatus==='success'&&chart.type && chart.type.includes('text')" :ref="element.propValue.id" :chart="chart" class="table-class" />
+    <div style="position: absolute;left: 20px;bottom:14px;">
+      <drill-path :drill-filters="drillFilters" @onDrillJump="drillJump" />
+    </div>
   </div>
 </template>
 
@@ -37,9 +40,11 @@ import { BASE_CHART_STRING } from '@/views/chart/chart/chart'
 import eventBus from '@/components/canvas/utils/eventBus'
 import { deepCopy } from '@/components/canvas/utils/utils'
 import { getToken, getLinkToken } from '@/utils/auth'
+import DrillPath from '@/views/chart/view/DrillPath'
+
 export default {
   name: 'UserView',
-  components: { ChartComponent, TableNormal, LabelNormal },
+  components: { ChartComponent, TableNormal, LabelNormal, DrillPath },
   props: {
     element: {
       type: Object,
@@ -77,13 +82,18 @@ export default {
       refId: null,
       chart: BASE_CHART_STRING,
       requestStatus: 'waiting',
-      message: null
+      message: null,
+      drillClickDimensionList: [],
+      drillFilters: [],
+      drillFields: []
     }
   },
   computed: {
     filter() {
       const filter = {}
       filter.filter = this.element.filters
+      filter.linkageFilters = this.element.linkageFilters
+      filter.drill = this.drillClickDimensionList
       return filter
     },
     filters() {
@@ -91,8 +101,30 @@ export default {
       if (!this.element.filters) return []
       return JSON.parse(JSON.stringify(this.element.filters))
     },
+
+    linkageFilters() {
+      // 必要 勿删勿该  watch数组，哪怕发生变化 oldValue等于newValue ，深拷贝解决
+      if (!this.element.linkageFilters) return []
+      console.log('linkageFilters:' + JSON.stringify(this.element.linkageFilters))
+      return JSON.parse(JSON.stringify(this.element.linkageFilters))
+    },
+    trackMenu() {
+      const trackMenuInfo = []
+      let linkageCount = 0
+      this.chart.data.fields && this.chart.data.fields.forEach(item => {
+        const sourceInfo = this.chart.id + '#' + item.id
+        if (this.nowPanelTrackInfo[sourceInfo]) {
+          linkageCount++
+        }
+      })
+      linkageCount && trackMenuInfo.push('linkage')
+      this.drillFields.length && trackMenuInfo.push('drill')
+      console.log('trackMenuInfo' + JSON.stringify(trackMenuInfo))
+      return trackMenuInfo
+    },
     ...mapState([
-      'canvasStyleData'
+      'canvasStyleData',
+      'nowPanelTrackInfo'
     ])
   },
 
@@ -101,6 +133,13 @@ export default {
       // this.getData(this.element.propValue.viewId)
       isChange(val1, val2) && this.getData(this.element.propValue.viewId)
     },
+    linkageFilters: {
+      handler(newVal, oldVal) {
+        debugger
+        isChange(newVal, oldVal) && this.getData(this.element.propValue.viewId)
+      },
+      deep: true
+    },
     // deep监听panel 如果改变 提交到 store
     canvasStyleData: {
       handler(newVal, oldVla) {
@@ -176,6 +215,13 @@ export default {
           // 将视图传入echart组件
           if (response.success) {
             this.chart = response.data
+            this.chart.drillFields = this.chart.drillFields ? JSON.parse(this.chart.drillFields) : []
+            debugger
+            if (!response.data.drill) {
+              this.drillClickDimensionList.splice(this.drillClickDimensionList.length - 1, 1)
+            }
+            this.drillFilters = JSON.parse(JSON.stringify(response.data.drillFilters))
+            this.drillFields = JSON.parse(JSON.stringify(response.data.drillFields))
             this.requestStatus = 'merging'
             this.mergeStyle()
             this.requestStatus = 'success'
@@ -210,6 +256,22 @@ export default {
       tableChart.customAttr = JSON.stringify(tableChart.customAttr)
       tableChart.customStyle = JSON.stringify(tableChart.customStyle)
       eventBus.$emit('openChartDetailsDialog', { chart: this.chart, tableChart: tableChart })
+    },
+
+    chartClick(param) {
+      debugger
+      if (this.drillClickDimensionList.length < this.chart.drillFields.length - 1) {
+        this.drillClickDimensionList.push({ dimensionList: param.data.dimensionList })
+        this.getData(this.element.propValue.viewId)
+      }
+    },
+
+    resetDrill() {
+      this.drillClickDimensionList = []
+    },
+    drillJump(index) {
+      this.drillClickDimensionList = this.drillClickDimensionList.slice(0, index)
+      this.getData(this.element.propValue.viewId)
     }
   }
 }
diff --git a/frontend/src/components/canvas/store/copy.js b/frontend/src/components/canvas/store/copy.js
index ef4eb98351..e7daeb98cd 100644
--- a/frontend/src/components/canvas/store/copy.js
+++ b/frontend/src/components/canvas/store/copy.js
@@ -41,7 +41,6 @@ export default {
       data.id = generateID()
 
       // 如果是用户视图 测先进行底层复制
-      debugger
       if (data.type === 'view') {
         chartCopy(data.propValue.viewId).then(res => {
           const newView = deepCopy(data)
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 8cf635faf5..9328202b86 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -837,7 +837,10 @@ export default {
     drill: 'Drill',
     drag_block_treemap_label: 'Color Label',
     drag_block_treemap_size: 'Color Size',
-    bubble_symbol: 'Shape'
+    bubble_symbol: 'Shape',
+    gap_width: 'Gap Width',
+    width: 'Width',
+    height: 'Height'
   },
   dataset: {
     sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',
@@ -1176,7 +1179,9 @@ export default {
     panel_save_tips: 'Do you want to save the changes you made to.',
     panel_save_warn_tips: "Your changes will be lost if you don't save them！",
     do_not_save: "Don't Save",
-    save_and_close: 'Save'
+    save_and_close: 'Save',
+    drill: 'drill',
+    linkage: 'linkage'
   },
   plugin: {
     local_install: 'Local installation',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index b0a38fd1b0..2d8dcfbea3 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -837,7 +837,10 @@ export default {
     drill: '鉆取',
     drag_block_treemap_label: '色塊標簽',
     drag_block_treemap_size: '色塊大小',
-    bubble_symbol: '圖形'
+    bubble_symbol: '圖形',
+    gap_width: '間隔',
+    width: '寬度',
+    height: '高度'
   },
   dataset: {
     sheet_warn: '有多個sheet頁面，默認抽取第一個',
@@ -1176,7 +1179,9 @@ export default {
     panel_save_tips: '仪表板已变动，是否保存？',
     panel_save_warn_tips: '如果未保存，你对仪表板做的变更将会丢失！',
     do_not_save: '不保存',
-    save: '保存'
+    save: '保存',
+    drill: '下钻',
+    linkage: '联动'
   },
   plugin: {
     local_install: '本地安裝',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index ba630a4bd8..4e4c656373 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -837,7 +837,10 @@ export default {
     drill: '钻取',
     drag_block_treemap_label: '色块标签',
     drag_block_treemap_size: '色块大小',
-    bubble_symbol: '图形'
+    bubble_symbol: '图形',
+    gap_width: '间隔',
+    width: '宽度',
+    height: '高度'
   },
   dataset: {
     sheet_warn: '有多个 Sheet 页，默认抽取第一个',
@@ -1178,7 +1181,9 @@ export default {
     panel_save_tips: '仪表板已变动，是否保存？',
     panel_save_warn_tips: '如果未保存，你对仪表板做的变更将会丢失！',
     do_not_save: '不保存',
-    save: '保存'
+    save: '保存',
+    drill: '下钻',
+    linkage: '联动'
   },
   plugin: {
     local_install: '本地安装',
diff --git a/frontend/src/nolic/Nolic.vue b/frontend/src/nolic/Nolic.vue
new file mode 100644
index 0000000000..3824ab98da
--- /dev/null
+++ b/frontend/src/nolic/Nolic.vue
@@ -0,0 +1,16 @@
+<template>
+  <div id="nolic" style="height:100%;">
+    <router-view />
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+    }
+  }
+}
+</script>
+<style scoped>
+
+</style>
diff --git a/frontend/src/nolic/nolic-router.js b/frontend/src/nolic/nolic-router.js
new file mode 100644
index 0000000000..4730048019
--- /dev/null
+++ b/frontend/src/nolic/nolic-router.js
@@ -0,0 +1,17 @@
+import Vue from 'vue'
+import Router from 'vue-router'
+
+Vue.use(Router)
+
+export default new Router({
+  routes: [
+    {
+      path: '/',
+      name: 'home',
+      component: () => import('../views/nolic/index.vue'),
+      meta: {
+        title: '首页'
+      }
+    }
+  ]
+})
diff --git a/frontend/src/nolic/nolic.js b/frontend/src/nolic/nolic.js
new file mode 100644
index 0000000000..f3110de5ae
--- /dev/null
+++ b/frontend/src/nolic/nolic.js
@@ -0,0 +1,26 @@
+import Vue from 'vue'
+import Nolic from './Nolic.vue'
+import router from './nolic-router'
+import store from '../store'
+import '@/styles/index.scss' // global css
+import i18n from '../lang' // internationalization
+import ElementUI from 'element-ui'
+import '@/components/canvas/custom-component' // 注册自定义组件
+import widgets from '@/components/widget'
+import * as echarts from 'echarts'
+import UmyUi from 'umy-ui'
+
+Vue.use(UmyUi)
+Vue.prototype.$echarts = echarts
+Vue.config.productionTip = false
+Vue.use(widgets)
+Vue.use(ElementUI, {
+
+  i18n: (key, value) => i18n.t(key, value)
+})
+new Vue({
+  router,
+  store,
+  i18n,
+  render: h => h(Nolic)
+}).$mount('#nolic')
diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index 3f299683e8..43facb6fe1 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -21,7 +21,9 @@ import event from '@/components/canvas/store/event'
 import layer from '@/components/canvas/store/layer'
 import snapshot from '@/components/canvas/store/snapshot'
 import lock from '@/components/canvas/store/lock'
-import { valueValid, formatCondition } from '@/utils/conditionUtil'
+import { valueValid, formatCondition, formatLinkageCondition } from '@/utils/conditionUtil'
+import { Condition } from '@/components/widget/bean/Condition'
+
 import {
   DEFAULT_COMMON_CANVAS_STYLE_STRING
 } from '@/views/panel/panel'
@@ -54,7 +56,9 @@ const data = {
     // 当前设置联动的组件
     curLinkageView: null,
     // 和当前组件联动的目标组件
-    targetLinkageInfo: []
+    targetLinkageInfo: [],
+    // 当前仪表板联动 下钻 上卷等信息
+    nowPanelTrackInfo: {}
   },
   mutations: {
     ...animation.mutations,
@@ -154,6 +158,46 @@ const data = {
         state.componentData[index] = element
       }
     },
+
+    // 添加联动 下钻 等过滤组件
+    addViewTrackFilter(state, data) {
+      const viewId = data.viewId
+      const trackInfo = state.nowPanelTrackInfo
+      for (let index = 0; index < state.componentData.length; index++) {
+        const element = state.componentData[index]
+        if (!element.type || element.type !== 'view') continue
+        const currentFilters = element.linkageFilters || [] // 当前联动filter
+
+        data.dimensionList.forEach(dimension => {
+          const sourceInfo = viewId + '#' + dimension.id
+          // 获取所有目标联动信息
+          const targetInfoList = trackInfo[sourceInfo] || []
+          targetInfoList.forEach(targetInfo => {
+            const targetInfoArray = targetInfo.split('#')
+            const targetViewId = targetInfoArray[0] // 目标视图
+            if (element.propValue.viewId === targetViewId) { // 如果目标视图 和 当前循环组件id相等 则进行条件增减
+              const targetFieldId = targetInfoArray[1] // 目标视图列ID
+              const condition = new Condition('', targetFieldId, 'eq', [dimension.value], [targetViewId])
+
+              let j = currentFilters.length
+              while (j--) {
+                const filter = currentFilters[j]
+                // 兼容性准备 viewIds 只会存放一个值
+                if (targetFieldId === filter.fieldId && filter.viewIds.includes(targetViewId)) {
+                  currentFilters.splice(j, 1)
+                }
+              }
+              // 不存在该条件 且 条件有效 直接保存该条件
+              // !filterExist && vValid && currentFilters.push(condition)
+              currentFilters.push(condition)
+            }
+          })
+        })
+
+        element.linkageFilters = currentFilters
+        state.componentData[index] = element
+      }
+    },
     setComponentWithId(state, component) {
       for (let index = 0; index < state.componentData.length; index++) {
         const element = state.componentData[index]
@@ -189,6 +233,17 @@ const data = {
       state.linkageSettingStatus = false
       state.curLinkageView = null
       state.targetLinkageInfo = []
+    },
+    setNowPanelTrackInfo(state, trackInfo) {
+      state.nowPanelTrackInfo = trackInfo
+    },
+    clearPanelLinkageInfo(state) {
+      state.componentData.forEach(item => {
+        if (item.linkageFilters && item.linkageFilters.length > 0) {
+          item.linkageFilters.splice(0, item.linkageFilters.length)
+        }
+      })
+      state.styleChangeTimes++
     }
   },
   modules: {
diff --git a/frontend/src/styles/deicon/demo.css b/frontend/src/styles/deicon/demo.css
index b7af3aa35d..a67054a0a0 100644
--- a/frontend/src/styles/deicon/demo.css
+++ b/frontend/src/styles/deicon/demo.css
@@ -3,9 +3,9 @@
   font-family: "iconfont logo";
   src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
   src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
-  url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
-  url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
-  url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
+    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
 }
 
 .logo {
@@ -215,35 +215,35 @@
   margin: 1em 0;
 }
 
-.markdown > p,
-.markdown > blockquote,
-.markdown > .highlight,
-.markdown > ol,
-.markdown > ul {
+.markdown>p,
+.markdown>blockquote,
+.markdown>.highlight,
+.markdown>ol,
+.markdown>ul {
   width: 80%;
 }
 
-.markdown ul > li {
+.markdown ul>li {
   list-style: circle;
 }
 
-.markdown > ul li,
-.markdown blockquote ul > li {
+.markdown>ul li,
+.markdown blockquote ul>li {
   margin-left: 20px;
   padding-left: 4px;
 }
 
-.markdown > ul li p,
-.markdown > ol li p {
+.markdown>ul li p,
+.markdown>ol li p {
   margin: 0.6em 0;
 }
 
-.markdown ol > li {
+.markdown ol>li {
   list-style: decimal;
 }
 
-.markdown > ol li,
-.markdown blockquote ol > li {
+.markdown>ol li,
+.markdown blockquote ol>li {
   margin-left: 20px;
   padding-left: 4px;
 }
@@ -260,7 +260,7 @@
   font-weight: 600;
 }
 
-.markdown > table {
+.markdown>table {
   border-collapse: collapse;
   border-spacing: 0px;
   empty-cells: show;
@@ -269,20 +269,20 @@
   margin-bottom: 24px;
 }
 
-.markdown > table th {
+.markdown>table th {
   white-space: nowrap;
   color: #333;
   font-weight: 600;
 }
 
-.markdown > table th,
-.markdown > table td {
+.markdown>table th,
+.markdown>table td {
   border: 1px solid #e9e9e9;
   padding: 8px 16px;
   text-align: left;
 }
 
-.markdown > table th {
+.markdown>table th {
   background: #F7F7F7;
 }
 
@@ -318,8 +318,8 @@
   display: inline-block;
 }
 
-.markdown > br,
-.markdown > p > br {
+.markdown>br,
+.markdown>p>br {
   clear: both;
 }
 
@@ -453,13 +453,13 @@ pre[class*="language-"] {
   overflow: auto;
 }
 
-:not(pre) > code[class*="language-"],
+:not(pre)>code[class*="language-"],
 pre[class*="language-"] {
   background: #f5f2f0;
 }
 
 /* Inline code */
-:not(pre) > code[class*="language-"] {
+:not(pre)>code[class*="language-"] {
   padding: .1em;
   border-radius: .3em;
   white-space: normal;
diff --git a/frontend/src/styles/deicon/demo_index.html b/frontend/src/styles/deicon/demo_index.html
index e01657bfe5..e997334f0c 100644
--- a/frontend/src/styles/deicon/demo_index.html
+++ b/frontend/src/styles/deicon/demo_index.html
@@ -54,6 +54,48 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe973;</span>
+                <div class="name">线性图标-取消下钻</div>
+                <div class="code-name">&amp;#xe973;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6ed;</span>
+                <div class="name">线性图标-取消下钻</div>
+                <div class="code-name">&amp;#xe6ed;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe6f7;</span>
+                <div class="name">联动</div>
+                <div class="code-name">&amp;#xe6f7;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe613;</span>
+                <div class="name">下钻</div>
+                <div class="code-name">&amp;#xe613;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe61f;</span>
+                <div class="name">上钻</div>
+                <div class="code-name">&amp;#xe61f;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe637;</span>
+                <div class="name">取消联动</div>
+                <div class="code-name">&amp;#xe637;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe604;</span>
+                <div class="name">edit-2</div>
+                <div class="code-name">&amp;#xe604;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe612;</span>
                 <div class="name">edit-2</div>
@@ -318,9 +360,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1627282547459') format('woff2'),
-       url('iconfont.woff?t=1627282547459') format('woff'),
-       url('iconfont.ttf?t=1627282547459') format('truetype');
+  src: url('iconfont.woff2?t=1628652979833') format('woff2'),
+       url('iconfont.woff?t=1628652979833') format('woff'),
+       url('iconfont.ttf?t=1628652979833') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -346,6 +388,69 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-quxiaoshangzuan"></span>
+            <div class="name">
+              线性图标-取消下钻
+            </div>
+            <div class="code-name">.icon-quxiaoshangzuan
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-quxiaoxiazuan"></span>
+            <div class="name">
+              线性图标-取消下钻
+            </div>
+            <div class="code-name">.icon-quxiaoxiazuan
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-linkage"></span>
+            <div class="name">
+              联动
+            </div>
+            <div class="code-name">.icon-linkage
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-xiazuan"></span>
+            <div class="name">
+              下钻
+            </div>
+            <div class="code-name">.icon-xiazuan
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shangzuan"></span>
+            <div class="name">
+              上钻
+            </div>
+            <div class="code-name">.icon-shangzuan
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-quxiaoliandong"></span>
+            <div class="name">
+              取消联动
+            </div>
+            <div class="code-name">.icon-quxiaoliandong
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-edit-outline"></span>
+            <div class="name">
+              edit-2
+            </div>
+            <div class="code-name">.icon-edit-outline
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-edit"></span>
             <div class="name">
@@ -742,6 +847,62 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-quxiaoshangzuan"></use>
+                </svg>
+                <div class="name">线性图标-取消下钻</div>
+                <div class="code-name">#icon-quxiaoshangzuan</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-quxiaoxiazuan"></use>
+                </svg>
+                <div class="name">线性图标-取消下钻</div>
+                <div class="code-name">#icon-quxiaoxiazuan</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-linkage"></use>
+                </svg>
+                <div class="name">联动</div>
+                <div class="code-name">#icon-linkage</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-xiazuan"></use>
+                </svg>
+                <div class="name">下钻</div>
+                <div class="code-name">#icon-xiazuan</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shangzuan"></use>
+                </svg>
+                <div class="name">上钻</div>
+                <div class="code-name">#icon-shangzuan</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-quxiaoliandong"></use>
+                </svg>
+                <div class="name">取消联动</div>
+                <div class="code-name">#icon-quxiaoliandong</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-edit-outline"></use>
+                </svg>
+                <div class="name">edit-2</div>
+                <div class="code-name">#icon-edit-outline</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-edit"></use>
diff --git a/frontend/src/styles/deicon/iconfont.css b/frontend/src/styles/deicon/iconfont.css
index 368265f0dc..f01e96009a 100644
--- a/frontend/src/styles/deicon/iconfont.css
+++ b/frontend/src/styles/deicon/iconfont.css
@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2459092 */
-  src: url('iconfont.woff2?t=1627282547459') format('woff2'),
-  url('iconfont.woff?t=1627282547459') format('woff'),
-  url('iconfont.ttf?t=1627282547459') format('truetype');
+  src: url('iconfont.woff2?t=1628652979833') format('woff2'),
+       url('iconfont.woff?t=1628652979833') format('woff'),
+       url('iconfont.ttf?t=1628652979833') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,34 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-quxiaoshangzuan:before {
+  content: "\e973";
+}
+
+.icon-quxiaoxiazuan:before {
+  content: "\e6ed";
+}
+
+.icon-linkage:before {
+  content: "\e6f7";
+}
+
+.icon-xiazuan:before {
+  content: "\e613";
+}
+
+.icon-shangzuan:before {
+  content: "\e61f";
+}
+
+.icon-quxiaoliandong:before {
+  content: "\e637";
+}
+
+.icon-edit-outline:before {
+  content: "\e604";
+}
+
 .icon-edit:before {
   content: "\e612";
 }
diff --git a/frontend/src/styles/deicon/iconfont.js b/frontend/src/styles/deicon/iconfont.js
index 270c2b7eab..0bde69814a 100644
--- a/frontend/src/styles/deicon/iconfont.js
+++ b/frontend/src/styles/deicon/iconfont.js
@@ -1 +1 @@
-!function(h){var c,l,a,v,t,i,o='<svg><symbol id="icon-edit" viewBox="0 0 1026 1024"><path d="M307.933767 709.191401l55.608246-121.906912 70.215853 67.788777-125.824099 54.118135z m95.818675-171.645022l366.409348-352.874171 82.001279 80.116062-365.732025 352.095249-82.678602-79.33714z m550.042994-370.90226l-50.505744 48.372175-81.854525-80.116062 49.704244-47.593254c8.003704-7.958549 23.435387-6.513593 32.150281 2.144858l48.281866 46.182162c5.147657 5.03477 8.071436 11.559652 8.071436 18.039379 0.011289 5.046059-2.201301 9.36964-5.847558 12.970742zM313.792614 530.299019c-0.745056 0.767633-1.467534 1.478823-2.21259 2.889913L259.640613 717.217683c-2.923779 10.78073 0 22.340381 8.071436 30.310219 6.581325 5.779826 14.607607 9.290618 23.390233 9.290619 2.935068 0 5.113791-0.699901 8.03757-1.399802l190.147239-49.749399h0.79021a8.048859 8.048859 0 0 0 5.791115-2.178724l507.721574-489.208069c15.28493-14.40441 23.356366-33.888744 23.356367-55.551803 0-24.519105-10.927483-49.03821-29.215214-67.077588l-48.281865-46.182163c-19.010208-18.039378-43.935707-28.853974-69.572396-28.853974-22.577445 0-43.145497 7.935972-57.707948 23.074149L314.503803 528.109007c-0.71119 0.699901-0.71119 1.478823-0.711189 2.190012zM100.932466 0C45.358086 0 0 44.70334 0 99.555242V923.530372c0 54.806747 45.358086 99.555242 100.932466 99.555241h806.082505c55.57438 0 100.864734-44.748495 100.864734-99.555241V397.543645h-86.290994v451.729511c0 49.049498-40.221718 87.939147-89.214772 87.939147H175.539632c-49.004344 0-89.214772-38.889648-89.214773-87.939147V173.157711c0-48.338309 40.210429-88.040745 89.214773-88.040745h457.904443V0H100.932466z"  ></path></symbol><symbol id="icon-xiangqing1" viewBox="0 0 1024 1024"><path d="M449.024 896h-288c-17.92 0-32-14.72-32-32v-704c0-17.92 14.08-32 32-32h640c17.28 0 32 14.08 32 32V448a32 32 0 0 0 64 0V128c0-35.2-28.8-64-64-64h-704c-35.2 0-64 28.8-64 64v768c0 35.2 28.8 64 64 64h320a32 32 0 0 0 0-64zM946.176 901.824l-83.2-83.2c-6.4-6.4-12.8-6.4-19.2-6.4-19.2 0-32 12.8-32 32 0 6.4 0 12.8 6.4 19.2l83.2 83.2c6.4 6.4 12.8 12.8 25.6 12.8 19.2 0 32-12.8 32-32 0-6.4-6.4-19.2-12.8-25.6z"  ></path><path d="M703.936 510.592a192 192 0 1 0 0 384 192 192 0 0 0 0-384z m0 320a128 128 0 1 1-0.064-255.936 128 128 0 0 1 0.064 255.936zM736.384 319.36H223.36a31.552 31.552 0 0 1-31.488-31.488v-1.024c0-17.344 14.144-31.488 31.488-31.488h513.024c17.344 0 31.488 14.144 31.488 31.488v1.024c0 17.28-14.208 31.488-31.488 31.488zM734.336 447.36H221.376a31.552 31.552 0 0 1-31.488-31.488v-1.024c0-17.344 14.144-31.488 31.488-31.488h513.024c17.344 0 31.488 14.144 31.488 31.488v1.024c0 17.28-14.208 31.488-31.552 31.488zM416 575.04H223.04a31.552 31.552 0 0 1-31.488-31.488v-1.024c0-17.344 14.144-31.488 31.488-31.488H416c17.344 0 31.488 14.144 31.488 31.488v1.024a31.552 31.552 0 0 1-31.488 31.488z"  ></path></symbol><symbol id="icon-weibiaoti-1" viewBox="0 0 1024 1024"><path d="M512 19.413487C47.059275 19.413487 19.413487 47.059275 19.413487 512s27.645788 492.586513 492.586513 492.586513 492.586513-27.645788 492.586513-492.586513S976.940725 19.413487 512 19.413487z" fill="#1296db" ></path></symbol><symbol id="icon-weibiaoti-" viewBox="0 0 1036 1024"><path d="M512.072842 512m-505.929333 0a505.929334 505.929334 0 1 0 1011.858667 0 505.929334 505.929334 0 1 0-1011.858667 0Z" fill="#ffffff" ></path><path d="M512.072842 1024C28.726387 1024 0.072842 995.346455 0.072842 512S28.726387 0 512.072842 0s512 28.653545 512 512-28.653545 512-512 512z m0-1011.858667C35.525534 12.141333 12.214175 35.452691 12.214175 512s23.311359 499.858667 499.858667 499.858667 499.858667-23.311359 499.858667-499.858667S988.620151 12.141333 512.072842 12.141333z"  ></path></symbol><symbol id="icon-touming" viewBox="0 0 1024 1024"><path d="M0 819.2h204.8V1024H0zM0 0h204.8v204.8H0zM0 409.6h204.8v204.8H0z" fill="#999999" ></path><path d="M204.8 204.8h204.8v204.8H204.8zM204.8 614.4h204.8v204.8H204.8z" fill="#B7B7B7" ></path><path d="M409.6 0h204.8v204.8H409.6zM409.6 409.6h204.8v204.8H409.6z" fill="#C6C6C6" ></path><path d="M614.4 204.8h204.8v204.8h-204.8zM614.4 614.4h204.8v204.8h-204.8z" fill="#DDDDDD" ></path><path d="M409.6 819.2h204.8V1024H409.6z" fill="#C6C6C6" ></path><path d="M819.2 0H1024v204.8h-204.8zM819.2 409.6H1024v204.8h-204.8zM819.2 819.2H1024V1024h-204.8z" fill="#F4F4F4" ></path></symbol><symbol id="icon-fangxing-" viewBox="0 0 1024 1024"><path d="M293.047427 796.738991v-133.327352c0-217.759502 176.531539-394.289445 394.289445-394.289446h133.330542v-104.189607H652.839875c-256.250417 0-463.980461 207.730044-463.980461 463.977271v167.829134h104.188013z"  ></path></symbol><symbol id="icon-fangda" viewBox="0 0 1024 1024"><path d="M470.624 553.376a32 32 0 0 1 2.656 42.24l-2.656 3.008L269.28 800l145.984 0.032a32 32 0 0 1 31.776 28.256l0.224 3.744a32 32 0 0 1-28.288 31.776l-3.712 0.224H192l-2.4-0.096-4.032-0.544-3.552-0.96-3.552-1.408-3.136-1.664-3.072-2.144-2.88-2.56a32.32 32.32 0 0 1-3.104-3.584l-2.272-3.52-1.728-3.648-1.12-3.36-0.96-4.8L160 832V607.872a32 32 0 0 1 63.776-3.712l0.224 3.712-0.032 146.848 201.408-201.344a32 32 0 0 1 45.248 0zM608.736 160H832l2.4 0.096 4.032 0.544 3.552 0.96 3.552 1.408 3.136 1.664 3.072 2.144 2.88 2.56c1.152 1.12 2.176 2.336 3.104 3.584l2.272 3.52 1.728 3.648 1.12 3.36 0.96 4.8L864 192v224.128a32 32 0 0 1-63.776 3.712l-0.224-3.712v-146.88L598.624 470.624a32 32 0 0 1-47.904-42.24l2.656-3.008L754.688 224h-145.92a32 32 0 0 1-31.808-28.256l-0.224-3.744a32 32 0 0 1 28.288-31.776l3.712-0.224z"  ></path></symbol><symbol id="icon-shezhi" viewBox="0 0 1024 1024"><path d="M416.4 958h191.2V849.7c0-12.7 6.4-25.5 19.1-31.9 31.9-12.7 63.7-31.9 89.2-51 12.7-6.4 25.5-6.4 38.2 0l95.6 57.3 95.6-165.7-95.6-57.3C837 588.5 830.6 575.7 837 563c0-19.1 6.4-31.9 6.4-51s0-31.9-6.4-51c0-12.7 6.4-25.5 12.7-31.9l95.6-57.3-95.6-165.7-95.6 57.3c-12.7 6.4-25.5 6.4-38.2 0-25.5-19.1-57.3-38.2-89.2-51-12.7-12.7-19.1-25.5-19.1-38.2V66H416.4v108.3c0 12.7-6.4 25.5-19.1 31.9-31.9 12.7-63.7 31.9-89.2 51-12.7 6.4-25.5 6.4-38.2 0l-95.6-51-95.6 165.6 95.6 57.3c12.7 6.4 19.1 19.1 12.7 31.9 0 19.1-6.4 31.9-6.4 51s0 31.9 6.4 51c6.4 12.7 0 25.5-12.7 31.9l-95.6 57.3 95.6 165.7 95.6-57.3c12.7-6.4 25.5-6.4 38.2 0 25.5 19.1 57.3 38.2 89.2 51 12.7 6.4 19.1 19.1 19.1 31.9V958z m223 63.7H384.6c-19.1 0-31.9-12.7-31.9-31.9v-121c-25.5-12.7-51-25.5-70.1-38.2l-101.9 63.7c-12.7 6.4-31.9 6.4-44.6-12.7L8.6 658.6c-12.7-19.1-6.4-38.2 12.7-44.6l101.9-63.7v-76.5L21.4 410.1c-19.1-6.4-25.5-25.5-12.7-44.6l127.4-223c6.4-12.7 25.5-19.1 44.6-6.4l101.9 63.7c19.1-12.7 44.6-31.9 70.1-38.2V34.1c0-19.1 12.7-31.9 31.9-31.9h254.9c19.1 0 31.9 12.7 31.9 31.9v121.1c25.5 12.7 51 25.5 70.1 38.2l101.9-63.7c12.7-6.4 31.9-6.4 44.6 12.7l127.4 223c12.7 19.1 6.4 38.2-12.7 44.6l-101.9 63.7v76.5l101.9 63.7c12.7 6.4 19.1 25.5 12.7 44.6L888 881.5c-6.4 12.7-25.5 19.1-44.6 12.7l-101.9-63.7c-19.1 12.7-44.6 31.9-70.1 38.2v121.1c-0.1 19.2-12.8 31.9-32 31.9zM512 703.2c-108.3 0-191.2-82.8-191.2-191.2S403.7 320.8 512 320.8 703.2 403.7 703.2 512 620.3 703.2 512 703.2z m0-318.6c-70.1 0-127.4 57.3-127.4 127.4S441.9 639.4 512 639.4 639.4 582.1 639.4 512 582.1 384.6 512 384.6z"  ></path></symbol><symbol id="icon-quanping1" viewBox="0 0 1024 1024"><path d="M628.053333 628.053333a32 32 0 0 1 45.226667 0l158.72 158.634667V693.333333l0.298667-4.352A32 32 0 0 1 896 693.333333v181.333334l-0.341333 3.84a21.333333 21.333333 0 0 1-20.992 17.493333h-181.333334l-4.352-0.298667a32 32 0 0 1-27.648-31.701333l0.298667-4.352a32 32 0 0 1 31.701333-27.648h93.44l-158.72-158.72-3.114666-3.584a32 32 0 0 1 3.114666-41.642667z m-232.106666 0a32 32 0 0 1 3.114666 41.642667l-3.114666 3.584-158.72 158.72h93.44a32 32 0 0 1 31.701333 27.648l0.298667 4.352a32 32 0 0 1-27.648 31.701333L330.666667 896H149.333333a21.333333 21.333333 0 0 1-20.992-17.493333L128 874.666667v-181.333334a32 32 0 0 1 63.701333-4.352l0.298667 4.352v93.354667l158.72-158.634667a32 32 0 0 1 45.226667 0zM874.666667 128a21.333333 21.333333 0 0 1 20.992 17.493333L896 149.333333v181.333334a32 32 0 0 1-63.701333 4.352L832 330.666667V237.312L673.28 395.946667a32 32 0 0 1-48.341333-41.642667l3.114666-3.584 158.72-158.72h-93.44a32 32 0 0 1-31.701333-27.648L661.333333 160a32 32 0 0 1 27.648-31.701333L693.333333 128h181.333334zM330.666667 128l4.352 0.298667a32 32 0 0 1 27.648 31.701333l-0.298667 4.352a32 32 0 0 1-31.701333 27.648H237.226667l158.72 158.72 3.114666 3.584a32 32 0 0 1-48.341333 41.642667L192 237.312V330.666667l-0.298667 4.352A32 32 0 0 1 128 330.666667V149.333333l0.341333-3.84A21.333333 21.333333 0 0 1 149.333333 128h181.333334z"  ></path></symbol><symbol id="icon-font-weight-bold" viewBox="0 0 1024 1024"><path d="M148.945455 55.854545h409.6c102.4 0 186.181818 27.927273 242.036363 83.781819 37.236364 37.236364 65.163636 93.090909 65.163637 148.945454 0 111.709091-65.163636 167.563636-130.327273 204.8 102.4 37.236364 176.872727 102.4 176.872727 223.418182 0 167.563636-130.327273 251.345455-335.127273 251.345455h-418.909091v-912.29091z m549.236363 260.654546c0-74.472727-55.854545-111.709091-158.254545-111.709091h-232.727273v242.036364h223.418182c93.090909-9.309091 167.563636-46.545455 167.563636-130.327273z m-139.636363 260.654545h-251.345455v251.345455h269.963636c111.709091 0 176.872727-46.545455 176.872728-121.018182-9.309091-83.781818-65.163636-130.327273-195.490909-130.327273z"  ></path></symbol><symbol id="icon-letter_spacing" viewBox="0 0 1127 1024"><path d="M320.37397 751.711955a32.882959 32.882959 0 0 0 20.669289-6.81147 64.356648 64.356648 0 0 0 15.971723-18.555384 172.400656 172.400656 0 0 0 12.21367-25.601732q5.167322-13.857818 10.569522-28.890028L422.780899 549.012002h281.853933l57.075421 163.005524a67.175187 67.175187 0 0 0 16.44148 29.359785 35.936376 35.936376 0 0 0 29.124906 10.099766q27.480758 0 34.996863-17.615871a61.068352 61.068352 0 0 0 0-43.217603L617.729869 37.447114a52.142978 52.142978 0 0 0-19.02514-27.245881A59.189326 59.189326 0 0 0 563.707866 0.101467a54.961517 54.961517 0 0 0-35.231742 10.099766 53.082491 53.082491 0 0 0-18.555384 27.245881l-222.19485 651.317463q-11.743914 36.171255 0 49.559316a41.338577 41.338577 0 0 0 32.64808 13.388062zM563.707866 108.85011l125.190121 365.705478H438.517744zM1122.483287 906.731618l-132.471348-96.300094a11.743914 11.743914 0 0 0-18.555384 9.395131v61.068352H156.194054v-60.833473a11.743914 11.743914 0 0 0-18.555383-9.395132L4.932444 906.731618a11.743914 11.743914 0 0 0 0 19.02514l132.471348 96.065216a11.743914 11.743914 0 0 0 18.555384-9.395131v-61.068352h815.027622v60.833473a11.743914 11.743914 0 0 0 18.555384 9.395131l132.706227-96.065215a11.743914 11.743914 0 0 0 0.234878-18.790262z"  ></path></symbol><symbol id="icon-letter-spacing" viewBox="0 0 1152 1024"><path d="M1024 0h128v1024h-128zM0 0h128v1024H0z m657.92 128H494.08L186.24 864h138.88l64-160h368.64l64 160h138.88z m49.28 448H448l128-313.6z"  ></path></symbol><symbol id="icon-zimua" viewBox="0 0 1024 1024"><path d="M481.28 117.76h61.44c22.528 0 43.008 13.824 51.2 34.816l287.232 745.984c1.536 3.584-1.024 7.68-5.12 7.68h-117.248c-2.048 0-4.096-1.536-5.12-3.584l-70.144-192.512c-1.536-4.096-5.632-7.168-10.24-7.168H349.696c-4.608 0-8.704 3.072-10.24 7.168l-70.144 192.512c-1.024 2.048-3.072 3.584-5.12 3.584H147.968c-3.584 0-6.656-4.096-5.12-7.68L430.08 152.576c8.192-20.992 28.16-34.816 51.2-34.816z m-87.04 485.888h235.008c7.68 0 12.8-7.68 10.24-14.848l-124.928-342.016h-4.608L384 588.8c-3.072 7.168 2.56 14.848 10.24 14.848z"  ></path></symbol><symbol id="icon-format_letter_spacing_" viewBox="0 0 1024 1024"><path d="M682.666667 704l128 106.666667-128 106.666666v-85.333333H341.333333v85.333333L213.333333 810.666667l128-106.666667v85.333333h341.333334v-85.333333zM170.666667 170.666667v682.666666H85.333333V170.666667h85.333334z m768 0v682.666666h-85.333334V170.666667h85.333334z m-394.666667 0l202.666667 469.333333h-89.6l-38.4-93.866667h-213.333334L366.933333 640H277.333333l202.666667-469.333333h64zM512 255.146667L432.213333 469.333333h159.573334L512 255.146667z"  ></path></symbol><symbol id="icon-font_size" viewBox="0 0 1024 1024"><path d="M923.456 713.152V644.48h-68.608v205.76h68.608v68.544h-205.76v-68.544h68.608V644.48h-68.608v68.608h-68.544V644.48c0-37.824 30.72-68.544 68.544-68.544h205.76c37.824 0 68.544 30.72 68.544 68.544v68.608h-68.544zM512 233.152H443.456v548.544H580.48v137.152H169.152v-137.152h137.152V233.152H237.696c-75.712 0-137.152 61.44-137.152 137.152H32V164.48C32 126.72 62.72 96 100.544 96h548.608c37.888 0 68.544 30.72 68.544 68.544v205.76h-68.544c0-75.776-61.44-137.152-137.152-137.152z"  ></path></symbol><symbol id="icon-align-center" viewBox="0 0 1024 1024"><path d="M34.45333333 77.86666667h954.56v124.37333333H34.45333333zM213.76 327.25333333H809.6v124.37333334H213.76zM34.45333333 575.46666667h954.56v124.37333333H34.45333333zM213.76 824.74666667H809.6v124.37333333H213.76z"  ></path></symbol><symbol id="icon-juyou" viewBox="0 0 1024 1024"><path d="M53.355789 53.894737v108.328421H970.105263V53.894737H53.355789z m431.157895 377.802105H970.105263V323.368421H484.513684v108.328421z m-431.157895 269.473684H970.105263V592.842105H53.355789v108.328421z m431.157895 269.473685H970.105263V862.315789H484.513684v108.328422z"  ></path></symbol><symbol id="icon-juzuo" viewBox="0 0 1331 1024"><path d="M898.304 819.712v127.488H153.6v-127.488z m279.296-256v127.488H153.6v-127.488z m-279.296-256V435.2H153.6V307.2zM1177.6 51.2v127.488H153.6V51.2z"  ></path></symbol><symbol id="icon-solid_line" viewBox="0 0 1024 1024"><path d="M102.4 460.8h819.2v102.4H102.4z"  ></path></symbol><symbol id="icon-huabi" viewBox="0 0 1024 1024"><path d="M884.641557 138.571009C811.672662 65.565275 755.277234 56.513108 726.075145 85.715197l-79.284741 79.283718 211.422224 211.422224 79.31851-79.284741C966.698434 267.936355 957.646268 211.538881 884.641557 138.571009z"  ></path><path d="M144.589584 667.200758c-14.600533 14.564717-68.333318 226.898707-68.333318 226.898707-3.193739 8.709359-10.073426 42.179658 0 52.855812 7.039323 7.460925 25.424042 10.638291 52.855812 0 0 0 212.33399-53.730739 226.938616-68.333318l449.309192-449.345008L593.934592 217.85575 144.589584 667.200758zM132.177903 891.034662 185.764356 708.376553l129.110543 129.071657L132.177903 891.034662z"  ></path></symbol><symbol id="icon-dianxian" viewBox="0 0 1024 1024"><path d="M228.32 532.76h-6.92c-11.47 0-20.76-9.3-20.76-20.76s9.29-20.76 20.76-20.76h6.92c11.47 0 20.76 9.3 20.76 20.76s-9.29 20.76-20.76 20.76zM712.65 532.76h-13.84c-11.47 0-20.76-9.3-20.76-20.76s9.29-20.76 20.76-20.76h13.84c11.47 0 20.76 9.3 20.76 20.76s-9.3 20.76-20.76 20.76z m-96.87 0h-13.84c-11.47 0-20.76-9.3-20.76-20.76s9.29-20.76 20.76-20.76h13.84c11.47 0 20.76 9.3 20.76 20.76s-9.29 20.76-20.76 20.76z m-96.86 0h-13.84c-11.47 0-20.76-9.3-20.76-20.76s9.29-20.76 20.76-20.76h13.84c11.47 0 20.76 9.3 20.76 20.76s-9.3 20.76-20.76 20.76z m-96.87 0h-13.84c-11.47 0-20.76-9.3-20.76-20.76s9.29-20.76 20.76-20.76h13.84c11.47 0 20.76 9.3 20.76 20.76s-9.29 20.76-20.76 20.76z m-96.86 0h-13.84c-11.47 0-20.76-9.3-20.76-20.76s9.29-20.76 20.76-20.76h13.84c11.47 0 20.76 9.3 20.76 20.76s-9.3 20.76-20.76 20.76zM802.59 532.76h-6.92c-11.47 0-20.76-9.3-20.76-20.76s9.29-20.76 20.76-20.76h6.92c11.47 0 20.76 9.3 20.76 20.76s-9.29 20.76-20.76 20.76z"  ></path></symbol><symbol id="icon-xuxian" viewBox="0 0 1024 1024"><path d="M304.43 532.76H221.4c-11.47 0-20.76-9.3-20.76-20.76s9.29-20.76 20.76-20.76h83.03c11.47 0 20.76 9.3 20.76 20.76s-9.29 20.76-20.76 20.76zM581.19 532.76H442.81c-11.47 0-20.76-9.3-20.76-20.76s9.29-20.76 20.76-20.76h138.38c11.47 0 20.76 9.3 20.76 20.76s-9.3 20.76-20.76 20.76zM802.59 532.76h-83.03c-11.47 0-20.76-9.3-20.76-20.76s9.29-20.76 20.76-20.76h83.03c11.47 0 20.76 9.3 20.76 20.76s-9.29 20.76-20.76 20.76z"  ></path></symbol><symbol id="icon-beijingse1" viewBox="0 0 1024 1024"><path d="M882.980571 580.900571c0-25.6-9.289143-51.2-27.940571-67.437714L508.342857 166.692571 398.848 57.270857a33.718857 33.718857 0 0 0-48.932571 0 33.718857 33.718857 0 0 0 0 48.859429L436.150857 192.365714 114.980571 511.122286c-37.302857 37.229714-37.302857 100.059429 0 137.289143l300.178286 300.251428c18.651429 18.578286 44.251429 27.867429 67.510857 27.867429 25.6 0 48.859429-9.289143 67.510857-27.867429l300.178286-300.251428c20.992-18.651429 32.621714-41.910857 32.621714-67.510858zM163.84 559.981714l321.097143-318.902857 318.902857 318.902857c4.681143 4.681143 6.948571 11.629714 6.948571 18.578286h-653.897142c0-4.608 2.267429-11.629714 6.948571-18.578286z m709.778286 214.089143s-62.829714 83.821714-62.829715 118.710857c0 34.889143 27.940571 62.829714 62.902858 62.829715 34.889143 0 62.829714-27.940571 62.829714-62.902858 0-34.816-62.902857-118.637714-62.902857-118.637714z" fill="#606266" ></path></symbol><symbol id="icon-juxing" viewBox="0 0 1024 1024"><path d="M876.4664713541666 302.9680989583333H776.4029947916665V202.90462239583334c0-11.865234374999998-9.8876953125-21.7529296875-21.7529296875-21.7529296875s-21.7529296875 9.8876953125-21.7529296875 21.7529296875v100.0634765625H632.8336588541666c-11.865234374999998 0-21.7529296875 9.8876953125-21.7529296875 21.7529296875s9.8876953125 21.7529296875 21.7529296875 21.7529296875h100.0634765625v100.0634765625c0 11.865234374999998 9.8876953125 21.7529296875 21.7529296875 21.7529296875s21.7529296875-9.8876953125 21.7529296875-21.7529296875V346.4739583333333H876.4664713541666c11.865234374999998 0 21.7529296875-9.8876953125 21.7529296875-21.7529296875 0-12.2607421875-9.8876953125-21.7529296875-21.7529296875-21.7529296875zM146.75455729166666 386.0247395833333c11.07421875 0 19.775390625-8.701171874999998 19.775390625-19.775390625h0.7910156249999999v-21.7529296875h36.38671875c10.678710937499998 0 19.775390625-8.701171874999998 19.775390625-19.775390625s-9.0966796875-19.775390625-19.775390625-19.775390625l-56.953125-0.39550781249999994c-11.07421875 0-19.775390625 8.701171874999998-19.775390625 19.775390625v42.71484374999999c0 9.8876953125 8.701171874999998 18.984374999999996 19.775390625 18.984374999999996z m135.26367187500003-41.92382812499999h98.876953125c11.07421875 0 19.775390625-8.701171874999998 19.775390625-19.775390625s-8.701171874999998-19.775390625-19.775390625-19.775390625h-98.876953125c-11.07421875 0-19.775390625 9.0966796875-19.775390625 19.775390625 0 11.07421875 9.0966796875 19.775390625 19.775390625 19.775390625z m177.1875 0h98.876953125c11.07421875 0 19.775390625-8.701171874999998 19.775390625-19.775390625s-8.701171874999998-19.775390625-19.775390625-19.775390625h-98.876953125c-11.07421875 0-19.775390625 9.0966796875-19.775390625 19.775390625 0.7910156249999999 11.07421875 8.701171874999998 19.775390625 19.775390625 19.775390625zM774.8209635416665 560.8391927083335c0-11.07421875-8.701171874999998-19.775390625-19.775390625-19.775390625s-19.775390625 8.701171874999998-19.775390625 19.775390625v98.876953125c0 11.07421875 8.701171874999998 19.775390625 19.775390625 19.775390625s19.775390625-8.701171874999998 19.775390625-19.775390625v-98.876953125z m-19.775390625 157.41210937500003c-11.07421875 0-19.775390625 9.0966796875-19.775390625 19.775390625v64.072265625h-79.1015625v1.1865234374999998c-11.07421875 0-19.775390625 8.701171874999998-19.775390625 19.775390625s8.701171874999998 19.775390625 19.775390625 19.775390625h98.876953125c11.07421875 0 19.775390625-8.701171874999998 19.775390625-19.775390625V738.8177083333334c0-11.865234374999998-9.0966796875-20.56640625-19.775390625-20.56640625zM581.0221354166666 802.0989583333333L166.52994791666666 801.3079427083333V423.2024739583333h-0.7910156249999999c0-11.07421875-8.701171874999998-19.775390625-19.775390625-19.775390625s-19.775390625 8.701171874999998-19.775390625 19.775390625V821.8743489583334c0 11.07421875 8.701171874999998 19.775390625 19.775390625 19.775390625H579.8356119791666c11.07421875 0 19.775390625-9.0966796875 19.775390625-19.775390625 0-11.07421875-9.0966796875-19.775390625-18.5888671875-19.775390625z"  ></path></symbol><symbol id="icon-text" viewBox="0 0 1024 1024"><path d="M853.333333 1024 170.666667 1024c-93.866667 0-170.666667-76.8-170.666667-170.666667L0 170.666667c0-93.866667 76.8-170.666667 170.666667-170.666667l682.666667 0c93.866667 0 170.666667 76.8 170.666667 170.666667l0 682.666667C1024 947.2 947.2 1024 853.333333 1024zM170.666667 85.333333C123.733333 85.333333 85.333333 123.733333 85.333333 170.666667l0 682.666667c0 46.933333 38.4 85.333333 85.333333 85.333333l682.666667 0c46.933333 0 85.333333-38.4 85.333333-85.333333L938.666667 170.666667c0-46.933333-38.4-85.333333-85.333333-85.333333L170.666667 85.333333z"  ></path><path d="M725.333333 341.333333 298.666667 341.333333C273.066667 341.333333 256 324.266667 256 298.666667s17.066667-42.666667 42.666667-42.666667l426.666667 0c25.6 0 42.666667 17.066667 42.666667 42.666667S750.933333 341.333333 725.333333 341.333333z"  ></path><path d="M298.666667 384C273.066667 384 256 366.933333 256 341.333333L256 298.666667c0-25.6 17.066667-42.666667 42.666667-42.666667s42.666667 17.066667 42.666667 42.666667l0 42.666667C341.333333 366.933333 324.266667 384 298.666667 384z"  ></path><path d="M725.333333 384c-25.6 0-42.666667-17.066667-42.666667-42.666667L682.666667 298.666667c0-25.6 17.066667-42.666667 42.666667-42.666667s42.666667 17.066667 42.666667 42.666667l0 42.666667C768 366.933333 750.933333 384 725.333333 384z"  ></path><path d="M512 768c-25.6 0-42.666667-17.066667-42.666667-42.666667L469.333333 298.666667c0-25.6 17.066667-42.666667 42.666667-42.666667s42.666667 17.066667 42.666667 42.666667l0 426.666667C554.666667 750.933333 537.6 768 512 768z"  ></path><path d="M554.666667 768l-85.333333 0c-25.6 0-42.666667-17.066667-42.666667-42.666667s17.066667-42.666667 42.666667-42.666667l85.333333 0c25.6 0 42.666667 17.066667 42.666667 42.666667S580.266667 768 554.666667 768z"  ></path></symbol><symbol id="icon-picture" viewBox="0 0 1024 1024"><path d="M875.633778 64H148.366222A98.602667 98.602667 0 0 0 49.777778 162.588444v698.823112a98.602667 98.602667 0 0 0 98.588444 98.602666h727.267556a98.602667 98.602667 0 0 0 98.588444-98.602666h0.014222V162.588444A98.602667 98.602667 0 0 0 875.633778 64zM106.666667 861.411556v-136.405334l201.372444-288.042666c6.215111-8.888889 14.876444-14.250667 24.405333-15.089778 9.628444-0.952889 19.015111 2.929778 26.680889 10.595555l176.924445 176.910223-218.624 293.745777H148.366222A41.713778 41.713778 0 0 1 106.666667 861.411556z m810.680889 0a41.713778 41.713778 0 0 1-41.713778 41.713777H352.867556l252.202666-338.816c6.599111-8.832 15.815111-14.193778 25.998222-15.089777 10.268444-0.867556 20.181333 2.773333 28.174223 10.339555l155.562666 146.744889c5.688889 5.390222 14.705778 5.105778 20.110223-0.583111a14.250667 14.250667 0 0 0-0.583112-20.110222L678.784 538.865778c-13.994667-13.198222-31.886222-19.626667-50.218667-17.976889-18.360889 1.607111-34.801778 10.993778-46.307555 26.439111l-29.027556 38.997333-173.980444-173.966222c-13.738667-13.738667-31.232-20.366222-49.294222-18.816-18.062222 1.578667-34.133333 11.221333-45.226667 27.121778L106.666667 675.370667V162.588444A41.699556 41.699556 0 0 1 148.366222 120.888889h727.267556a41.699556 41.699556 0 0 1 41.699555 41.699555h0.014223v698.823112z" fill="" ></path><path d="M868.636444 717.937778a14.222222 14.222222 0 0 0-19.527111 20.664889l16.995556 16.056889a14.208 14.208 0 0 0 20.096-0.583112 14.193778 14.193778 0 0 0-0.554667-20.081777l-17.009778-16.056889zM636.743111 175.957333c-67.783111 0-122.908444 55.125333-122.908444 122.894223 0 67.768889 55.125333 122.908444 122.908444 122.908444 67.754667 0 122.908444-55.139556 122.908445-122.908444s-55.139556-122.894222-122.908445-122.894223z m0 217.372445c-52.081778 0-94.464-42.368-94.464-94.464s42.368-94.449778 94.464-94.449778 94.464 42.353778 94.464 94.449778-42.368 94.464-94.464 94.464z" fill="" ></path></symbol><symbol id="icon-shuru" viewBox="0 0 1024 1024"><path d="M970.666667 204.8l-151.466667-151.466667L701.866667 170.666667H64c-12.8 0-21.333333 8.533333-21.333333 21.333333v768c0 12.8 8.533333 21.333333 21.333333 21.333333h576c6.4 0 10.666667-2.133333 14.933333-6.4l192-192c4.266667-4.266667 6.4-8.533333 6.4-14.933333V322.133333l117.333334-117.333333z m-529.066667 469.333333l-98.133333-85.333333L742.4 189.866667l91.733333 91.733333-392.533333 392.533333z m-123.733333-49.066666l89.6 76.8-121.6 34.133333 32-110.933333zM910.933333 204.8l-46.933333 46.933333-91.733333-91.733333 46.933333-46.933333 91.733333 91.733333zM661.333333 908.8V789.333333h119.466667L661.333333 908.8z m149.333334-162.133333h-170.666667c-12.8 0-21.333333 8.533333-21.333333 21.333333v170.666667H85.333333V213.333333h573.866667l-128 128H170.666667v42.666667h317.866666l-128 128H170.666667v42.666667h147.2l-32 32-61.866667 213.333333 213.333333-61.866667 183.466667-183.466666H725.333333v-42.666667h-61.866666l147.2-147.2V746.666667z"  ></path></symbol><symbol id="icon-tree" viewBox="0 0 1024 1024"><path d="M448.84 880.29H175.37c-20.14 0-36.46-16.33-36.46-36.46 0-20.14 16.33-36.46 36.46-36.46h273.48c20.14 0 36.46 16.33 36.46 36.46 0 20.14-16.33 36.46-36.47 36.46zM448.84 588.58H175.37c-20.14 0-36.46-16.33-36.46-36.46 0-20.14 16.33-36.46 36.46-36.46h273.48c20.14 0 36.46 16.33 36.46 36.46 0 20.14-16.33 36.46-36.47 36.46z"  ></path><path d="M138.9 843.83V296.88c0-20.14 16.33-36.46 36.46-36.46 20.14 0 36.46 16.33 36.46 36.46v546.95c0 20.14-16.33 36.46-36.46 36.46-20.13 0-36.46-16.32-36.46-36.46z"  ></path><path d="M211.83 348.16H138.9c-40.11 0-72.93-32.82-72.93-72.93V202.3c0-40.11 32.82-72.93 72.93-72.93h72.93c40.11 0 72.93 32.82 72.93 72.93v72.93c0 40.11-32.82 72.93-72.93 72.93zM922.87 625.05H605.12c-20.05 0-36.46-16.41-36.46-36.46v-72.93c0-20.05 16.41-36.46 36.46-36.46h317.75c20.05 0 36.46 16.41 36.46 36.46v72.93c0 20.05-16.41 36.46-36.46 36.46zM921.67 311.69h-508.1c-20.71 0-37.66-16.95-37.66-37.66V203.5c0-20.71 16.95-37.66 37.66-37.66h508.1c20.71 0 37.66 16.95 37.66 37.66v70.54c0 20.71-16.94 37.65-37.66 37.65zM922.87 916.76H605.12c-20.05 0-36.46-16.41-36.46-36.46v-72.93c0-20.05 16.41-36.46 36.46-36.46h317.75c20.05 0 36.46 16.41 36.46 36.46v72.93c0 20.05-16.41 36.46-36.46 36.46z"  ></path></symbol><symbol id="icon-chaxunsousuo" viewBox="0 0 1024 1024"><path d="M724.173722 608.066299m33.939704 33.939705l203.638226 203.638225q33.939704 33.939704 0 67.879409l0 0q-33.939704 33.939704-67.879409 0l-203.638225-203.638226q-33.939704-33.939704 0-67.879408l0 0q33.939704-33.939704 67.879408 0Z"  ></path><path d="M48.436376 928.00402m47.99799 0l287.98794 0q47.99799 0 47.99799 47.99799l0 0q0 47.99799-47.99799 47.99799l-287.98794 0q-47.99799 0-47.99799-47.99799l0 0q0-47.99799 47.99799-47.99799Z"  ></path><path d="M464.418957 832.00804a415.982581 415.982581 0 1 1 293.747699-121.594909A415.342608 415.342608 0 0 1 464.418957 832.00804z m0-735.969182A319.986601 319.986601 0 1 0 688.409577 192.034839a319.986601 319.986601 0 0 0-223.99062-95.995981z"  ></path></symbol><symbol id="icon-jidu" viewBox="0 0 1024 1024"><path d="M153.850705 812.896572v-537.121614c0.409313-0.511642 0.920955-0.920955 0.920955-1.432598 1.330269-12.688718 6.856001-23.637854 15.144599-32.949735 13.609673-15.451584 31.005496-22.716898 51.573498-22.716898H284.626362v-5.62806-44.205856c0-1.637254 0.511642-3.376836 0.716298-5.01409 0.920955-6.037374 6.242031-7.469971 10.539822-9.925852h9.516539c10.130509 3.581493 12.688718 11.563106 12.381732 21.386629-0.409313 12.177076-0.102328 24.45648-0.102328 36.633557v6.446687h389.359448c0-14.4283 0.306985-28.549615-0.102328-42.67093-0.306985-10.02818 1.841911-18.112122 12.381733-21.898272h9.516538c8.902568 3.683821 12.074748 10.437494 11.460778 19.954032-0.61397 10.64215-0.204657 21.181973-0.204657 31.824124v13.098031h5.730389c19.851704 0 39.703408-0.102328 59.555111 0.102328 4.093135 0 8.18627 0.204657 12.177076 1.023284 20.874988 4.809433 37.145198 16.065554 46.559409 35.81493 2.353553 4.911762 3.990806 10.232837 5.935045 15.349255v546.740482c-0.61397 1.739582-1.330269 3.581493-1.944239 5.423403-7.879285 23.84251-23.740182 39.191766-48.401319 44.922155-2.353553 0.511642-4.604777 1.330269-6.856001 1.944239H211.973219c-0.306985-0.306985-0.511642-0.818627-0.920956-0.920955-9.209553-0.61397-17.498151-3.888478-25.377435-8.697912-12.074748-7.265314-21.181973-16.986509-26.298392-30.186869-2.148896-5.525732-3.683821-11.460777-5.525731-17.293495z m33.25672-397.955031V803.482362c0 18.419107 14.121315 33.359049 33.461377 33.359049 194.526232 0.102328 389.052463 0.102328 583.578695 0 19.237734 0 33.563705-14.325972 33.563705-33.666034 0.102328-127.603478 0.102328-255.206955 0.102329-382.810432v-5.321076c-217.038473-0.102328-433.565304-0.102328-650.706106-0.102328z m0-33.666034h650.501449c0.102328-0.920955 0.204657-1.534926 0.204657-2.148896 0-31.721795 0.102328-63.443589-0.102329-95.165384 0-2.762866-0.61397-5.62806-1.534925-8.186269-5.116419-15.963226-16.679524-23.126212-31.926452-23.637854-20.056361-0.511642-40.112721-0.204657-60.169082-0.102328-1.22794 0-2.455881 0.204657-3.888478 0.409313 0 17.088838 0.204657 33.870691-0.204656 50.754872-0.102328 3.172179-1.534926 6.856001-3.683822 9.209553-5.62806 6.037374-12.688718 6.549016-20.261017 3.581493-5.01409-1.944239-9.107225-8.18627-9.107225-14.632957-0.102328-13.302688 0-26.707705 0-40.010393v-8.800239H317.576097c0 15.758569 0.204657 31.107825-0.102329 46.45708-0.204657 10.64215-3.581493 16.679524-14.939942 18.726091-6.856001 1.22794-18.419107-3.78615-18.316778-14.4283 0.204657-15.246927 0.102328-30.391526 0.102328-45.740781v-5.321076H224.150295c-2.967523 0-5.832717 0.61397-8.902568 0.818627-17.805136 1.22794-28.754272 19.135405-28.549616 33.461377 0.409313 29.879884 0.102328 59.65744 0.102329 89.537324 0.306985 1.330269 0.306985 3.172179 0.306985 5.218747z m-33.25672 431.621065c1.841911 5.730389 3.479165 11.767763 5.62806 17.395823 5.116419 13.20036 14.223643 23.023883 26.298391 30.18687 7.879285 4.707105 16.167882 7.981613 25.377436 8.697911 0.306985 0 0.61397 0.511642 0.920955 0.920955h-58.122514c-0.102328-19.135405-0.102328-38.066154-0.102328-57.201559z m659.097032 57.201559c2.353553-0.61397 4.604777-1.432597 6.856-1.944239 24.661137-5.832717 40.419706-21.181973 48.401319-44.922154 0.61397-1.841911 1.330269-3.581493 1.944239-5.423404v52.392126c-19.135405-0.102328-38.168482-0.102328-57.201558-0.102329z" fill="" ></path><path d="M227.424803 623.179774l10.02818-2.353552c25.275107-6.242031 44.410513-13.81433 56.792245-22.921555 12.893375-9.004897 23.433197-17.191166 31.517138-24.763466h-30.08454c-13.81433 0-33.359049 0.511642-58.224843 1.944239 0.511642-3.376836 0.511642-6.242031 0.920955-8.083941s0.511642-3.78615 0.511642-5.730389-0.511642-6.242031-1.432597-13.302688c32.949735 1.432597 52.494454 1.944239 58.224843 1.944239h59.145797v-22.512241c-25.275107 1.432597-39.601079 1.944239-42.977915 1.944239l-26.707705 0.409313-13.405016 0.511642c-0.920955-3.78615-2.353553-7.674628-3.376836-10.949136-0.920955-3.376836-4.297792-8.595583-9.107225-15.758569l10.02818 0.920956c6.242031 0.920955 18.112122 0.920955 35.81493 0.920955 20.568002 0 45.331468-0.920955 74.495053-3.376836 29.061257-2.353553 50.140901-5.218747 63.44359-8.595583l9.516538-2.353553c5.218747 9.004897 10.949136 17.60048 17.191166 26.196063l-30.493854 2.353553-32.438094 2.865194-29.572898 2.353552v23.842511h54.438692c5.218747 0 25.275107-0.511642 60.169082-1.944239-0.920955 3.78615-1.432597 7.162986-1.432597 8.595583-0.511642 1.944239-0.511642 3.376836-0.511642 3.786149 0 0.920955 0.511642 5.218747 1.944239 13.302689-24.865794-1.432597-44.819826-1.944239-60.169082-1.944239h-26.298391c6.242031 6.651344 15.246927 14.325972 26.707705 23.330868 11.972419 9.004897 31.517138 15.758569 59.145798 20.05636l9.107225 1.432598c-5.218747 5.218747-8.595583 9.516538-10.949136 12.893374-2.353553 3.376836-4.809433 8.595583-6.651344 15.246927l-9.107225-3.786149c-30.493854-13.302688-50.550215-24.354152-61.090037-32.847407-10.02818-8.595583-17.191166-15.246927-20.977316-19.544719L382.452283 575.801739l-3.786149-4.809434h-1.944239v29.982213c0 3.78615 0.511642 10.949136 1.432597 21.488958-6.651344-0.920955-10.539822-0.920955-12.381733-0.920956-1.432597 0-5.730389 0.511642-12.893375 0.920956 0.920955-10.02818 1.944239-17.191166 1.944239-21.488958V570.787649c-4.297792 4.297792-9.107225 9.004897-14.837613 14.735285s-11.460777 11.460777-18.112122 17.60048c-6.651344 5.730389-18.623763 14.325972-36.224243 24.763465 10.949136 0.920955 20.977316 1.432597 29.572899 1.432597h95.47237c10.539822 0 22.921555-0.511642 36.735884-1.432597-18.112122 14.735285-30.493854 24.763466-37.65684 29.061257L378.666134 676.595183v0.511642h47.68502c15.246927 0 35.81493-0.511642 62.010992-1.944239-0.511642 4.297792-0.920955 7.162986-0.920955 9.004897 0 1.944239-0.511642 3.78615-0.511642 5.730388s0.511642 6.242031 1.432597 12.893375c-24.865794-1.432597-45.331468-2.353553-62.010992-2.353552H378.666134v33.359048c0 8.083941-1.432597 14.735285-4.297792 19.033077-2.865194 4.809433-17.191166 7.162986-43.387229 8.083941 0-3.78615-0.511642-7.162986-0.920955-9.004896-0.511642-2.353553-0.920955-4.297792-1.944239-6.242031-0.920955-2.353553-4.297792-8.083941-10.539822-17.191166 11.972419 2.353553 20.977316 3.376836 27.219346 2.865194 3.376836 0 5.730389-0.511642 7.162986-1.944239 1.432597-1.432597 1.944239-4.809433 1.944239-9.516538v-19.544719h-51.573498c-11.972419 0-31.926451 0.920955-60.169082 2.353553 0-3.376836 0.511642-7.162986 0.511642-10.437494s0.511642-6.242031 0.511642-7.674628l-0.920956-9.516538c25.275107 1.432597 45.331468 1.944239 60.169082 1.944239h50.550215v-6.242031l-0.511642-3.376836 3.78615-0.920955c7.674628-2.353553 18.112122-8.083941 31.926451-17.60048h-73.47177c-9.516538 0-20.056361 0.511642-31.005496 1.432597 0.511642-2.865194 0.920955-5.218747 0.920956-7.674628 0.511642-1.944239 0.511642-3.376836 0.511641-4.809433l-0.511641-2.865194-0.511642-7.674628c-9.516538 5.730389-18.623763 10.437494-26.707705 14.735285l-7.674628 3.78615c-3.376836-6.242031-5.730389-10.02818-7.674627-11.870091-1.330269-0.204657-6.549016-4.502448-14.632957-10.744479zM522.744479 740.448086l7.162986-10.949135c2.353553-3.78615 5.218747-9.516538 8.595583-16.167883s6.651344-16.167882 10.539822-28.549615c3.78615-11.870091 6.242031-28.140302 6.651344-48.094334 0.920955-20.056361 0.920955-34.791646 1.432597-44.819826V568.536425L555.182572 525.660837c18.112122 0.920955 28.651944 1.432597 32.438094 1.432598h71.629859c-2.353553-5.730389-5.218747-11.870091-8.595583-18.623764l-4.297792-7.674628c8.083941-1.432597 17.191166-4.297792 26.707705-8.595583l11.972419 35.303288h36.224243c10.02818 0 27.62866-0.511642 52.494454-1.944239-0.511642 3.376836-0.920955 5.730389-0.920956 7.674628v4.297791c0 0.920955 0.511642 4.809433 1.432598 10.949136-11.972419 0-22.409913-0.511642-32.438094-0.920955-10.02818-0.511642-16.679524-0.511642-20.568002-0.511642h-140.803837V578.87159h43.387229v-8.083941c0-3.78615 0-6.651344-0.511642-8.595583l-0.920956-9.004897c6.242031 0.920955 10.02818 1.432597 10.949136 1.432597s5.730389-0.511642 13.405016-1.432597c-0.920955 4.297792-0.920955 7.162986-1.432597 9.516538v15.758569h58.736485v-6.24203c0-5.218747 0-8.595583-0.511642-10.02818l-0.920955-9.004897c6.651344 0.920955 10.949136 1.432597 12.381732 1.432597 1.432597 0 5.730389-0.511642 12.893375-1.432597-0.920955 4.297792-0.920955 7.162986-1.432597 9.516538v15.758569h20.568002c9.516538 0 20.568002-0.511642 31.926452-1.432597-0.511642 3.376836-0.511642 5.730389-0.511642 7.162986 0 1.432597 0 3.376836-0.511642 4.809434-0.511642 1.432597 0 2.353553 0 2.865194l0.920955 7.674628c-11.460777-0.920955-22.0006-1.432597-31.926451-1.432598H726.582592V616.733087c0 6.651344 0 10.437494 0.511642 12.381733l0.920955 12.893374c-9.107225-0.920955-18.112122-1.432597-26.298391-1.432597h-53.006095c-8.083941 0-16.679524 0.511642-25.78675 1.432597 0.511642-5.218747 0.511642-9.516538 0.920956-12.893374 0-3.376836 0.511642-7.162986 0.511641-11.460778v-19.544719h-43.89887c0 6.242031-0.511642 12.381733-0.511642 18.623764s-0.920955 15.246927-1.944239 27.62866c-0.920955 11.870091-2.353553 22.409913-3.376836 31.005496-1.432597 8.595583-4.297792 20.056361-8.595584 34.280004-4.297792 14.325972-9.107225 26.707705-13.81433 36.224243l-5.218746 11.460777c-2.865194-2.865194-5.218747-5.218747-7.162986-6.651344-2.762866-2.148896-7.981613-5.525732-17.088838-10.232837z m53.517737-9.107225c23.433197 0 48.196662-5.218747 74.495054-15.758569-8.083941-8.083941-14.325972-14.735285-18.112122-19.544718-3.78615-5.218747-8.083941-12.893375-13.405016-22.409913l-23.433197 1.944239c0.511642-3.376836 0.511642-5.730389 0.511642-7.162986 0-1.432597 0-2.865194 0.511642-4.297792 0-1.432597 0-4.809433-0.920955-10.949135 12.381733 0.920955 24.354152 1.432597 35.303287 1.432597h79.202159c10.949136 0 22.409913-0.511642 34.382332-1.432597-4.809433 9.004897-10.02818 17.60048-15.758569 25.684421-5.730389 8.083941-17.702808 20.056361-34.791646 36.735884 15.758569 6.242031 28.140302 10.437494 37.65684 11.870091 9.107225 1.432597 16.679524 2.353553 22.921555 2.865195l16.679525 0.920955 8.083941 0.920955c-3.376836 3.376836-9.107225 10.437494-16.679524 20.465674l-3.78615 7.162986-9.107225-2.865194c-0.511642 0-8.083941-1.944239-22.921555-6.242031-14.837614-4.297792-32.438093-11.460777-53.415409-21.898271-27.62866 12.381733-53.927051 21.488958-79.202159 26.707705l-9.107225 1.944239c-1.944239-2.353553-3.376836-4.809433-4.809433-7.674628-1.432597-2.865194-2.353553-4.297792-2.865194-5.218747l-4.297792-5.730389-6.651344-8.083941h9.516538v0.61397z m126.887179-57.610872h-58.736484c2.865194 6.242031 6.242031 11.460777 10.02818 16.167882 3.78615 4.809433 9.516538 9.516538 16.679525 14.735286 5.218747-2.865194 10.02818-6.242031 14.837613-10.02818 4.809433-3.274508 10.539822-10.437494 17.191166-20.874988z m-56.792245-50.550215h58.736484v-25.275107h-58.736484v25.275107z" fill="" ></path></symbol><symbol id="icon-shuzishunxu" viewBox="0 0 1024 1024"><path d="M862.138182 252.16h-523.636364a34.909091 34.909091 0 0 1 0-69.818182h523.636364a34.909091 34.909091 0 0 1 0 69.818182z m0 290.909091h-523.636364a34.909091 34.909091 0 0 1 0-69.818182h523.636364a34.909091 34.909091 0 0 1 0 69.818182z m0 290.909091h-523.636364a34.909091 34.909091 0 0 1 0-69.818182h523.636364a34.909091 34.909091 0 0 1 0 69.818182zM149.178182 294.865455V139.636364h43.962182v155.229091h-43.985455z m76.776727 247.854545v44.916364H125.626182l50.059636-93.323637c2.304-4.352 3.490909-8.075636 3.490909-11.170909 0-5.748364-3.584-8.610909-10.682182-8.610909a10.100364 10.100364 0 0 0-10.496 10.24 12.334545 12.334545 0 0 0 3.956364 8.843636l-19.781818 35.374546C124.951273 517.818182 116.363636 502.458182 116.363636 482.909091c0-14.894545 5.236364-27.671273 15.685819-38.283636a51.688727 51.688727 0 0 1 38.260363-15.941819c15.383273 0 28.229818 5.376 38.562909 16.174546 10.309818 10.775273 15.453091 23.458909 15.453091 38.050909 0 8.541091-1.908364 16.523636-5.818182 23.970909L200.145455 542.72h25.809454z m-95.976727 177.431273h82.129454l-25.134545 59.810909c8.843636 6.050909 15.36 12.730182 19.549091 20.014545 4.189091 7.307636 6.283636 15.988364 6.283636 26.088728 0 15.499636-5.376 28.043636-16.174545 37.585454-10.775273 9.541818-24.692364 14.312727-41.774546 14.312727a92.858182 92.858182 0 0 1-25.367272-3.723636v-43.752727c6.842182 3.072 13.032727 4.608 18.618181 4.608 5.445818 0 9.658182-1.536 12.683637-4.724364 3.025455-3.165091 4.561455-7.726545 4.561454-13.637818a18.152727 18.152727 0 0 0-8.029091-15.36c-5.376-3.863273-12.520727-5.818182-21.527272-5.818182l11.380363-30.487273h-17.221818v-44.916363z" fill="#797979" ></path></symbol><symbol id="icon-Group-" viewBox="0 0 1024 1024"><path d="M160 352a32 32 0 0 1-32-32V192a32 32 0 0 1 32-32h128a32 32 0 0 1 32 32v128a32 32 0 0 1-32 32z m32-64h64V224H192zM416 288a32 32 0 0 1 0-64h448a32 32 0 0 1 0 64zM160 608a32 32 0 0 1-32-32v-128a32 32 0 0 1 32-32h128a32 32 0 0 1 32 32v128a32 32 0 0 1-32 32z m32-64h64v-64H192zM416 544a32 32 0 0 1 0-64h448a32 32 0 0 1 0 64zM160 864a32 32 0 0 1-32-32v-128a32 32 0 0 1 32-32h128a32 32 0 0 1 32 32v128a32 32 0 0 1-32 32z m32-64h64v-64H192zM416 800a32 32 0 0 1 0-64h448a32 32 0 0 1 0 64z"  ></path></symbol><symbol id="icon-riqi" viewBox="0 0 1024 1024"><path d="M819.6 202.6H700.7v-63.8c0-17.6-14.3-31.9-31.9-31.9-17.6 0-31.9 14.3-31.9 31.9v63.8h-255v-63.8c0-17.6-14.3-31.9-31.9-31.9s-31.9 14.3-31.9 31.9v63.8H199.3C140.7 202.6 93 250.3 93 308.9v504.8C93 872.3 140.7 920 199.3 920h620.3c58.6 0 106.3-47.7 106.3-106.3V308.9c0-58.6-47.7-106.3-106.3-106.3z m42.5 611.1c0 23.4-19.1 42.5-42.5 42.5H199.3c-23.4 0-42.5-19.1-42.5-42.5V308.9c0-23.4 19.1-42.5 42.5-42.5h118.8v47.8c0 17.6 14.3 31.9 31.9 31.9s31.9-14.3 31.9-31.9v-47.8H637v47.8c0 17.6 14.3 31.9 31.9 31.9 17.6 0 31.9-14.3 31.9-31.9v-47.8h118.8c23.4 0 42.5 19.1 42.5 42.5v504.8z"  ></path><path d="M340.1 409.9H238c-12.9 0-23.4 10.5-23.4 23.4v87.6c0 12.9 10.5 23.4 23.4 23.4h102.1c12.9 0 23.4-10.5 23.4-23.4v-87.6c0-12.9-10.5-23.4-23.4-23.4zM560.5 409.9H458.4c-12.9 0-23.4 10.5-23.4 23.4v87.6c0 12.9 10.5 23.4 23.4 23.4h102.1c12.9 0 23.4-10.5 23.4-23.4v-87.6c0-12.9-10.5-23.4-23.4-23.4zM781 409.9H678.8c-12.9 0-23.4 10.5-23.4 23.4v87.6c0 12.9 10.5 23.4 23.4 23.4H781c12.9 0 23.4-10.5 23.4-23.4v-87.6c0-12.9-10.6-23.4-23.4-23.4zM340.1 632.9H238c-12.9 0-23.4 10.5-23.4 23.4v87.6c0 12.9 10.5 23.4 23.4 23.4h102.1c12.9 0 23.4-10.5 23.4-23.4v-87.6c0-12.9-10.5-23.4-23.4-23.4zM560.5 632.9H458.4c-12.9 0-23.4 10.5-23.4 23.4v87.6c0 12.9 10.5 23.4 23.4 23.4h102.1c12.9 0 23.4-10.5 23.4-23.4v-87.6c0-12.9-10.5-23.4-23.4-23.4zM781 632.9H678.8c-12.9 0-23.4 10.5-23.4 23.4v87.6c0 12.9 10.5 23.4 23.4 23.4H781c12.9 0 23.4-10.5 23.4-23.4v-87.6c0-12.9-10.6-23.4-23.4-23.4z"  ></path></symbol><symbol id="icon-zuoce-qujian" viewBox="0 0 1024 1024"><path d="M915.456 198.656c-49.3568 0-90.9312 32.768-104.0384 77.824h-195.1744c-13.312-45.056-54.8864-77.824-104.0384-77.824-49.3568 0-90.9312 32.768-104.0384 77.824H30.72c-16.9984 0-30.72 13.7216-30.72 30.72s13.7216 30.72 30.72 30.72h377.2416c13.312 45.056 54.8864 77.824 104.0384 77.824 49.3568 0 90.9312-32.768 104.0384-77.824h195.1744c13.312 45.056 54.8864 77.824 104.0384 77.824 60.0064 0 108.544-48.5376 108.544-108.544 0.2048-60.0064-48.3328-108.544-108.3392-108.544z m-403.456 155.648c-26.0096 0-47.104-21.0944-47.104-47.104s21.0944-47.104 47.104-47.104 47.104 21.0944 47.104 47.104-21.0944 47.104-47.104 47.104z m403.456 0c-26.0096 0-47.104-21.0944-47.104-47.104s21.0944-47.104 47.104-47.104 47.104 21.0944 47.104 47.104-21.0944 47.104-47.104 47.104zM993.28 686.08H616.0384c-13.312-45.056-54.8864-77.824-104.0384-77.824-49.3568 0-90.9312 32.768-104.0384 77.824h-193.1264c-13.312-45.056-54.8864-77.824-104.0384-77.824-55.7056 0-101.376 41.7792-107.7248 95.6416-1.8432 3.8912-2.8672 8.192-2.8672 12.9024s1.024 9.0112 2.8672 12.9024C9.216 783.5648 54.8864 825.344 110.592 825.344c49.3568 0 90.9312-32.768 104.0384-77.824h193.1264c13.312 45.056 54.8864 77.824 104.0384 77.824 49.3568 0 90.9312-32.768 104.0384-77.824H993.28c16.9984 0 30.72-13.7216 30.72-30.72s-13.7216-30.72-30.72-30.72zM110.592 763.904c-26.0096 0-47.104-21.0944-47.104-47.104s21.0944-47.104 47.104-47.104 47.104 21.0944 47.104 47.104-21.0944 47.104-47.104 47.104z m401.408 0c-26.0096 0-47.104-21.0944-47.104-47.104s21.0944-47.104 47.104-47.104 47.104 21.0944 47.104 47.104-21.0944 47.104-47.104 47.104z" fill="#646464" ></path></symbol><symbol id="icon-liebiao" viewBox="0 0 1024 1024"><path d="M92.5 573.1h179.4c16.5 0 29.9-13.4 29.9-29.9s-13.4-29.9-29.9-29.9H92.5c-16.5 0-29.9 13.4-29.9 29.9s13.4 29.9 29.9 29.9zM950.9 823L848 720c31.9-40.7 51.7-91.2 51.7-146.9 0-132.1-107.1-239.2-239.2-239.2S421.3 441 421.3 573.1s107.1 239.2 239.2 239.2c55.7 0 106.3-19.9 146.9-51.7l103 103c11.2 11.2 29.3 11.2 40.5 0 11.2-11.3 11.2-29.4 0-40.6zM788.7 698.3c-0.5 0.5-1.3 0.7-1.7 1.2-0.5 0.5-0.7 1.3-1.2 1.7-32.4 31.6-76.4 51.2-125.3 51.2-99.1 0-179.4-80.3-179.4-179.4 0-99.1 80.3-179.4 179.4-179.4S839.9 474 839.9 573.1c0.1 48.8-19.6 92.9-51.2 125.2z m-696.2-484h538.2c16.5 0 29.9-13.4 29.9-29.9s-13.4-29.9-29.9-29.9H92.5c-16.5 0-29.9 13.4-29.9 29.9s13.4 29.9 29.9 29.9z m239.2 119.6H92.5c-16.5 0-29.9 13.4-29.9 29.9s13.4 29.9 29.9 29.9h239.2c16.5 0 29.9-13.4 29.9-29.9s-13.4-29.9-29.9-29.9z m0 358.8H92.5c-16.5 0-29.9 13.4-29.9 29.9s13.4 29.9 29.9 29.9h239.2c16.5 0 29.9-13.4 29.9-29.9s-13.4-29.9-29.9-29.9z m0 0"  ></path></symbol><symbol id="icon-xialakuang" viewBox="0 0 1024 1024"><path d="M970.105263 404.210526H53.894737v-323.368421h916.210526v323.368421z m-862.315789-53.894737h808.421052v-215.578947H107.789474v215.578947z" fill="#444A5C" ></path><path d="M970.105263 943.157895H53.894737v-592.842106h916.210526v592.842106z m-862.315789-53.894737h808.421052v-485.052632H107.789474v485.052632zM754.526316 307.2L662.905263 215.578947l37.726316-37.726315 53.894737 53.894736 53.894737-53.894736 37.726315 37.726315z" fill="#444A5C" ></path><path d="M264.084211 781.473684h485.052631v-53.894737h-485.052631v53.894737z m0-107.789473h485.052631v-53.894737h-485.052631v53.894737z m0-161.684211v53.894737h485.052631v-53.894737h-485.052631z" fill="#444A5C" ></path></symbol><symbol id="icon-xialashu" viewBox="0 0 1024 1024"><path d="M970.105263 323.368421H53.894737V53.894737h916.210526v269.473684zM107.789474 269.473684h808.421052V107.789474H107.789474v161.68421zM215.578947 538.947368H53.894737V377.263158h161.68421v161.68421zM107.789474 485.052632h53.894737V431.157895H107.789474v53.894737z" fill="#444A5C" ></path><path d="M269.473684 431.157895h431.157895v53.894737H269.473684V431.157895zM538.947368 646.736842h431.157895v53.894737h-431.157895v-53.894737zM538.947368 862.315789h431.157895v53.894737h-431.157895v-53.894737zM107.789474 485.052632h53.894737v431.157894H107.789474V485.052632zM161.684211 700.631579v-53.894737h161.68421v53.894737H161.684211M161.684211 916.210526v-53.894737h161.68421v53.894737H161.684211" fill="#444A5C" ></path><path d="M485.052632 754.526316H323.368421v-161.684211h161.684211v161.684211z m-107.789474-53.894737h53.894737v-53.894737H377.263158v53.894737zM485.052632 970.105263H323.368421v-161.68421h161.684211v161.68421z m-107.789474-53.894737h53.894737v-53.894737H377.263158v53.894737z" fill="#444A5C" ></path><path d="M754.526316 161.684211h107.789473v53.894736h-107.789473V161.684211z" fill="#444A5C" ></path></symbol><symbol id="icon-zhongzhi" viewBox="0 0 1024 1024"><path d="M624.593455 23.272727a93.090909 93.090909 0 0 1 93.090909 93.090909v168.587637l143.406545 0.023272a116.363636 116.363636 0 0 1 116.247273 111.313455l0.116363 5.050182V861.090909a116.363636 116.363636 0 0 1-116.363636 116.363636H162.909091a116.363636 116.363636 0 0 1-116.363636-116.363636V401.338182a116.363636 116.363636 0 0 1 116.363636-116.363637l146.664727-0.023272V116.363636a93.090909 93.090909 0 0 1 88.459637-92.974545l4.654545-0.116364zM139.636364 581.818182v279.272727a23.272727 23.272727 0 0 0 23.272727 23.272727h302.545454v-162.909091a46.545455 46.545455 0 1 1 93.09091 0v162.909091h93.090909v-162.909091a46.545455 46.545455 0 1 1 93.090909 0v162.909091h116.363636a23.272727 23.272727 0 0 0 23.272727-23.272727V581.818182H139.636364z m0-93.090909h744.727272v-87.389091a23.272727 23.272727 0 0 0-23.272727-23.272727h-166.679273a69.818182 69.818182 0 0 1-69.818181-69.818182V116.363636h-221.905455v191.883637a69.818182 69.818182 0 0 1-69.818182 69.818182H162.909091a23.272727 23.272727 0 0 0-23.272727 23.272727V488.727273z"  ></path></symbol><symbol id="icon-ri" viewBox="0 0 1024 1024"><path d="M408.222897 789.115586v-35.345655h217.15862v34.886621h33.474207V388.378483h-283.68331v400.737103h33.050483z m217.15862-237.779862h-217.15862v-130.824827h217.15862v130.824827z m0 170.301793h-217.15862v-138.169379h217.15862v138.169379z"  ></path><path d="M917.645241 144.772414a70.62069 70.62069 0 0 1 70.62069 70.620689v681.489656a70.62069 70.62069 0 0 1-70.62069 70.620689H94.384552a70.62069 70.62069 0 0 1-70.62069-70.620689V215.393103a70.62069 70.62069 0 0 1 70.62069-70.620689h823.260689z m0 45.903448H94.384552a24.717241 24.717241 0 0 0-24.50538 21.362759l-0.211862 3.354482v681.489656a24.717241 24.717241 0 0 0 21.362759 24.505379l3.354483 0.211862h823.260689a24.717241 24.717241 0 0 0 24.50538-21.362759l0.211862-3.354482V215.393103a24.717241 24.717241 0 0 0-21.362759-24.505379l-3.354483-0.211862z"  ></path><path d="M312.214069 31.249655a22.951724 22.951724 0 0 1 22.704552 19.561931l0.247172 3.389793v180.824276a22.951724 22.951724 0 0 1-45.656276 3.389793l-0.247172-3.389793v-180.788965a22.951724 22.951724 0 0 1 22.951724-22.951724zM691.023448 31.249655a22.951724 22.951724 0 0 1 22.704552 19.561931l0.247172 3.389793v180.824276a22.951724 22.951724 0 0 1-45.656275 3.389793l-0.247173-3.389793v-180.788965a22.951724 22.951724 0 0 1 22.951724-22.951724z"  ></path></symbol><symbol id="icon-nian" viewBox="0 0 1024 1024"><path d="M715.702857 32.365714a23.771429 23.771429 0 0 1 23.515429 20.260572l0.256 3.510857V149.942857l210.944 0.036572a73.142857 73.142857 0 0 1 73.142857 73.142857v705.828571a73.142857 73.142857 0 0 1-73.142857 73.142857H97.755429a73.142857 73.142857 0 0 1-73.142858-73.142857V223.085714a73.142857 73.142857 0 0 1 73.142858-73.142857h201.837714V56.100571a23.771429 23.771429 0 0 1 47.286857-3.510857l0.256 3.510857V149.942857h344.795429V56.137143a23.771429 23.771429 0 0 1 23.771428-23.771429zM299.593143 197.485714l-201.874286 0.036572a25.6 25.6 0 0 0-25.344 22.125714l-0.219428 3.474286v705.828571a25.6 25.6 0 0 0 22.125714 25.380572l3.474286 0.219428h852.662857a25.6 25.6 0 0 0 25.380571-22.125714l0.219429-3.474286V223.085714a25.6 25.6 0 0 0-22.125715-25.380571l-3.474285-0.219429H739.474286v45.933715a23.771429 23.771429 0 0 1-47.286857 3.510857l-0.256-3.510857V197.485714H347.136v45.970286a23.771429 23.771429 0 0 1-47.286857 3.510857l-0.256-3.510857V197.485714z m112.274286 181.504l35.657142 6.656c-5.229714 18.066286-11.410286 34.706286-18.066285 50.870857h295.241143v33.28h-149.284572v76.068572h132.644572v32.804571h-132.644572v102.692572h164.498286v33.28h-164.498286v106.020571h-34.706286V714.605714H321.097143v-33.28h78.445714v-135.497143h141.202286v-76.068571h-127.890286a285.805714 285.805714 0 0 1-75.117714 84.626286l-22.820572-28.525715c48.018286-36.132571 80.347429-85.101714 96.987429-146.907428z m128.841142 199.68H433.737143v102.692572h106.971428v-102.692572z"  ></path></symbol><symbol id="icon-yue" viewBox="0 0 1024 1024"><path d="M371.959172 792.328828c29.837241-39.017931 47.315862-88.134621 52.788966-147.809104h197.843862v91.347862c0 13.312-5.508414 20.197517-16.066207 20.197517-17.44331 0-36.722759-0.918069-57.838345-1.836137l9.18069 32.591448h59.215448c25.705931 0 39.017931-13.312 39.017931-39.476966V388.378483h-263.026758v224.008827c-0.918069 63.346759-16.066207 115.67669-46.362483 156.989793l25.246896 22.951725z m250.632828-291.945931h-195.972414v-80.331035h195.972414v80.331035z m0 113.381517h-195.972414v-82.626207h195.972414v82.626207z"  ></path><path d="M917.645241 144.772414a70.62069 70.62069 0 0 1 70.62069 70.620689v681.489656a70.62069 70.62069 0 0 1-70.62069 70.620689H94.384552a70.62069 70.62069 0 0 1-70.62069-70.620689V215.393103a70.62069 70.62069 0 0 1 70.62069-70.620689h823.260689z m0 45.903448H94.384552a24.717241 24.717241 0 0 0-24.50538 21.362759l-0.211862 3.354482v681.489656a24.717241 24.717241 0 0 0 21.362759 24.505379l3.354483 0.211862h823.260689a24.717241 24.717241 0 0 0 24.50538-21.362759l0.211862-3.354482V215.393103a24.717241 24.717241 0 0 0-21.362759-24.505379l-3.354483-0.211862z"  ></path><path d="M312.214069 31.249655a22.951724 22.951724 0 0 1 22.704552 19.561931l0.247172 3.389793v180.824276a22.951724 22.951724 0 0 1-45.656276 3.389793l-0.247172-3.389793v-180.788965a22.951724 22.951724 0 0 1 22.951724-22.951724zM691.023448 31.249655a22.951724 22.951724 0 0 1 22.704552 19.561931l0.247172 3.389793v180.824276a22.951724 22.951724 0 0 1-45.656275 3.389793l-0.247173-3.389793v-180.788965a22.951724 22.951724 0 0 1 22.951724-22.951724z"  ></path></symbol></svg>',z=(z=document.getElementsByTagName("script"))[z.length-1].getAttribute("data-injectcss");if(z&&!h.__iconfont__svg__cssinject__){h.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(h){console&&console.log(h)}}function s(){t||(t=!0,a())}c=function(){var h,c,l;(l=document.createElement("div")).innerHTML=o,o=null,(c=l.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",h=c,(l=document.body).firstChild?(c=l.firstChild).parentNode.insertBefore(h,c):l.appendChild(h))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(c,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),c()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(a=c,v=h.document,t=!1,(i=function(){try{v.documentElement.doScroll("left")}catch(h){return void setTimeout(i,50)}s()})(),v.onreadystatechange=function(){"complete"==v.readyState&&(v.onreadystatechange=null,s())})}(window);
\ No newline at end of file
+!function(c){var h,l,a,v,t,i='<svg><symbol id="icon-quxiaoshangzuan" viewBox="0 0 1024 1024"><path d="M547.584 252.064l-35.584-20.48-30.016 17.28 0-53.696-93.632-0.96 125.792-124.8 121.536 127.232-88.096-0.896 0 56.32zM32.512 825.888l-31.776-55.552 226.976-129.792-155.52-89.504c-10.016-5.76-10.88-19.55200001-2.496-26.656l2.528-1.76 423.424-243.776c8.864-5.12 19.52-5.76 28.832-1.92l3.904 1.92 165.376 95.2 253.12-144.8 31.808 55.552-220.704 126.208 193.792 111.616a16.416 16.416 0 0 1 2.528 26.656l-2.528 1.76-423.392 243.776c-8.864 5.12-19.52 5.76-28.832 1.92l-3.904-1.92-203.68-117.28-259.456 148.352z m261.12-223.04l188.384-107.712 0-94.912 29.984-17.28 35.584 20.48L547.584 457.6l80.224-45.824L512 345.088l-333.024 191.744 114.656 66.016z m218.4 125.696L845.024 536.832l-152.99199999-88.096-144.41600001 82.592-0.032 138.88-35.584 20.48-30.016-17.28 0-104.576-124.096 70.976L512 728.54400001z m-30.048 226.04799999l0-129.79199999L512 842.07999999l35.584-20.47999999L547.584 954.56l-65.6 0z" fill="#979BA5" ></path></symbol><symbol id="icon-quxiaoxiazuan" viewBox="0 0 1024 1024"><path d="M476.416 771.936l35.584 20.48 30.016-17.28v53.696l93.632 0.96-125.792 124.8-121.536-127.232 88.096 0.896v-56.32zM991.488 198.112l31.776 55.552-226.976 129.792 155.52 89.504c10.016 5.76 10.88 19.552 2.496 26.656l-2.528 1.76-423.424 243.776c-8.864 5.12-19.52 5.76-28.832 1.92l-3.904-1.92-165.376-95.2-253.12 144.8-31.808-55.552 220.704-126.208-193.792-111.616a16.416 16.416 0 0 1-2.528-26.656l2.528-1.76 423.392-243.776c8.864-5.12 19.52-5.76 28.832-1.92l3.904 1.92 203.68 117.28 259.456-148.352z m-261.12 223.04l-188.384 107.712v94.912l-29.984 17.28-35.584-20.48V566.4l-80.224 45.824L512 678.912l333.024-191.744-114.656-66.016z m-218.4-125.696L178.976 487.168l152.992 88.096 144.416-82.592 0.032-138.88 35.584-20.48 30.016 17.28v104.576l124.096-70.976L512 295.456z m30.048-226.048v129.792L512 181.92l-35.584 20.48V69.44h65.6z" fill="#979BA5" ></path></symbol><symbol id="icon-linkage" viewBox="0 0 1024 1024"><path d="M 876.8 147.2 c -112 -112 -294.4 -112 -409.6 0 l -137.6 137.6 l 44.8 44.8 L 512 195.2 c 86.4 -86.4 230.4 -86.4 316.8 0 s 86.4 230.4 0 316.8 l -137.6 137.6 l 44.8 44.8 l 137.6 -137.6 c 115.2 -112 115.2 -294.4 3.2 -409.6 Z M 512 828.8 c -86.4 86.4 -230.4 86.4 -316.8 0 s -86.4 -230.4 0 -316.8 l 137.6 -137.6 L 288 329.6 l -137.6 137.6 c -112 112 -112 297.6 0 409.6 s 294.4 112 409.6 0 l 137.6 -137.6 l -44.8 -44.8 l -140.8 134.4 Z m 182.4 -454.4 l -44.8 -44.8 l -316.8 316.8 l 44.8 44.8 l 316.8 -316.8 Z"  ></path></symbol><symbol id="icon-xiazuan" viewBox="0 0 1024 1024"><path d="M506.88 546.133333c18.773333 0 34.133333-15.36 34.133333-34.133333V46.08c0-18.773333-15.36-34.133333-34.133333-34.133333s-34.133333 15.36-34.133333 34.133333V512c0 18.773333 15.36 34.133333 34.133333 34.133333z"  ></path><path d="M989.866667 464.213333l-336.213334-150.186666c-17.066667-8.533333-37.546667 0-44.373333 17.066666-8.533333 17.066667 0 37.546667 17.066667 44.373334l256 114.346666-373.76 121.173334-365.226667-129.706667L392.533333 373.76c17.066667-6.826667 25.6-27.306667 17.066667-44.373333-6.826667-17.066667-27.306667-25.6-44.373333-17.066667L37.546667 453.973333c-11.946667 5.12-20.48 17.066667-20.48 32.426667s8.533333 25.6 22.186666 30.72L494.933333 680.96c3.413333 1.706667 6.826667 1.706667 11.946667 1.706667 3.413333 0 6.826667 0 10.24-1.706667L986.453333 529.066667c13.653333-5.12 22.186667-17.066667 23.893334-30.72 0-15.36-8.533333-27.306667-20.48-34.133334zM590.506667 855.04L541.013333 904.533333v-134.826666c0-18.773333-15.36-34.133333-34.133333-34.133334s-34.133333 15.36-34.133333 34.133334v124.586666l-39.253334-39.253333c-13.653333-13.653333-34.133333-13.653333-47.786666 0s-13.653333 34.133333 0 47.786667l102.4 102.4c6.826667 6.826667 15.36 10.24 23.893333 10.24 8.533333 0 17.066667-3.413333 23.893333-10.24l102.4-102.4c13.653333-13.653333 13.653333-34.133333 0-47.786667-11.946667-13.653333-34.133333-13.653333-47.786666 0z"  ></path></symbol><symbol id="icon-shangzuan" viewBox="0 0 1024 1024"><path d="M520.533333 780.8c-19.2 0-34.133333 14.933333-34.133333 34.133333V981.333333c0 19.2 14.933333 34.133333 34.133333 34.133334 19.2 0 34.133333-14.933333 34.133334-34.133334v-166.4c0-19.2-14.933333-34.133333-34.133334-34.133333zM17.066667 533.333333c2.133333 12.8 10.666667 25.6 23.466666 29.866667l469.333334 151.466667c4.266667 2.133333 6.4 2.133333 10.666666 2.133333s8.533333 0 12.8-2.133333l456.533334-164.266667c12.8-4.266667 21.333333-14.933333 21.333333-29.866667s-8.533333-27.733333-21.333333-32L661.333333 347.733333c-17.066667-8.533333-38.4 0-44.8 17.066667-8.533333 17.066667 0 38.4 17.066667 44.8l249.6 106.666667-364.8 130.133333-373.333333-121.6 256-115.2c17.066667-6.4 25.6-27.733333 17.066666-44.8-6.4-17.066667-27.733333-25.6-44.8-17.066667l-337.066666 149.333334c-10.666667 10.666667-19.2 21.333333-19.2 36.266666zM437.333333 172.8l49.066667-49.066667v411.733334c0 19.2 14.933333 34.133333 34.133333 34.133333 19.2 0 34.133333-14.933333 34.133334-34.133333V132.266667L593.066667 170.666667c12.8 12.8 34.133333 12.8 46.933333 0s12.8-34.133333 0-46.933334L539.733333 21.333333c-6.4-6.4-14.933333-10.666667-23.466666-10.666666-8.533333 0-17.066667 4.266667-23.466667 10.666666l-102.4 102.4c-12.8 12.8-12.8 34.133333 0 46.933334 10.666667 14.933333 32 14.933333 46.933333 2.133333z"  ></path></symbol><symbol id="icon-quxiaoliandong" viewBox="0 0 1024 1024"><path d="M611.754667 710.613333a38.144 38.144 0 0 1 0 53.930667l-123.818667 123.818667c-95.530667 95.530667-256.341333 95.530667-351.872 0-95.488-95.488-95.488-256.341333 0-351.829334l123.818667-123.818666a38.144 38.144 0 1 1 53.973333 53.930666L190.037333 590.506667c-70.528 73.685333-74.069333 177.28-3.626666 247.637333 70.4 70.4 170.453333 72.234667 247.594666-3.669333l123.818667-123.818667a38.144 38.144 0 0 1 53.930667 0z m-199.509334-397.226666a38.144 38.144 0 0 1 0-53.930667l123.818667-123.818667c95.488-95.530667 256.341333-95.530667 351.872 0 95.488 95.488 95.488 256.341333 0 351.829334l-123.818667 123.818666a38.144 38.144 0 1 1-53.930666-53.930666l123.776-123.818667c70.528-73.685333 74.069333-177.28 3.669333-247.637333-70.357333-70.4-170.453333-72.234667-247.594667 3.669333l-123.861333 123.818667a38.144 38.144 0 0 1-53.930667 0z m232.362667 512.426666a32.682667 32.682667 0 0 1 65.408 0v65.450667a32.682667 32.682667 0 1 1-65.408 0v-65.408z m208.042667 27.434667a33.621333 33.621333 0 0 1-47.445334-0.554667l-45.482666-46.421333a33.28 33.28 0 0 1 47.36-46.890667l45.909333 45.994667a33.621333 33.621333 0 0 1-0.341333 47.872z m-55.466667-176.384c0-20.053333 16.298667-36.309333 36.352-36.309333H891.733333a36.352 36.352 0 0 1 0 72.661333h-58.154666a36.352 36.352 0 0 1-36.309334-36.352zM317.013333 130.773333a32.682667 32.682667 0 1 1 65.408 0v65.408a32.682667 32.682667 0 0 1-65.408 0V130.773333z m-142.677333 37.973334A33.621333 33.621333 0 0 1 221.866667 169.386667l45.482666 46.421333a33.28 33.28 0 0 1-47.36 46.848L173.994667 216.704a33.621333 33.621333 0 0 1 0.341333-47.914667zM98.986667 345.173333c0-20.053333 16.256-36.352 36.352-36.352h58.112a36.352 36.352 0 0 1 0 72.704H135.338667a36.352 36.352 0 0 1-36.352-36.352z"  ></path></symbol><symbol id="icon-edit-outline" viewBox="0 0 1026 1024"><path d="M307.933767 709.191401l55.608246-121.906912 70.215853 67.788777-125.824099 54.118135z m95.818675-171.645022l366.409348-352.874171 82.001279 80.116062-365.732025 352.095249-82.678602-79.33714z m550.042994-370.90226l-50.505744 48.372175-81.854525-80.116062 49.704244-47.593254c8.003704-7.958549 23.435387-6.513593 32.150281 2.144858l48.281866 46.182162c5.147657 5.03477 8.071436 11.559652 8.071436 18.039379 0.011289 5.046059-2.201301 9.36964-5.847558 12.970742zM313.792614 530.299019c-0.745056 0.767633-1.467534 1.478823-2.21259 2.889913L259.640613 717.217683c-2.923779 10.78073 0 22.340381 8.071436 30.310219 6.581325 5.779826 14.607607 9.290618 23.390233 9.290619 2.935068 0 5.113791-0.699901 8.03757-1.399802l190.147239-49.749399h0.79021a8.048859 8.048859 0 0 0 5.791115-2.178724l507.721574-489.208069c15.28493-14.40441 23.356366-33.888744 23.356367-55.551803 0-24.519105-10.927483-49.03821-29.215214-67.077588l-48.281865-46.182163c-19.010208-18.039378-43.935707-28.853974-69.572396-28.853974-22.577445 0-43.145497 7.935972-57.707948 23.074149L314.503803 528.109007c-0.71119 0.699901-0.71119 1.478823-0.711189 2.190012zM100.932466 0C45.358086 0 0 44.70334 0 99.555242V923.530372c0 54.806747 45.358086 99.555242 100.932466 99.555241h806.082505c55.57438 0 100.864734-44.748495 100.864734-99.555241V397.543645h-86.290994v451.729511c0 49.049498-40.221718 87.939147-89.214772 87.939147H175.539632c-49.004344 0-89.214772-38.889648-89.214773-87.939147V173.157711c0-48.338309 40.210429-88.040745 89.214773-88.040745h457.904443V0H100.932466z"  ></path></symbol><symbol id="icon-edit" viewBox="0 0 1026 1024"><path d="M307.933767 709.191401l55.608246-121.906912 70.215853 67.788777-125.824099 54.118135z m95.818675-171.645022l366.409348-352.874171 82.001279 80.116062-365.732025 352.095249-82.678602-79.33714z m550.042994-370.90226l-50.505744 48.372175-81.854525-80.116062 49.704244-47.593254c8.003704-7.958549 23.435387-6.513593 32.150281 2.144858l48.281866 46.182162c5.147657 5.03477 8.071436 11.559652 8.071436 18.039379 0.011289 5.046059-2.201301 9.36964-5.847558 12.970742zM313.792614 530.299019c-0.745056 0.767633-1.467534 1.478823-2.21259 2.889913L259.640613 717.217683c-2.923779 10.78073 0 22.340381 8.071436 30.310219 6.581325 5.779826 14.607607 9.290618 23.390233 9.290619 2.935068 0 5.113791-0.699901 8.03757-1.399802l190.147239-49.749399h0.79021a8.048859 8.048859 0 0 0 5.791115-2.178724l507.721574-489.208069c15.28493-14.40441 23.356366-33.888744 23.356367-55.551803 0-24.519105-10.927483-49.03821-29.215214-67.077588l-48.281865-46.182163c-19.010208-18.039378-43.935707-28.853974-69.572396-28.853974-22.577445 0-43.145497 7.935972-57.707948 23.074149L314.503803 528.109007c-0.71119 0.699901-0.71119 1.478823-0.711189 2.190012zM100.932466 0C45.358086 0 0 44.70334 0 99.555242V923.530372c0 54.806747 45.358086 99.555242 100.932466 99.555241h806.082505c55.57438 0 100.864734-44.748495 100.864734-99.555241V397.543645h-86.290994v451.729511c0 49.049498-40.221718 87.939147-89.214772 87.939147H175.539632c-49.004344 0-89.214772-38.889648-89.214773-87.939147V173.157711c0-48.338309 40.210429-88.040745 89.214773-88.040745h457.904443V0H100.932466z"  ></path></symbol><symbol id="icon-xiangqing1" viewBox="0 0 1024 1024"><path d="M449.024 896h-288c-17.92 0-32-14.72-32-32v-704c0-17.92 14.08-32 32-32h640c17.28 0 32 14.08 32 32V448a32 32 0 0 0 64 0V128c0-35.2-28.8-64-64-64h-704c-35.2 0-64 28.8-64 64v768c0 35.2 28.8 64 64 64h320a32 32 0 0 0 0-64zM946.176 901.824l-83.2-83.2c-6.4-6.4-12.8-6.4-19.2-6.4-19.2 0-32 12.8-32 32 0 6.4 0 12.8 6.4 19.2l83.2 83.2c6.4 6.4 12.8 12.8 25.6 12.8 19.2 0 32-12.8 32-32 0-6.4-6.4-19.2-12.8-25.6z"  ></path><path d="M703.936 510.592a192 192 0 1 0 0 384 192 192 0 0 0 0-384z m0 320a128 128 0 1 1-0.064-255.936 128 128 0 0 1 0.064 255.936zM736.384 319.36H223.36a31.552 31.552 0 0 1-31.488-31.488v-1.024c0-17.344 14.144-31.488 31.488-31.488h513.024c17.344 0 31.488 14.144 31.488 31.488v1.024c0 17.28-14.208 31.488-31.488 31.488zM734.336 447.36H221.376a31.552 31.552 0 0 1-31.488-31.488v-1.024c0-17.344 14.144-31.488 31.488-31.488h513.024c17.344 0 31.488 14.144 31.488 31.488v1.024c0 17.28-14.208 31.488-31.552 31.488zM416 575.04H223.04a31.552 31.552 0 0 1-31.488-31.488v-1.024c0-17.344 14.144-31.488 31.488-31.488H416c17.344 0 31.488 14.144 31.488 31.488v1.024a31.552 31.552 0 0 1-31.488 31.488z"  ></path></symbol><symbol id="icon-weibiaoti-1" viewBox="0 0 1024 1024"><path d="M512 19.413487C47.059275 19.413487 19.413487 47.059275 19.413487 512s27.645788 492.586513 492.586513 492.586513 492.586513-27.645788 492.586513-492.586513S976.940725 19.413487 512 19.413487z" fill="#1296db" ></path></symbol><symbol id="icon-weibiaoti-" viewBox="0 0 1036 1024"><path d="M512.072842 512m-505.929333 0a505.929334 505.929334 0 1 0 1011.858667 0 505.929334 505.929334 0 1 0-1011.858667 0Z" fill="#ffffff" ></path><path d="M512.072842 1024C28.726387 1024 0.072842 995.346455 0.072842 512S28.726387 0 512.072842 0s512 28.653545 512 512-28.653545 512-512 512z m0-1011.858667C35.525534 12.141333 12.214175 35.452691 12.214175 512s23.311359 499.858667 499.858667 499.858667 499.858667-23.311359 499.858667-499.858667S988.620151 12.141333 512.072842 12.141333z"  ></path></symbol><symbol id="icon-touming" viewBox="0 0 1024 1024"><path d="M0 819.2h204.8V1024H0zM0 0h204.8v204.8H0zM0 409.6h204.8v204.8H0z" fill="#999999" ></path><path d="M204.8 204.8h204.8v204.8H204.8zM204.8 614.4h204.8v204.8H204.8z" fill="#B7B7B7" ></path><path d="M409.6 0h204.8v204.8H409.6zM409.6 409.6h204.8v204.8H409.6z" fill="#C6C6C6" ></path><path d="M614.4 204.8h204.8v204.8h-204.8zM614.4 614.4h204.8v204.8h-204.8z" fill="#DDDDDD" ></path><path d="M409.6 819.2h204.8V1024H409.6z" fill="#C6C6C6" ></path><path d="M819.2 0H1024v204.8h-204.8zM819.2 409.6H1024v204.8h-204.8zM819.2 819.2H1024V1024h-204.8z" fill="#F4F4F4" ></path></symbol><symbol id="icon-fangxing-" viewBox="0 0 1024 1024"><path d="M293.047427 796.738991v-133.327352c0-217.759502 176.531539-394.289445 394.289445-394.289446h133.330542v-104.189607H652.839875c-256.250417 0-463.980461 207.730044-463.980461 463.977271v167.829134h104.188013z"  ></path></symbol><symbol id="icon-fangda" viewBox="0 0 1024 1024"><path d="M470.624 553.376a32 32 0 0 1 2.656 42.24l-2.656 3.008L269.28 800l145.984 0.032a32 32 0 0 1 31.776 28.256l0.224 3.744a32 32 0 0 1-28.288 31.776l-3.712 0.224H192l-2.4-0.096-4.032-0.544-3.552-0.96-3.552-1.408-3.136-1.664-3.072-2.144-2.88-2.56a32.32 32.32 0 0 1-3.104-3.584l-2.272-3.52-1.728-3.648-1.12-3.36-0.96-4.8L160 832V607.872a32 32 0 0 1 63.776-3.712l0.224 3.712-0.032 146.848 201.408-201.344a32 32 0 0 1 45.248 0zM608.736 160H832l2.4 0.096 4.032 0.544 3.552 0.96 3.552 1.408 3.136 1.664 3.072 2.144 2.88 2.56c1.152 1.12 2.176 2.336 3.104 3.584l2.272 3.52 1.728 3.648 1.12 3.36 0.96 4.8L864 192v224.128a32 32 0 0 1-63.776 3.712l-0.224-3.712v-146.88L598.624 470.624a32 32 0 0 1-47.904-42.24l2.656-3.008L754.688 224h-145.92a32 32 0 0 1-31.808-28.256l-0.224-3.744a32 32 0 0 1 28.288-31.776l3.712-0.224z"  ></path></symbol><symbol id="icon-shezhi" viewBox="0 0 1024 1024"><path d="M416.4 958h191.2V849.7c0-12.7 6.4-25.5 19.1-31.9 31.9-12.7 63.7-31.9 89.2-51 12.7-6.4 25.5-6.4 38.2 0l95.6 57.3 95.6-165.7-95.6-57.3C837 588.5 830.6 575.7 837 563c0-19.1 6.4-31.9 6.4-51s0-31.9-6.4-51c0-12.7 6.4-25.5 12.7-31.9l95.6-57.3-95.6-165.7-95.6 57.3c-12.7 6.4-25.5 6.4-38.2 0-25.5-19.1-57.3-38.2-89.2-51-12.7-12.7-19.1-25.5-19.1-38.2V66H416.4v108.3c0 12.7-6.4 25.5-19.1 31.9-31.9 12.7-63.7 31.9-89.2 51-12.7 6.4-25.5 6.4-38.2 0l-95.6-51-95.6 165.6 95.6 57.3c12.7 6.4 19.1 19.1 12.7 31.9 0 19.1-6.4 31.9-6.4 51s0 31.9 6.4 51c6.4 12.7 0 25.5-12.7 31.9l-95.6 57.3 95.6 165.7 95.6-57.3c12.7-6.4 25.5-6.4 38.2 0 25.5 19.1 57.3 38.2 89.2 51 12.7 6.4 19.1 19.1 19.1 31.9V958z m223 63.7H384.6c-19.1 0-31.9-12.7-31.9-31.9v-121c-25.5-12.7-51-25.5-70.1-38.2l-101.9 63.7c-12.7 6.4-31.9 6.4-44.6-12.7L8.6 658.6c-12.7-19.1-6.4-38.2 12.7-44.6l101.9-63.7v-76.5L21.4 410.1c-19.1-6.4-25.5-25.5-12.7-44.6l127.4-223c6.4-12.7 25.5-19.1 44.6-6.4l101.9 63.7c19.1-12.7 44.6-31.9 70.1-38.2V34.1c0-19.1 12.7-31.9 31.9-31.9h254.9c19.1 0 31.9 12.7 31.9 31.9v121.1c25.5 12.7 51 25.5 70.1 38.2l101.9-63.7c12.7-6.4 31.9-6.4 44.6 12.7l127.4 223c12.7 19.1 6.4 38.2-12.7 44.6l-101.9 63.7v76.5l101.9 63.7c12.7 6.4 19.1 25.5 12.7 44.6L888 881.5c-6.4 12.7-25.5 19.1-44.6 12.7l-101.9-63.7c-19.1 12.7-44.6 31.9-70.1 38.2v121.1c-0.1 19.2-12.8 31.9-32 31.9zM512 703.2c-108.3 0-191.2-82.8-191.2-191.2S403.7 320.8 512 320.8 703.2 403.7 703.2 512 620.3 703.2 512 703.2z m0-318.6c-70.1 0-127.4 57.3-127.4 127.4S441.9 639.4 512 639.4 639.4 582.1 639.4 512 582.1 384.6 512 384.6z"  ></path></symbol><symbol id="icon-quanping1" viewBox="0 0 1024 1024"><path d="M628.053333 628.053333a32 32 0 0 1 45.226667 0l158.72 158.634667V693.333333l0.298667-4.352A32 32 0 0 1 896 693.333333v181.333334l-0.341333 3.84a21.333333 21.333333 0 0 1-20.992 17.493333h-181.333334l-4.352-0.298667a32 32 0 0 1-27.648-31.701333l0.298667-4.352a32 32 0 0 1 31.701333-27.648h93.44l-158.72-158.72-3.114666-3.584a32 32 0 0 1 3.114666-41.642667z m-232.106666 0a32 32 0 0 1 3.114666 41.642667l-3.114666 3.584-158.72 158.72h93.44a32 32 0 0 1 31.701333 27.648l0.298667 4.352a32 32 0 0 1-27.648 31.701333L330.666667 896H149.333333a21.333333 21.333333 0 0 1-20.992-17.493333L128 874.666667v-181.333334a32 32 0 0 1 63.701333-4.352l0.298667 4.352v93.354667l158.72-158.634667a32 32 0 0 1 45.226667 0zM874.666667 128a21.333333 21.333333 0 0 1 20.992 17.493333L896 149.333333v181.333334a32 32 0 0 1-63.701333 4.352L832 330.666667V237.312L673.28 395.946667a32 32 0 0 1-48.341333-41.642667l3.114666-3.584 158.72-158.72h-93.44a32 32 0 0 1-31.701333-27.648L661.333333 160a32 32 0 0 1 27.648-31.701333L693.333333 128h181.333334zM330.666667 128l4.352 0.298667a32 32 0 0 1 27.648 31.701333l-0.298667 4.352a32 32 0 0 1-31.701333 27.648H237.226667l158.72 158.72 3.114666 3.584a32 32 0 0 1-48.341333 41.642667L192 237.312V330.666667l-0.298667 4.352A32 32 0 0 1 128 330.666667V149.333333l0.341333-3.84A21.333333 21.333333 0 0 1 149.333333 128h181.333334z"  ></path></symbol><symbol id="icon-font-weight-bold" viewBox="0 0 1024 1024"><path d="M148.945455 55.854545h409.6c102.4 0 186.181818 27.927273 242.036363 83.781819 37.236364 37.236364 65.163636 93.090909 65.163637 148.945454 0 111.709091-65.163636 167.563636-130.327273 204.8 102.4 37.236364 176.872727 102.4 176.872727 223.418182 0 167.563636-130.327273 251.345455-335.127273 251.345455h-418.909091v-912.29091z m549.236363 260.654546c0-74.472727-55.854545-111.709091-158.254545-111.709091h-232.727273v242.036364h223.418182c93.090909-9.309091 167.563636-46.545455 167.563636-130.327273z m-139.636363 260.654545h-251.345455v251.345455h269.963636c111.709091 0 176.872727-46.545455 176.872728-121.018182-9.309091-83.781818-65.163636-130.327273-195.490909-130.327273z"  ></path></symbol><symbol id="icon-letter_spacing" viewBox="0 0 1127 1024"><path d="M320.37397 751.711955a32.882959 32.882959 0 0 0 20.669289-6.81147 64.356648 64.356648 0 0 0 15.971723-18.555384 172.400656 172.400656 0 0 0 12.21367-25.601732q5.167322-13.857818 10.569522-28.890028L422.780899 549.012002h281.853933l57.075421 163.005524a67.175187 67.175187 0 0 0 16.44148 29.359785 35.936376 35.936376 0 0 0 29.124906 10.099766q27.480758 0 34.996863-17.615871a61.068352 61.068352 0 0 0 0-43.217603L617.729869 37.447114a52.142978 52.142978 0 0 0-19.02514-27.245881A59.189326 59.189326 0 0 0 563.707866 0.101467a54.961517 54.961517 0 0 0-35.231742 10.099766 53.082491 53.082491 0 0 0-18.555384 27.245881l-222.19485 651.317463q-11.743914 36.171255 0 49.559316a41.338577 41.338577 0 0 0 32.64808 13.388062zM563.707866 108.85011l125.190121 365.705478H438.517744zM1122.483287 906.731618l-132.471348-96.300094a11.743914 11.743914 0 0 0-18.555384 9.395131v61.068352H156.194054v-60.833473a11.743914 11.743914 0 0 0-18.555383-9.395132L4.932444 906.731618a11.743914 11.743914 0 0 0 0 19.02514l132.471348 96.065216a11.743914 11.743914 0 0 0 18.555384-9.395131v-61.068352h815.027622v60.833473a11.743914 11.743914 0 0 0 18.555384 9.395131l132.706227-96.065215a11.743914 11.743914 0 0 0 0.234878-18.790262z"  ></path></symbol><symbol id="icon-letter-spacing" viewBox="0 0 1152 1024"><path d="M1024 0h128v1024h-128zM0 0h128v1024H0z m657.92 128H494.08L186.24 864h138.88l64-160h368.64l64 160h138.88z m49.28 448H448l128-313.6z"  ></path></symbol><symbol id="icon-zimua" viewBox="0 0 1024 1024"><path d="M481.28 117.76h61.44c22.528 0 43.008 13.824 51.2 34.816l287.232 745.984c1.536 3.584-1.024 7.68-5.12 7.68h-117.248c-2.048 0-4.096-1.536-5.12-3.584l-70.144-192.512c-1.536-4.096-5.632-7.168-10.24-7.168H349.696c-4.608 0-8.704 3.072-10.24 7.168l-70.144 192.512c-1.024 2.048-3.072 3.584-5.12 3.584H147.968c-3.584 0-6.656-4.096-5.12-7.68L430.08 152.576c8.192-20.992 28.16-34.816 51.2-34.816z m-87.04 485.888h235.008c7.68 0 12.8-7.68 10.24-14.848l-124.928-342.016h-4.608L384 588.8c-3.072 7.168 2.56 14.848 10.24 14.848z"  ></path></symbol><symbol id="icon-format_letter_spacing_" viewBox="0 0 1024 1024"><path d="M682.666667 704l128 106.666667-128 106.666666v-85.333333H341.333333v85.333333L213.333333 810.666667l128-106.666667v85.333333h341.333334v-85.333333zM170.666667 170.666667v682.666666H85.333333V170.666667h85.333334z m768 0v682.666666h-85.333334V170.666667h85.333334z m-394.666667 0l202.666667 469.333333h-89.6l-38.4-93.866667h-213.333334L366.933333 640H277.333333l202.666667-469.333333h64zM512 255.146667L432.213333 469.333333h159.573334L512 255.146667z"  ></path></symbol><symbol id="icon-font_size" viewBox="0 0 1024 1024"><path d="M923.456 713.152V644.48h-68.608v205.76h68.608v68.544h-205.76v-68.544h68.608V644.48h-68.608v68.608h-68.544V644.48c0-37.824 30.72-68.544 68.544-68.544h205.76c37.824 0 68.544 30.72 68.544 68.544v68.608h-68.544zM512 233.152H443.456v548.544H580.48v137.152H169.152v-137.152h137.152V233.152H237.696c-75.712 0-137.152 61.44-137.152 137.152H32V164.48C32 126.72 62.72 96 100.544 96h548.608c37.888 0 68.544 30.72 68.544 68.544v205.76h-68.544c0-75.776-61.44-137.152-137.152-137.152z"  ></path></symbol><symbol id="icon-align-center" viewBox="0 0 1024 1024"><path d="M34.45333333 77.86666667h954.56v124.37333333H34.45333333zM213.76 327.25333333H809.6v124.37333334H213.76zM34.45333333 575.46666667h954.56v124.37333333H34.45333333zM213.76 824.74666667H809.6v124.37333333H213.76z"  ></path></symbol><symbol id="icon-juyou" viewBox="0 0 1024 1024"><path d="M53.355789 53.894737v108.328421H970.105263V53.894737H53.355789z m431.157895 377.802105H970.105263V323.368421H484.513684v108.328421z m-431.157895 269.473684H970.105263V592.842105H53.355789v108.328421z m431.157895 269.473685H970.105263V862.315789H484.513684v108.328422z"  ></path></symbol><symbol id="icon-juzuo" viewBox="0 0 1331 1024"><path d="M898.304 819.712v127.488H153.6v-127.488z m279.296-256v127.488H153.6v-127.488z m-279.296-256V435.2H153.6V307.2zM1177.6 51.2v127.488H153.6V51.2z"  ></path></symbol><symbol id="icon-solid_line" viewBox="0 0 1024 1024"><path d="M102.4 460.8h819.2v102.4H102.4z"  ></path></symbol><symbol id="icon-huabi" viewBox="0 0 1024 1024"><path d="M884.641557 138.571009C811.672662 65.565275 755.277234 56.513108 726.075145 85.715197l-79.284741 79.283718 211.422224 211.422224 79.31851-79.284741C966.698434 267.936355 957.646268 211.538881 884.641557 138.571009z"  ></path><path d="M144.589584 667.200758c-14.600533 14.564717-68.333318 226.898707-68.333318 226.898707-3.193739 8.709359-10.073426 42.179658 0 52.855812 7.039323 7.460925 25.424042 10.638291 52.855812 0 0 0 212.33399-53.730739 226.938616-68.333318l449.309192-449.345008L593.934592 217.85575 144.589584 667.200758zM132.177903 891.034662 185.764356 708.376553l129.110543 129.071657L132.177903 891.034662z"  ></path></symbol><symbol id="icon-dianxian" viewBox="0 0 1024 1024"><path d="M228.32 532.76h-6.92c-11.47 0-20.76-9.3-20.76-20.76s9.29-20.76 20.76-20.76h6.92c11.47 0 20.76 9.3 20.76 20.76s-9.29 20.76-20.76 20.76zM712.65 532.76h-13.84c-11.47 0-20.76-9.3-20.76-20.76s9.29-20.76 20.76-20.76h13.84c11.47 0 20.76 9.3 20.76 20.76s-9.3 20.76-20.76 20.76z m-96.87 0h-13.84c-11.47 0-20.76-9.3-20.76-20.76s9.29-20.76 20.76-20.76h13.84c11.47 0 20.76 9.3 20.76 20.76s-9.29 20.76-20.76 20.76z m-96.86 0h-13.84c-11.47 0-20.76-9.3-20.76-20.76s9.29-20.76 20.76-20.76h13.84c11.47 0 20.76 9.3 20.76 20.76s-9.3 20.76-20.76 20.76z m-96.87 0h-13.84c-11.47 0-20.76-9.3-20.76-20.76s9.29-20.76 20.76-20.76h13.84c11.47 0 20.76 9.3 20.76 20.76s-9.29 20.76-20.76 20.76z m-96.86 0h-13.84c-11.47 0-20.76-9.3-20.76-20.76s9.29-20.76 20.76-20.76h13.84c11.47 0 20.76 9.3 20.76 20.76s-9.3 20.76-20.76 20.76zM802.59 532.76h-6.92c-11.47 0-20.76-9.3-20.76-20.76s9.29-20.76 20.76-20.76h6.92c11.47 0 20.76 9.3 20.76 20.76s-9.29 20.76-20.76 20.76z"  ></path></symbol><symbol id="icon-xuxian" viewBox="0 0 1024 1024"><path d="M304.43 532.76H221.4c-11.47 0-20.76-9.3-20.76-20.76s9.29-20.76 20.76-20.76h83.03c11.47 0 20.76 9.3 20.76 20.76s-9.29 20.76-20.76 20.76zM581.19 532.76H442.81c-11.47 0-20.76-9.3-20.76-20.76s9.29-20.76 20.76-20.76h138.38c11.47 0 20.76 9.3 20.76 20.76s-9.3 20.76-20.76 20.76zM802.59 532.76h-83.03c-11.47 0-20.76-9.3-20.76-20.76s9.29-20.76 20.76-20.76h83.03c11.47 0 20.76 9.3 20.76 20.76s-9.29 20.76-20.76 20.76z"  ></path></symbol><symbol id="icon-beijingse1" viewBox="0 0 1024 1024"><path d="M882.980571 580.900571c0-25.6-9.289143-51.2-27.940571-67.437714L508.342857 166.692571 398.848 57.270857a33.718857 33.718857 0 0 0-48.932571 0 33.718857 33.718857 0 0 0 0 48.859429L436.150857 192.365714 114.980571 511.122286c-37.302857 37.229714-37.302857 100.059429 0 137.289143l300.178286 300.251428c18.651429 18.578286 44.251429 27.867429 67.510857 27.867429 25.6 0 48.859429-9.289143 67.510857-27.867429l300.178286-300.251428c20.992-18.651429 32.621714-41.910857 32.621714-67.510858zM163.84 559.981714l321.097143-318.902857 318.902857 318.902857c4.681143 4.681143 6.948571 11.629714 6.948571 18.578286h-653.897142c0-4.608 2.267429-11.629714 6.948571-18.578286z m709.778286 214.089143s-62.829714 83.821714-62.829715 118.710857c0 34.889143 27.940571 62.829714 62.902858 62.829715 34.889143 0 62.829714-27.940571 62.829714-62.902858 0-34.816-62.902857-118.637714-62.902857-118.637714z" fill="#606266" ></path></symbol><symbol id="icon-juxing" viewBox="0 0 1024 1024"><path d="M876.4664713541666 302.9680989583333H776.4029947916665V202.90462239583334c0-11.865234374999998-9.8876953125-21.7529296875-21.7529296875-21.7529296875s-21.7529296875 9.8876953125-21.7529296875 21.7529296875v100.0634765625H632.8336588541666c-11.865234374999998 0-21.7529296875 9.8876953125-21.7529296875 21.7529296875s9.8876953125 21.7529296875 21.7529296875 21.7529296875h100.0634765625v100.0634765625c0 11.865234374999998 9.8876953125 21.7529296875 21.7529296875 21.7529296875s21.7529296875-9.8876953125 21.7529296875-21.7529296875V346.4739583333333H876.4664713541666c11.865234374999998 0 21.7529296875-9.8876953125 21.7529296875-21.7529296875 0-12.2607421875-9.8876953125-21.7529296875-21.7529296875-21.7529296875zM146.75455729166666 386.0247395833333c11.07421875 0 19.775390625-8.701171874999998 19.775390625-19.775390625h0.7910156249999999v-21.7529296875h36.38671875c10.678710937499998 0 19.775390625-8.701171874999998 19.775390625-19.775390625s-9.0966796875-19.775390625-19.775390625-19.775390625l-56.953125-0.39550781249999994c-11.07421875 0-19.775390625 8.701171874999998-19.775390625 19.775390625v42.71484374999999c0 9.8876953125 8.701171874999998 18.984374999999996 19.775390625 18.984374999999996z m135.26367187500003-41.92382812499999h98.876953125c11.07421875 0 19.775390625-8.701171874999998 19.775390625-19.775390625s-8.701171874999998-19.775390625-19.775390625-19.775390625h-98.876953125c-11.07421875 0-19.775390625 9.0966796875-19.775390625 19.775390625 0 11.07421875 9.0966796875 19.775390625 19.775390625 19.775390625z m177.1875 0h98.876953125c11.07421875 0 19.775390625-8.701171874999998 19.775390625-19.775390625s-8.701171874999998-19.775390625-19.775390625-19.775390625h-98.876953125c-11.07421875 0-19.775390625 9.0966796875-19.775390625 19.775390625 0.7910156249999999 11.07421875 8.701171874999998 19.775390625 19.775390625 19.775390625zM774.8209635416665 560.8391927083335c0-11.07421875-8.701171874999998-19.775390625-19.775390625-19.775390625s-19.775390625 8.701171874999998-19.775390625 19.775390625v98.876953125c0 11.07421875 8.701171874999998 19.775390625 19.775390625 19.775390625s19.775390625-8.701171874999998 19.775390625-19.775390625v-98.876953125z m-19.775390625 157.41210937500003c-11.07421875 0-19.775390625 9.0966796875-19.775390625 19.775390625v64.072265625h-79.1015625v1.1865234374999998c-11.07421875 0-19.775390625 8.701171874999998-19.775390625 19.775390625s8.701171874999998 19.775390625 19.775390625 19.775390625h98.876953125c11.07421875 0 19.775390625-8.701171874999998 19.775390625-19.775390625V738.8177083333334c0-11.865234374999998-9.0966796875-20.56640625-19.775390625-20.56640625zM581.0221354166666 802.0989583333333L166.52994791666666 801.3079427083333V423.2024739583333h-0.7910156249999999c0-11.07421875-8.701171874999998-19.775390625-19.775390625-19.775390625s-19.775390625 8.701171874999998-19.775390625 19.775390625V821.8743489583334c0 11.07421875 8.701171874999998 19.775390625 19.775390625 19.775390625H579.8356119791666c11.07421875 0 19.775390625-9.0966796875 19.775390625-19.775390625 0-11.07421875-9.0966796875-19.775390625-18.5888671875-19.775390625z"  ></path></symbol><symbol id="icon-text" viewBox="0 0 1024 1024"><path d="M853.333333 1024 170.666667 1024c-93.866667 0-170.666667-76.8-170.666667-170.666667L0 170.666667c0-93.866667 76.8-170.666667 170.666667-170.666667l682.666667 0c93.866667 0 170.666667 76.8 170.666667 170.666667l0 682.666667C1024 947.2 947.2 1024 853.333333 1024zM170.666667 85.333333C123.733333 85.333333 85.333333 123.733333 85.333333 170.666667l0 682.666667c0 46.933333 38.4 85.333333 85.333333 85.333333l682.666667 0c46.933333 0 85.333333-38.4 85.333333-85.333333L938.666667 170.666667c0-46.933333-38.4-85.333333-85.333333-85.333333L170.666667 85.333333z"  ></path><path d="M725.333333 341.333333 298.666667 341.333333C273.066667 341.333333 256 324.266667 256 298.666667s17.066667-42.666667 42.666667-42.666667l426.666667 0c25.6 0 42.666667 17.066667 42.666667 42.666667S750.933333 341.333333 725.333333 341.333333z"  ></path><path d="M298.666667 384C273.066667 384 256 366.933333 256 341.333333L256 298.666667c0-25.6 17.066667-42.666667 42.666667-42.666667s42.666667 17.066667 42.666667 42.666667l0 42.666667C341.333333 366.933333 324.266667 384 298.666667 384z"  ></path><path d="M725.333333 384c-25.6 0-42.666667-17.066667-42.666667-42.666667L682.666667 298.666667c0-25.6 17.066667-42.666667 42.666667-42.666667s42.666667 17.066667 42.666667 42.666667l0 42.666667C768 366.933333 750.933333 384 725.333333 384z"  ></path><path d="M512 768c-25.6 0-42.666667-17.066667-42.666667-42.666667L469.333333 298.666667c0-25.6 17.066667-42.666667 42.666667-42.666667s42.666667 17.066667 42.666667 42.666667l0 426.666667C554.666667 750.933333 537.6 768 512 768z"  ></path><path d="M554.666667 768l-85.333333 0c-25.6 0-42.666667-17.066667-42.666667-42.666667s17.066667-42.666667 42.666667-42.666667l85.333333 0c25.6 0 42.666667 17.066667 42.666667 42.666667S580.266667 768 554.666667 768z"  ></path></symbol><symbol id="icon-picture" viewBox="0 0 1024 1024"><path d="M875.633778 64H148.366222A98.602667 98.602667 0 0 0 49.777778 162.588444v698.823112a98.602667 98.602667 0 0 0 98.588444 98.602666h727.267556a98.602667 98.602667 0 0 0 98.588444-98.602666h0.014222V162.588444A98.602667 98.602667 0 0 0 875.633778 64zM106.666667 861.411556v-136.405334l201.372444-288.042666c6.215111-8.888889 14.876444-14.250667 24.405333-15.089778 9.628444-0.952889 19.015111 2.929778 26.680889 10.595555l176.924445 176.910223-218.624 293.745777H148.366222A41.713778 41.713778 0 0 1 106.666667 861.411556z m810.680889 0a41.713778 41.713778 0 0 1-41.713778 41.713777H352.867556l252.202666-338.816c6.599111-8.832 15.815111-14.193778 25.998222-15.089777 10.268444-0.867556 20.181333 2.773333 28.174223 10.339555l155.562666 146.744889c5.688889 5.390222 14.705778 5.105778 20.110223-0.583111a14.250667 14.250667 0 0 0-0.583112-20.110222L678.784 538.865778c-13.994667-13.198222-31.886222-19.626667-50.218667-17.976889-18.360889 1.607111-34.801778 10.993778-46.307555 26.439111l-29.027556 38.997333-173.980444-173.966222c-13.738667-13.738667-31.232-20.366222-49.294222-18.816-18.062222 1.578667-34.133333 11.221333-45.226667 27.121778L106.666667 675.370667V162.588444A41.699556 41.699556 0 0 1 148.366222 120.888889h727.267556a41.699556 41.699556 0 0 1 41.699555 41.699555h0.014223v698.823112z" fill="" ></path><path d="M868.636444 717.937778a14.222222 14.222222 0 0 0-19.527111 20.664889l16.995556 16.056889a14.208 14.208 0 0 0 20.096-0.583112 14.193778 14.193778 0 0 0-0.554667-20.081777l-17.009778-16.056889zM636.743111 175.957333c-67.783111 0-122.908444 55.125333-122.908444 122.894223 0 67.768889 55.125333 122.908444 122.908444 122.908444 67.754667 0 122.908444-55.139556 122.908445-122.908444s-55.139556-122.894222-122.908445-122.894223z m0 217.372445c-52.081778 0-94.464-42.368-94.464-94.464s42.368-94.449778 94.464-94.449778 94.464 42.353778 94.464 94.449778-42.368 94.464-94.464 94.464z" fill="" ></path></symbol><symbol id="icon-shuru" viewBox="0 0 1024 1024"><path d="M970.666667 204.8l-151.466667-151.466667L701.866667 170.666667H64c-12.8 0-21.333333 8.533333-21.333333 21.333333v768c0 12.8 8.533333 21.333333 21.333333 21.333333h576c6.4 0 10.666667-2.133333 14.933333-6.4l192-192c4.266667-4.266667 6.4-8.533333 6.4-14.933333V322.133333l117.333334-117.333333z m-529.066667 469.333333l-98.133333-85.333333L742.4 189.866667l91.733333 91.733333-392.533333 392.533333z m-123.733333-49.066666l89.6 76.8-121.6 34.133333 32-110.933333zM910.933333 204.8l-46.933333 46.933333-91.733333-91.733333 46.933333-46.933333 91.733333 91.733333zM661.333333 908.8V789.333333h119.466667L661.333333 908.8z m149.333334-162.133333h-170.666667c-12.8 0-21.333333 8.533333-21.333333 21.333333v170.666667H85.333333V213.333333h573.866667l-128 128H170.666667v42.666667h317.866666l-128 128H170.666667v42.666667h147.2l-32 32-61.866667 213.333333 213.333333-61.866667 183.466667-183.466666H725.333333v-42.666667h-61.866666l147.2-147.2V746.666667z"  ></path></symbol><symbol id="icon-tree" viewBox="0 0 1024 1024"><path d="M448.84 880.29H175.37c-20.14 0-36.46-16.33-36.46-36.46 0-20.14 16.33-36.46 36.46-36.46h273.48c20.14 0 36.46 16.33 36.46 36.46 0 20.14-16.33 36.46-36.47 36.46zM448.84 588.58H175.37c-20.14 0-36.46-16.33-36.46-36.46 0-20.14 16.33-36.46 36.46-36.46h273.48c20.14 0 36.46 16.33 36.46 36.46 0 20.14-16.33 36.46-36.47 36.46z"  ></path><path d="M138.9 843.83V296.88c0-20.14 16.33-36.46 36.46-36.46 20.14 0 36.46 16.33 36.46 36.46v546.95c0 20.14-16.33 36.46-36.46 36.46-20.13 0-36.46-16.32-36.46-36.46z"  ></path><path d="M211.83 348.16H138.9c-40.11 0-72.93-32.82-72.93-72.93V202.3c0-40.11 32.82-72.93 72.93-72.93h72.93c40.11 0 72.93 32.82 72.93 72.93v72.93c0 40.11-32.82 72.93-72.93 72.93zM922.87 625.05H605.12c-20.05 0-36.46-16.41-36.46-36.46v-72.93c0-20.05 16.41-36.46 36.46-36.46h317.75c20.05 0 36.46 16.41 36.46 36.46v72.93c0 20.05-16.41 36.46-36.46 36.46zM921.67 311.69h-508.1c-20.71 0-37.66-16.95-37.66-37.66V203.5c0-20.71 16.95-37.66 37.66-37.66h508.1c20.71 0 37.66 16.95 37.66 37.66v70.54c0 20.71-16.94 37.65-37.66 37.65zM922.87 916.76H605.12c-20.05 0-36.46-16.41-36.46-36.46v-72.93c0-20.05 16.41-36.46 36.46-36.46h317.75c20.05 0 36.46 16.41 36.46 36.46v72.93c0 20.05-16.41 36.46-36.46 36.46z"  ></path></symbol><symbol id="icon-chaxunsousuo" viewBox="0 0 1024 1024"><path d="M724.173722 608.066299m33.939704 33.939705l203.638226 203.638225q33.939704 33.939704 0 67.879409l0 0q-33.939704 33.939704-67.879409 0l-203.638225-203.638226q-33.939704-33.939704 0-67.879408l0 0q33.939704-33.939704 67.879408 0Z"  ></path><path d="M48.436376 928.00402m47.99799 0l287.98794 0q47.99799 0 47.99799 47.99799l0 0q0 47.99799-47.99799 47.99799l-287.98794 0q-47.99799 0-47.99799-47.99799l0 0q0-47.99799 47.99799-47.99799Z"  ></path><path d="M464.418957 832.00804a415.982581 415.982581 0 1 1 293.747699-121.594909A415.342608 415.342608 0 0 1 464.418957 832.00804z m0-735.969182A319.986601 319.986601 0 1 0 688.409577 192.034839a319.986601 319.986601 0 0 0-223.99062-95.995981z"  ></path></symbol><symbol id="icon-jidu" viewBox="0 0 1024 1024"><path d="M153.850705 812.896572v-537.121614c0.409313-0.511642 0.920955-0.920955 0.920955-1.432598 1.330269-12.688718 6.856001-23.637854 15.144599-32.949735 13.609673-15.451584 31.005496-22.716898 51.573498-22.716898H284.626362v-5.62806-44.205856c0-1.637254 0.511642-3.376836 0.716298-5.01409 0.920955-6.037374 6.242031-7.469971 10.539822-9.925852h9.516539c10.130509 3.581493 12.688718 11.563106 12.381732 21.386629-0.409313 12.177076-0.102328 24.45648-0.102328 36.633557v6.446687h389.359448c0-14.4283 0.306985-28.549615-0.102328-42.67093-0.306985-10.02818 1.841911-18.112122 12.381733-21.898272h9.516538c8.902568 3.683821 12.074748 10.437494 11.460778 19.954032-0.61397 10.64215-0.204657 21.181973-0.204657 31.824124v13.098031h5.730389c19.851704 0 39.703408-0.102328 59.555111 0.102328 4.093135 0 8.18627 0.204657 12.177076 1.023284 20.874988 4.809433 37.145198 16.065554 46.559409 35.81493 2.353553 4.911762 3.990806 10.232837 5.935045 15.349255v546.740482c-0.61397 1.739582-1.330269 3.581493-1.944239 5.423403-7.879285 23.84251-23.740182 39.191766-48.401319 44.922155-2.353553 0.511642-4.604777 1.330269-6.856001 1.944239H211.973219c-0.306985-0.306985-0.511642-0.818627-0.920956-0.920955-9.209553-0.61397-17.498151-3.888478-25.377435-8.697912-12.074748-7.265314-21.181973-16.986509-26.298392-30.186869-2.148896-5.525732-3.683821-11.460777-5.525731-17.293495z m33.25672-397.955031V803.482362c0 18.419107 14.121315 33.359049 33.461377 33.359049 194.526232 0.102328 389.052463 0.102328 583.578695 0 19.237734 0 33.563705-14.325972 33.563705-33.666034 0.102328-127.603478 0.102328-255.206955 0.102329-382.810432v-5.321076c-217.038473-0.102328-433.565304-0.102328-650.706106-0.102328z m0-33.666034h650.501449c0.102328-0.920955 0.204657-1.534926 0.204657-2.148896 0-31.721795 0.102328-63.443589-0.102329-95.165384 0-2.762866-0.61397-5.62806-1.534925-8.186269-5.116419-15.963226-16.679524-23.126212-31.926452-23.637854-20.056361-0.511642-40.112721-0.204657-60.169082-0.102328-1.22794 0-2.455881 0.204657-3.888478 0.409313 0 17.088838 0.204657 33.870691-0.204656 50.754872-0.102328 3.172179-1.534926 6.856001-3.683822 9.209553-5.62806 6.037374-12.688718 6.549016-20.261017 3.581493-5.01409-1.944239-9.107225-8.18627-9.107225-14.632957-0.102328-13.302688 0-26.707705 0-40.010393v-8.800239H317.576097c0 15.758569 0.204657 31.107825-0.102329 46.45708-0.204657 10.64215-3.581493 16.679524-14.939942 18.726091-6.856001 1.22794-18.419107-3.78615-18.316778-14.4283 0.204657-15.246927 0.102328-30.391526 0.102328-45.740781v-5.321076H224.150295c-2.967523 0-5.832717 0.61397-8.902568 0.818627-17.805136 1.22794-28.754272 19.135405-28.549616 33.461377 0.409313 29.879884 0.102328 59.65744 0.102329 89.537324 0.306985 1.330269 0.306985 3.172179 0.306985 5.218747z m-33.25672 431.621065c1.841911 5.730389 3.479165 11.767763 5.62806 17.395823 5.116419 13.20036 14.223643 23.023883 26.298391 30.18687 7.879285 4.707105 16.167882 7.981613 25.377436 8.697911 0.306985 0 0.61397 0.511642 0.920955 0.920955h-58.122514c-0.102328-19.135405-0.102328-38.066154-0.102328-57.201559z m659.097032 57.201559c2.353553-0.61397 4.604777-1.432597 6.856-1.944239 24.661137-5.832717 40.419706-21.181973 48.401319-44.922154 0.61397-1.841911 1.330269-3.581493 1.944239-5.423404v52.392126c-19.135405-0.102328-38.168482-0.102328-57.201558-0.102329z" fill="" ></path><path d="M227.424803 623.179774l10.02818-2.353552c25.275107-6.242031 44.410513-13.81433 56.792245-22.921555 12.893375-9.004897 23.433197-17.191166 31.517138-24.763466h-30.08454c-13.81433 0-33.359049 0.511642-58.224843 1.944239 0.511642-3.376836 0.511642-6.242031 0.920955-8.083941s0.511642-3.78615 0.511642-5.730389-0.511642-6.242031-1.432597-13.302688c32.949735 1.432597 52.494454 1.944239 58.224843 1.944239h59.145797v-22.512241c-25.275107 1.432597-39.601079 1.944239-42.977915 1.944239l-26.707705 0.409313-13.405016 0.511642c-0.920955-3.78615-2.353553-7.674628-3.376836-10.949136-0.920955-3.376836-4.297792-8.595583-9.107225-15.758569l10.02818 0.920956c6.242031 0.920955 18.112122 0.920955 35.81493 0.920955 20.568002 0 45.331468-0.920955 74.495053-3.376836 29.061257-2.353553 50.140901-5.218747 63.44359-8.595583l9.516538-2.353553c5.218747 9.004897 10.949136 17.60048 17.191166 26.196063l-30.493854 2.353553-32.438094 2.865194-29.572898 2.353552v23.842511h54.438692c5.218747 0 25.275107-0.511642 60.169082-1.944239-0.920955 3.78615-1.432597 7.162986-1.432597 8.595583-0.511642 1.944239-0.511642 3.376836-0.511642 3.786149 0 0.920955 0.511642 5.218747 1.944239 13.302689-24.865794-1.432597-44.819826-1.944239-60.169082-1.944239h-26.298391c6.242031 6.651344 15.246927 14.325972 26.707705 23.330868 11.972419 9.004897 31.517138 15.758569 59.145798 20.05636l9.107225 1.432598c-5.218747 5.218747-8.595583 9.516538-10.949136 12.893374-2.353553 3.376836-4.809433 8.595583-6.651344 15.246927l-9.107225-3.786149c-30.493854-13.302688-50.550215-24.354152-61.090037-32.847407-10.02818-8.595583-17.191166-15.246927-20.977316-19.544719L382.452283 575.801739l-3.786149-4.809434h-1.944239v29.982213c0 3.78615 0.511642 10.949136 1.432597 21.488958-6.651344-0.920955-10.539822-0.920955-12.381733-0.920956-1.432597 0-5.730389 0.511642-12.893375 0.920956 0.920955-10.02818 1.944239-17.191166 1.944239-21.488958V570.787649c-4.297792 4.297792-9.107225 9.004897-14.837613 14.735285s-11.460777 11.460777-18.112122 17.60048c-6.651344 5.730389-18.623763 14.325972-36.224243 24.763465 10.949136 0.920955 20.977316 1.432597 29.572899 1.432597h95.47237c10.539822 0 22.921555-0.511642 36.735884-1.432597-18.112122 14.735285-30.493854 24.763466-37.65684 29.061257L378.666134 676.595183v0.511642h47.68502c15.246927 0 35.81493-0.511642 62.010992-1.944239-0.511642 4.297792-0.920955 7.162986-0.920955 9.004897 0 1.944239-0.511642 3.78615-0.511642 5.730388s0.511642 6.242031 1.432597 12.893375c-24.865794-1.432597-45.331468-2.353553-62.010992-2.353552H378.666134v33.359048c0 8.083941-1.432597 14.735285-4.297792 19.033077-2.865194 4.809433-17.191166 7.162986-43.387229 8.083941 0-3.78615-0.511642-7.162986-0.920955-9.004896-0.511642-2.353553-0.920955-4.297792-1.944239-6.242031-0.920955-2.353553-4.297792-8.083941-10.539822-17.191166 11.972419 2.353553 20.977316 3.376836 27.219346 2.865194 3.376836 0 5.730389-0.511642 7.162986-1.944239 1.432597-1.432597 1.944239-4.809433 1.944239-9.516538v-19.544719h-51.573498c-11.972419 0-31.926451 0.920955-60.169082 2.353553 0-3.376836 0.511642-7.162986 0.511642-10.437494s0.511642-6.242031 0.511642-7.674628l-0.920956-9.516538c25.275107 1.432597 45.331468 1.944239 60.169082 1.944239h50.550215v-6.242031l-0.511642-3.376836 3.78615-0.920955c7.674628-2.353553 18.112122-8.083941 31.926451-17.60048h-73.47177c-9.516538 0-20.056361 0.511642-31.005496 1.432597 0.511642-2.865194 0.920955-5.218747 0.920956-7.674628 0.511642-1.944239 0.511642-3.376836 0.511641-4.809433l-0.511641-2.865194-0.511642-7.674628c-9.516538 5.730389-18.623763 10.437494-26.707705 14.735285l-7.674628 3.78615c-3.376836-6.242031-5.730389-10.02818-7.674627-11.870091-1.330269-0.204657-6.549016-4.502448-14.632957-10.744479zM522.744479 740.448086l7.162986-10.949135c2.353553-3.78615 5.218747-9.516538 8.595583-16.167883s6.651344-16.167882 10.539822-28.549615c3.78615-11.870091 6.242031-28.140302 6.651344-48.094334 0.920955-20.056361 0.920955-34.791646 1.432597-44.819826V568.536425L555.182572 525.660837c18.112122 0.920955 28.651944 1.432597 32.438094 1.432598h71.629859c-2.353553-5.730389-5.218747-11.870091-8.595583-18.623764l-4.297792-7.674628c8.083941-1.432597 17.191166-4.297792 26.707705-8.595583l11.972419 35.303288h36.224243c10.02818 0 27.62866-0.511642 52.494454-1.944239-0.511642 3.376836-0.920955 5.730389-0.920956 7.674628v4.297791c0 0.920955 0.511642 4.809433 1.432598 10.949136-11.972419 0-22.409913-0.511642-32.438094-0.920955-10.02818-0.511642-16.679524-0.511642-20.568002-0.511642h-140.803837V578.87159h43.387229v-8.083941c0-3.78615 0-6.651344-0.511642-8.595583l-0.920956-9.004897c6.242031 0.920955 10.02818 1.432597 10.949136 1.432597s5.730389-0.511642 13.405016-1.432597c-0.920955 4.297792-0.920955 7.162986-1.432597 9.516538v15.758569h58.736485v-6.24203c0-5.218747 0-8.595583-0.511642-10.02818l-0.920955-9.004897c6.651344 0.920955 10.949136 1.432597 12.381732 1.432597 1.432597 0 5.730389-0.511642 12.893375-1.432597-0.920955 4.297792-0.920955 7.162986-1.432597 9.516538v15.758569h20.568002c9.516538 0 20.568002-0.511642 31.926452-1.432597-0.511642 3.376836-0.511642 5.730389-0.511642 7.162986 0 1.432597 0 3.376836-0.511642 4.809434-0.511642 1.432597 0 2.353553 0 2.865194l0.920955 7.674628c-11.460777-0.920955-22.0006-1.432597-31.926451-1.432598H726.582592V616.733087c0 6.651344 0 10.437494 0.511642 12.381733l0.920955 12.893374c-9.107225-0.920955-18.112122-1.432597-26.298391-1.432597h-53.006095c-8.083941 0-16.679524 0.511642-25.78675 1.432597 0.511642-5.218747 0.511642-9.516538 0.920956-12.893374 0-3.376836 0.511642-7.162986 0.511641-11.460778v-19.544719h-43.89887c0 6.242031-0.511642 12.381733-0.511642 18.623764s-0.920955 15.246927-1.944239 27.62866c-0.920955 11.870091-2.353553 22.409913-3.376836 31.005496-1.432597 8.595583-4.297792 20.056361-8.595584 34.280004-4.297792 14.325972-9.107225 26.707705-13.81433 36.224243l-5.218746 11.460777c-2.865194-2.865194-5.218747-5.218747-7.162986-6.651344-2.762866-2.148896-7.981613-5.525732-17.088838-10.232837z m53.517737-9.107225c23.433197 0 48.196662-5.218747 74.495054-15.758569-8.083941-8.083941-14.325972-14.735285-18.112122-19.544718-3.78615-5.218747-8.083941-12.893375-13.405016-22.409913l-23.433197 1.944239c0.511642-3.376836 0.511642-5.730389 0.511642-7.162986 0-1.432597 0-2.865194 0.511642-4.297792 0-1.432597 0-4.809433-0.920955-10.949135 12.381733 0.920955 24.354152 1.432597 35.303287 1.432597h79.202159c10.949136 0 22.409913-0.511642 34.382332-1.432597-4.809433 9.004897-10.02818 17.60048-15.758569 25.684421-5.730389 8.083941-17.702808 20.056361-34.791646 36.735884 15.758569 6.242031 28.140302 10.437494 37.65684 11.870091 9.107225 1.432597 16.679524 2.353553 22.921555 2.865195l16.679525 0.920955 8.083941 0.920955c-3.376836 3.376836-9.107225 10.437494-16.679524 20.465674l-3.78615 7.162986-9.107225-2.865194c-0.511642 0-8.083941-1.944239-22.921555-6.242031-14.837614-4.297792-32.438093-11.460777-53.415409-21.898271-27.62866 12.381733-53.927051 21.488958-79.202159 26.707705l-9.107225 1.944239c-1.944239-2.353553-3.376836-4.809433-4.809433-7.674628-1.432597-2.865194-2.353553-4.297792-2.865194-5.218747l-4.297792-5.730389-6.651344-8.083941h9.516538v0.61397z m126.887179-57.610872h-58.736484c2.865194 6.242031 6.242031 11.460777 10.02818 16.167882 3.78615 4.809433 9.516538 9.516538 16.679525 14.735286 5.218747-2.865194 10.02818-6.242031 14.837613-10.02818 4.809433-3.274508 10.539822-10.437494 17.191166-20.874988z m-56.792245-50.550215h58.736484v-25.275107h-58.736484v25.275107z" fill="" ></path></symbol><symbol id="icon-shuzishunxu" viewBox="0 0 1024 1024"><path d="M862.138182 252.16h-523.636364a34.909091 34.909091 0 0 1 0-69.818182h523.636364a34.909091 34.909091 0 0 1 0 69.818182z m0 290.909091h-523.636364a34.909091 34.909091 0 0 1 0-69.818182h523.636364a34.909091 34.909091 0 0 1 0 69.818182z m0 290.909091h-523.636364a34.909091 34.909091 0 0 1 0-69.818182h523.636364a34.909091 34.909091 0 0 1 0 69.818182zM149.178182 294.865455V139.636364h43.962182v155.229091h-43.985455z m76.776727 247.854545v44.916364H125.626182l50.059636-93.323637c2.304-4.352 3.490909-8.075636 3.490909-11.170909 0-5.748364-3.584-8.610909-10.682182-8.610909a10.100364 10.100364 0 0 0-10.496 10.24 12.334545 12.334545 0 0 0 3.956364 8.843636l-19.781818 35.374546C124.951273 517.818182 116.363636 502.458182 116.363636 482.909091c0-14.894545 5.236364-27.671273 15.685819-38.283636a51.688727 51.688727 0 0 1 38.260363-15.941819c15.383273 0 28.229818 5.376 38.562909 16.174546 10.309818 10.775273 15.453091 23.458909 15.453091 38.050909 0 8.541091-1.908364 16.523636-5.818182 23.970909L200.145455 542.72h25.809454z m-95.976727 177.431273h82.129454l-25.134545 59.810909c8.843636 6.050909 15.36 12.730182 19.549091 20.014545 4.189091 7.307636 6.283636 15.988364 6.283636 26.088728 0 15.499636-5.376 28.043636-16.174545 37.585454-10.775273 9.541818-24.692364 14.312727-41.774546 14.312727a92.858182 92.858182 0 0 1-25.367272-3.723636v-43.752727c6.842182 3.072 13.032727 4.608 18.618181 4.608 5.445818 0 9.658182-1.536 12.683637-4.724364 3.025455-3.165091 4.561455-7.726545 4.561454-13.637818a18.152727 18.152727 0 0 0-8.029091-15.36c-5.376-3.863273-12.520727-5.818182-21.527272-5.818182l11.380363-30.487273h-17.221818v-44.916363z" fill="#797979" ></path></symbol><symbol id="icon-Group-" viewBox="0 0 1024 1024"><path d="M160 352a32 32 0 0 1-32-32V192a32 32 0 0 1 32-32h128a32 32 0 0 1 32 32v128a32 32 0 0 1-32 32z m32-64h64V224H192zM416 288a32 32 0 0 1 0-64h448a32 32 0 0 1 0 64zM160 608a32 32 0 0 1-32-32v-128a32 32 0 0 1 32-32h128a32 32 0 0 1 32 32v128a32 32 0 0 1-32 32z m32-64h64v-64H192zM416 544a32 32 0 0 1 0-64h448a32 32 0 0 1 0 64zM160 864a32 32 0 0 1-32-32v-128a32 32 0 0 1 32-32h128a32 32 0 0 1 32 32v128a32 32 0 0 1-32 32z m32-64h64v-64H192zM416 800a32 32 0 0 1 0-64h448a32 32 0 0 1 0 64z"  ></path></symbol><symbol id="icon-riqi" viewBox="0 0 1024 1024"><path d="M819.6 202.6H700.7v-63.8c0-17.6-14.3-31.9-31.9-31.9-17.6 0-31.9 14.3-31.9 31.9v63.8h-255v-63.8c0-17.6-14.3-31.9-31.9-31.9s-31.9 14.3-31.9 31.9v63.8H199.3C140.7 202.6 93 250.3 93 308.9v504.8C93 872.3 140.7 920 199.3 920h620.3c58.6 0 106.3-47.7 106.3-106.3V308.9c0-58.6-47.7-106.3-106.3-106.3z m42.5 611.1c0 23.4-19.1 42.5-42.5 42.5H199.3c-23.4 0-42.5-19.1-42.5-42.5V308.9c0-23.4 19.1-42.5 42.5-42.5h118.8v47.8c0 17.6 14.3 31.9 31.9 31.9s31.9-14.3 31.9-31.9v-47.8H637v47.8c0 17.6 14.3 31.9 31.9 31.9 17.6 0 31.9-14.3 31.9-31.9v-47.8h118.8c23.4 0 42.5 19.1 42.5 42.5v504.8z"  ></path><path d="M340.1 409.9H238c-12.9 0-23.4 10.5-23.4 23.4v87.6c0 12.9 10.5 23.4 23.4 23.4h102.1c12.9 0 23.4-10.5 23.4-23.4v-87.6c0-12.9-10.5-23.4-23.4-23.4zM560.5 409.9H458.4c-12.9 0-23.4 10.5-23.4 23.4v87.6c0 12.9 10.5 23.4 23.4 23.4h102.1c12.9 0 23.4-10.5 23.4-23.4v-87.6c0-12.9-10.5-23.4-23.4-23.4zM781 409.9H678.8c-12.9 0-23.4 10.5-23.4 23.4v87.6c0 12.9 10.5 23.4 23.4 23.4H781c12.9 0 23.4-10.5 23.4-23.4v-87.6c0-12.9-10.6-23.4-23.4-23.4zM340.1 632.9H238c-12.9 0-23.4 10.5-23.4 23.4v87.6c0 12.9 10.5 23.4 23.4 23.4h102.1c12.9 0 23.4-10.5 23.4-23.4v-87.6c0-12.9-10.5-23.4-23.4-23.4zM560.5 632.9H458.4c-12.9 0-23.4 10.5-23.4 23.4v87.6c0 12.9 10.5 23.4 23.4 23.4h102.1c12.9 0 23.4-10.5 23.4-23.4v-87.6c0-12.9-10.5-23.4-23.4-23.4zM781 632.9H678.8c-12.9 0-23.4 10.5-23.4 23.4v87.6c0 12.9 10.5 23.4 23.4 23.4H781c12.9 0 23.4-10.5 23.4-23.4v-87.6c0-12.9-10.6-23.4-23.4-23.4z"  ></path></symbol><symbol id="icon-zuoce-qujian" viewBox="0 0 1024 1024"><path d="M915.456 198.656c-49.3568 0-90.9312 32.768-104.0384 77.824h-195.1744c-13.312-45.056-54.8864-77.824-104.0384-77.824-49.3568 0-90.9312 32.768-104.0384 77.824H30.72c-16.9984 0-30.72 13.7216-30.72 30.72s13.7216 30.72 30.72 30.72h377.2416c13.312 45.056 54.8864 77.824 104.0384 77.824 49.3568 0 90.9312-32.768 104.0384-77.824h195.1744c13.312 45.056 54.8864 77.824 104.0384 77.824 60.0064 0 108.544-48.5376 108.544-108.544 0.2048-60.0064-48.3328-108.544-108.3392-108.544z m-403.456 155.648c-26.0096 0-47.104-21.0944-47.104-47.104s21.0944-47.104 47.104-47.104 47.104 21.0944 47.104 47.104-21.0944 47.104-47.104 47.104z m403.456 0c-26.0096 0-47.104-21.0944-47.104-47.104s21.0944-47.104 47.104-47.104 47.104 21.0944 47.104 47.104-21.0944 47.104-47.104 47.104zM993.28 686.08H616.0384c-13.312-45.056-54.8864-77.824-104.0384-77.824-49.3568 0-90.9312 32.768-104.0384 77.824h-193.1264c-13.312-45.056-54.8864-77.824-104.0384-77.824-55.7056 0-101.376 41.7792-107.7248 95.6416-1.8432 3.8912-2.8672 8.192-2.8672 12.9024s1.024 9.0112 2.8672 12.9024C9.216 783.5648 54.8864 825.344 110.592 825.344c49.3568 0 90.9312-32.768 104.0384-77.824h193.1264c13.312 45.056 54.8864 77.824 104.0384 77.824 49.3568 0 90.9312-32.768 104.0384-77.824H993.28c16.9984 0 30.72-13.7216 30.72-30.72s-13.7216-30.72-30.72-30.72zM110.592 763.904c-26.0096 0-47.104-21.0944-47.104-47.104s21.0944-47.104 47.104-47.104 47.104 21.0944 47.104 47.104-21.0944 47.104-47.104 47.104z m401.408 0c-26.0096 0-47.104-21.0944-47.104-47.104s21.0944-47.104 47.104-47.104 47.104 21.0944 47.104 47.104-21.0944 47.104-47.104 47.104z" fill="#646464" ></path></symbol><symbol id="icon-liebiao" viewBox="0 0 1024 1024"><path d="M92.5 573.1h179.4c16.5 0 29.9-13.4 29.9-29.9s-13.4-29.9-29.9-29.9H92.5c-16.5 0-29.9 13.4-29.9 29.9s13.4 29.9 29.9 29.9zM950.9 823L848 720c31.9-40.7 51.7-91.2 51.7-146.9 0-132.1-107.1-239.2-239.2-239.2S421.3 441 421.3 573.1s107.1 239.2 239.2 239.2c55.7 0 106.3-19.9 146.9-51.7l103 103c11.2 11.2 29.3 11.2 40.5 0 11.2-11.3 11.2-29.4 0-40.6zM788.7 698.3c-0.5 0.5-1.3 0.7-1.7 1.2-0.5 0.5-0.7 1.3-1.2 1.7-32.4 31.6-76.4 51.2-125.3 51.2-99.1 0-179.4-80.3-179.4-179.4 0-99.1 80.3-179.4 179.4-179.4S839.9 474 839.9 573.1c0.1 48.8-19.6 92.9-51.2 125.2z m-696.2-484h538.2c16.5 0 29.9-13.4 29.9-29.9s-13.4-29.9-29.9-29.9H92.5c-16.5 0-29.9 13.4-29.9 29.9s13.4 29.9 29.9 29.9z m239.2 119.6H92.5c-16.5 0-29.9 13.4-29.9 29.9s13.4 29.9 29.9 29.9h239.2c16.5 0 29.9-13.4 29.9-29.9s-13.4-29.9-29.9-29.9z m0 358.8H92.5c-16.5 0-29.9 13.4-29.9 29.9s13.4 29.9 29.9 29.9h239.2c16.5 0 29.9-13.4 29.9-29.9s-13.4-29.9-29.9-29.9z m0 0"  ></path></symbol><symbol id="icon-xialakuang" viewBox="0 0 1024 1024"><path d="M970.105263 404.210526H53.894737v-323.368421h916.210526v323.368421z m-862.315789-53.894737h808.421052v-215.578947H107.789474v215.578947z" fill="#444A5C" ></path><path d="M970.105263 943.157895H53.894737v-592.842106h916.210526v592.842106z m-862.315789-53.894737h808.421052v-485.052632H107.789474v485.052632zM754.526316 307.2L662.905263 215.578947l37.726316-37.726315 53.894737 53.894736 53.894737-53.894736 37.726315 37.726315z" fill="#444A5C" ></path><path d="M264.084211 781.473684h485.052631v-53.894737h-485.052631v53.894737z m0-107.789473h485.052631v-53.894737h-485.052631v53.894737z m0-161.684211v53.894737h485.052631v-53.894737h-485.052631z" fill="#444A5C" ></path></symbol><symbol id="icon-xialashu" viewBox="0 0 1024 1024"><path d="M970.105263 323.368421H53.894737V53.894737h916.210526v269.473684zM107.789474 269.473684h808.421052V107.789474H107.789474v161.68421zM215.578947 538.947368H53.894737V377.263158h161.68421v161.68421zM107.789474 485.052632h53.894737V431.157895H107.789474v53.894737z" fill="#444A5C" ></path><path d="M269.473684 431.157895h431.157895v53.894737H269.473684V431.157895zM538.947368 646.736842h431.157895v53.894737h-431.157895v-53.894737zM538.947368 862.315789h431.157895v53.894737h-431.157895v-53.894737zM107.789474 485.052632h53.894737v431.157894H107.789474V485.052632zM161.684211 700.631579v-53.894737h161.68421v53.894737H161.684211M161.684211 916.210526v-53.894737h161.68421v53.894737H161.684211" fill="#444A5C" ></path><path d="M485.052632 754.526316H323.368421v-161.684211h161.684211v161.684211z m-107.789474-53.894737h53.894737v-53.894737H377.263158v53.894737zM485.052632 970.105263H323.368421v-161.68421h161.684211v161.68421z m-107.789474-53.894737h53.894737v-53.894737H377.263158v53.894737z" fill="#444A5C" ></path><path d="M754.526316 161.684211h107.789473v53.894736h-107.789473V161.684211z" fill="#444A5C" ></path></symbol><symbol id="icon-zhongzhi" viewBox="0 0 1024 1024"><path d="M624.593455 23.272727a93.090909 93.090909 0 0 1 93.090909 93.090909v168.587637l143.406545 0.023272a116.363636 116.363636 0 0 1 116.247273 111.313455l0.116363 5.050182V861.090909a116.363636 116.363636 0 0 1-116.363636 116.363636H162.909091a116.363636 116.363636 0 0 1-116.363636-116.363636V401.338182a116.363636 116.363636 0 0 1 116.363636-116.363637l146.664727-0.023272V116.363636a93.090909 93.090909 0 0 1 88.459637-92.974545l4.654545-0.116364zM139.636364 581.818182v279.272727a23.272727 23.272727 0 0 0 23.272727 23.272727h302.545454v-162.909091a46.545455 46.545455 0 1 1 93.09091 0v162.909091h93.090909v-162.909091a46.545455 46.545455 0 1 1 93.090909 0v162.909091h116.363636a23.272727 23.272727 0 0 0 23.272727-23.272727V581.818182H139.636364z m0-93.090909h744.727272v-87.389091a23.272727 23.272727 0 0 0-23.272727-23.272727h-166.679273a69.818182 69.818182 0 0 1-69.818181-69.818182V116.363636h-221.905455v191.883637a69.818182 69.818182 0 0 1-69.818182 69.818182H162.909091a23.272727 23.272727 0 0 0-23.272727 23.272727V488.727273z"  ></path></symbol><symbol id="icon-ri" viewBox="0 0 1024 1024"><path d="M408.222897 789.115586v-35.345655h217.15862v34.886621h33.474207V388.378483h-283.68331v400.737103h33.050483z m217.15862-237.779862h-217.15862v-130.824827h217.15862v130.824827z m0 170.301793h-217.15862v-138.169379h217.15862v138.169379z"  ></path><path d="M917.645241 144.772414a70.62069 70.62069 0 0 1 70.62069 70.620689v681.489656a70.62069 70.62069 0 0 1-70.62069 70.620689H94.384552a70.62069 70.62069 0 0 1-70.62069-70.620689V215.393103a70.62069 70.62069 0 0 1 70.62069-70.620689h823.260689z m0 45.903448H94.384552a24.717241 24.717241 0 0 0-24.50538 21.362759l-0.211862 3.354482v681.489656a24.717241 24.717241 0 0 0 21.362759 24.505379l3.354483 0.211862h823.260689a24.717241 24.717241 0 0 0 24.50538-21.362759l0.211862-3.354482V215.393103a24.717241 24.717241 0 0 0-21.362759-24.505379l-3.354483-0.211862z"  ></path><path d="M312.214069 31.249655a22.951724 22.951724 0 0 1 22.704552 19.561931l0.247172 3.389793v180.824276a22.951724 22.951724 0 0 1-45.656276 3.389793l-0.247172-3.389793v-180.788965a22.951724 22.951724 0 0 1 22.951724-22.951724zM691.023448 31.249655a22.951724 22.951724 0 0 1 22.704552 19.561931l0.247172 3.389793v180.824276a22.951724 22.951724 0 0 1-45.656275 3.389793l-0.247173-3.389793v-180.788965a22.951724 22.951724 0 0 1 22.951724-22.951724z"  ></path></symbol><symbol id="icon-nian" viewBox="0 0 1024 1024"><path d="M715.702857 32.365714a23.771429 23.771429 0 0 1 23.515429 20.260572l0.256 3.510857V149.942857l210.944 0.036572a73.142857 73.142857 0 0 1 73.142857 73.142857v705.828571a73.142857 73.142857 0 0 1-73.142857 73.142857H97.755429a73.142857 73.142857 0 0 1-73.142858-73.142857V223.085714a73.142857 73.142857 0 0 1 73.142858-73.142857h201.837714V56.100571a23.771429 23.771429 0 0 1 47.286857-3.510857l0.256 3.510857V149.942857h344.795429V56.137143a23.771429 23.771429 0 0 1 23.771428-23.771429zM299.593143 197.485714l-201.874286 0.036572a25.6 25.6 0 0 0-25.344 22.125714l-0.219428 3.474286v705.828571a25.6 25.6 0 0 0 22.125714 25.380572l3.474286 0.219428h852.662857a25.6 25.6 0 0 0 25.380571-22.125714l0.219429-3.474286V223.085714a25.6 25.6 0 0 0-22.125715-25.380571l-3.474285-0.219429H739.474286v45.933715a23.771429 23.771429 0 0 1-47.286857 3.510857l-0.256-3.510857V197.485714H347.136v45.970286a23.771429 23.771429 0 0 1-47.286857 3.510857l-0.256-3.510857V197.485714z m112.274286 181.504l35.657142 6.656c-5.229714 18.066286-11.410286 34.706286-18.066285 50.870857h295.241143v33.28h-149.284572v76.068572h132.644572v32.804571h-132.644572v102.692572h164.498286v33.28h-164.498286v106.020571h-34.706286V714.605714H321.097143v-33.28h78.445714v-135.497143h141.202286v-76.068571h-127.890286a285.805714 285.805714 0 0 1-75.117714 84.626286l-22.820572-28.525715c48.018286-36.132571 80.347429-85.101714 96.987429-146.907428z m128.841142 199.68H433.737143v102.692572h106.971428v-102.692572z"  ></path></symbol><symbol id="icon-yue" viewBox="0 0 1024 1024"><path d="M371.959172 792.328828c29.837241-39.017931 47.315862-88.134621 52.788966-147.809104h197.843862v91.347862c0 13.312-5.508414 20.197517-16.066207 20.197517-17.44331 0-36.722759-0.918069-57.838345-1.836137l9.18069 32.591448h59.215448c25.705931 0 39.017931-13.312 39.017931-39.476966V388.378483h-263.026758v224.008827c-0.918069 63.346759-16.066207 115.67669-46.362483 156.989793l25.246896 22.951725z m250.632828-291.945931h-195.972414v-80.331035h195.972414v80.331035z m0 113.381517h-195.972414v-82.626207h195.972414v82.626207z"  ></path><path d="M917.645241 144.772414a70.62069 70.62069 0 0 1 70.62069 70.620689v681.489656a70.62069 70.62069 0 0 1-70.62069 70.620689H94.384552a70.62069 70.62069 0 0 1-70.62069-70.620689V215.393103a70.62069 70.62069 0 0 1 70.62069-70.620689h823.260689z m0 45.903448H94.384552a24.717241 24.717241 0 0 0-24.50538 21.362759l-0.211862 3.354482v681.489656a24.717241 24.717241 0 0 0 21.362759 24.505379l3.354483 0.211862h823.260689a24.717241 24.717241 0 0 0 24.50538-21.362759l0.211862-3.354482V215.393103a24.717241 24.717241 0 0 0-21.362759-24.505379l-3.354483-0.211862z"  ></path><path d="M312.214069 31.249655a22.951724 22.951724 0 0 1 22.704552 19.561931l0.247172 3.389793v180.824276a22.951724 22.951724 0 0 1-45.656276 3.389793l-0.247172-3.389793v-180.788965a22.951724 22.951724 0 0 1 22.951724-22.951724zM691.023448 31.249655a22.951724 22.951724 0 0 1 22.704552 19.561931l0.247172 3.389793v180.824276a22.951724 22.951724 0 0 1-45.656275 3.389793l-0.247173-3.389793v-180.788965a22.951724 22.951724 0 0 1 22.951724-22.951724z"  ></path></symbol></svg>',o=(o=document.getElementsByTagName("script"))[o.length-1].getAttribute("data-injectcss"),z=function(c,h){h.parentNode.insertBefore(c,h)};if(o&&!c.__iconfont__svg__cssinject__){c.__iconfont__svg__cssinject__=!0;try{document.write("<style>.svgfont {display: inline-block;width: 1em;height: 1em;fill: currentColor;vertical-align: -0.1em;font-size:16px;}</style>")}catch(c){console&&console.log(c)}}function s(){t||(t=!0,a())}function m(){try{v.documentElement.doScroll("left")}catch(c){return void setTimeout(m,50)}s()}h=function(){var c,h;(h=document.createElement("div")).innerHTML=i,i=null,(c=h.getElementsByTagName("svg")[0])&&(c.setAttribute("aria-hidden","true"),c.style.position="absolute",c.style.width=0,c.style.height=0,c.style.overflow="hidden",h=c,(c=document.body).firstChild?z(h,c.firstChild):c.appendChild(h))},document.addEventListener?~["complete","loaded","interactive"].indexOf(document.readyState)?setTimeout(h,0):(l=function(){document.removeEventListener("DOMContentLoaded",l,!1),h()},document.addEventListener("DOMContentLoaded",l,!1)):document.attachEvent&&(a=h,v=c.document,t=!1,m(),v.onreadystatechange=function(){"complete"==v.readyState&&(v.onreadystatechange=null,s())})}(window);
\ No newline at end of file
diff --git a/frontend/src/styles/deicon/iconfont.json b/frontend/src/styles/deicon/iconfont.json
index 5fb84fce72..026c833ac0 100644
--- a/frontend/src/styles/deicon/iconfont.json
+++ b/frontend/src/styles/deicon/iconfont.json
@@ -5,6 +5,55 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "23496077",
+      "name": "线性图标-取消下钻",
+      "font_class": "quxiaoshangzuan",
+      "unicode": "e973",
+      "unicode_decimal": 59763
+    },
+    {
+      "icon_id": "23005499",
+      "name": "线性图标-取消下钻",
+      "font_class": "quxiaoxiazuan",
+      "unicode": "e6ed",
+      "unicode_decimal": 59117
+    },
+    {
+      "icon_id": "8657066",
+      "name": "联动",
+      "font_class": "linkage",
+      "unicode": "e6f7",
+      "unicode_decimal": 59127
+    },
+    {
+      "icon_id": "12725578",
+      "name": "下钻",
+      "font_class": "xiazuan",
+      "unicode": "e613",
+      "unicode_decimal": 58899
+    },
+    {
+      "icon_id": "13006352",
+      "name": "上钻",
+      "font_class": "shangzuan",
+      "unicode": "e61f",
+      "unicode_decimal": 58911
+    },
+    {
+      "icon_id": "22983243",
+      "name": "取消联动",
+      "font_class": "quxiaoliandong",
+      "unicode": "e637",
+      "unicode_decimal": 58935
+    },
+    {
+      "icon_id": "5384479",
+      "name": "edit-2",
+      "font_class": "edit-outline",
+      "unicode": "e604",
+      "unicode_decimal": 58884
+    },
     {
       "icon_id": "3684252",
       "name": "edit-2",
diff --git a/frontend/src/styles/deicon/iconfont.ttf b/frontend/src/styles/deicon/iconfont.ttf
index f41e737d13..7c1b1a0797 100644
Binary files a/frontend/src/styles/deicon/iconfont.ttf and b/frontend/src/styles/deicon/iconfont.ttf differ
diff --git a/frontend/src/styles/deicon/iconfont.woff b/frontend/src/styles/deicon/iconfont.woff
index 70a60e5875..edbbcef435 100644
Binary files a/frontend/src/styles/deicon/iconfont.woff and b/frontend/src/styles/deicon/iconfont.woff differ
diff --git a/frontend/src/styles/deicon/iconfont.woff2 b/frontend/src/styles/deicon/iconfont.woff2
index e821792c16..916b7b9b94 100644
Binary files a/frontend/src/styles/deicon/iconfont.woff2 and b/frontend/src/styles/deicon/iconfont.woff2 differ
diff --git a/frontend/src/utils/conditionUtil.js b/frontend/src/utils/conditionUtil.js
index 0e010b8665..7cfee37f9f 100644
--- a/frontend/src/utils/conditionUtil.js
+++ b/frontend/src/utils/conditionUtil.js
@@ -30,3 +30,9 @@ export const formatCondition = obj => {
   const condition = new Condition(component.id, fieldId, operator, value, viewIds)
   return condition
 }
+
+export const formatLinkageCondition = obj => {
+  const { viewIds, fieldId, value, operator } = obj
+  const condition = new Condition(null, fieldId, operator, value, viewIds)
+  return condition
+}
diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js
index 90e7c5134f..3a453fee24 100644
--- a/frontend/src/views/chart/chart/chart.js
+++ b/frontend/src/views/chart/chart/chart.js
@@ -39,7 +39,9 @@ export const DEFAULT_SIZE = {
   dimensionShow: true,
   quotaShow: true,
   scatterSymbol: 'circle',
-  scatterSymbolSize: 20
+  scatterSymbolSize: 20,
+  treemapWidth: 80,
+  treemapHeight: 80
 }
 export const DEFAULT_LABEL = {
   show: false,
@@ -623,7 +625,7 @@ export const BASE_MAP = {
     {
       name: '',
       type: 'map',
-      map: 'HK',
+      map: 'MAP',
       roam: true,
       //   label: {
       //     show: true
diff --git a/frontend/src/views/chart/chart/map/map.js b/frontend/src/views/chart/chart/map/map.js
index f6da490cea..a336f534e7 100644
--- a/frontend/src/views/chart/chart/map/map.js
+++ b/frontend/src/views/chart/chart/map/map.js
@@ -33,16 +33,22 @@ export function baseMapOption(chart_option, chart) {
       }
       // visualMap
       const valueArr = chart.data.series[0].data
-      chart_option.visualMap.min = Math.min(...valueArr)
-      chart_option.visualMap.max = Math.max(...valueArr)
+      const values = []
+      valueArr.forEach(function(ele) {
+        values.push(ele.value)
+      })
+      chart_option.visualMap.min = Math.min(...values)
+      chart_option.visualMap.max = Math.max(...values)
       if (customAttr.color && customAttr.color.colors) {
         chart_option.visualMap.inRange.color = customAttr.color.colors
       }
       for (let i = 0; i < valueArr.length; i++) {
-        const y = {
-          name: chart.data.x[i],
-          value: valueArr[i]
-        }
+        // const y = {
+        //   name: chart.data.x[i],
+        //   value: valueArr[i]
+        // }
+        const y = valueArr[i]
+        y.name = chart.data.x[i]
         // color
         // y.itemStyle = {
         //   color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha),
diff --git a/frontend/src/views/chart/chart/treemap/treemap.js b/frontend/src/views/chart/chart/treemap/treemap.js
index 5ecca3ca82..de7c07eb49 100644
--- a/frontend/src/views/chart/chart/treemap/treemap.js
+++ b/frontend/src/views/chart/chart/treemap/treemap.js
@@ -24,12 +24,13 @@ export function baseTreemapOption(chart_option, chart) {
       // chart_option.series[0].name = chart.data.series[0].name
       // size
       if (customAttr.size) {
-        // chart_option.series[0].radius = [customAttr.size.pieInnerRadius + '%', customAttr.size.pieOuterRadius + '%']
+        chart_option.series[0].width = (customAttr.size.treemapWidth ? customAttr.size.treemapWidth : 80) + '%'
+        chart_option.series[0].height = (customAttr.size.treemapHeight ? customAttr.size.treemapHeight : 80) + '%'
       }
       // label
-      if (customAttr.label) {
-        // chart_option.series[0].label = customAttr.label
-      }
+      // if (customAttr.label) {
+      // chart_option.series[0].label = customAttr.label
+      // }
       const valueArr = chart.data.series[0].data
       for (let i = 0; i < valueArr.length; i++) {
         // const y = {
diff --git a/frontend/src/views/chart/components/ChartComponent.vue b/frontend/src/views/chart/components/ChartComponent.vue
index 1cea6ea399..121fce342c 100644
--- a/frontend/src/views/chart/components/ChartComponent.vue
+++ b/frontend/src/views/chart/components/ChartComponent.vue
@@ -1,5 +1,6 @@
 <template>
   <div style="display: flex;">
+    <view-track-bar ref="viewTrack" :track-menu="trackMenu" class="track-bar" :style="trackBarStyleTime" @trackClick="trackClick" />
     <div :id="chartId" style="width: 100%;height: 100%;" />
   </div>
 </template>
@@ -18,9 +19,11 @@ import { baseTreemapOption } from '../chart/treemap/treemap'
 // import eventBus from '@/components/canvas/utils/eventBus'
 import { uuid } from 'vue-uuid'
 import { geoJson } from '@/api/map/map'
+import ViewTrackBar from '@/components/canvas/components/Editor/ViewTrackBar'
 
 export default {
   name: 'ChartComponent',
+  components: { ViewTrackBar },
   props: {
     chart: {
       type: Object,
@@ -32,13 +35,33 @@ export default {
       default: function() {
         return {}
       }
+    },
+    trackMenu: {
+      type: Array,
+      required: false,
+      default: function() {
+        return ['drill']
+      }
     }
   },
   data() {
     return {
       myChart: {},
       chartId: uuid.v1(),
-      currentGeoJson: null
+      currentGeoJson: null,
+      showTrackBar: true,
+      trackBarStyle: {
+        position: 'absolute',
+        left: '0px',
+        top: '0px'
+      },
+      pointParam: null
+    }
+  },
+
+  computed: {
+    trackBarStyleTime() {
+      return this.trackBarStyle
     }
   },
   watch: {
@@ -62,6 +85,7 @@ export default {
     preDraw() {
       // 基于准备好的dom，初始化echarts实例
       // 渲染echart等待dom加载完毕,渲染之前先尝试销毁具有相同id的echart 放置多次切换仪表板有重复id情况
+      const that = this
       new Promise((resolve) => { resolve() }).then(() => {
         //	此dom为echarts图标展示dom
         this.myChart = this.$echarts.getInstanceByDom(document.getElementById(this.chartId))
@@ -69,6 +93,18 @@ export default {
           this.myChart = this.$echarts.init(document.getElementById(this.chartId))
         }
         this.drawEcharts()
+
+        this.myChart.off('click')
+        this.myChart.on('click', function(param) {
+          that.pointParam = param
+          if (that.trackMenu.length < 2) { // 只有一个事件直接调用
+            that.trackClick(that.trackMenu[0])
+          } else { // 视图关联多个事件
+            that.trackBarStyle.left = param.event.offsetX + 'px'
+            that.trackBarStyle.top = (param.event.offsetY - 15) + 'px'
+            that.$refs.viewTrack.trackButtonClick()
+          }
+        })
       })
     },
     drawEcharts() {
@@ -136,7 +172,7 @@ export default {
     },
     initMapChart(geoJson, chart) {
       // this.$echarts.registerMap('HK', geoJson)
-      this.$echarts.getMap('HK') || this.$echarts.registerMap('HK', geoJson)
+      this.$echarts.getMap('MAP') || this.$echarts.registerMap('MAP', geoJson)
       const base_json = JSON.parse(JSON.stringify(BASE_MAP))
       const chart_option = baseMapOption(base_json, chart)
       this.myEcharts(chart_option)
@@ -153,6 +189,23 @@ export default {
       // 指定图表的配置项和数据
       const chart = this.myChart
       chart.resize()
+    },
+    trackClick(trackAction) {
+      const linkageParam = {
+        viewId: this.chart.id,
+        dimensionList: this.pointParam.data.dimensionList,
+        quotaList: this.pointParam.data.quotaList
+      }
+      switch (trackAction) {
+        case 'drill':
+          this.$emit('onChartClick', this.pointParam)
+          break
+        case 'linkage':
+          this.$store.commit('addViewTrackFilter', linkageParam)
+          break
+        default:
+          break
+      }
     }
   }
 }
diff --git a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
index 906a1eb79f..0295369719 100644
--- a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
@@ -151,6 +151,15 @@
           <el-slider v-model="sizeForm.scatterSymbolSize" show-input :show-input-controls="false" input-size="mini" :min="1" :max="20" @change="changeBarSizeCase" />
         </el-form-item>
       </el-form>
+
+      <el-form v-show="chart.type && chart.type === 'treemap'" ref="sizeFormLine" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="80px" size="mini">
+        <el-form-item :label="$t('chart.width')" class="form-item form-item-slider">
+          <el-slider v-model="sizeForm.treemapWidth" show-input :show-input-controls="false" input-size="mini" :min="0" :max="100" @change="changeBarSizeCase" />
+        </el-form-item>
+        <el-form-item :label="$t('chart.height')" class="form-item form-item-slider">
+          <el-slider v-model="sizeForm.treemapHeight" show-input :show-input-controls="false" input-size="mini" :min="0" :max="100" @change="changeBarSizeCase" />
+        </el-form-item>
+      </el-form>
     </el-col>
     <!--      <el-popover-->
     <!--        placement="right"-->
@@ -353,6 +362,8 @@ export default {
         }
         if (customAttr.size) {
           this.sizeForm = customAttr.size
+          this.sizeForm.treemapWidth = this.sizeForm.treemapWidth ? this.sizeForm.treemapWidth : 80
+          this.sizeForm.treemapHeight = this.sizeForm.treemapHeight ? this.sizeForm.treemapHeight : 80
         }
       }
     },
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 6d48edba2e..df8529901a 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -247,30 +247,6 @@
                       />
                     </span>
                   </el-row>
-                  <el-row class="padding-lr">
-                    <span style="width: 80px;text-align: right;">
-                      <span>{{ $t('chart.drill') }}</span>
-                      /
-                      <span>{{ $t('chart.dimension') }}</span>
-                    </span>
-                    <draggable
-                      v-model="view.drillFields"
-                      :disabled="!hasDataPermission('manage',param.privileges)"
-                      group="drag"
-                      animation="300"
-                      :move="onMove"
-                      class="drag-block-style"
-                      @add="addDrill"
-                      @update="save(true)"
-                    >
-                      <transition-group class="draggable-group">
-                        <drill-item v-for="(item,index) in view.drillFields" :key="item.id" :param="param" :index="index" :item="item" @onDimensionItemChange="drillItemChange" @onDimensionItemRemove="drillItemRemove" />
-                      </transition-group>
-                    </draggable>
-                    <div v-if="!view.drillFields || view.drillFields.length === 0" class="drag-placeholder-style">
-                      <span class="drag-placeholder-style-span">{{ $t('chart.placeholder_field') }}</span>
-                    </div>
-                  </el-row>
                   <el-row v-if="view.type !=='text' && view.type !== 'gauge'" class="padding-lr">
                     <span style="width: 80px;text-align: right;">
                       <span v-if="view.type && view.type.includes('table')">{{ $t('chart.drag_block_table_data_column') }}</span>
@@ -404,6 +380,30 @@
                       <span class="drag-placeholder-style-span">{{ $t('chart.placeholder_field') }}</span>
                     </div>
                   </el-row>
+                  <el-row v-if="view.type && view.type !== 'treemap' && !view.type.includes('table') && !view.type.includes('text') && !view.type.includes('radar') && !view.type.includes('gauge')" class="padding-lr" style="margin-top: 6px;">
+                    <span style="width: 80px;text-align: right;">
+                      <span>{{ $t('chart.drill') }}</span>
+                      /
+                      <span>{{ $t('chart.dimension') }}</span>
+                    </span>
+                    <draggable
+                      v-model="view.drillFields"
+                      :disabled="!hasDataPermission('manage',param.privileges)"
+                      group="drag"
+                      animation="300"
+                      :move="onMove"
+                      class="drag-block-style"
+                      @add="addDrill"
+                      @update="save(true)"
+                    >
+                      <transition-group class="draggable-group">
+                        <drill-item v-for="(item,index) in view.drillFields" :key="item.id" :param="param" :index="index" :item="item" @onDimensionItemChange="drillItemChange" @onDimensionItemRemove="drillItemRemove" />
+                      </transition-group>
+                    </draggable>
+                    <div v-if="!view.drillFields || view.drillFields.length === 0" class="drag-placeholder-style">
+                      <span class="drag-placeholder-style-span">{{ $t('chart.placeholder_field') }}</span>
+                    </div>
+                  </el-row>
                 </el-row>
               </div>
             </el-col>
@@ -427,7 +427,7 @@
                   <el-collapse-item name="color" :title="$t('chart.color')">
                     <color-selector :param="param" class="attr-selector" :chart="chart" @onColorChange="onColorChange" />
                   </el-collapse-item>
-                  <el-collapse-item v-show="chart.type !== 'map' && chart.type !== 'treemap'" name="size" :title="$t('chart.size')">
+                  <el-collapse-item v-show="chart.type !== 'map'" name="size" :title="$t('chart.size')">
                     <size-selector :param="param" class="attr-selector" :chart="chart" @onSizeChange="onSizeChange" />
                   </el-collapse-item>
                   <el-collapse-item v-show="!view.type.includes('table') && !view.type.includes('text') && view.type !== 'treemap'" name="label" :title="$t('chart.label')">
@@ -483,7 +483,7 @@
       <el-col style="height: 100%;min-width: 500px;border-top: 1px solid #E6E6E6;">
         <el-row style="width: 100%;height: 100%;" class="padding-lr">
           <div ref="imageWrapper" style="height: 100%">
-            <chart-component v-if="httpRequest.status && chart.type && !chart.type.includes('table') && !chart.type.includes('text')" :chart-id="chart.id" :chart="chart" class="chart-class" />
+            <chart-component v-if="httpRequest.status && chart.type && !chart.type.includes('table') && !chart.type.includes('text')" :chart-id="chart.id" :chart="chart" class="chart-class" @onChartClick="chartClick" />
             <table-normal v-if="httpRequest.status && chart.type && chart.type.includes('table')" :chart="chart" class="table-class" />
             <label-normal v-if="httpRequest.status && chart.type && chart.type.includes('text')" :chart="chart" class="table-class" />
             <div v-if="!httpRequest.status" class="chart-error-class">
@@ -494,6 +494,9 @@
               </div>
             </div>
           </div>
+          <div style="position: absolute;left: 20px;bottom:14px;">
+            <drill-path :drill-filters="drillFilters" @onDrillJump="drillJump" />
+          </div>
         </el-row>
       </el-col>
     </el-row>
@@ -603,6 +606,7 @@ import ChartDragItem from '../components/drag-item/ChartDragItem'
 import DrillItem from '../components/drag-item/DrillItem'
 import ResultFilterEditor from '../components/filter/ResultFilterEditor'
 import ChartComponent from '../components/ChartComponent'
+import DrillPath from '@/views/chart/view/DrillPath'
 import bus from '@/utils/bus'
 import DatasetChartDetail from '../../dataset/common/DatasetChartDetail'
 // shape attr,component style
@@ -663,7 +667,8 @@ export default {
     DimensionItem,
     draggable,
     ChartDragItem,
-    DrillItem
+    DrillItem,
+    DrillPath
   },
   props: {
     param: {
@@ -738,7 +743,9 @@ export default {
       filterItem: {},
       places: [],
       attrActiveNames: [],
-      styleActiveNames: []
+      styleActiveNames: [],
+      drillClickDimensionList: [],
+      drillFilters: []
     }
   },
   computed: {
@@ -750,6 +757,7 @@ export default {
   },
   watch: {
     'param': function() {
+      this.resetDrill()
       if (this.param.optType === 'new') {
         //
       } else {
@@ -877,6 +885,13 @@ export default {
       if (view.type === 'treemap' && trigger === 'chart') {
         view.customAttr.label.show = true
       }
+      if (view.type === 'treemap' ||
+        view.type.includes('table') ||
+        view.type.includes('text') ||
+        view.type.includes('gauge') ||
+        view.type.includes('radar')) {
+        view.drillFields = []
+      }
       view.customFilter.forEach(function(ele) {
         if (ele && !ele.filter) {
           ele.filter = []
@@ -894,6 +909,7 @@ export default {
         // this.get(response.data.id);
         // this.getData(response.data.id)
 
+        this.resetDrill()
         if (getData) {
           this.getData(response.data.id)
         } else {
@@ -983,7 +999,8 @@ export default {
     getData(id) {
       if (id) {
         ajaxGetData(id, {
-          filter: []
+          filter: [],
+          drill: this.drillClickDimensionList
         }).then(response => {
           this.initTableData(response.data.tableId)
           this.view = JSON.parse(JSON.stringify(response.data))
@@ -1003,8 +1020,13 @@ export default {
           if (this.chart.privileges) {
             this.param.privileges = this.chart.privileges
           }
+          if (!response.data.drill) {
+            this.drillClickDimensionList.splice(this.drillClickDimensionList.length - 1, 1)
+          }
+          this.drillFilters = JSON.parse(JSON.stringify(response.data.drillFilters))
         }).catch(err => {
           this.resetView()
+          this.resetDrill()
           this.httpRequest.status = err.response.data.success
           this.httpRequest.msg = err.response.data.message
           this.$nextTick(() => {
@@ -1487,6 +1509,21 @@ export default {
     bubbleItemRemove(item) {
       this.view.extBubble.splice(item.index, 1)
       this.save(true)
+    },
+
+    chartClick(param) {
+      if (this.drillClickDimensionList.length < this.view.drillFields.length - 1) {
+        this.drillClickDimensionList.push({ dimensionList: param.data.dimensionList })
+        this.getData(this.param.id)
+      }
+    },
+
+    resetDrill() {
+      this.drillClickDimensionList = []
+    },
+    drillJump(index) {
+      this.drillClickDimensionList = this.drillClickDimensionList.slice(0, index)
+      this.getData(this.param.id)
     }
   }
 }
diff --git a/frontend/src/views/chart/view/DrillPath.vue b/frontend/src/views/chart/view/DrillPath.vue
new file mode 100644
index 0000000000..b3370eae0d
--- /dev/null
+++ b/frontend/src/views/chart/view/DrillPath.vue
@@ -0,0 +1,47 @@
+<template>
+  <div v-if="drillFilters && drillFilters.length > 0">
+    <el-breadcrumb separator-class="el-icon-arrow-right" class="drill-style">
+      <el-breadcrumb-item class="drill-item" @click.native="drillJump(0)">{{ $t('commons.all') }}</el-breadcrumb-item>
+      <el-breadcrumb-item v-for="(filter,index) in drillFilters" :key="index" class="drill-item" @click.native="drillJump(index + 1)">{{ filter.value[0] }}</el-breadcrumb-item>
+    </el-breadcrumb>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'DrillPath',
+  props: {
+    drillFilters: {
+      type: Array,
+      required: true
+    }
+  },
+  data() {
+    return {
+    }
+  },
+  watch: {
+  },
+  mounted() {
+  },
+  methods: {
+    drillJump(index) {
+      if (index < this.drillFilters.length) {
+        this.$emit('onDrillJump', index)
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+.drill-style {
+  font-size: 12px;
+}
+.drill-style >>> .el-breadcrumb__separator{
+  margin: 0!important;
+}
+.drill-item{
+  cursor: pointer;
+}
+</style>
diff --git a/frontend/src/views/nolic/index.vue b/frontend/src/views/nolic/index.vue
new file mode 100644
index 0000000000..0ce8caa15f
--- /dev/null
+++ b/frontend/src/views/nolic/index.vue
@@ -0,0 +1,9 @@
+<template>
+  <div>缺少许可</div>
+</template>
+
+<script>
+export default {
+
+}
+</script>
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 070886ad4d..5149e7ab18 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -192,6 +192,7 @@ import { mapState } from 'vuex'
 import { uuid } from 'vue-uuid'
 import Toolbar from '@/components/canvas/components/Toolbar'
 import { findOne } from '@/api/panel/panel'
+import { getPanelAllLinkageInfo } from '@/api/panel/linkage'
 import PreviewFullScreen from '@/components/canvas/components/Editor/PreviewFullScreen'
 import Preview from '@/components/canvas/components/Editor/Preview'
 import AttrList from '@/components/canvas/components/AttrList'
@@ -363,6 +364,7 @@ export default {
         const componentDatas = JSON.parse(componentDataTemp)
         componentDatas.forEach(item => {
           item.filters = (item.filters || [])
+          item.linkageFilters = (item.linkageFilters || [])
         })
         this.$store.commit('setComponentData', this.resetID(componentDatas))
         // this.$store.commit('setComponentData', this.resetID(JSON.parse(componentDataTemp)))
@@ -375,12 +377,17 @@ export default {
           const componentDatas = JSON.parse(response.data.panelData)
           componentDatas.forEach(item => {
             item.filters = (item.filters || [])
+            item.linkageFilters = (item.linkageFilters || [])
           })
           this.$store.commit('setComponentData', this.resetID(componentDatas))
           //   this.$store.commit('setComponentData', this.resetID(JSON.parse(response.data.panelData)))
           const panelStyle = JSON.parse(response.data.panelStyle)
           this.$store.commit('setCanvasStyle', panelStyle)
           this.$store.commit('recordSnapshot')// 记录快照
+          // 刷新联动信息
+          getPanelAllLinkageInfo(panelId).then(rsp => {
+            this.$store.commit('setNowPanelTrackInfo', rsp.data)
+          })
         })
       }
     },
@@ -463,6 +470,7 @@ export default {
             }
             component.propValue = propValue
             component.filters = []
+            component.linkageFilters = []
           }
         })
       } else {
@@ -660,6 +668,7 @@ export default {
           }
           component.propValue = propValue
           component.filters = []
+          component.linkageFilters = []
         }
       })
 
diff --git a/frontend/src/views/panel/list/EditPanel/index.vue b/frontend/src/views/panel/list/EditPanel/index.vue
index 0aca7f717e..368b7c2e3c 100644
--- a/frontend/src/views/panel/list/EditPanel/index.vue
+++ b/frontend/src/views/panel/list/EditPanel/index.vue
@@ -134,7 +134,6 @@ export default {
         return false
       }
 
-      debugger
       if (this.editPanel.panelInfo.name.length > 50) {
         this.$warning(this.$t('commons.char_can_not_more_50'))
         return false
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index d7b5c99bda..6f69d67cde 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -177,6 +177,8 @@ import { uuid } from 'vue-uuid'
 import bus from '@/utils/bus'
 import EditPanel from './EditPanel'
 import { addGroup, delGroup, groupTree, defaultTree, findOne } from '@/api/panel/panel'
+import { getPanelAllLinkageInfo } from '@/api/panel/linkage'
+import { mapState } from 'vuex'
 import {
   DEFAULT_COMMON_CANVAS_STYLE_STRING
 } from '@/views/panel/panel'
@@ -274,7 +276,10 @@ export default {
   computed: {
     panelDialogTitle() {
       return this.editPanel.titlePre + this.editPanel.titleSuf
-    }
+    },
+    ...mapState([
+      'nowPanelTrackInfo'
+    ])
   },
   watch: {
     // 切换展示页面后 重新点击一下当前节点
@@ -517,12 +522,18 @@ export default {
           const componentDatas = JSON.parse(response.data.panelData)
           componentDatas.forEach(item => {
             item.filters = (item.filters || [])
+            item.linkageFilters = (item.linkageFilters || [])
           })
           this.$store.commit('setComponentData', this.resetID(componentDatas))
           //   this.$store.commit('setComponentData', sourceInfo.type === 'custom' ? sourceInfo : this.resetID(sourceInfo))
           const temp = JSON.parse(response.data.panelStyle)
           this.$store.commit('setCanvasStyle', temp)
           this.$store.dispatch('panel/setPanelInfo', data)
+
+          // 刷新联动信息
+          getPanelAllLinkageInfo(data.id).then(rsp => {
+            this.$store.commit('setNowPanelTrackInfo', rsp.data)
+          })
         })
       }
       if (node.expanded) {
diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue
index 6b4e026daa..ae60457ecb 100644
--- a/frontend/src/views/system/datasource/DsTree.vue
+++ b/frontend/src/views/system/datasource/DsTree.vue
@@ -156,6 +156,8 @@ export default {
         return 'SQL Server'
       } else if (type === 'oracle') {
         return 'Oracle'
+      }else if (type === 'pg') {
+        return 'PostgreSQL'
       }
     },
 
diff --git a/frontend/src/views/system/datasource/form.vue b/frontend/src/views/system/datasource/form.vue
index e2ee45c109..1916bbe5a5 100644
--- a/frontend/src/views/system/datasource/form.vue
+++ b/frontend/src/views/system/datasource/form.vue
@@ -46,30 +46,13 @@
         <el-form-item v-if="form.configuration.dataSourceType=='jdbc'" :label="$t('datasource.port')" prop="configuration.port">
           <el-input v-model="form.configuration.port" autocomplete="off" />
         </el-form-item>
-        <el-form-item v-if="form.type=='oracle'">
+        <el-form-item v-if="form.type=='oracle' || form.type=='sqlServer' || form.type=='pg'">
           <el-button icon="el-icon-plus" size="mini" @click="getSchema()">
             {{ $t('datasource.get_schema') }}
           </el-button>
         </el-form-item>
 
-        <el-form-item v-if="form.type=='oracle'" :label="$t('datasource.schema')">
-          <el-select filterable v-model="form.configuration.schema" :placeholder="$t('datasource.please_choose_schema')" class="select-width">
-            <el-option
-              v-for="item in schemas"
-              :key="item"
-              :label="item"
-              :value="item"
-            />
-          </el-select>
-        </el-form-item>
-
-
-        <el-form-item v-if="form.type=='sqlServer'">
-          <el-button icon="el-icon-plus" size="mini" @click="getSchema()">
-            {{ $t('datasource.get_schema') }}
-          </el-button>
-        </el-form-item>
-        <el-form-item v-if="form.type=='sqlServer'" :label="$t('datasource.schema')">
+        <el-form-item v-if="form.type=='oracle' || form.type=='sqlServer' || form.type=='pg'" :label="$t('datasource.schema')">
           <el-select filterable v-model="form.configuration.schema" :placeholder="$t('datasource.please_choose_schema')" class="select-width">
             <el-option
               v-for="item in schemas"
@@ -124,7 +107,8 @@ export default {
       },
       allTypes: [{ name: 'mysql', label: 'MySQL', type: 'jdbc' },
                 { name: 'oracle', label: 'Oracle', type: 'jdbc' },
-                { name: 'sqlServer', label: 'SQLSERVER', type: 'jdbc' }],
+                { name: 'sqlServer', label: 'SQL Server', type: 'jdbc' },
+                { name: 'pg', label: 'PostgreSQL', type: 'jdbc' }],
       schemas: [],
       canEdit: false,
       originConfiguration: {}
diff --git a/frontend/src/views/system/dept/form.vue b/frontend/src/views/system/dept/form.vue
deleted file mode 100644
index 8b090ed13b..0000000000
--- a/frontend/src/views/system/dept/form.vue
+++ /dev/null
@@ -1,161 +0,0 @@
-<template>
-  <layout-content :header="formType=='add' ? $t('organization.create') : $t('organization.modify')" back-name="system-dept" style="height: 100%;">
-    <el-form ref="deptForm" :model="form" :rules="rule" size="small" label-width="auto" label-position="right">
-      <el-form-item :label="$t('organization.name')" prop="name">
-        <el-input v-model="form.name" />
-      </el-form-item>
-      <el-form-item :label="$t('organization.sort')" prop="deptSort">
-        <el-input-number
-
-          v-model.number="form.deptSort"
-          :min="0"
-          :max="999"
-          controls-position="right"
-        />
-      </el-form-item>
-
-      <el-form-item :label="$t('organization.top_org')" prop="top">
-        <el-radio-group v-model="form.top" @change="topChange">
-          <el-radio :label="true">{{ $t('commons.yes') }}</el-radio>
-          <el-radio :label="false">{{ $t('commons.no') }}</el-radio>
-        </el-radio-group>
-      </el-form-item>
-
-      <el-form-item v-if="!form.top" :label="$t('organization.parent_org')" prop="pid">
-        <treeselect
-          v-model="form.pid"
-          :auto-load-root-options="false"
-          :load-options="loadDepts"
-          :options="depts"
-          :placeholder="$t('organization.select_parent_org')"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="save">{{ $t('commons.save') }}</el-button>
-        <el-button @click="reset">{{ $t('commons.reset') }}</el-button>
-      </el-form-item>
-    </el-form>
-
-  </layout-content>
-</template>
-
-<script>
-import LayoutContent from '@/components/business/LayoutContent'
-import { getDeptTree, treeByDeptId, addDept, editDept } from '@/api/system/dept'
-export default {
-
-  components: { LayoutContent },
-  data() {
-    return {
-      defaultForm: { deptId: null, top: true, pid: null },
-      maps: new Map(),
-      form: {},
-      rule: {
-        name: [
-          { required: true, message: this.$t('organization.input_name'), trigger: 'blur' },
-          { min: 2, max: 25, message: this.$t('commons.input_limit', [2, 25]), trigger: 'blur' }
-        ],
-        description: [
-          { max: 50, message: this.$t('commons.input_limit', [0, 50]), trigger: 'blur' }
-        ]
-      },
-      depts: null,
-
-      formType: 'add'
-    }
-  },
-
-  created() {
-    if (this.$router.currentRoute.params && this.$router.currentRoute.params.deptId) {
-      const row = this.$router.currentRoute.params
-      this.edit(row)
-    } else {
-      this.create()
-    }
-  },
-  methods: {
-    create() {
-      this.formType = 'add'
-      this.form = Object.assign({}, this.defaultForm)
-    },
-    edit(row) {
-      this.formType = 'modify'
-      this.form = Object.assign({}, row)
-      this.initDeptTree()
-    },
-
-    initDeptTree() {
-      treeByDeptId(this.form.pid || 0).then(res => {
-        const results = res.data.map(node => {
-          if (node.hasChildren && !node.children) {
-            node.children = null
-          }
-          return node
-        })
-        this.depts = results
-      })
-    },
-    // 获取弹窗内部门数据
-    loadDepts({ action, parentNode, callback }) {
-      if (action === 'LOAD_ROOT_OPTIONS' && !this.form.pid) {
-        const _self = this
-        treeByDeptId(0).then(res => {
-          const results = res.data.map(node => {
-            if (node.hasChildren && !node.children) {
-              node.children = null
-            }
-            return node
-          })
-          _self.depts = results
-          callback()
-        })
-      }
-
-      if (action === 'LOAD_CHILDREN_OPTIONS') {
-        const _self = this
-        getDeptTree(parentNode.id).then(res => {
-          parentNode.children = res.data.map(function(obj) {
-            return _self.normalizer(obj)
-          })
-          callback()
-        })
-      }
-    },
-    normalizer(node) {
-      if (node.hasChildren) {
-        node.children = null
-      }
-      return {
-        id: node.deptId,
-        label: node.name,
-        children: node.children
-      }
-    },
-    topChange(value) {
-      if (!value) {
-        this.form.pid = null
-        this.depts = null
-      }
-    },
-    reset() {
-      this.$refs.deptForm.resetFields()
-    },
-    save() {
-      this.$refs.deptForm.validate(valid => {
-        if (valid) {
-          const method = this.formType === 'add' ? addDept : editDept
-          method(this.form).then(res => {
-            this.$success(this.$t('commons.save_success'))
-            this.backToList()
-          })
-        } else {
-          return false
-        }
-      })
-    },
-    backToList() {
-      this.$router.push({ name: 'system-dept' })
-    }
-  }
-}
-</script>
diff --git a/frontend/src/views/system/dept/index.vue b/frontend/src/views/system/dept/index.vue
deleted file mode 100644
index d4ea1402af..0000000000
--- a/frontend/src/views/system/dept/index.vue
+++ /dev/null
@@ -1,521 +0,0 @@
-<template>
-  <layout-content v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
-    <tree-table
-      :columns="columns"
-      :search-config="searchConfig"
-      @search="search"
-    >
-      <template #toolbar>
-        <el-button v-permission="['dept:add']" icon="el-icon-circle-plus-outline" @click="create">{{ $t('organization.create') }}</el-button>
-      </template>
-      <el-table
-        ref="table"
-        :data="tableData"
-        lazy
-        :load="loadExpandDatas"
-        style="width: 100%"
-        :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-        row-key="deptId"
-      >
-        <el-table-column :label="$t('organization.name')" prop="name" />
-        <el-table-column :label="$t('organization.sub_organizations')" prop="subCount" />
-        <el-table-column prop="createTime" :label="$t('organization.create_time')">
-          <template v-slot:default="scope">
-            <span>{{ scope.row.createTime | timestampFormatDate }}</span>
-          </template>
-        </el-table-column>
-
-        <fu-table-operations :buttons="buttons" :label="$t('commons.operating')" fix />
-      </el-table>
-    </tree-table>
-    <!-- </complex-table> -->
-
-    <!-- add organization form -->
-    <el-dialog
-      :close-on-click-modal="false"
-      :title="formType=='add' ? $t('organization.create') : $t('organization.modify')"
-      :visible.sync="dialogOrgAddVisible"
-      width="500px"
-      :destroy-on-close="true"
-      @closed="closeFunc"
-    >
-      <el-form ref="createOrganization" inline :model="form" :rules="rule" size="small" label-width="80px">
-
-        <el-form-item :label="$t('organization.name')" prop="name">
-          <el-input v-model="form.name" style="width: 370px;" />
-        </el-form-item>
-        <el-form-item :label="$t('organization.sort')" prop="deptSort">
-          <el-input-number
-            v-model.number="form.deptSort"
-            :min="0"
-            :max="999"
-            controls-position="right"
-            style="width: 370px;"
-          />
-        </el-form-item>
-
-        <el-form-item :label="$t('organization.top_org')" prop="top">
-          <el-radio-group v-model="form.top" style="width: 140px" @change="topChange">
-            <el-radio :label="true">{{ $t('commons.yes') }}</el-radio>
-            <el-radio :label="false">{{ $t('commons.no') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-
-        <el-form-item label="$t('commons.status')" prop="enabled">
-          <el-radio-group v-model="form.enabled" style="width: 140px" disabled>
-            <el-radio :label="true">{{ $t('commons.enable') }}</el-radio>
-            <el-radio :label="false">{{ $t('commons.disable') }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item v-if="!form.top" style="margin-bottom: 0;" :label="$t('organization.parent_org')" prop="pid">
-          <treeselect
-            v-model="form.pid"
-            :auto-load-root-options="false"
-            :load-options="loadDepts"
-            :options="depts"
-            style="width: 370px;"
-            :placeholder="$t('organization.select_parent_org')"
-          />
-        </el-form-item>
-      </el-form>
-
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="dialogOrgAddVisible = false">{{ $t('commons.cancel') }}</el-button>
-        <el-button type="primary" @click="createDept('createOrganization')">{{ $t('commons.confirm') }}</el-button>
-      </div>
-
-    </el-dialog>
-
-  </layout-content>
-</template>
-
-<script>
-import LayoutContent from '@/components/business/LayoutContent'
-import TreeTable from '@/components/business/tree-table'
-import { formatCondition, formatQuickCondition } from '@/utils/index'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import { checkPermission } from '@/utils/permission'
-import { getDeptTree, addDept, editDept, delDept, loadTable } from '@/api/system/dept'
-
-export default {
-  name: 'MsOrganization',
-  components: {
-    LayoutContent,
-    TreeTable
-  },
-  data() {
-    return {
-      rootNodeLoaded: false,
-      depts: null,
-      formType: 'add',
-      queryPath: '/api/dept/childNodes',
-      deletePath: '/api/dept/delete',
-      createPath: '/api/dept/create',
-      updatePath: '/api/dept/update',
-      changeStatusPath: '/api/dept/updateStatus',
-      result: {},
-      dialogOrgAddVisible: false,
-      tableData: [],
-      maps: new Map(),
-      oldPid: null,
-      form: {},
-      rule: {
-        name: [
-          { required: true, message: this.$t('organization.input_name'), trigger: 'blur' },
-          { min: 2, max: 25, message: this.$t('commons.input_limit', [2, 25]), trigger: 'blur' }
-        ],
-        description: [
-          { max: 50, message: this.$t('commons.input_limit', [0, 50]), trigger: 'blur' }
-        ]
-      },
-      permission: {
-        add: ['dept:add'],
-        edit: ['dept:edit'],
-        del: ['dept:del']
-      },
-      header: '',
-      columns: [],
-      buttons: [
-        {
-          label: this.$t('commons.edit'), icon: 'el-icon-edit', type: 'primary', click: this.edit,
-          show: checkPermission(['dept:edit'])
-        }, {
-          label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this._handleDelete,
-          show: checkPermission(['dept:del'])
-        }
-      ],
-      searchConfig: {
-        useQuickSearch: true,
-        quickPlaceholder: this.$t('role.search_by_name'),
-        components: [
-          { field: 'name', label: this.$t('organization.name'), component: 'FuComplexInput' }
-        ]
-      },
-
-      defaultCondition: {
-        field: 'pid',
-        operator: 'eq',
-        value: 0
-      },
-      defaultForm: { deptId: null, top: true, enabled: true, pid: null },
-      isTableExpand: false,
-      isLazy: true
-    }
-  },
-  mounted() {
-    this.form = Object.assign({}, this.defaultForm)
-    this.search()
-  },
-  methods: {
-    // create() {
-    //   this.form = Object.assign({}, this.defaultForm)
-    //   this.dialogOrgAddVisible = true
-    //   this.formType = 'add'
-    // },
-    // edit(row) {
-    //   this.dialogOrgAddVisible = true
-    //   this.formType = 'modify'
-    //   this.oldPid = row.pid
-    //   this.form = Object.assign({}, row)
-    //   this.treeByRow(row)
-    // },
-    create() {
-      this.$router.push({ name: 'system-dept-form' })
-    },
-    edit(row) {
-      this.$router.push({ name: 'system-dept-form', params: row })
-    },
-
-    treeByRow(row) {
-      !this.depts && (this.depts = [])
-      if (!this.depts.some(node => node.id === row.pid) && row.pid !== 0) {
-        const arr = this.mapToArray()
-        const ids = arr.map(item => item.id)
-        const tempTreeNodes = this.treeByArr(arr)
-        const pnodes = this.tableData.filter(node => (node.pid === 0) && (ids.indexOf(node.deptId) === -1)).map(node => this.normalizer(node))
-        const showNodes = tempTreeNodes.concat(pnodes)
-        this.depts = this.depts.concat(showNodes)
-      }
-    },
-
-    mapToArray() {
-      const result = []
-
-      this.maps.forEach((value, key) => {
-        if (value.hasOwnProperty('row')) {
-          result.push(this.editNormalizer(value.row))
-        }
-      })
-      return result
-    },
-    treeByArr(arr) {
-      if (!Array.isArray(arr) || !arr.length) return
-      const map = {}
-      arr.forEach(item => {
-        map[item.id] = item
-      })
-
-      const roots = []
-      arr.forEach(item => {
-        const parent = map[item.pid]
-        if (parent) {
-          (parent.children || (parent.children = [])).push(item)
-        } else {
-          roots.push(item)
-        }
-      })
-      return roots
-    },
-
-    quick_condition(condition) {
-      const result = {}
-      if (condition && condition.quick) {
-        for (const [key, value] of Object.entries(condition)) {
-          // console.log(`${key}`)
-          if (`${key}` === 'quick') {
-            const v_new = Object.assign({}, value)
-            v_new['field'] = 'name'
-            result['name'] = v_new
-          } else {
-            result[`${key}`] = value
-          }
-        }
-        return result
-      }
-      return Object.assign({}, condition)
-    },
-
-    setTableAttr(isSearch) {
-      if (isSearch) {
-        this.lazy = false
-        this.isTableExpand = true
-      } else {
-        this.lazy = true
-        this.isTableExpand = false
-      }
-    },
-    // 加载表格数据
-    search(condition) {
-      condition = formatQuickCondition(condition, 'name')
-      let conditionExist = false
-      const temp = formatCondition(condition)
-      this.tableData = []
-      let param = {}
-      if (temp && temp.conditions && temp.conditions.length !== 0) {
-        conditionExist = true
-        param = temp
-      } else {
-        param = { conditions: [this.defaultCondition] }
-      }
-
-      loadTable(param).then(res => {
-        let data = res.data
-        data = data.map(obj => {
-          if (obj.subCount > 0) {
-            obj.hasChildren = true
-          }
-          return obj
-        })
-
-        if (conditionExist) {
-          data = this.buildTree(data)
-        }
-        this.tableData = data
-        this.$nextTick(() => {
-          this.tableData.forEach(node => {
-            this.$refs.table.toggleRowExpansion(node, conditionExist)
-          })
-        })
-        this.depts = null
-      })
-    },
-
-    buildTree(arrs) {
-      const idMapping = arrs.reduce((acc, el, i) => {
-        acc[el.deptId] = i
-        return acc
-      }, {})
-      const roots = []
-      arrs.forEach(el => {
-        // 判断根节点
-        if (el.pid === null || el.pid === 0) {
-          roots.push(el)
-          return
-        }
-        // 用映射表找到父元素
-        const parentEl = arrs[idMapping[el.pid]]
-        // 把当前元素添加到父元素的`children`数组中
-        parentEl.children = [...(parentEl.children || []), el]
-      })
-      return roots
-    },
-
-    // 加载下一级子节点数据
-    loadExpandDatas(row, treeNode, resolve) {
-      getDeptTree(row.deptId).then(res => {
-        let data = res.data
-        data = data.map(obj => {
-          if (obj.subCount > 0) {
-            obj.hasChildren = true
-          }
-          return obj
-        })
-        this.maps.set(row.deptId, { row, treeNode, resolve })
-        resolve && resolve(data)
-      })
-    },
-
-    // initTableData(row, treeNode, resolve) {
-    //   const _self = this
-    //   const pid = (row && row.deptId) ? row.deptId : '0'
-    //   getDeptTree(pid).then(response => {
-    //     let data = response.data
-    //     data = data.map(obj => {
-    //       if (obj.subCount > 0) {
-    //         obj.hasChildren = true
-    //       }
-    //       return obj
-    //     })
-    //     if (!row) {
-    //       data.some(node => {
-    //         node.children = null
-    //       })
-    //       _self.tableData = data
-    //       _self.depts = null
-    //     } else {
-    //       this.maps.set(row.deptId, { row, treeNode, resolve })
-    //       resolve && resolve(data)
-    //     }
-    //   })
-    // },
-    closeFunc() {
-      this.search()
-      this.form = {}
-      this.oldPid = null
-      this.depts = null
-      this.dialogOrgAddVisible = false
-    },
-
-    // 获取弹窗内部门数据
-    loadDepts({ action, parentNode, callback }) {
-      if (action === 'LOAD_ROOT_OPTIONS') {
-        const _self = this
-        !this.depts && getDeptTree('0').then(res => {
-          _self.depts = res.data.map(node => _self.normalizer(node))
-          callback()
-        })
-      }
-
-      if (action === 'LOAD_CHILDREN_OPTIONS') {
-        const _self = this
-        getDeptTree(parentNode.id).then(res => {
-          parentNode.children = res.data.map(function(obj) {
-            return _self.normalizer(obj)
-          })
-          callback()
-        })
-      }
-    },
-    normalizer(node) {
-      if (node.hasChildren) {
-        node.children = null
-      }
-      return {
-        id: node.deptId,
-        label: node.name,
-        children: node.children
-      }
-    },
-    editNormalizer(node) {
-      return {
-        id: node.deptId,
-        pid: node.pid,
-        label: node.name,
-        children: node.children || null
-      }
-    },
-    // 改变状态
-    changeEnabled(data, val) {
-      this.$confirm('此操作将 "停用" ' + data.name + '组织, 是否继续？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        const param = { deptId: data.deptId, status: data.enabled }
-        this.$post(this.changeStatusPath, param, () => {
-          this.$success(this.$t('commons.modify_success'))
-        })
-      }).catch(() => {
-        data.enabled = !data.enabled
-      })
-    },
-    // checkboxT(row, rowIndex) {
-    //   return row.depId !== 1
-    // },
-    createDept(createOrganizationForm) {
-      this.$refs[createOrganizationForm].validate(valid => {
-        if (valid) {
-          if (this.formType !== 'modify') {
-            addDept(this.form).then(res => {
-              this.$success(this.$t('commons.save_success'))
-              this.search()
-              this.oldPid && this.reloadByPid(this.oldPid)
-              this.reloadByPid(this.form['pid'])
-              this.dialogOrgAddVisible = false
-            })
-          } else {
-            editDept(this.form).then(res => {
-              this.$success(this.$t('commons.save_success'))
-              this.search()
-              this.oldPid && this.reloadByPid(this.oldPid)
-              this.reloadByPid(this.form['pid'])
-              this.dialogOrgAddVisible = false
-            })
-          }
-        } else {
-          return false
-        }
-      })
-    },
-
-    _handleDelete(organization) {
-      this.$confirm(this.$t('organization.delete_confirm'), '', {
-        confirmButtonText: this.$t('commons.confirm'),
-        cancelButtonText: this.$t('commons.cancel'),
-        type: 'warning'
-      }).then(() => {
-        const requests = [{ deptId: organization.deptId, pid: organization.pid }]
-        delDept(requests).then(res => {
-          this.$success(this.$t('commons.delete_success'))
-          this.search()
-          this.reloadByPid(organization.pid)
-        })
-      }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: this.$t('commons.delete_cancelled')
-        })
-      })
-    },
-    reloadByPid(pid) {
-      if (pid !== 0 && this.maps.get(pid)) {
-        const { row, treeNode, resolve } = this.maps.get(pid)
-        this.$set(this.$refs.table.store.states.lazyTreeNodeMap, pid, [])
-        this.loadExpandDatas(row, treeNode, resolve)
-      }
-    },
-    array2Tree(arr) {
-      if (!Array.isArray(arr) || !arr.length) return
-      const map = {}
-      arr.forEach(item => {
-        map[item.id] = item
-      })
-
-      const roots = []
-      arr.forEach(item => {
-        const parent = map[item.pid]
-        if (parent) {
-          (parent.children || (parent.children = [])).push(item)
-        } else {
-          roots.push(item)
-        }
-      })
-      return roots
-    },
-    topChange(value) {
-    //   console.log(value)
-      !value && (this.depts = null)
-    }
-
-  }
-
-}
-</script>
-
-<style scoped>
-.member-size {
-  text-decoration: underline;
-}
-
-.org-member-id {
-  float: left;
-}
-
-.org-member-email {
-  float: right;
-  color: #8492a6;
-  font-size: 13px;
-}
-
-.select-width {
-  width: 100%;
-}
-
-.dialog-css >>> .el-dialog__header {
-  padding: 0;
-}
- ::v-deep .el-input-number .el-input__inner {
-    text-align: left;
-  }
-
-</style>
diff --git a/frontend/src/views/system/map/index.vue b/frontend/src/views/system/map/index.vue
index b57ec0cf05..4f0377cdd6 100644
--- a/frontend/src/views/system/map/index.vue
+++ b/frontend/src/views/system/map/index.vue
@@ -37,7 +37,7 @@ export default {
           series: [
             {
               type: 'map',
-              map: 'HK', // 自定义扩展图表类型
+              map: 'MAP', // 自定义扩展图表类型
               roam: true,
               label: {
                 show: false
diff --git a/frontend/src/views/system/role/form.vue b/frontend/src/views/system/role/form.vue
deleted file mode 100644
index 7a9930f673..0000000000
--- a/frontend/src/views/system/role/form.vue
+++ /dev/null
@@ -1,104 +0,0 @@
-<template>
-  <layout-content :header="formType=='add' ? $t('role.add') : $t('role.modify')" back-name="system-role">
-    <el-form ref="roleForm" :model="form" :rules="rule" size="small" label-width="auto" label-position="right">
-      <el-form-item :label="$t('commons.name')" prop="name">
-        <el-input v-model="form.name" />
-      </el-form-item>
-      <el-form-item :label="$t('commons.description')" prop="description">
-        <el-input v-model="form.description" type="textarea" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="save">{{ $t('commons.save') }}</el-button>
-        <el-button @click="reset">{{ $t('commons.reset') }}</el-button>
-      </el-form-item>
-    </el-form>
-
-  </layout-content>
-</template>
-
-<script>
-import LayoutContent from '@/components/business/LayoutContent'
-import { addRole, editRole, allRoles } from '@/api/system/role'
-export default {
-
-  components: { LayoutContent },
-  data() {
-    return {
-      formType: 'add',
-      form: {},
-      rule: {
-        name: [
-          { required: true, trigger: 'blur', validator: this.roleValidator }
-        ],
-        description: [{ max: 50, message: this.$t('commons.char_can_not_more_50'), trigger: 'blur' }]
-      },
-      roles: [],
-      originName: null
-    }
-  },
-
-  created() {
-    if (this.$router.currentRoute.params && this.$router.currentRoute.params.roleId) {
-      const row = this.$router.currentRoute.params
-      this.edit(row)
-    } else {
-      this.create()
-    }
-    this.queryAllRoles()
-  },
-  methods: {
-    create() {
-      this.formType = 'add'
-    },
-    edit(row) {
-      this.formType = 'modify'
-      this.form = Object.assign({}, row)
-      this.originName = row.name
-    },
-
-    reset() {
-      this.$refs.roleForm.resetFields()
-    },
-    save() {
-      this.$refs.roleForm.validate(valid => {
-        if (valid) {
-          const method = this.formType === 'add' ? addRole : editRole
-          method(this.form).then(res => {
-            this.$success(this.$t('commons.save_success'))
-            this.backToList()
-          })
-        } else {
-          return false
-        }
-      })
-    },
-    queryAllRoles() {
-      allRoles().then(res => {
-        this.roles = res.data
-      })
-    },
-    nameRepeat(value) {
-      if (!this.roles || this.roles.length === 0) {
-        return false
-      }
-      // 编辑场景 不能 因为名称重复而报错
-      if (this.formType === 'modify' && this.originName === value) {
-        return false
-      }
-      return this.roles.some(role => role.name === value)
-    },
-    roleValidator(rule, value, callback) {
-      if (!value || value.length === 0) {
-        callback(new Error('请输入名称'))
-      } else if (this.nameRepeat(value)) {
-        callback(new Error('角色名称已存在'))
-      } else {
-        callback()
-      }
-    },
-    backToList() {
-      this.$router.push({ name: 'system-role' })
-    }
-  }
-}
-</script>
diff --git a/frontend/src/views/system/role/index.vue b/frontend/src/views/system/role/index.vue
deleted file mode 100644
index 27a2399d88..0000000000
--- a/frontend/src/views/system/role/index.vue
+++ /dev/null
@@ -1,276 +0,0 @@
-<template>
-  <layout-content v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
-    <!-- <div v-loading="result.loading" style="height: 100%"> -->
-    <el-container style="width: 100%; height: 100%;">
-      <el-aside width="70%">
-        <complex-table
-          highlight-current-row
-          :data="tableData"
-          :columns="columns"
-
-          :search-config="searchConfig"
-          :pagination-config="paginationConfig"
-          @search="search"
-          @row-click="rowClick"
-        >
-          <template #toolbar>
-            <el-button v-permission="['role:add']" icon="el-icon-circle-plus-outline" @click="create">{{ $t('role.add') }}</el-button>
-          </template>
-
-          <el-table-column prop="name" :label="$t('commons.name')" />
-          <el-table-column :show-overflow-tooltip="true" prop="description" :label="$t('commons.description')" />
-          <el-table-column :show-overflow-tooltip="true" prop="createTime" :label="$t('commons.create_time')">
-            <template v-slot:default="scope">
-              <span>{{ scope.row.createTime | timestampFormatDate }}</span>
-            </template>
-          </el-table-column>
-          <fu-table-operations :buttons="buttons" :label="$t('commons.operating')" fix />
-        </complex-table>
-      </el-aside>
-      <el-main style="padding: 8px 20px;">
-        <el-tabs v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane :label="$t('role.menu_authorization')" name="first">
-            <el-tree
-              ref="menu"
-              lazy
-              :data="menus"
-              :default-checked-keys="menuIds"
-              :load="getMenuDatas"
-              :props="defaultProps"
-              check-strictly
-              show-checkbox
-              node-key="id"
-              @check="menuChange"
-            />
-          </el-tab-pane>
-          <el-tab-pane :label="$t('role.data_authorization')" name="second">玩命开发中...</el-tab-pane>
-        </el-tabs>
-      </el-main>
-    </el-container>
-    <el-dialog
-      :close-on-click-modal="false"
-      :title="formType=='add' ? $t('role.add') : $t('role.modify')"
-      :visible.sync="dialogVisible"
-      width="580px"
-      :destroy-on-close="true"
-      @closed="closeFunc"
-    >
-      <el-form ref="roleForm" inline :model="form" :rules="rule" size="small" label-width="80px">
-
-        <el-form-item label="角色名称" prop="name">
-          <el-input v-model="form.name" style="width: 380px;" />
-        </el-form-item>
-
-        <!-- <el-form-item label="角色代码" prop="code">
-          <el-input v-model="form.code" style="width: 380px;" />
-        </el-form-item> -->
-
-        <el-form-item label="描述信息" prop="description">
-          <el-input v-model="form.description" style="width: 380px;" rows="5" type="textarea" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="dialogVisible = false">{{ $t('commons.cancel') }}</el-button>
-        <el-button type="primary" @click="saveRole('roleForm')">{{ $t('commons.confirm') }}</el-button>
-      </div>
-    </el-dialog>
-
-  </layout-content>
-
-</template>
-<script>
-
-import LayoutContent from '@/components/business/LayoutContent'
-import ComplexTable from '@/components/business/complex-table'
-import { formatCondition, formatQuickCondition } from '@/utils/index'
-import { addRole, editRole, delRole, roleGrid, addRoleMenus, menuIds } from '@/api/system/role'
-
-import { getMenusTree, getChild } from '@/api/system/menu'
-export default {
-  name: 'Role',
-  components: {
-    LayoutContent,
-    ComplexTable
-  },
-  data() {
-    return {
-
-      tableData: [],
-      menus: [],
-      menuIds: [],
-      defaultProps: { children: 'children', label: 'label', isLeaf: 'isLeaf' },
-      activeName: 'first',
-      dialogVisible: false,
-      formType: 'add',
-      form: {},
-      rule: {
-        name: [
-          { required: true, message: this.$t('role.pls_input_name'), trigger: 'blur' }
-        ],
-        code: [{ required: true, message: '请输入代码', trigger: 'blur' }]
-      },
-      currentRow: null,
-      permission: {
-        add: ['role:add'],
-        edit: ['role:edit'],
-        del: ['role:del']
-      },
-      header: '',
-      columns: [],
-      buttons: [
-        {
-          label: this.$t('commons.edit'), icon: 'el-icon-edit', type: 'primary', click: this.edit, disabled: this.btnDisabled
-        }, {
-          label: this.$t('commons.delete'), icon: 'el-icon-delete', type: 'danger', click: this.handleDelete, disabled: this.btnDisabled
-        }
-      ],
-      searchConfig: {
-        useQuickSearch: true,
-        quickPlaceholder: this.$t('role.search_by_name'),
-        components: [
-          { field: 'name', label: this.$t('role.role_name'), component: 'FuComplexInput' }
-        ]
-      },
-      paginationConfig: {
-        currentPage: 1,
-        pageSize: 10,
-        total: 0
-      }
-    }
-  },
-  watch: {
-    currentRow: 'currentRowChange'
-  },
-  mounted() {
-    this.search()
-  },
-  methods: {
-    handleClick(tab, event) {
-      // console.log(tab, event)
-    },
-    create() {
-      this.$router.push({ name: 'system-role-form' })
-    },
-    search(condition) {
-      condition = formatQuickCondition(condition, 'name')
-      const temp = formatCondition(condition)
-      const param = temp || {}
-      roleGrid(this.paginationConfig.currentPage, this.paginationConfig.pageSize, param).then(response => {
-        const data = response.data
-        this.paginationConfig.total = data.itemCount
-        this.tableData = data.listObject
-      })
-    },
-    edit(row) {
-      this.$router.push({ name: 'system-role-form', params: row })
-    },
-
-    saveRole(roleForm) {
-      this.$refs[roleForm].validate(valid => {
-        if (valid) {
-          const method = this.formType === 'add' ? addRole : editRole
-          method(this.form).then(res => {
-            this.$success(this.$t('commons.save_success'))
-            this.search()
-            this.dialogVisible = false
-          })
-        } else {
-          return false
-        }
-      })
-    },
-
-    closeFunc() {
-      this.dialogVisible = false
-    },
-
-    getMenuDatas(node, resolve) {
-      const pid = node.data.id ? node.data.id : '0'
-      getMenusTree(pid).then(res => {
-        const datas = res.data
-        const nodes = datas.map(data => this.formatNode(data))
-        resolve && resolve(nodes)
-      })
-    },
-    formatNode(node) {
-      const result = {
-        id: node.menuId,
-        label: node.title,
-        isLeaf: !node.hasChildren,
-        children: node.children
-      }
-      return result
-    },
-    menuChange(menu) {
-      getChild(menu.id).then(res => {
-        const childIds = res.data
-        if (this.menuIds.indexOf(menu.id) !== -1) {
-          for (let i = 0; i < childIds.length; i++) {
-            const index = this.menuIds.indexOf(childIds[i])
-            if (index !== -1) {
-              this.menuIds.splice(index, 1)
-            }
-          }
-        } else {
-          for (let i = 0; i < childIds.length; i++) {
-            const index = this.menuIds.indexOf(childIds[i])
-            if (index === -1) {
-              this.menuIds.push(childIds[i])
-            }
-          }
-        }
-        this.$refs.menu.setCheckedKeys(this.menuIds)
-        this.saveMenus()
-      })
-    },
-    saveMenus() {
-      if (!this.currentRow) {
-        return
-      }
-      const param = { roleId: this.currentRow.roleId, menuIds: this.menuIds }
-      addRoleMenus(param).then(res => {
-        this.search()
-      })
-    },
-    rowClick(row, column, event) {
-      menuIds(row.roleId).then(res => {
-        const menuIds = res.data
-        row.menuIds = menuIds
-        this.currentRow = row
-      })
-    },
-    currentRowChange(newVal, oldVal) {
-      if (newVal === oldVal) {
-        return
-      }
-      if (!newVal) {
-        this.menuIds = []
-        return
-      }
-
-      this.menuIds = newVal.menuIds
-      this.$refs.menu.setCheckedKeys(this.menuIds)
-    },
-    handleDelete(row) {
-      this.$confirm(this.$t('role.confirm_delete') + ': ' + row.name + '？', this.$t('role.tips'), {
-        confirmButtonText: this.$t('commons.confirm'),
-        cancelButtonText: this.$t('commons.cancel'),
-        type: 'warning'
-      }).then(() => {
-        delRole(row.roleId).then(res => {
-          this.$success(this.$t('commons.delete_success'))
-          this.search()
-        })
-      }).catch(() => {
-
-      })
-    },
-    btnDisabled(row) {
-      return !row.updateTime
-    }
-  }
-}
-</script>
-
-<style scoped>
-</style>
diff --git a/frontend/src/views/system/user/form.vue b/frontend/src/views/system/user/form.vue
index 25b1887457..72d71aec53 100644
--- a/frontend/src/views/system/user/form.vue
+++ b/frontend/src/views/system/user/form.vue
@@ -72,16 +72,11 @@
 
 <script>
 import LayoutContent from '@/components/business/LayoutContent'
-// import Treeselect from '@riophae/vue-treeselect'
-// import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import { PHONE_REGEX } from '@/utils/validate'
-// import { LOAD_CHILDREN_OPTIONS, LOAD_ROOT_OPTIONS } from '@riophae/vue-treeselect'
 import { getDeptTree, treeByDeptId } from '@/api/system/dept'
-import { allRoles } from '@/api/system/role'
-import { addUser, editUser } from '@/api/system/user'
+import { addUser, editUser, allRoles } from '@/api/system/user'
 export default {
 
-  //   components: { LayoutContent, Treeselect },
   components: { LayoutContent },
   data() {
     return {
diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index 26ebcdc018..d3c89b8d6d 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -169,8 +169,8 @@ import { LOAD_CHILDREN_OPTIONS, LOAD_ROOT_OPTIONS } from '@riophae/vue-treeselec
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 
-import { userLists, addUser, editUser, delUser, editPassword, editStatus } from '@/api/system/user'
-import { allRoles } from '@/api/system/role'
+import { userLists, addUser, editUser, delUser, editPassword, editStatus, allRoles } from '@/api/system/user'
+// import { allRoles } from '@/api/system/role'
 import { getDeptTree, treeByDeptId } from '@/api/system/dept'
 
 export default {
diff --git a/frontend/vue.config.js b/frontend/vue.config.js
index 1fbffca388..8005c12a4a 100644
--- a/frontend/vue.config.js
+++ b/frontend/vue.config.js
@@ -40,6 +40,11 @@ module.exports = {
       entry: 'src/link/link.js',
       template: 'public/link.html',
       filename: 'link.html'
+    },
+    nolic: {
+      entry: 'src/nolic/nolic.js',
+      template: 'public/nolic.html',
+      filename: 'nolic.html'
     }
   },
   configureWebpack: {