Merge branch '20221012_sun会后修正' of sckj/mz-cloud into master

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/enums/SourceOfRatingStatus.java

@@ -0,0 +1,25 @@
+package com.ruoyi.system.api.enums;
+
+public enum SourceOfRatingStatus {
+
+    SYS("00", "系统"), INS("01", "养老机构"), CINS("02", "社区养老服务机构");
+
+    private final String code;
+    private final String info;
+
+    SourceOfRatingStatus(String code, String info)
+    {
+        this.code = code;
+        this.info = info;
+    }
+
+    public String getCode()
+    {
+        return code;
+    }
+
+    public String getInfo()
+    {
+        return info;
+    }
+}

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/utils/SysUserTypeUtil.java

@@ -0,0 +1,23 @@
+package com.ruoyi.system.utils;
+
+import com.ruoyi.system.api.enums.SourceOfRatingStatus;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SysUserTypeUtil {
+
+    public static String getSysUserType(String code) {
+        String res = "";
+        List<SourceOfRatingStatus> sourceList = new ArrayList<>();
+        sourceList.add(SourceOfRatingStatus.SYS);
+        sourceList.add(SourceOfRatingStatus.INS);
+        sourceList.add(SourceOfRatingStatus.CINS);
+        for (SourceOfRatingStatus status: sourceList) {
+            if (status.getCode().equals(code)) {
+                res = status.getInfo();
+            }
+        }
+        return res;
+    }
+}

ruoyi-modules/mz-business-djpd/src/main/java/com/ruoyi/business/domain/DjpdSq.java

@@ -345,4 +345,7 @@ public class DjpdSq extends BaseEntity
 
     @TableField(exist = false)
     private String sqdjs;
+
+    @TableField(exist = false)
+    private String ly;
 }

ruoyi-modules/mz-business-djpd/src/main/java/com/ruoyi/business/service/impl/DjpdSqServiceImpl.java

@@ -13,6 +13,8 @@ import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.organization.domain.YljgJcxx;
+import com.ruoyi.organization.validator.OrganizationJgScztVH;
+import com.ruoyi.organization.validator.OrganizationSqJgScztVH;
 import com.ruoyi.system.api.RemoteUserService;
 import com.ruoyi.system.api.enums.*;
 import com.ruoyi.system.api.model.LoginUser;
@@ -22,6 +24,7 @@ import com.ruoyi.system.mapper.SysDeptJlMapper;
 import com.ruoyi.system.mapper.SysDjpdzbJbpzMapper;
 import com.ruoyi.system.mapper.TaskMapper;
 import com.ruoyi.system.service.impl.ProcessDefinitionServiceImpl;
+import com.ruoyi.system.utils.SysUserTypeUtil;
 import org.activiti.bpmn.model.BpmnModel;
 import org.activiti.bpmn.model.EndEvent;
 import org.activiti.bpmn.model.FlowNode;
@@ -91,10 +94,10 @@ public class DjpdSqServiceImpl implements IDjpdSqService
     private RemoteUserService userService;
     @Autowired
     private ProcessDefinitionServiceImpl definitionService;
