diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/config/LocalFileResourceConfig.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/config/LocalFileResourceConfig.java new file mode 100644 index 00000000..4171bdcf --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/config/LocalFileResourceConfig.java @@ -0,0 +1,42 @@ +package com.zdxt.enforcementcode.config; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +/** + * 本地文件静态资源映射配置 + *

+ * 将 URL 路径 /profile/** 映射到本地磁盘文件目录， + * 使上传的附件可通过浏览器直接访问（图片预览、文件下载等）。 + *

+ * + * @author zdxt + */ +@Slf4j +@Configuration +public class LocalFileResourceConfig implements WebMvcConfigurer { + + @Value("${zdxt.file.upload-path:#{T(java.lang.System).getProperty('user.dir') + '/upload'}}") + private String uploadBasePath; + + @Value("${zdxt.file.url-prefix:/profile}") + private String urlPrefix; + + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + // 确保路径格式正确：URL 以 /** 结尾，本地路径以 file: 开头、/ 结尾 + String pathPattern = urlPrefix.endsWith("/") ? urlPrefix + "**" : urlPrefix + "/**"; + String locationPath = uploadBasePath.replace("\\", "/"); + if (!locationPath.endsWith("/")) { + locationPath += "/"; + } + String resourceLocation = "file:" + locationPath; + + log.info("静态资源映射: {} -> {}", pathPattern, resourceLocation); + registry.addResourceHandler(pathPattern) + .addResourceLocations(resourceLocation); + } +} diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/ZdxtFileUtilController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/ZdxtFileUtilController.java index 23f9ad27..64ecb2da 100644 --- a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/ZdxtFileUtilController.java +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/ZdxtFileUtilController.java @@ -1,7 +1,10 @@ package com.zdxt.enforcementcode.controller; +import cn.dev33.satoken.annotation.SaIgnore; import com.zdxt.enforcementcode.domain.vo.ZdxtFileVo; import com.zdxt.enforcementcode.helper.ZdxtFileHelper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import lombok.RequiredArgsConstructor; @@ -11,10 +14,16 @@ import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.web.core.BaseController; +import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URLConnection; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.List; /** diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseInformationController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseInformationController.java index 9991ea86..d3e0e68a 100644 --- a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseInformationController.java +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseInformationController.java @@ -37,8 +37,8 @@ public class AppEnterpriseInformationController { * @return 企业信息列表（enterpriseId, enterpriseName, enterpriseNumber） */ @SaIgnore - @GetMapping("/getEnterpriseInfo") - public R>> getEnterpriseInfo(@RequestParam Long userId) { + @GetMapping("/getUserRefEnterpriseInfo") + public R>> getUserRefEnterpriseInfo(@RequestParam Long userId) { if (userId == null) { return R.fail("用户ID不能为空"); } @@ -51,6 +51,8 @@ public class AppEnterpriseInformationController { data.put("enterpriseName", ref.getEnterpriseName()); data.put("enterpriseNumber", ref.getEnterpriseNumber()); dataList.add(data); + + enterpriseInformationService.generateQrCode("", ref.getEnterpriseNumber(), "app.enterprise", "getUserRefEnterpriseInfo"); } } return R.ok(dataList); diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppLoginController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppLoginController.java index c5be3e69..447c8f1d 100644 --- a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppLoginController.java +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppLoginController.java @@ -6,6 +6,7 @@ import cn.dev33.satoken.stp.parameter.SaLoginParameter; import cn.hutool.crypto.digest.DigestUtil; import com.zdxt.enforcementcode.domain.vo.EnterpriseUserVo; import com.zdxt.enforcementcode.domain.vo.EnterpriseUserRefVo; +import com.zdxt.enforcementcode.service.IEnterpriseInformationService; import com.zdxt.enforcementcode.service.IEnterpriseUserService; import com.zdxt.enforcementcode.service.IEnterpriseUserRefService; import lombok.RequiredArgsConstructor; @@ -34,7 +35,7 @@ import java.util.Map; public class AppLoginController { private final IEnterpriseUserService enterpriseUserService; - + private final IEnterpriseInformationService enterpriseInformationService; /** * AES密钥（与前端一致） @@ -100,7 +101,8 @@ public class AppLoginController { LoginHelper.login(loginUser, model); - // 6. 构造返回数据 + + // 7. 构造返回数据 Map data = new HashMap<>(); data.put("token", StpUtil.getTokenValue()); data.put("userId", user.getUserId()); diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseComplaintController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseComplaintController.java index e5f54412..5960306b 100644 --- a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseComplaintController.java +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseComplaintController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/web/enforcementcode/complaint") +@RequestMapping("/web/supervision/complaint") public class EnterpriseComplaintController extends BaseController { private final IEnterpriseComplaintService enterpriseComplaintService; diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseEvaluateController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseEvaluateController.java index 5af50a24..04b9d4da 100644 --- a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseEvaluateController.java +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseEvaluateController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/web/enforcementcode/evaluate") +@RequestMapping("/web/supervision/evaluate") public class EnterpriseEvaluateController extends BaseController { private final IEnterpriseEvaluateService enterpriseEvaluateService; diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseLawEnforcementController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseLawEnforcementController.java index 19b6a066..551e0e6e 100644 --- a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseLawEnforcementController.java +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseLawEnforcementController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/web/enforcementcode/lawEnforcement") +@RequestMapping("/web/supervision/lawEnforcement") public class EnterpriseLawEnforcementController extends BaseController { private final IEnterpriseLawEnforcementService enterpriseLawEnforcementService; diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseMerchantAuthorizationController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseMerchantAuthorizationController.java index 6aa9b939..0e944630 100644 --- a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseMerchantAuthorizationController.java +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseMerchantAuthorizationController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/web/enforcementcode/merchantAuthorization") +@RequestMapping("/web/supervision/merchantAuthorization") public class EnterpriseMerchantAuthorizationController extends BaseController { private final IEnterpriseMerchantAuthorizationService enterpriseMerchantAuthorizationService; diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/LawEnforcementEnterpriseController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/LawEnforcementEnterpriseController.java index b8a2c66e..4348df71 100644 --- a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/LawEnforcementEnterpriseController.java +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/LawEnforcementEnterpriseController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/web/enforcementcode/enforcementEnterprise") +@RequestMapping("/web/supervision/enforcementEnterprise") public class LawEnforcementEnterpriseController extends BaseController { private final ILawEnforcementEnterpriseService lawEnforcementEnterpriseService; diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/QrCodeGenerateHistoryController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/QrCodeGenerateHistoryController.java index 8b604392..07c1fd5f 100644 --- a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/QrCodeGenerateHistoryController.java +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/QrCodeGenerateHistoryController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/web/enforcementcode/codeGenerateHistory") +@RequestMapping("/web/supervision/codeGenerateHistory") public class QrCodeGenerateHistoryController extends BaseController { private final IQrCodeGenerateHistoryService qrCodeGenerateHistoryService; diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/ZdxtFileController.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/ZdxtFileController.java index 914a82df..7e4947de 100644 --- a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/ZdxtFileController.java +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/ZdxtFileController.java @@ -31,7 +31,7 @@ import org.dromara.common.mybatis.core.page.TableDataInfo; @Validated @RequiredArgsConstructor @RestController -@RequestMapping("/web/enforcementcode/file") +@RequestMapping("/web/supervision/file") public class ZdxtFileController extends BaseController { private final IZdxtFileService zdxtFileService; diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseInformation.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseInformation.java index 91fd7cfc..dce61e39 100644 --- a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseInformation.java +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/domain/EnterpriseInformation.java @@ -4,6 +4,8 @@ import org.dromara.common.mybatis.core.domain.BaseEntity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; import lombok.EqualsAndHashCode; + +import java.io.Serializable; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; @@ -16,9 +18,8 @@ import java.io.Serial; * @date 2026-04-10 */ @Data -@EqualsAndHashCode(callSuper = true) @TableName("enterprise_information") -public class EnterpriseInformation extends BaseEntity { +public class EnterpriseInformation implements Serializable { @Serial private static final long serialVersionUID = 1L; @@ -29,6 +30,18 @@ public class EnterpriseInformation extends BaseEntity { @TableId(value = "id") private String id; + /** + * 覆盖父类字段: 数据库中create_by存储的是人名字符串而非用户ID，跳过查询避免类型转换异常 + */ + @TableField(value = "create_by", fill = FieldFill.INSERT) + private String createBy; + + /** + * 覆盖父类字段: 数据库中update_by存储的是人名字符串而非用户ID，跳过查询避免类型转换异常 + */ + @TableField(value = "update_by", fill = FieldFill.INSERT_UPDATE) + private String updateBy; + /** * 企业名称 */ diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/helper/QrCodeHelper.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/helper/QrCodeHelper.java index 636c9b19..cc47dde1 100644 --- a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/helper/QrCodeHelper.java +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/helper/QrCodeHelper.java @@ -79,7 +79,7 @@ public class QrCodeHelper { public static QrCodeGenerateHistoryVo generateBlueWithLogoAndSave(String salt,String type, String enterpriseId, String enterpriseNumber, String formModule, Date createDate, - String refExId) { + String refExId,String reasonsChange) { int defaultSize = 400; // 1. 自动生成 codeId、salt String codeId = IdUtil.fastSimpleUUID(); @@ -104,7 +104,7 @@ public class QrCodeHelper { BufferedImage image = createBlueQrCodeWithLogo(qrContent, defaultSize); // 4. 保存文件和历史记录 - return uploadAndSaveRecords(image, enterpriseNumber, enterpriseId, codeId); + return uploadAndSaveRecords(image, enterpriseNumber, enterpriseId, codeId, reasonsChange); } // ==================== 图片生成 ==================== @@ -181,7 +181,7 @@ public class QrCodeHelper { private static QrCodeGenerateHistoryVo uploadAndSaveRecords(BufferedImage image, String enterpriseNumber, String businessId, - String codeId) { + String codeId,String reasonsChange) { byte[] imageBytes = imageToBytes(image); String fileName = "qrcode_" + IdUtil.fastSimpleUUID() + IMAGE_SUFFIX; @@ -194,6 +194,7 @@ public class QrCodeHelper { historyBo.setQrCodeUrl(fileVo.getUploadPath()); historyBo.setEnterpriseNumber(enterpriseNumber); historyBo.setStatus(0L); // 0=有效 + historyBo.setReasonsChange(reasonsChange); Boolean historySuccess = historyService.insertByBo(historyBo); if (!historySuccess) { throw new ServiceException("保存二维码生成历史失败"); diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnterpriseInformationService.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnterpriseInformationService.java index 27bc24b3..c0aad8d6 100644 --- a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnterpriseInformationService.java +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnterpriseInformationService.java @@ -85,5 +85,5 @@ public interface IEnterpriseInformationService { * @param formModule 表单模块 * @return 二维码生成历史记录 */ - QrCodeGenerateHistoryVo generateQrCode(String type, String enterpriseNumber, String formModule); + QrCodeGenerateHistoryVo generateQrCode(String type, String enterpriseNumber, String formModule,String reasonsChange); } diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseInformationServiceImpl.java b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseInformationServiceImpl.java index e1868018..33689072 100644 --- a/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseInformationServiceImpl.java +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseInformationServiceImpl.java @@ -181,7 +181,7 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS *

如果企业已存在有效二维码，则直接返回已有记录，不重复生成

*/ @Override - public QrCodeGenerateHistoryVo generateQrCode(String type, String enterpriseNumber, String formModule) { + public QrCodeGenerateHistoryVo generateQrCode(String type, String enterpriseNumber, String formModule,String reasonsChange) { // 1. 校验企业是否存在 EnterpriseInformationVo enterprise = queryByEnterpriseNumber(enterpriseNumber); if (enterprise == null) { @@ -197,7 +197,7 @@ public class EnterpriseInformationServiceImpl implements IEnterpriseInformationS // 3. 生成二维码 QrCodeGenerateHistoryVo qrCodeVo = QrCodeHelper.generateBlueWithLogoAndSave(enterprise.getSalt(), - type, enterprise.getId(), enterpriseNumber, formModule, new Date(), ""); + type, enterprise.getId(), enterpriseNumber, formModule, new Date(), "", reasonsChange); log.info("企业[{}]二维码生成成功，qrCodeId={}", enterpriseNumber, qrCodeVo.getId()); // 4. 更新企业的二维码ID和最后生成时间 diff --git a/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/LinkageDictMapper.xml b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/LinkageDictMapper.xml new file mode 100644 index 00000000..f1f48b8a --- /dev/null +++ b/ruoyi-modules/zdxt-enforcement-code/src/main/resources/mapper/enforcementcode/LinkageDictMapper.xml @@ -0,0 +1,6 @@ + + + + diff --git a/script/sql/zfjd-refactoring-v1/009-修改执法码相关的表.sql b/script/sql/zfjd-refactoring-v1/009-修改执法码相关的表.sql index 1864681e..ad071b74 100644 --- a/script/sql/zfjd-refactoring-v1/009-修改执法码相关的表.sql +++ b/script/sql/zfjd-refactoring-v1/009-修改执法码相关的表.sql @@ -26,3 +26,158 @@ ALTER TABLE qr_code_generate_history ADD COLUMN create_time datetime NULL COMMENT '创建时间' AFTER update_by, ADD COLUMN update_time datetime NULL COMMENT '更新时间' AFTER create_time, ADD COLUMN tenant_id varchar(50) NULL COMMENT '租户ID' AFTER update_time + + + +-- 缺少全部 6 个字段 +ALTER TABLE complaint_item + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN create_time datetime NULL COMMENT '创建时间', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +ALTER TABLE complaint_statistics + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN create_time datetime NULL COMMENT '创建时间', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +ALTER TABLE rule_item_list + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN create_time datetime NULL COMMENT '创建时间', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +ALTER TABLE xzcfajdsrxx594019 + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN create_time datetime NULL COMMENT '创建时间', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +ALTER TABLE xzcfajjbxx026705 + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN create_time datetime NULL COMMENT '创建时间', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +ALTER TABLE xzcfajjdxx778518 + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN create_time datetime NULL COMMENT '创建时间', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +ALTER TABLE xzjcdsrxx016987 + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN create_time datetime NULL COMMENT '创建时间', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +ALTER TABLE xzjcjbxx025711 + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN create_time datetime NULL COMMENT '创建时间', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +ALTER TABLE xzqzcsxx274939 + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN create_time datetime NULL COMMENT '创建时间', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +ALTER TABLE xzqzdsrxx997874 + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN create_time datetime NULL COMMENT '创建时间', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +ALTER TABLE xzqzjbxx173774 + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN create_time datetime NULL COMMENT '创建时间', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +-- 缺少部分字段 +ALTER TABLE enforcement_inspection_program + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +ALTER TABLE enforcement_registration + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +ALTER TABLE enterprise_complaint + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +ALTER TABLE enterprise_evaluate + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +ALTER TABLE enterprise_information + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +ALTER TABLE enterprise_law_enforcement + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +ALTER TABLE law_enforcement_enterprise + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +ALTER TABLE law_enforcement_warning_list + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +ALTER TABLE law_plan_audit + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +ALTER TABLE linkage_dict + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + +ALTER TABLE non_enforcement_registration + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + +ALTER TABLE rule_list + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + ADD COLUMN update_time datetime NULL COMMENT '更新时间', + +ALTER TABLE srz_dept + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', + +ALTER TABLE srz_user + ADD COLUMN create_dept varchar(100) NULL COMMENT '创建部门', + ADD COLUMN create_by varchar(50) NULL COMMENT '创建者', + ADD COLUMN update_by varchar(50) NULL COMMENT '更新者', diff --git a/script/sql/zfjd-refactoring-v1/1001-修改用于测试的账号密码.sql b/script/sql/zfjd-refactoring-v1/1001-修改用于测试的账号密码.sql new file mode 100644 index 00000000..d8b3ac82 --- /dev/null +++ b/script/sql/zfjd-refactoring-v1/1001-修改用于测试的账号密码.sql @@ -0,0 +1,15 @@ +-- 企业端,密码:123456 +-- 17608540150,weil45,"",15817307171,深圳农牧美益肉业有限公司,91440300662678582M,21 +-- 17608557492,DGD440881199506180622,"",15817381630,深圳市深水龙岗污水处理有限公司,914403006820066603,12 +-- 17608540121,smiledzb1982,"",13723454151,深圳康泰生物制品股份有限公司,91440300618837873J,10 +-- 17608594890,A7271888,"",13751661770,深圳市里程食品有限公司,91440300738848091F,9 +-- 17608565612,qintongzhen138,"",13823610579,欧姆龙电子部件（深圳）有限公司,914403007261811621,9 +-- 17608601734,XP073215,"",15012671807,深圳市强达电路股份有限公司,91440300763461366N,9 +-- 17608556724,33ef1970fd449676fa4bc197,"",13537602265,吉田拉链（深圳）有限公司公明工厂,91440300788302281W,8 +update enterprise_user set password='df9f19db2f0503c4564d967956adc318',salt='413f53' where user_id='17608540150'; +update enterprise_user set password='011c72e1631ae4d37463b6ec1f0d4825',salt='413f53' where user_id='17608557492'; +update enterprise_user set password='4c5ddbdb1266ef79b9e552f603c5a368',salt='413f53' where user_id='17608540121'; +update enterprise_user set password='18e70eb4a12f389c2969d09d16964ed2',salt='413f53' where user_id='17608594890'; +update enterprise_user set password='f1035f44ee5654be31465a6be5cd4240',salt='413f53' where user_id='17608565612'; +update enterprise_user set password='0071ba98dde715b02b82b22acfc7379c',salt='413f53' where user_id='17608601734'; +update enterprise_user set password='efc923c94bbb4a3d617d6865d7b7e694',salt='413f53' where user_id='17608556724'; diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/api/Classify.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/Classify.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/api/Classify.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/Classify.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/api/Home.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/Home.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/api/Home.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/Home.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/api/My.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/My.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/api/My.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/My.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/api/ShopCard.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/ShopCard.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/api/ShopCard.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/ShopCard.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/api/common.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/common.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/api/common.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/common.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/api/enforce/administrative.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/enforcement/administrative.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/api/enforce/administrative.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/enforcement/administrative.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/api/enforce/index.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/enforcement/index.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/api/enforce/index.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/enforcement/index.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/enterprise/index.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/enterprise/index.js new file mode 100644 index 00000000..64f894eb --- /dev/null +++ b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/enterprise/index.js @@ -0,0 +1,208 @@ +import { _get, _post,_form,_delete } from "../../http/index"; + +// region 重新整理有用的接口 + +let enterpriseAppBaseUrl = "/app/enterprise"; +// 企业端用户登录 +export const enterpriseLogin = (params, success, error) => _post(enterpriseAppBaseUrl + "/login/do", params, success, error); + +// 获取包裹的数据 +export const siqCode = (params, success, error) => _get(enterpriseAppBaseUrl+"/thirdLogin/getSiqCode",params,success,error); + + +// 获取用户关联的企业信息 +export const getUserRefEnterpriseInfo = (params, success, error) => _get(enterpriseAppBaseUrl + "/enterpriseInfo/getUserRefEnterpriseInfo", params, success, error); +//查询用户关联企业授权信息 +export const getEnterpriseMerchantAuthorization = (params, success, error) => _get(enterpriseAppBaseUrl + "/authorization/queryList",params,success,error); + +//查询企业二维码 +export const queryEnterpriseInformationQrCode = (enterpriseNumber, success, error) => _get(enterpriseAppBaseUrl+"/enterpriseInfo/getQrCode/"+enterpriseNumber,null,success,error) + + +// endregion + + + +//深i企登录 +export const getSiqLoginAuth = (params, success, error) => _post(enterpriseAppBaseUrl +"/thirdLogin/siqLogin",params,success,error); + +export const getSiqLoginAuthTest = (params, success, error) => _post("/app/thirdLogin/siqLoginTest",params,success,error); + +//企业信息登记 +export const addEnterpriseInformation = (params, success, error) => _post("/app/enterpriseInformation/add", params, success, error); + +//查询企业信息 +export const searchEnterpriseByNumber = (enterpriseNumber, success, error) => _get("/app/enterpriseInformation/searchEnterpriseByNumber/"+enterpriseNumber, null, success, error); + + +//查询企业执法登记列表 +export const queryRegistrationList = (params, success, error) => _get("/app/code/registration/queryList",params,success,error) +//查询企业执法登记列表-企业端修改联合检查查询语句 +export const queryEnterpriseList = (params, success, error) => _get("/app/code/registration/queryEnterpriseList",params,success,error) +//查询企业执法登记列表 - 剔除执法日期距离今天超过5天的执法记录 +export const queryRegistrationList2 = (params, success, error) => _get("/app/code/registration/queryList2",params,success,error) + +//查询执法日期距离今天至5日内的的执法记录 +export const queryListWithFiveDay = (params, success, error) => _get("/app/code/registration/queryListWithFiveDay",params,success,error) + +/** + * 查询企业执法登记列表-不分页 + * @param {*} params + * @param {*} success + * @param {*} error + * @returns + */ +export const selectRegistrationList = (params, success, error) => _get("/app/code/registration/selectList",params,success,error) + +//保存在线投诉 +export const addEnterpriseComplaint = (params, success, error) => _post("/app/code/complaint/add",params,success,error) + +// 投诉-- 查询行政and非行政未被投诉列表 +export const getAllCheckList = (params, success, error) => _post("/app/code/complaint/getAllCheckList",params,success,error) + +// 查询 +export const getEnterpriseComplaintById = (id, success, error) => _get("/app/code/complaint/getById/"+id,null,success,error) + +//查询投诉工单详情 +export const complaintInfoById = (params, success, error) => _get("/app/code/complaint/queryById",params,success,error) +//查询投诉工单处置进度列表 +export const complaintInfoProcessById = (params, success, error) => _get("/app/code/complaint/queryProcessById",params,success,error) +//工单办结 +export const mssqQueryEndInfo = (params, success, error) => _get("/app/code/complaint/mssqQueryEndInfo",params,success,error) +// 诉求工单评价页面 +export const toMssqAppraise = (params, success, error) => _post("/app/code/complaint/mssqAppraise",params,success,error) + +// 诉求工单评价页面 +export const queryEnterpriseComplaintList = (params, success, error) => _post("/app/code/complaint/queryList",params,success,error) +export const getObjByKey = (params, success, error) => _get("/app/satisfy/getObjByKey/"+params,null,success,error) +export const mssqDownFiles = (params, success, error) => _post("/app/satisfy/mssqDownFiles",params,success,error) +export const mssqDownFile = (params, success, error) => _post("/app/satisfy/mssqDownFile",params,success,error) +/** + * 查询企业行政执法通知记录 + * @param {*} params + * @param {*} success + * @param {*} error + * @returns + */ +export const queryEnforcementList = (params, success, error) => _post("/app/code/enforcement/queryList",params,success,error) + +/** + * 查询企业信息 + * @returns + */ +export const getEnterpriseInformation = (id,success,error) => _get("/app/enterpriseInformation/getEnterpriseInformation/" + id,null,success,error) + + +/** + * 查询企业列表 + * @param {} params + * @param {*} success + * @param {*} error + * @returns + */ +export const queryEnterpriseInfoList = (params, success, error) =>_get("/app/enterpriseInformation/queryList",params, success, error) + +/** + * 查询企业列表 + * @param {} params + * @param {*} success + * @param {*} error + * @returns + */ +export const queryEnterpriseInfoListAndQrInfo = (params, success, error) =>_post("/app/enterpriseInformation/queryListAndQrInfo",params, success, error) + + +/** + * 查询企业历史二维码生成记录 + * @param {*} params + * @param {*} success + * @param {*} error + * @returns + */ +export const queryHistoryQrCodeList = (params, success, error) =>_get("/app/enterpriseInformation/queryHistoryQrCodeList",params, success, error) + +/** + * 查询历史检查案件 + * @param {*} params + * @param {*} success + * @param {*} error + * @returns + */ +export const queryXzjcjbxxList = (params, success, error) =>_post("/app/xzjcjbxx/queryList", params,success, error) + +/** + * 查询强制案件 + * @param {*} enterpriseNumber + * @param {*} success + * @param {*} error + * @returns + */ +export const queryQZAJList = (params, success, error) =>_post("/app/xzjcjbxx/queryQZAJList", params,success, error) +/** + * 查询历史处罚案件 + * @param {*} enterpriseNumber + * @param {*} success + * @param {*} error + * @returns + */ +export const queryCFAJList = (params, success, error) =>_post("/app/xzjcjbxx/queryCFAJList",params,success, error) +/** + * 查询企业是否存在 + * @param {*} enterpriseNumber 企业统一信用代码 + * @param {*} success + * @param {*} error + * @returns + */ +export const checkIsExists = (enterpriseNumber, success, error) =>_get("/app/enterpriseInformation/checkIsExists/" + enterpriseNumber,null,success, error) + + +/** + * 保存企业对行政执法的评价 + * @param {*} enterpriseNumber 企业统一信用代码 + * @param {*} success + * @param {*} error + * @returns + */ +export const addEvaluateInfo = (params, success, error) =>_post("/app/evaluate/add",params,success, error) + + + +/** + * 查询民生诉求执法部门列表 + * @param {*} params + * @param {*} success + * @param {*} error + * @returns + */ +export const queryComplaintItemList = (params, success, error) =>_get("/app/code/item/queryList",params,success, error) + + +/** + * 查询执法人员统计数据 + * @param {*} params + * @param {*} success + * @param {*} error + * @returns + */ +export const queryStatisticsIndicatorPart1 = (params, success, error) =>_get("/app/enforcementCheckStatistics/statisticsIndicatorPart1",params,success,error) + +/** + * 查询统计个人分析数据 + * @param {*} params + * @param {*} success + * @param {*} error + * @returns + */ +export const queryStatisticsIndicatorPart2 = (params, success, error) =>_get("/app/enforcementCheckStatistics/statisticsIndicatorPart2",params,success,error) + +/** + * 查询统计部门分析数据 + * @param {*} params + * @param {*} success + * @param {*} error + * @returns + */ +export const queryStatisticsIndicatorPart3 = (params, success, error) =>_get("/app/enforcementCheckStatistics/statisticsIndicatorPart3",params,success,error) + +//获取全部执法单位 +export const getAllEnforceDept = (params, success, error) => _post("/app/code/registration/getAllEnforceDept",params,success,error) diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/api/linkage.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/linkage.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/api/linkage.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/linkage.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/api/pdf.worker.min.mjs b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/pdf.worker.min.mjs similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/api/pdf.worker.min.mjs rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/pdf.worker.min.mjs diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/api/pdf.worker.mjs b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/pdf.worker.mjs similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/api/pdf.worker.mjs rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/pdf.worker.mjs diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/api/user.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/user.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/api/user.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/api/user.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/components/carousel-card/index.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/components/carousel-card/index.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/components/carousel-card/index.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/components/carousel-card/index.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/components/footer-enforcement-nav/index.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/components/footer-enforcement-nav/index.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/components/footer-enforcement-nav/index.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/components/footer-enforcement-nav/index.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/components/footer-nav/index.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/components/footer-nav/index.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/components/footer-nav/index.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/components/footer-nav/index.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/components/goods-card/index.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/components/goods-card/index.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/components/goods-card/index.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/components/goods-card/index.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/components/header-nav/index.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/components/header-nav/index.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/components/header-nav/index.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/components/header-nav/index.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/components/lodding-card/index.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/components/lodding-card/index.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/components/lodding-card/index.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/components/lodding-card/index.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/components/refresh-list/index.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/components/refresh-list/index.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/components/refresh-list/index.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/components/refresh-list/index.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/router/address.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/router/address.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/router/address.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/router/address.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/router/administrative.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/router/administrative.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/router/administrative.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/router/administrative.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/router/classify.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/router/classify.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/router/classify.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/router/classify.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/router/enforce.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/router/enforce.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/router/enforce.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/router/enforce.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/router/enforceHome.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/router/enforceHome.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/router/enforceHome.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/router/enforceHome.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/router/enterprise-app/ent-main-router.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/router/enterprise-app/ent-main-router.js new file mode 100644 index 00000000..eed04f1f --- /dev/null +++ b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/router/enterprise-app/ent-main-router.js @@ -0,0 +1,29 @@ + +const routes = [ + // 企业端登录 + { + path: "/enterprise/login", + name: "enterpriseLogin", + component: () => import("@/views/enterprise/login.vue"), + meta: { + isKeepAlive: false, + }, + }, + // 企业端首页（新路由名称） + { + path: "/enterprise/home", + name: "enterpriseHome", + component: () => import("@/views/enterprise/enterpriseHome.vue"), + meta: { + isKeepAlive: false, + }, + }, + // 执法监督码 + { + path: "/enterprise/qrCode", + name: "enterpriseQrCode", + component: () => import("@/views/enterprise/qrCode.vue"), + } +]; + +export {routes}; diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/router/home.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/router/home.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/router/home.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/router/home.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/router/my.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/router/my.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/router/my.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/router/my.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/router/non-law.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/router/non-law.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/router/non-law.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/router/non-law.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/store/Classify.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/store/Classify.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/store/Classify.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/store/Classify.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/store/Common.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/store/Common.js new file mode 100644 index 00000000..fd265790 --- /dev/null +++ b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/store/Common.js @@ -0,0 +1,123 @@ + +import { getLang, getGoodsNum, getGoodsdetal } from "@/api/common"; + +export default defineStore('useCommon', { + state: () => ({ + subMsgKey: "", // 定义通知(由于路由不再支持parmas传参丢失) + goods_card_num: 0, + is_reload_card: false, + id:"", + //企业统一信用代码 + enterpriseNumber:"", + //企业名称 + enterpriseName:"", + //企业ID + enterpriseId:"", + //当前登录用户ID + userId:"", + //执法主体 + orgId:"", + // token + token: "", + //当前登录用户的手机号 + phonenumber:"", + //是否初始化加载 + firstLoad: true, + // 是否执法人员 + hasLaw: false, + }), + getters: {}, + actions: { + // 设置缓存页面通知事件标识 + SET_SUB_MSG_KEY(data) { + this.subMsgKey = data; + }, + // 设置购物车数量 + SET_GOODS_NUM(data) { + this.goods_card_num = data; + }, + // 是否重新加载购物车 + SET_RELAOD_SHOP(data) { + this.is_reload_card = data; + }, + //修改用户关联的企业纳税识别号 + SET_USER_ENTERPRISE_NUMBER(data){ + this.enterpriseNumber = data; + }, + //修改用户关联的企业纳税识别号 + SET_USER_ENTERPRISE_NAME(data){ + this.enterpriseName = data; + }, + //设置企业ID + SET_USER_ENTERPRISE_ID(data){ + this.enterpriseId = data; + }, + //设置用户ID + SET_USER_ID(data){ + this.userId = data; + }, + //设置执法主体ID + SET_ORG_ID(data){ + this.orgId = data; + }, + //设置用户token + SET_TOKEN(data){ + this.token = data; + }, + //设置用户token + SET_IS_FIRST_LOAD(data){ + this.firstLoad = data; + }, + //设置用户手机号码 + SET_USER_PHONENUMBER(data){ + this.phonenumber = data; + }, + //设置是否执法人员 + SET_HAS_LAW(data){ + this.hasLaw = data; + }, + // 获取多语言数据 + async getLang(params) { + let url = $globalRequestUrl({ + url: getLang, + }); + + try { + const rep = await $globalRequest(url, params, { method: "GET" }); + return rep; + } catch (error) { + return error; + } + }, + // 获取购物车数量 + async getGoodsNum(params) { + let url = $globalRequestUrl({ + url: getGoodsNum, + }); + + try { + const rep = await $globalRequest(url, params, { method: "GET" }); + return rep; + } catch (error) { + return error; + } + }, + // 获取商品详情 + async getGoodsdetal(params) { + let url = $globalRequestUrl({ + url: getGoodsdetal, + }); + + try { + const rep = await $globalRequest(url, params, { method: "POST" }); + return rep; + } catch (error) { + return error; + } + }, + }, + persist: { + storage: sessionStorage, + pick: ['token', 'userId', 'enterpriseNumber', 'enterpriseName', 'enterpriseId', 'phonenumber', 'orgId', 'hasLaw'], + }, +}); diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/store/Home.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/store/Home.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/store/Home.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/store/Home.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/store/My.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/store/My.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/store/My.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/store/My.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/store/ShopCard.js b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/store/ShopCard.js similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/src/store/ShopCard.js rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/store/ShopCard.js diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/404.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/404.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/404.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/404.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/Classify.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/Classify.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/Classify.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/Classify.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/Home.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/Home.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/Home.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/Home.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/HomeWx.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/HomeWx.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/HomeWx.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/HomeWx.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/My.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/My.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/My.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/My.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/Shop.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/Shop.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/Shop.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/Shop.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/administrative/appointment-bak.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/administrative/appointment-bak.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/administrative/appointment-bak.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/administrative/appointment-bak.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/administrative/appointment.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/administrative/appointment.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/administrative/appointment.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/administrative/appointment.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/administrative/appointmentBase.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/administrative/appointmentBase.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/administrative/appointmentBase.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/administrative/appointmentBase.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/administrative/appointmentDetail.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/administrative/appointmentDetail.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/administrative/appointmentDetail.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/administrative/appointmentDetail.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/administrative/appointmentEdit.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/administrative/appointmentEdit.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/administrative/appointmentEdit.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/administrative/appointmentEdit.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/administrative/appointmentList.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/administrative/appointmentList.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/administrative/appointmentList.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/administrative/appointmentList.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/administrative/appointmentRelaunch.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/administrative/appointmentRelaunch.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/administrative/appointmentRelaunch.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/administrative/appointmentRelaunch.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/administrative/deptFilter.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/administrative/deptFilter.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/administrative/deptFilter.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/administrative/deptFilter.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/administrative/userFilter.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/administrative/userFilter.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/administrative/userFilter.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/administrative/userFilter.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/common/addressEdit.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/common/addressEdit.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/common/addressEdit.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/common/addressEdit.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/common/addressList.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/common/addressList.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/common/addressList.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/common/addressList.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/common/analyse-back.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/common/analyse-back.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/common/analyse-back.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/common/analyse-back.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/common/analyse.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/common/analyse.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/common/analyse.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/common/analyse.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/common/analyseFilter.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/common/analyseFilter.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/common/analyseFilter.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/common/analyseFilter.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/common/goodsDetail.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/common/goodsDetail.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/common/goodsDetail.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/common/goodsDetail.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/common/pdfPngPreview.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/common/pdfPngPreview.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/common/pdfPngPreview.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/common/pdfPngPreview.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/common/pdfPreview.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/common/pdfPreview.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/common/pdfPreview.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/common/pdfPreview.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/common/pdfvVew.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/common/pdfvVew.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/common/pdfvVew.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/common/pdfvVew.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/common/setting.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/common/setting.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/common/setting.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/common/setting.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/assistUserFilter.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/assistUserFilter.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/assistUserFilter.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/assistUserFilter.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/comprehensiveAnalysis.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/comprehensiveAnalysis.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/comprehensiveAnalysis.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/comprehensiveAnalysis.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/earlyWarning.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/earlyWarning.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/earlyWarning.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/earlyWarning.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/earlyWarningBak.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/earlyWarningBak.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/earlyWarningBak.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/earlyWarningBak.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enforceNotice.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enforceNotice.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enforceNotice.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enforceNotice.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enforceNoticeBase.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enforceNoticeBase.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enforceNoticeBase.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enforceNoticeBase.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enforceNoticeDetai-bak2.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enforceNoticeDetai-bak2.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enforceNoticeDetai-bak2.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enforceNoticeDetai-bak2.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enforceNoticeDetail-bak.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enforceNoticeDetail-bak.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enforceNoticeDetail-bak.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enforceNoticeDetail-bak.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enforceNoticeDetail.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enforceNoticeDetail.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enforceNoticeDetail.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enforceNoticeDetail.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enforceNoticeSystem.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enforceNoticeSystem.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enforceNoticeSystem.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enforceNoticeSystem.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enforcementPlan.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enforcementPlan.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enforcementPlan.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enforcementPlan.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enforcementPlanAdd.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enforcementPlanAdd.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enforcementPlanAdd.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enforcementPlanAdd.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enforcementPlanBase.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enforcementPlanBase.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enforcementPlanBase.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enforcementPlanBase.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enforcementPlanDetailed.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enforcementPlanDetailed.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enforcementPlanDetailed.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enforcementPlanDetailed.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enterpriseBaseInfo.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enterpriseBaseInfo.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enterpriseBaseInfo.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enterpriseBaseInfo.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enterpriseScanPreview.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enterpriseScanPreview.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enterpriseScanPreview.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enterpriseScanPreview.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enterpriseWarningInfo.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enterpriseWarningInfo.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enterpriseWarningInfo.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enterpriseWarningInfo.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enterpriseWarningInfoBak.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enterpriseWarningInfoBak.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/enterpriseWarningInfoBak.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/enterpriseWarningInfoBak.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/evaluate.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/evaluate.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/evaluate.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/evaluate.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/historyCheck.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/historyCheck.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/historyCheck.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/historyCheck.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/lawFilter.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/lawFilter.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/lawFilter.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/lawFilter.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/login.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/login.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/login.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/login.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/noScan.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/noScan.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/noScan.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/noScan.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/noScanFilter-bak.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/noScanFilter-bak.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/noScanFilter-bak.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/noScanFilter-bak.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/noScanFilter.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/noScanFilter.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/noScanFilter.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/noScanFilter.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/outsideRegister.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/outsideRegister.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/outsideRegister.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/outsideRegister.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/qrCodeLoading.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/qrCodeLoading.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/qrCodeLoading.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/qrCodeLoading.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/scanPage.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/scanPage.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/scanPage.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/scanPage.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/scanPage_szy.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/scanPage_szy.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/scanPage_szy.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/scanPage_szy.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/scanQrCode.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/scanQrCode.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/scanQrCode.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/scanQrCode.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/selectEntrustFilter.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/selectEntrustFilter.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/selectEntrustFilter.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/selectEntrustFilter.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/sign.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/sign.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/sign.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/sign.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/userFilter.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/userFilter.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/userFilter.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/userFilter.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/zqyjjdmFilter.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/zqyjjdmFilter.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforce/zqyjjdmFilter.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforce/zqyjjdmFilter.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforceHome.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforceHome.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enforceHome.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enforceHome.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/caseFilter.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/caseFilter.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/caseFilter.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/caseFilter.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/compaint/compaintBase.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/compaint/compaintBase.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/compaint/compaintBase.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/compaint/compaintBase.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/compaint/compaintDetailIndex.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/compaint/compaintDetailIndex.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/compaint/compaintDetailIndex.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/compaint/compaintDetailIndex.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/compaint/compaintFlowView.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/compaint/compaintFlowView.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/compaint/compaintFlowView.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/compaint/compaintFlowView.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/compaint/registrationListView.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/compaint/registrationListView.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/compaint/registrationListView.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/compaint/registrationListView.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/compaint/selectDeptFilter.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/compaint/selectDeptFilter.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/compaint/selectDeptFilter.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/compaint/selectDeptFilter.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/compaint/selectMssqFilter.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/compaint/selectMssqFilter.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/compaint/selectMssqFilter.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/compaint/selectMssqFilter.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/compaint/uniteDept.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/compaint/uniteDept.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/compaint/uniteDept.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/compaint/uniteDept.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/companyFilter.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/companyFilter.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/companyFilter.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/companyFilter.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/complaint.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/complaint.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/complaint.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/complaint.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/complaintDetail.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/complaintDetail.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/complaintDetail.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/complaintDetail.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/complaintDetailView.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/complaintDetailView.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/complaintDetailView.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/complaintDetailView.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/complaintEvaluate.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/complaintEvaluate.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/complaintEvaluate.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/complaintEvaluate.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/complaintItem.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/complaintItem.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/complaintItem.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/complaintItem.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/complaintList.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/complaintList.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/complaintList.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/complaintList.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/complaintNoScan.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/complaintNoScan.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/complaintNoScan.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/complaintNoScan.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/enterpriseEvaluate/evaluate.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/enterpriseEvaluate/evaluate.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/enterpriseEvaluate/evaluate.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/enterpriseEvaluate/evaluate.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/enterpriseHome.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/enterpriseHome.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/enterpriseHome.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/enterpriseHome.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/enterpriseInformation.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/enterpriseInformation.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/enterpriseInformation.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/enterpriseInformation.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/enterpriseInspectionDetail.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/enterpriseInspectionDetail.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/enterpriseInspectionDetail.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/enterpriseInspectionDetail.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/enterpriseInspectionList.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/enterpriseInspectionList.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/enterpriseInspectionList.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/enterpriseInspectionList.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/enterpriseInspectionNotice.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/enterpriseInspectionNotice.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/enterpriseInspectionNotice.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/enterpriseInspectionNotice.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/login.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/login.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/login.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/login.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/qrCode.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/qrCode.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/qrCode.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/qrCode.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/qrCodeHistory.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/qrCodeHistory.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/qrCodeHistory.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/qrCodeHistory.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/registrationDetail.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/registrationDetail.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/registrationDetail.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/registrationDetail.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/registrationEdit.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/registrationEdit.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/registrationEdit.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/registrationEdit.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/registrationList.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/registrationList.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/registrationList.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/registrationList.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/registrationSelectList.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/registrationSelectList.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/registrationSelectList.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/registrationSelectList.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/systemNotice.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/systemNotice.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/systemNotice.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/systemNotice.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/systemNoticeDetail.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/systemNoticeDetail.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/enterprise/systemNoticeDetail.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/enterprise/systemNoticeDetail.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/login.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/login.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/login.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/login.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/noAccess.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/noAccess.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/noAccess.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/noAccess.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/non-law/enterpriseBaseInfo.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/non-law/enterpriseBaseInfo.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/non-law/enterpriseBaseInfo.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/non-law/enterpriseBaseInfo.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/non-law/enterpriseScanPreview.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/non-law/enterpriseScanPreview.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/non-law/enterpriseScanPreview.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/non-law/enterpriseScanPreview.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/non-law/enterpriseWarningInfo.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/non-law/enterpriseWarningInfo.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/non-law/enterpriseWarningInfo.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/non-law/enterpriseWarningInfo.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/non-law/noScanFilter.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/non-law/noScanFilter.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/non-law/noScanFilter.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/non-law/noScanFilter.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/non-law/nonSignDetail.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/non-law/nonSignDetail.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/non-law/nonSignDetail.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/non-law/nonSignDetail.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/non-law/outsideRegister.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/non-law/outsideRegister.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/non-law/outsideRegister.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/non-law/outsideRegister.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/non-law/qrCodeLoading.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/non-law/qrCodeLoading.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/non-law/qrCodeLoading.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/non-law/qrCodeLoading.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/non-law/scanQrCode.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/non-law/scanQrCode.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/non-law/scanQrCode.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/non-law/scanQrCode.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/non-law/sign.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/non-law/sign.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/non-law/sign.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/non-law/sign.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/notExist.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/notExist.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/notExist.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/notExist.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/fordelete/register.vue b/zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/register.vue similarity index 100% rename from zdxt-web-client/zdxt-enforcement-code-app/fordelete/register.vue rename to zdxt-web-client/zdxt-enforcement-code-app/fordelete/views/register.vue diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/api/enterprise/index.js b/zdxt-web-client/zdxt-enforcement-code-app/src/api/enterprise/index.js index be429f1a..ac3fc3c6 100644 --- a/zdxt-web-client/zdxt-enforcement-code-app/src/api/enterprise/index.js +++ b/zdxt-web-client/zdxt-enforcement-code-app/src/api/enterprise/index.js @@ -1,204 +1,24 @@ import { _get, _post,_form,_delete } from "../../http/index"; // region 重新整理有用的接口 -// 企业端用户登录 -let enterpriseAppBaseUrl = "/app/enterprise"; +let enterpriseAppBaseUrl = "/app/enterprise"; +// 企业端用户登录 export const enterpriseLogin = (params, success, error) => _post(enterpriseAppBaseUrl + "/login/do", params, success, error); + +// 获取包裹的数据 +export const siqCode = (params, success, error) => _get(enterpriseAppBaseUrl+"/thirdLogin/getSiqCode",params,success,error); + + // 获取用户关联的企业信息 -export const getEnterpriseInfo = (params, success, error) => _get(enterpriseAppBaseUrl + "/enterpriseInfo/getEnterpriseInfo", params, success, error); +export const getUserRefEnterpriseInfo = (params, success, error) => _get(enterpriseAppBaseUrl + "/enterpriseInfo/getUserRefEnterpriseInfo", params, success, error); //查询用户关联企业授权信息 export const getEnterpriseMerchantAuthorization = (params, success, error) => _get(enterpriseAppBaseUrl + "/authorization/queryList",params,success,error); //查询企业二维码 export const queryEnterpriseInformationQrCode = (enterpriseNumber, success, error) => _get(enterpriseAppBaseUrl+"/enterpriseInfo/getQrCode/"+enterpriseNumber,null,success,error) +//深i企登录-暂时没有环境调通 +export const getSiqLoginAuth = (params, success, error) => _post(enterpriseAppBaseUrl +"/thirdLogin/siqLogin",params,success,error); // endregion - - - -//深i企登录 -export const getSiqLoginAuth = (params, success, error) => _post("/app/thirdLogin/siqLogin",params,success,error); -export const getSiqLoginAuthTest = (params, success, error) => _post("/app/thirdLogin/siqLoginTest",params,success,error); -// 获取包裹的数据 -export const siqCode = (params, success, error) => _get("/app/thirdLogin/getSiqCode",params,success,error); - -//企业信息登记 -export const addEnterpriseInformation = (params, success, error) => _post("/app/enterpriseInformation/add", params, success, error); - -//查询企业信息 -export const searchEnterpriseByNumber = (enterpriseNumber, success, error) => _get("/app/enterpriseInformation/searchEnterpriseByNumber/"+enterpriseNumber, null, success, error); - - -//查询企业执法登记列表 -export const queryRegistrationList = (params, success, error) => _get("/app/code/registration/queryList",params,success,error) -//查询企业执法登记列表-企业端修改联合检查查询语句 -export const queryEnterpriseList = (params, success, error) => _get("/app/code/registration/queryEnterpriseList",params,success,error) -//查询企业执法登记列表 - 剔除执法日期距离今天超过5天的执法记录 -export const queryRegistrationList2 = (params, success, error) => _get("/app/code/registration/queryList2",params,success,error) - -//查询执法日期距离今天至5日内的的执法记录 -export const queryListWithFiveDay = (params, success, error) => _get("/app/code/registration/queryListWithFiveDay",params,success,error) - -/** - * 查询企业执法登记列表-不分页 - * @param {*} params - * @param {*} success - * @param {*} error - * @returns - */ -export const selectRegistrationList = (params, success, error) => _get("/app/code/registration/selectList",params,success,error) - -//保存在线投诉 -export const addEnterpriseComplaint = (params, success, error) => _post("/app/code/complaint/add",params,success,error) - -// 投诉-- 查询行政and非行政未被投诉列表 -export const getAllCheckList = (params, success, error) => _post("/app/code/complaint/getAllCheckList",params,success,error) - -// 查询 -export const getEnterpriseComplaintById = (id, success, error) => _get("/app/code/complaint/getById/"+id,null,success,error) - -//查询投诉工单详情 -export const complaintInfoById = (params, success, error) => _get("/app/code/complaint/queryById",params,success,error) -//查询投诉工单处置进度列表 -export const complaintInfoProcessById = (params, success, error) => _get("/app/code/complaint/queryProcessById",params,success,error) -//工单办结 -export const mssqQueryEndInfo = (params, success, error) => _get("/app/code/complaint/mssqQueryEndInfo",params,success,error) -// 诉求工单评价页面 -export const toMssqAppraise = (params, success, error) => _post("/app/code/complaint/mssqAppraise",params,success,error) - -// 诉求工单评价页面 -export const queryEnterpriseComplaintList = (params, success, error) => _post("/app/code/complaint/queryList",params,success,error) -export const getObjByKey = (params, success, error) => _get("/app/satisfy/getObjByKey/"+params,null,success,error) -export const mssqDownFiles = (params, success, error) => _post("/app/satisfy/mssqDownFiles",params,success,error) -export const mssqDownFile = (params, success, error) => _post("/app/satisfy/mssqDownFile",params,success,error) -/** - * 查询企业行政执法通知记录 - * @param {*} params - * @param {*} success - * @param {*} error - * @returns - */ -export const queryEnforcementList = (params, success, error) => _post("/app/code/enforcement/queryList",params,success,error) - -/** - * 查询企业信息 - * @returns - */ -export const getEnterpriseInformation = (id,success,error) => _get("/app/enterpriseInformation/getEnterpriseInformation/" + id,null,success,error) - - -/** - * 查询企业列表 - * @param {} params - * @param {*} success - * @param {*} error - * @returns - */ -export const queryEnterpriseInfoList = (params, success, error) =>_get("/app/enterpriseInformation/queryList",params, success, error) - -/** - * 查询企业列表 - * @param {} params - * @param {*} success - * @param {*} error - * @returns - */ -export const queryEnterpriseInfoListAndQrInfo = (params, success, error) =>_post("/app/enterpriseInformation/queryListAndQrInfo",params, success, error) - - -/** - * 查询企业历史二维码生成记录 - * @param {*} params - * @param {*} success - * @param {*} error - * @returns - */ -export const queryHistoryQrCodeList = (params, success, error) =>_get("/app/enterpriseInformation/queryHistoryQrCodeList",params, success, error) - -/** - * 查询历史检查案件 - * @param {*} params - * @param {*} success - * @param {*} error - * @returns - */ -export const queryXzjcjbxxList = (params, success, error) =>_post("/app/xzjcjbxx/queryList", params,success, error) - -/** - * 查询强制案件 - * @param {*} enterpriseNumber - * @param {*} success - * @param {*} error - * @returns - */ -export const queryQZAJList = (params, success, error) =>_post("/app/xzjcjbxx/queryQZAJList", params,success, error) -/** - * 查询历史处罚案件 - * @param {*} enterpriseNumber - * @param {*} success - * @param {*} error - * @returns - */ -export const queryCFAJList = (params, success, error) =>_post("/app/xzjcjbxx/queryCFAJList",params,success, error) -/** - * 查询企业是否存在 - * @param {*} enterpriseNumber 企业统一信用代码 - * @param {*} success - * @param {*} error - * @returns - */ -export const checkIsExists = (enterpriseNumber, success, error) =>_get("/app/enterpriseInformation/checkIsExists/" + enterpriseNumber,null,success, error) - - -/** - * 保存企业对行政执法的评价 - * @param {*} enterpriseNumber 企业统一信用代码 - * @param {*} success - * @param {*} error - * @returns - */ -export const addEvaluateInfo = (params, success, error) =>_post("/app/evaluate/add",params,success, error) - - - -/** - * 查询民生诉求执法部门列表 - * @param {*} params - * @param {*} success - * @param {*} error - * @returns - */ -export const queryComplaintItemList = (params, success, error) =>_get("/app/code/item/queryList",params,success, error) - - -/** - * 查询执法人员统计数据 - * @param {*} params - * @param {*} success - * @param {*} error - * @returns - */ -export const queryStatisticsIndicatorPart1 = (params, success, error) =>_get("/app/enforcementCheckStatistics/statisticsIndicatorPart1",params,success,error) - -/** - * 查询统计个人分析数据 - * @param {*} params - * @param {*} success - * @param {*} error - * @returns - */ -export const queryStatisticsIndicatorPart2 = (params, success, error) =>_get("/app/enforcementCheckStatistics/statisticsIndicatorPart2",params,success,error) - -/** - * 查询统计部门分析数据 - * @param {*} params - * @param {*} success - * @param {*} error - * @returns - */ -export const queryStatisticsIndicatorPart3 = (params, success, error) =>_get("/app/enforcementCheckStatistics/statisticsIndicatorPart3",params,success,error) - -//获取全部执法单位 -export const getAllEnforceDept = (params, success, error) => _post("/app/code/registration/getAllEnforceDept",params,success,error) diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/components/enterprise/footerNav.vue b/zdxt-web-client/zdxt-enforcement-code-app/src/components/enterprise/footerNav.vue new file mode 100644 index 00000000..c0e85625 --- /dev/null +++ b/zdxt-web-client/zdxt-enforcement-code-app/src/components/enterprise/footerNav.vue @@ -0,0 +1,58 @@ + + + + diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/router/enterprise-app/ent-main-router.js b/zdxt-web-client/zdxt-enforcement-code-app/src/router/enterprise-app/ent-main-router.js index eed04f1f..1bb90702 100644 --- a/zdxt-web-client/zdxt-enforcement-code-app/src/router/enterprise-app/ent-main-router.js +++ b/zdxt-web-client/zdxt-enforcement-code-app/src/router/enterprise-app/ent-main-router.js @@ -11,7 +11,7 @@ const routes = [ }, // 企业端首页（新路由名称） { - path: "/enterprise/home", + path: "/enterprise/enterpriseHome", name: "enterpriseHome", component: () => import("@/views/enterprise/enterpriseHome.vue"), meta: { @@ -23,6 +23,12 @@ const routes = [ path: "/enterprise/qrCode", name: "enterpriseQrCode", component: () => import("@/views/enterprise/qrCode.vue"), + }, + // 执法监督码 + { + path: "/enterprise/registrationList", + name: "registrationList", + component: () => import("@/views/enterprise/registrationList.vue"), } ]; diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/store/Common.js b/zdxt-web-client/zdxt-enforcement-code-app/src/store/Common.js index fd265790..8690975f 100644 --- a/zdxt-web-client/zdxt-enforcement-code-app/src/store/Common.js +++ b/zdxt-web-client/zdxt-enforcement-code-app/src/store/Common.js @@ -1,6 +1,3 @@ - -import { getLang, getGoodsNum, getGoodsdetal } from "@/api/common"; - export default defineStore('useCommon', { state: () => ({ subMsgKey: "", // 定义通知(由于路由不再支持parmas传参丢失) @@ -77,7 +74,7 @@ export default defineStore('useCommon', { this.hasLaw = data; }, // 获取多语言数据 - async getLang(params) { + /*async getLang(params) { let url = $globalRequestUrl({ url: getLang, }); @@ -88,9 +85,9 @@ export default defineStore('useCommon', { } catch (error) { return error; } - }, + },*/ // 获取购物车数量 - async getGoodsNum(params) { + /*async getGoodsNum(params) { let url = $globalRequestUrl({ url: getGoodsNum, }); @@ -101,9 +98,9 @@ export default defineStore('useCommon', { } catch (error) { return error; } - }, + },*/ // 获取商品详情 - async getGoodsdetal(params) { + /*async getGoodsdetal(params) { let url = $globalRequestUrl({ url: getGoodsdetal, }); @@ -114,7 +111,7 @@ export default defineStore('useCommon', { } catch (error) { return error; } - }, + },*/ }, persist: { storage: sessionStorage, diff --git a/zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/enterpriseHome.vue b/zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/enterpriseHome.vue index b7d70733..14125bdc 100644 --- a/zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/enterpriseHome.vue +++ b/zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/enterpriseHome.vue @@ -6,14 +6,13 @@ -
-
+
@@ -34,7 +33,6 @@
-
@@ -43,38 +41,19 @@ + + diff --git a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml index 05650b6e..c9350714 100644 --- a/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml +++ b/zdxt-web-server/zdxt-admin-web-server/src/main/resources/application.yml @@ -120,6 +120,8 @@ security: - /warm-flow-ui/config # enforcement-code 统计面板（静态HTML页面调用，无token） - /code/statisticalPanel/** + # 本地文件静态资源访问（图片预览、附件下载） + - /profile/** # 多租户配置 tenant: @@ -139,6 +141,34 @@ tenant: - flow_spel - sys_job - sys_job_log + - complaint_item + - complaint_statistics + - rule_item_list + - xzcfajdsrxx594019 + - xzcfajjbxx026705 + - xzcfajjdxx78518 + - xzjcdsrxx016987 + - xzjcjbxx025711 + - xzqzcsxx274939 + - xzqzdsrxx997874 + - xzqzjbxx173774 + - enforcement_inspection_program + - enforcement_registration + - enterprise_complaint + - enterprise_evaluate + - enterprise_information + - enterprise_law_enforcement + - enterprise_merchant_authorization + - enterprise_user + - enterprise_user_ref + - law_enforcement_enterprise + - law_enforcement_warning_list + - law_plan_audit + - linkage_dict + - non_enforcement_registration + - rule_list + - srz_dept + - srz_user # MyBatisPlus配置 # https://baomidou.com/config/