-//    @Autowired
-//    private BusinessJgVH checkJgSczt;
-//    @Autowired
-//    private BusinessSqJgVH checkSqJgSczt;
+    @Autowired
+    private OrganizationJgScztVH checkJgSczt;
+    @Autowired
+    private OrganizationSqJgScztVH checkSqJgSczt;
     /**
      * 查询等级评定申请
      *
@@ -347,33 +350,46 @@ public class DjpdSqServiceImpl implements IDjpdSqService
             }
         }
         List<DjpdSq> res = djpdSqMapper.selectList(lqw);
-        res.forEach(r -> r.setSzxzqh(sysDeptJlMapper.getXzqhNames(r.getSzxzqhId())));
+        res.forEach(r -> {
+            r.setSzxzqh(sysDeptJlMapper.getXzqhNames(r.getSzxzqhId()));
+            r.setLy(SysUserTypeUtil.getSysUserType(r.getCreateUserType()));
+        });
         return res;
     }
 
     @Override
     public List<DjpdSq> selectDjpdSlList(DjpdSq djpdSq) {
-        return djpdSqMapper.selectDjpdSlList(djpdSq);
+        List<DjpdSq> res = djpdSqMapper.selectDjpdSlList(djpdSq);
+        res.forEach(r -> r.setLy(SysUserTypeUtil.getSysUserType(r.getCreateUserType())));
+        return res;
     }
 
     @Override
     public List<DjpdSq> selectDjpdShList(DjpdSq djpdSq) {
-        return djpdSqMapper.selectDjpdShList(djpdSq);
+        List<DjpdSq> res = djpdSqMapper.selectDjpdShList(djpdSq);
+        res.forEach(r -> r.setLy(SysUserTypeUtil.getSysUserType(r.getCreateUserType())));
+        return res;
     }
 
     @Override
     public List<DjpdSq> selectDjpdCqList(DjpdSq djpdSq) {
-        return djpdSqMapper.selectDjpdCqList(djpdSq);
+        List<DjpdSq> res = djpdSqMapper.selectDjpdCqList(djpdSq);
+        res.forEach(r -> r.setLy(SysUserTypeUtil.getSysUserType(r.getCreateUserType())));
+        return res;
     }
 
     @Override
     public List<DjpdSq> selectDjpdGxList(DjpdSq djpdSq) {
-        return djpdSqMapper.selectDjpdGxList(djpdSq);
+        List<DjpdSq> res = djpdSqMapper.selectDjpdGxList(djpdSq);
+        res.forEach(r -> r.setLy(SysUserTypeUtil.getSysUserType(r.getCreateUserType())));
+        return res;
     }
 
     @Override
     public List<DjpdSq> selectPdjgGxList(DjpdSq djpdSq) {
-        return djpdSqMapper.selectPdjgGxList(djpdSq);
+        List<DjpdSq> res = djpdSqMapper.selectPdjgGxList(djpdSq);
+        res.forEach(r -> r.setLy(SysUserTypeUtil.getSysUserType(r.getCreateUserType())));
+        return res;
     }
 
     @Override
@@ -391,28 +407,17 @@ public class DjpdSqServiceImpl implements IDjpdSqService
                     r.setIsFhyq(WhetherStatus.NO.getCode());
                 }
                 r.setGslx(lastGs.getGslx());
-//                if (StringUtils.equals(lastGs.getGslx(), AnnounceStatus.RES.getCode())) {
-//                    Map<String, Object> dept = sysDeptJlMapper.selectDeptByParams(lastGs.getCreateUnit());
-//                    if (ObjectUtils.isNotEmpty(dept)) {
-//                        if (dept.containsKey(SysDeptJlStatus.ANCESTORS.getCode())) {
-//                            if (Arrays.asList(dept.get(SysDeptJlStatus.ANCESTORS.getCode()).toString().split(","))
-//                                    .size() >= Arrays.asList(SecurityUtils.getLoginUser().getSysUser().getDept()
-//                                    .getAncestors().split(",")).size()) {
-//                                r.setIsFhyq(WhetherStatus.YES.getCode());
-//                            } else {
-//                                r.setIsFhyq(WhetherStatus.NO.getCode());
-//                            }
-//                        }
-//                    }
-//                }
             }
+            r.setLy(SysUserTypeUtil.getSysUserType(r.getCreateUserType()));
         });
         return res;
     }
 
     @Override
     public List<DjpdSq> selectDjpdZsPbList(DjpdSq djpdSq) {
-        return djpdSqMapper.selectDjpdZsPbList(djpdSq);
+        List<DjpdSq> res = djpdSqMapper.selectDjpdZsPbList(djpdSq);
+        res.forEach(r -> r.setLy(SysUserTypeUtil.getSysUserType(r.getCreateUserType())));
+        return res;
     }
 
     @Override
@@ -425,6 +430,7 @@ public class DjpdSqServiceImpl implements IDjpdSqService
             if (ObjectUtils.isNotEmpty(zspb)) {
                 r.setId(zspb.getId());
                 r.setZsyxjsrq(zspb.getZsyxjsrq());
+                r.setLy(SysUserTypeUtil.getSysUserType(r.getCreateUserType()));
             }
         });
         return res;
@@ -432,17 +438,23 @@ public class DjpdSqServiceImpl implements IDjpdSqService
 
 	@Override
     public List<DjpdSq> selectDjpdJbtjList(DjpdSq djpdSq) {
-        return djpdSqMapper.selectDjpdJbtjList(djpdSq);
+        List<DjpdSq> res = djpdSqMapper.selectDjpdJbtjList(djpdSq);
+        res.forEach(r -> r.setLy(SysUserTypeUtil.getSysUserType(r.getCreateUserType())));
+        return res;
     }
 
     @Override
     public List<DjpdSq> selectDjpdTxList(DjpdSq djpdSq) {
-        return djpdSqMapper.selectDjpdTxList(djpdSq);
+        List<DjpdSq> res = djpdSqMapper.selectDjpdTxList(djpdSq);
+        res.forEach(r -> r.setLy(SysUserTypeUtil.getSysUserType(r.getCreateUserType())));
+        return res;
     }
 
 	@Override
     public List<DjpdSq> selectDjpdXzpdList(DjpdSq djpdSq) {
-        return djpdSqMapper.selectDjpdXzpdList(djpdSq);
+        List<DjpdSq> res = djpdSqMapper.selectDjpdXzpdList(djpdSq);
+        res.forEach(r -> r.setLy(SysUserTypeUtil.getSysUserType(r.getCreateUserType())));
+        return res;
     }
 
     @Override
@@ -470,17 +482,6 @@ public class DjpdSqServiceImpl implements IDjpdSqService
                 DjpdGs gsxx = djpdGsMapper.selectOne(gsLqw);
                 if (ObjectUtils.isNotEmpty(gsxx)) {
                     if (checkTimeForGs(gsxx.getJsrq())) {
-//                        if (StringUtils.equals(sq.getSqzt(), ApplicationStatus.FPUB.getCode())) {
-//                            sq.setSqzt(ApplicationStatus.EXT.getCode());
-//                            djpdSqMapper.updateById(sq);
-//                            gsxx.setStatus(DataStatus.DELETE.getCode());
-//                            djpdGsMapper.updateById(gsxx);
-//                        } else {
-//                            sq.setSqzt(ApplicationStatus.ISS.getCode());
-//                            djpdSqMapper.updateById(sq);
-//                            gsxx.setStatus(DataStatus.DELETE.getCode());
-//                            djpdGsMapper.updateById(gsxx);
-//                        }
                         sq.setSqzt(definitionService.getDjpdSqztByInstanceId(sq.getInstanceId()));
                         djpdSqMapper.updateById(sq);
                         gsxx.setStatus(DataStatus.DELETE.getCode());
@@ -491,15 +492,16 @@ public class DjpdSqServiceImpl implements IDjpdSqService
                 logger.error(e.getMessage());
             }
         }
-//        LambdaQueryWrapper<DjpdSq> allLqw = new LambdaQueryWrapper<DjpdSq>();
-//        List<DjpdSq> sqList = djpdSqMapper.selectList(allLqw);
-//        for (DjpdSq sq: sqList) {
-//            if (!checkJgSczt.check(sq.getJgId()) && !checkSqJgSczt.check(sq.getJgId())) {
-//                stopRunProcessInstance(sq.getInstanceId());
-//                sq.setState(StateStatus.DELETE.getCode());
-//                djpdSqMapper.updateById(sq);
-//            }
-//        }
+        LambdaQueryWrapper<DjpdSq> allLqw = new LambdaQueryWrapper<DjpdSq>()
+                .eq(DjpdSq::getStatus, DataStatus.NORMAL.getCode());
+        List<DjpdSq> sqList = djpdSqMapper.selectList(allLqw);
+        for (DjpdSq sq: sqList) {
+            if (!checkJgSczt.check(sq.getJgId()) && !checkSqJgSczt.check(sq.getJgId())) {
+                stopRunProcessInstance(sq.getInstanceId());
+                sq.setStatus(DataStatus.DELETE.getCode());
+                djpdSqMapper.updateById(sq);
+            }
+        }
     }
 
     public void stopRunProcessInstance(String insId) {

ruoyi-modules/mz-business-djpd/src/main/java/com/ruoyi/business/service/impl/PdzjServiceImpl.java

@@ -82,6 +82,16 @@ public class PdzjServiceImpl implements IPdzjService
     @Override
     public List<Pdzj> selectPdzjList(Pdzj pdzj)
     {
+        List<Pdzj> res = pdzjMapper.selectPdzjList(pdzj);
+        res.forEach(r -> {
+            LoginUser loginUser = userService.getUserInfo(SecurityUtils.getAreaCode().substring(0, 6) + "_" +
+                    r.getDh(), SecurityConstants.INNER).getData();
+            if (ObjectUtils.isNotEmpty(loginUser)) {
+                r.setSysUserNum(DataStatus.CLASSA.getCode());
+            } else {
+                r.setSysUserNum(DataStatus.NORMAL.getCode());
+            }
+        });
         return pdzjMapper.selectPdzjList(pdzj);
     }
 
@@ -94,7 +104,7 @@ public class PdzjServiceImpl implements IPdzjService
     @Override
     public int insertPdzj(Pdzj pdzj)
     {
-        LoginUser loginUser = userService.getUserInfo(pdzj.getDh(), SecurityConstants.INNER).getData();
+        LoginUser loginUser = userService.getUserInfo(SecurityUtils.getAreaCode().substring(0, 6) + "_" + pdzj.getDh(), SecurityConstants.INNER).getData();
         if (ObjectUtils.isNotEmpty(loginUser)) {
             throw new ServiceException("该专家账号已存在，请更换手机号码注册");
         }
@@ -109,13 +119,13 @@ public class PdzjServiceImpl implements IPdzjService
         AjaxResult res = AjaxResult.error("操作失败");
         Pdzj pdzj = pdzjMapper.selectById(id);
         if (ObjectUtils.isNotEmpty(pdzj)) {
-            LoginUser loginUser = userService.getUserInfo(pdzj.getDh(), SecurityConstants.INNER).getData();
+            LoginUser loginUser = userService.getUserInfo(SecurityUtils.getAreaCode().substring(0, 6) + "_" + pdzj.getDh(), SecurityConstants.INNER).getData();
             if (ObjectUtils.isNotEmpty(loginUser)) {
                 throw new ServiceException("该专家账号已存在");
             }
             SysUser user = new SysUser();
             user.setDeptId(Long.valueOf(SecurityUtils.getUserUnitId()));
-            user.setUserName(pdzj.getDh());
+            user.setUserName(SecurityUtils.getAreaCode().substring(0, 6) + "_" + pdzj.getDh());
             user.setUserType(SysUserTypeStatus.PDZJ.getCode());
             user.setSex(SexStatus.UNKNOWN.getCode());
             user.setPassword(configService.getConfigKey("sys.user.initPassword", SecurityConstants.INNER)
@@ -177,7 +187,7 @@ public class PdzjServiceImpl implements IPdzjService
         }
         Pdzj pdzj = pdzjMapper.selectById(idList.get(0));
         List<Long> removeList = new ArrayList<>();
-        LoginUser loginUser = userService.getUserInfo(pdzj.getDh(), SecurityConstants.INNER).getData();
+        LoginUser loginUser = userService.getUserInfo(SecurityUtils.getAreaCode().substring(0, 6) + "_" + pdzj.getDh(), SecurityConstants.INNER).getData();
         removeList.add(loginUser.getSysUser().getUserId());
         userService.remove(removeList.toArray(new Long[0]), SecurityConstants.INNER);
         return pdzjMapper.deleteBatchIds(idList);

ruoyi-modules/mz-business-djpd/src/main/resources/mapper/business/DjpdSqMapper.xml

@@ -191,7 +191,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sqrxm,
             sqsj,
             sqzt,
-            sqdj
+            sqdj,
+            create_user_type
         FROM
             zwyw_djpd_sq
         <where>
@@ -224,7 +225,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sqzt,
         sqdj,
         pddj,
-        (select zwyw_xzpd_jg.zdf from zwyw_xzpd_jg where zwyw_xzpd_jg.sq_id = zwyw_djpd_sq.id) AS pdzf
+        (select zwyw_xzpd_jg.zdf from zwyw_xzpd_jg where zwyw_xzpd_jg.sq_id = zwyw_djpd_sq.id) AS pdzf,
+        create_user_type
         FROM
         zwyw_djpd_sq
         <where>
@@ -255,7 +257,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sqrxm,
         sqsj,
         sqzt,
-        sqdj
+        sqdj,
+        create_user_type
         FROM
         zwyw_djpd_sq
         <where>
@@ -285,7 +288,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sqrxm,
         sqsj,
         sqzt,
-        sqdj
+        sqdj,
+        create_user_type
         FROM
         zwyw_djpd_sq
         <where>
@@ -315,7 +319,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sqrxm,
         sqsj,
         sqzt,
-        sqdj
+        sqdj,
+        create_user_type
         FROM
         zwyw_djpd_sq
         <where>
@@ -344,7 +349,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         zwyw_djpd_sq.sqrxm as sqrxm,
         zwyw_djpd_sq.sqsj as sqsj,
         zwyw_djpd_sq.sqzt as sqzt,
-        zwyw_djpd_sq.sqdj as sqdj
+        zwyw_djpd_sq.sqdj as sqdj,
+        zwyw_djpd_sq.create_user_type as create_user_type
         FROM
         zwyw_djpd_sq
         <where>
@@ -370,7 +376,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sqzt,
         pddj,
         sqdj,
-        (select zwyw_djzs_pb.id from zwyw_djzs_pb where zwyw_djzs_pb.sq_id = zwyw_djpd_sq.id limit 1) as id
+        (select zwyw_djzs_pb.id from zwyw_djzs_pb where zwyw_djzs_pb.sq_id = zwyw_djpd_sq.id limit 1) as id,
+        create_user_type
         FROM
         zwyw_djpd_sq
         <where>
@@ -400,7 +407,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         zwyw_djpd_sq.sqsj AS sqsj,
         zwyw_djpd_sq.sqzt AS sqzt,
         zwyw_djpd_sq.pddj AS pddj,
-        zwyw_djpd_sq.sqdj AS sqdj
+        zwyw_djpd_sq.sqdj AS sqdj,
+        zwyw_djpd_sq.create_user_type AS create_user_type
         FROM
         zwyw_djpd_sq
         <where>
@@ -427,7 +435,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sqsj,
         sqzt,
         pddj,
-        sqdj
+        sqdj,
+        create_user_type
         FROM
         zwyw_djpd_sq
         <where>
@@ -463,7 +472,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         zwyw_djpd_sq.sqdj AS sqdj,
         zwyw_djzs_pb.id AS id,
         zwyw_djzs_pb.zsyxjsrq AS zsyxjsrq,
-        zwyw_djzs_pb.create_unit AS create_unit
+        zwyw_djzs_pb.create_unit AS create_unit,
+        zwyw_djpd_sq.create_user_type AS create_user_type
         FROM
         zwyw_djpd_sq
         LEFT JOIN zwyw_djzs_pb ON zwyw_djpd_sq.id = zwyw_djzs_pb.sq_id
@@ -494,7 +504,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         sqsj,
         sqzt,
         pddj,
-        sqdj
+        sqdj,
+        create_user_type
         FROM
         zwyw_djpd_sq
         <where>

ruoyi-modules/mz-business-djpd/src/main/resources/mapper/business/PdzjMapper.xml

@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectPdzjList" parameterType="Pdzj" resultMap="PdzjResult">
         select id, xm, dwmc, zjlx, zjhm, zc, ly, dh, hjqh_id, getxzqhmcbycode(dwqh_id) as dwqh_id, tx, fj,
-               status, (select count(*) from sys_user where user_name = zwyw_pdzj.dh) as sysUserNum
+               status
         from zwyw_pdzj
         <where>
             <if test="xm != null and xm != ''"> and xm like concat('%',#{xm},'%')</if>

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/validator/OrganizationJgScztVH.java

@@ -1,11 +1,11 @@
 package com.ruoyi.organization.validator;
 
-import com.ruoyi.organization.domain.YljgJcxx;
 import com.ruoyi.organization.mapper.YljgJcxxMapper;
+import com.ruoyi.system.api.enums.SurvivalStatus;
 import com.ruoyi.system.validate.ValidatorHandler;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.util.ObjectUtils;
 
 @Component
 public class OrganizationJgScztVH implements ValidatorHandler {
@@ -15,14 +15,6 @@ public class OrganizationJgScztVH implements ValidatorHandler {
 
     @Override
     public boolean check(String value) {
-        boolean res = true;
-        YljgJcxx yljgJcxx = yljgJcxxMapper.selectYljgJcxxById(value);
-        if (ObjectUtils.isEmpty(yljgJcxx)) {
-            res = false;
-        }
-        if (!"01".equals(yljgJcxx.getSczt())) {
-            res = false;
-        }
-        return res;
+        return StringUtils.equals(yljgJcxxMapper.checkSczt(value), SurvivalStatus.NORMAL.getCode());
     }
 }

ruoyi-modules/mz-organization-jg/src/main/java/com/ruoyi/organization/validator/OrganizationSqJgScztVH.java

@@ -0,0 +1,20 @@
+package com.ruoyi.organization.validator;
+
+import com.ruoyi.organization.mapper.YljgsqJcxxMapper;
+import com.ruoyi.system.api.enums.SurvivalStatus;
+import com.ruoyi.system.validate.ValidatorHandler;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class OrganizationSqJgScztVH implements ValidatorHandler {
+
+    @Autowired
+    private YljgsqJcxxMapper yljgsqJcxxMapper;
+
+    @Override
+    public boolean check(String value) {
+        return StringUtils.equals(yljgsqJcxxMapper.checkSczt(value), SurvivalStatus.NORMAL.getCode());
+    }
+}

ruoyi-modules/mz-portal/src/main/java/com/ruoyi/portal/service/impl/MhZcXwServiceImpl.java

@@ -218,6 +218,7 @@ public class MhZcXwServiceImpl implements IMhZcXwService
     @Override
     public int insertMhZcXw(MhZcXw mhZcXw)
     {
+        mhZcXw.setStatus(DataStatus.DELETE.getCode());
         return mhZcXwMapper.insert(mhZcXw);
     }
 

ruoyi-ui/src/views/business/fwjggl/djpd/djpdGx/index.vue

@@ -119,6 +119,7 @@
           <dict-tag :options="dict.type.CZ013" :value="scope.row.sqzt" />
         </template>
       </el-table-column>
+      <el-table-column label="数据来源" align="center" prop="ly" />
       <el-table-column
         label="操作"
         align="center"

ruoyi-ui/src/views/business/fwjggl/djpd/djpdSh/index.vue

@@ -131,6 +131,7 @@
           <dict-tag :options="dict.type.CZ012" :value="scope.row.pddj"/>
         </template>
       </el-table-column>
+      <el-table-column label="数据来源" align="center" prop="ly" />
       <el-table-column
         label="操作"
         align="center"

ruoyi-ui/src/views/business/fwjggl/djpd/djpdSl/index.vue

@@ -120,6 +120,7 @@
           <dict-tag :options="dict.type.CZ013" :value="scope.row.sqzt" />
         </template>
       </el-table-column>
+      <el-table-column label="数据来源" align="center" prop="ly" />
       <el-table-column
         label="操作"
         align="center"

ruoyi-ui/src/views/business/fwjggl/djpd/djpdSq/index.vue

@@ -68,6 +68,7 @@
           <dict-tag :options="dict.type.CZ013" :value="scope.row.sqzt" />
         </template>
       </el-table-column>
+      <el-table-column label="数据来源" align="center" prop="ly" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button v-if="scope.row.sqzt === '21'" size="mini" type="text" icon="el-icon-edit"

ruoyi-ui/src/views/business/fwjggl/djpd/djzsCx/index.vue

@@ -59,7 +59,7 @@
           <span>{{ special(scope.row.zsyxjsrq) }}</span>
         </template>
       </el-table-column>
-
+      <el-table-column label="数据来源" align="center" prop="ly" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button v-if="['13', '14', '15', '16'].includes(scope.row.sqzt)" size="mini" type="text"

ruoyi-ui/src/views/business/fwjggl/djpd/djzspb/index.vue

@@ -66,6 +66,7 @@
           <span>{{ special(scope.row.sqsj) }}</span>
         </template>
       </el-table-column>
+      <el-table-column label="数据来源" align="center" prop="ly" />
       <el-table-column label="操作" align="center" width="220" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button v-if="scope.row.sqzt === '12' && !(scope.row.sqdj === '04' && user.userData.dept.ancestors.split(',').length <= 1)" size="mini" type="text" icon="el-icon-edit"

ruoyi-ui/src/views/business/fwjggl/djpd/gsjgFk/index.vue

@@ -98,6 +98,7 @@
           <dict-tag :options="dict.type.CZ014" :value="scope.row.gslx" />
         </template>
       </el-table-column>
+      <el-table-column label="数据来源" align="center" prop="ly" />
       <el-table-column
         label="操作"
         align="center"

ruoyi-ui/src/views/business/fwjggl/djpd/jbtjPd/index.vue

@@ -90,7 +90,7 @@
           <span>{{ special(scope.row.sqsj) }}</span>
         </template>
       </el-table-column>
-
+      <el-table-column label="数据来源" align="center" prop="ly" />
       <el-table-column
         label="操作"
         align="center"

ruoyi-ui/src/views/business/fwjggl/djpd/pdjgGx/index.vue

@@ -119,6 +119,7 @@
           <dict-tag :options="dict.type.CZ013" :value="scope.row.sqzt" />
         </template>
       </el-table-column>
+      <el-table-column label="数据来源" align="center" prop="ly" />
       <el-table-column
         label="操作"
         align="center"

ruoyi-ui/src/views/business/fwjggl/djpd/pdzjCq/indexnew.vue

@@ -113,6 +113,7 @@
           <dict-tag :options="dict.type.CZ013" :value="scope.row.sqzt" />
         </template>
       </el-table-column>
+      <el-table-column label="数据来源" align="center" prop="ly" />
       <el-table-column
         label="操作"
         align="center"

ruoyi-ui/src/views/business/fwjggl/djpd/xzlr/index.vue

@@ -89,7 +89,7 @@
       </el-table-column>
       <el-table-column label="申请人姓名" align="center" prop="sqrxm">
       </el-table-column>
-
+      <el-table-column label="数据来源" align="center" prop="ly" />
       <el-table-column
         label="操作"
         align="center"
@@ -216,8 +216,19 @@
       </div>
     </el-dialog>
 
-    <!-- 添加或修改等级评定申请对话框 -->
+    <!-- 详细对话框 -->
     <el-dialog
+      v-dialog-drag
+      title="详情"
+      :visible.sync="isXQ"
+      width="1200px"
+      append-to-body
+    >
+      <Details :data="details.xqList"></Details>
+    </el-dialog>
+
+    <!-- 添加或修改等级评定申请对话框 -->
+    <!-- <el-dialog
       v-dialog-drag
       :title="title"
       :visible.sync="open"
@@ -305,12 +316,12 @@
       <div slot="footer" class="dialog-footer">
         <el-button @click="cancel">返 回</el-button>
       </div>
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
 
 <script>
-import {changePdjg, delDjpdSq, getDjpdSq, searchJg} from '@/api/business/fwjggl/djpd/djpdSq'
+import {changePdjg, delDjpdSq, getDjpdSqConfig, searchJg} from '@/api/business/fwjggl/djpd/djpdSq'
 import {addXzlr, listXzPd, listXzTree} from '@/api/business/fwjggl/djpd/xzlr'
 import {mapState} from 'vuex'
 
@@ -354,6 +365,8 @@ export default {
         // 等级评定申请表格数据
         djpdShList: [],
         addList: [],
+        isXQ: false,
+        details: {},
         // 弹出层标题
         title: '',
         addTitle: '',
@@ -714,16 +727,33 @@ export default {
         this.queIndex=queIndex;
       },
       /** 修改按钮操作 */
+      // handleUpdate(row) {
+      //   this.reset()
+      //   const id = row.id || this.ids
+      //   getDjpdSq(id).then((response) => {
+      //     this.form = response.data
+      //     this.form.szlx = this.form.szlx ? this.form.szlx.split(',') : []
+      //     this.open = true
+      //     this.title = '详情'
+      //   })
+      // },
+
       handleUpdate(row) {
-        this.reset()
-        const id = row.id || this.ids
-        getDjpdSq(id).then((response) => {
-          this.form = response.data
-          this.form.szlx = this.form.szlx ? this.form.szlx.split(',') : []
-          this.open = true
-          this.title = '详情'
+        this.details = {}
+        getDjpdSqConfig(row.id, 'pdjgSh').then((response) => {
+          this.details = response.data
+          this.details.xqList.unshift(
+            {
+              'jg': {
+                ...response.data
+              },
+              'title': '等级机构基本信息'
+            }
+          )
+          this.isXQ = true
         })
       },
+
       /** 提交按钮 */
       submitForm() {
         this.$refs["addForm"].validate((valid) => {

ruoyi-ui/src/views/business/fwjggl/djpd/zsdqTx/index.vue

@@ -128,7 +128,7 @@
         </template>
       </el-table-column>
       <el-table-column label="发放人" align="center" prop="sqrxm" />
-
+      <el-table-column label="数据来源" align="center" prop="ly" />
       <el-table-column
         label="操作"
         align="center"

ruoyi-ui/src/views/organization/zwyw/djpdsq/djpdSq/index.vue

@@ -69,6 +69,7 @@
           <dict-tag :options="dict.type.CZ013" :value="scope.row.sqzt" />
         </template>
       </el-table-column>
+      <el-table-column label="数据来源" align="center" prop="ly" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button v-if="scope.row.sqzt === '21'" size="mini" type="text" icon="el-icon-edit"

ruoyi-ui/src/views/portal/bszn/index.vue

@@ -47,12 +47,17 @@
       </el-table-column>
       <el-table-column label="发文字号" align="center" prop="issZh" />
       <el-table-column label="标题" align="center" prop="bt" />
+      <el-table-column label="状态" align="center" prop="status" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.XZ101" :value="scope.row.status" />
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button v-if="scope.row.status=='0'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdateState(scope.row)"
-            v-hasPermi="['portal:mhZcxw:edit']">无效</el-button>
+            v-hasPermi="['portal:mhZcxw:edit']">撤回</el-button>
           <el-button v-if="scope.row.status=='99'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdateState(scope.row)"
-            v-hasPermi="['portal:mhZcxw:edit']">有效</el-button>
+            v-hasPermi="['portal:mhZcxw:edit']">发布</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['portal:mhZcxw:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row, scope.$index)"
@@ -125,7 +130,7 @@ import {addMhBs, delMhZcxw, getMhZcxw, listMhBs, updateMhZcxw, updateState} from
 
 export default {
   name: "MhZcxw",
-  dicts: ['XZ089', 'XZ088', 'XZ087', 'XZ086', 'XZ085', 'XZ094', 'XZ095', 'CZ035'],
+  dicts: ['XZ089', 'XZ088', 'XZ087', 'XZ086', 'XZ085', 'XZ094', 'XZ095', 'CZ035', 'XZ101'],
   data() {
     return {
       // 遮罩层

ruoyi-ui/src/views/portal/fwxm/index.vue

@@ -39,12 +39,17 @@
         </template>
       </el-table-column>
       <el-table-column label="标题" align="center" prop="bt" />
+      <el-table-column label="状态" align="center" prop="status" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.XZ101" :value="scope.row.status" />
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button v-if="scope.row.status=='0'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdateState(scope.row)"
-            v-hasPermi="['portal:mhZcxw:edit']">无效</el-button>
+            v-hasPermi="['portal:mhZcxw:edit']">撤回</el-button>
           <el-button v-if="scope.row.status=='99'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdateState(scope.row)"
-            v-hasPermi="['portal:mhZcxw:edit']">有效</el-button>
+            v-hasPermi="['portal:mhZcxw:edit']">发布</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['portal:mhZcxw:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row, scope.$index)"
@@ -91,7 +96,7 @@ import {addMhFw, delMhZcxw, getMhZcxw, listMhFw, updateMhZcxw, updateState} from
 
 export default {
   name: "MhZcxw",
-  dicts: ['XZ089', 'XZ088', 'XZ087', 'XZ086', 'XZ085'],
+  dicts: ['XZ089', 'XZ088', 'XZ087', 'XZ086', 'XZ085', 'XZ101'],
   data() {
     return {
       // 遮罩层

ruoyi-ui/src/views/portal/ghbg/index.vue

@@ -39,12 +39,17 @@
         </template>
       </el-table-column>
       <el-table-column label="标题" align="center" prop="bt" />
+      <el-table-column label="状态" align="center" prop="status" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.XZ101" :value="scope.row.status" />
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button v-if="scope.row.status=='0'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdateState(scope.row)"
-            v-hasPermi="['portal:mhZcxw:edit']">无效</el-button>
+            v-hasPermi="['portal:mhZcxw:edit']">撤回</el-button>
           <el-button v-if="scope.row.status=='99'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdateState(scope.row)"
-            v-hasPermi="['portal:mhZcxw:edit']">有效</el-button>
+            v-hasPermi="['portal:mhZcxw:edit']">发布</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['portal:mhZcxw:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row, scope.$index)"
@@ -91,7 +96,7 @@ import {addMhGh, delMhZcxw, getMhZcxw, listMhGh, updateMhZcxw, updateState} from
 
 export default {
   name: "MhZcxw",
-  dicts: ['XZ089', 'XZ088', 'XZ087', 'XZ086', 'XZ085'],
+  dicts: ['XZ089', 'XZ088', 'XZ087', 'XZ086', 'XZ085', 'XZ101'],
   data() {
     return {
       // 遮罩层

ruoyi-ui/src/views/portal/hygl/index.vue

@@ -39,12 +39,17 @@
         </template>
       </el-table-column>
       <el-table-column label="标题" align="center" prop="bt" />
+      <el-table-column label="状态" align="center" prop="status" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.XZ101" :value="scope.row.status" />
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button v-if="scope.row.status=='0'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdateState(scope.row)"
-            v-hasPermi="['portal:mhZcxw:edit']">无效</el-button>
+            v-hasPermi="['portal:mhZcxw:edit']">撤回</el-button>
           <el-button v-if="scope.row.status=='99'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdateState(scope.row)"
-            v-hasPermi="['portal:mhZcxw:edit']">有效</el-button>
+            v-hasPermi="['portal:mhZcxw:edit']">发布</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['portal:mhZcxw:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row, scope.$index)"
@@ -91,7 +96,7 @@ import {addMhHy, delMhZcxw, getMhZcxw, listMhHy, updateMhZcxw, updateState} from
 
 export default {
   name: "MhZcxw",
-  dicts: ['XZ089', 'XZ088', 'XZ087', 'XZ086', 'XZ085'],
+  dicts: ['XZ089', 'XZ088', 'XZ087', 'XZ086', 'XZ085', 'XZ101'],
   data() {
     return {
       // 遮罩层

ruoyi-ui/src/views/portal/lbt/index.vue

@@ -39,12 +39,17 @@
           <img :src="scope.row.url" width="40" height="40" />
         </template>
       </el-table-column>
+      <el-table-column label="状态" align="center" prop="status" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.XZ101" :value="scope.row.status" />
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button v-if="scope.row.status=='0'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdateState(scope.row)"
-            v-hasPermi="['portal:mhZcxw:edit']">无效</el-button>
+            v-hasPermi="['portal:mhZcxw:edit']">撤回</el-button>
           <el-button v-if="scope.row.status=='99'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdateState(scope.row)"
-            v-hasPermi="['portal:mhZcxw:edit']">有效</el-button>
+            v-hasPermi="['portal:mhZcxw:edit']">发布</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['portal:mhZcxw:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row, scope.$index)"
@@ -102,7 +107,7 @@ import {addMhLb, delMhZcxw, getMhZcxw, listMhLb, updateMhZcxw, updateState} from
 
 export default {
   name: "MhZcxw",
-  dicts: ['XZ089', 'XZ088', 'XZ087', 'XZ086', 'XZ085'],
+  dicts: ['XZ089', 'XZ088', 'XZ087', 'XZ086', 'XZ085', 'XZ101'],
   data() {
     return {
       // 遮罩层

ruoyi-ui/src/views/portal/llsj/index.vue

@@ -39,12 +39,17 @@
         </template>
       </el-table-column>
       <el-table-column label="标题" align="center" prop="bt" />
+      <el-table-column label="状态" align="center" prop="status" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.XZ101" :value="scope.row.status" />
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button v-if="scope.row.status=='0'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdateState(scope.row)"
-            v-hasPermi="['portal:mhZcxw:edit']">无效</el-button>
+            v-hasPermi="['portal:mhZcxw:edit']">撤回</el-button>
           <el-button v-if="scope.row.status=='99'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdateState(scope.row)"
-            v-hasPermi="['portal:mhZcxw:edit']">有效</el-button>
+            v-hasPermi="['portal:mhZcxw:edit']">发布</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['portal:mhZcxw:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row, scope.$index)"
@@ -91,7 +96,7 @@ import {addMhLl, delMhZcxw, getMhZcxw, listMhLl, updateMhZcxw, updateState} from
 
 export default {
   name: "MhZcxw",
-  dicts: ['XZ089', 'XZ088', 'XZ087', 'XZ086', 'XZ085'],
+  dicts: ['XZ089', 'XZ088', 'XZ087', 'XZ086', 'XZ085', 'XZ101'],
   data() {
     return {
       // 遮罩层

ruoyi-ui/src/views/portal/mhZc/index.vue

@@ -69,12 +69,17 @@
       </el-table-column>
       <el-table-column label="发文字号" align="center" prop="issZh" />
       <el-table-column label="标题" align="center" prop="bt" />
+      <el-table-column label="状态" align="center" prop="status" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.XZ101" :value="scope.row.status" />
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button v-if="scope.row.status=='0'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdateState(scope.row)"
-            v-hasPermi="['portal:mhZcxw:edit']">无效</el-button>
+            v-hasPermi="['portal:mhZcxw:edit']">撤回</el-button>
           <el-button v-if="scope.row.status=='99'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdateState(scope.row)"
-            v-hasPermi="['portal:mhZcxw:edit']">有效</el-button>
+            v-hasPermi="['portal:mhZcxw:edit']">发布</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['portal:mhZcxw:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row, scope.$index)"
@@ -153,7 +158,7 @@ import {addMhZc, delMhZcxw, getMhZcxw, listMhZc, updateMhZcxw, updateState} from
 
 export default {
   name: "MhZcxw",
-  dicts: ['XZ089', 'XZ088', 'XZ087', 'XZ086', 'XZ085'],
+  dicts: ['XZ089', 'XZ088', 'XZ087', 'XZ086', 'XZ085', 'XZ101'],
   data() {
     return {
       // 遮罩层

ruoyi-ui/src/views/portal/syxx/index.vue

@@ -42,12 +42,17 @@
       </el-table-column>
       <el-table-column label="发文字号" align="center" prop="issZh" />
       <el-table-column label="标题" align="center" prop="bt" />
+      <el-table-column label="状态" align="center" prop="status" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.XZ101" :value="scope.row.status" />
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button v-if="scope.row.status=='0'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdateState(scope.row)"
-            v-hasPermi="['portal:mhZcxw:edit']">无效</el-button>
+            v-hasPermi="['portal:mhZcxw:edit']">撤回</el-button>
           <el-button v-if="scope.row.status=='99'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdateState(scope.row)"
-            v-hasPermi="['portal:mhZcxw:edit']">有效</el-button>
+            v-hasPermi="['portal:mhZcxw:edit']">发布</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['portal:mhZcxw:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row, scope.$index)"
@@ -97,7 +102,7 @@ import {addMhSy, delMhZcxw, getMhZcxw, listMhSy, updateMhZcxw, updateState} from
 
 export default {
   name: "MhZcxw",
-  dicts: ['XZ089', 'XZ088', 'XZ087', 'XZ086', 'XZ085'],
+  dicts: ['XZ089', 'XZ088', 'XZ087', 'XZ086', 'XZ085', 'XZ101'],
   data() {
     return {
       // 遮罩层

ruoyi-ui/src/views/portal/wlj/index.vue

@@ -27,12 +27,17 @@
       <el-table-column label="标题" align="center" prop="bt" />
       <el-table-column label="排序" align="center" prop="sort" />
       <el-table-column label="链接" align="center" prop="url" />
+      <el-table-column label="状态" align="center" prop="status" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.XZ101" :value="scope.row.status" />
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right">
         <template slot-scope="scope">
           <el-button v-if="scope.row.status=='0'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdateState(scope.row)"
-            v-hasPermi="['portal:mhZcxw:edit']">无效</el-button>
+            v-hasPermi="['portal:mhZcxw:edit']">撤回</el-button>
           <el-button v-if="scope.row.status=='99'" size="mini" type="text" icon="el-icon-edit" @click="handleUpdateState(scope.row)"
-            v-hasPermi="['portal:mhZcxw:edit']">有效</el-button>
+            v-hasPermi="['portal:mhZcxw:edit']">发布</el-button>
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['portal:mhZcxw:edit']">修改</el-button>
           <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row, scope.$index)"
@@ -76,7 +81,7 @@ import {addMhWl, delMhZcxw, getMhZcxw, listMhWl, updateMhZcxw, updateState} from
 
 export default {
   name: "MhZcxw",
-  dicts: ['XZ089', 'XZ088', 'XZ087', 'XZ086', 'XZ085'],
+  dicts: ['XZ089', 'XZ088', 'XZ087', 'XZ086', 'XZ085', 'XZ101'],
   data() {
     return {
       // 遮罩层

ruoyi-ui/src/views/system/demo/index.vue

@@ -1688,6 +1688,7 @@ export default {
     this.updateEcharts();
     this.iniyggcheng();
     this.iniyggchenga();
+    alert(CryptoJS.enc.Base64.stringify( "encryptedHexStr" ));
      window.onresize = () => {
        this.myCharta.resize();
      }