Browse Source

重写接口第二天

master
庄锐波 7 months ago
parent
commit
09453acde9
  1. 4
      ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/DictController.java
  2. 52
      ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseInformationController.java
  3. 4
      ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseMerchantAuthorizationController.java
  4. 17
      ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppLoginController.java
  5. 8
      ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppThirdLoginController.java
  6. 2
      ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseComplaintController.java
  7. 2
      ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseEvaluateController.java
  8. 2
      ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseInformationController.java
  9. 2
      ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseLawEnforcementController.java
  10. 2
      ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseMerchantAuthorizationController.java
  11. 2
      ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/LawEnforcementEnterpriseController.java
  12. 2
      ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/QrCodeGenerateHistoryController.java
  13. 16
      ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnterpriseUserRefService.java
  14. 20
      ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseUserRefServiceImpl.java
  15. 12
      zdxt-web-client/zdxt-enforcement-code-app/src/App.vue
  16. 12
      zdxt-web-client/zdxt-enforcement-code-app/src/api/Home.js
  17. 3
      zdxt-web-client/zdxt-enforcement-code-app/src/api/enforce/administrative.js
  18. 4
      zdxt-web-client/zdxt-enforcement-code-app/src/api/enforce/index.js
  19. 134
      zdxt-web-client/zdxt-enforcement-code-app/src/api/enterprise/index.js
  20. 4
      zdxt-web-client/zdxt-enforcement-code-app/src/http/http.js
  21. 6
      zdxt-web-client/zdxt-enforcement-code-app/src/router/enforce.js
  22. 6
      zdxt-web-client/zdxt-enforcement-code-app/src/router/enforceHome.js
  23. 8
      zdxt-web-client/zdxt-enforcement-code-app/src/store/Common.js
  24. 2
      zdxt-web-client/zdxt-enforcement-code-app/src/views/Home.vue
  25. 2
      zdxt-web-client/zdxt-enforcement-code-app/src/views/HomeWx.vue
  26. 2
      zdxt-web-client/zdxt-enforcement-code-app/src/views/administrative/appointment-bak.vue
  27. 2
      zdxt-web-client/zdxt-enforcement-code-app/src/views/administrative/appointment.vue
  28. 2
      zdxt-web-client/zdxt-enforcement-code-app/src/views/administrative/appointmentDetail.vue
  29. 2
      zdxt-web-client/zdxt-enforcement-code-app/src/views/administrative/appointmentEdit.vue
  30. 2
      zdxt-web-client/zdxt-enforcement-code-app/src/views/administrative/appointmentList.vue
  31. 2
      zdxt-web-client/zdxt-enforcement-code-app/src/views/administrative/appointmentRelaunch.vue
  32. 2
      zdxt-web-client/zdxt-enforcement-code-app/src/views/common/pdfPngPreview.vue
  33. 2
      zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/earlyWarning.vue
  34. 2
      zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/earlyWarningBak.vue
  35. 2
      zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/enforceNoticeBase.vue
  36. 2
      zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/enterpriseScanPreview.vue
  37. 2
      zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/noScanFilter.vue
  38. 2
      zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/scanQrCode.vue
  39. 2
      zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/sign.vue
  40. 3
      zdxt-web-client/zdxt-enforcement-code-app/src/views/enforceHome.vue
  41. 2
      zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/companyFilter.vue
  42. 638
      zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/enterpriseHome.vue
  43. 2
      zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/enterpriseInspectionDetail.vue
  44. 25
      zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/login.vue
  45. 2
      zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/registrationEdit.vue
  46. 2
      zdxt-web-client/zdxt-enforcement-code-app/vite-env/.env.enforcement-dev
  47. 2
      zdxt-web-client/zdxt-enforcement-code-app/vite-env/.env.enterprise-dev
  48. 2
      zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-enforcement.yml
  49. 2
      zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-enterprise.yml
  50. 2
      zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-supervision.yml
  51. 6
      zdxt-web-server/zdxt-gateway-web-server/src/main/resources/application.yml

4
ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/AppDictController.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/DictController.java

@ -1,4 +1,4 @@
package com.zdxt.enforcementcode.appcontroller.enterprise; package com.zdxt.enforcementcode.controller;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
@ -17,7 +17,7 @@ import java.util.List;
@RequiredArgsConstructor @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/app") @RequestMapping("/app")
public class AppDictController { public class DictController {
private final ISysDictDataService dictDataService; private final ISysDictDataService dictDataService;

52
ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseInformationController.java

@ -0,0 +1,52 @@
package com.zdxt.enforcementcode.controller.app.enterprise;
import cn.dev33.satoken.annotation.SaIgnore;
import com.zdxt.enforcementcode.domain.vo.EnterpriseUserRefVo;
import com.zdxt.enforcementcode.service.IEnterpriseUserRefService;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.R;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Slf4j
@RequiredArgsConstructor
@RestController
@RequestMapping("/app/enterprise/enterpriseInfo")
public class AppEnterpriseInformationController {
private final IEnterpriseUserRefService enterpriseUserRefService;
/**
* 根据用户ID获取关联的企业信息列表
*
* @param userId 用户ID
* @return 企业信息列表(enterpriseId, enterpriseName, enterpriseNumber)
*/
@SaIgnore
@GetMapping("/getEnterpriseInfo")
public R<List<Map<String, Object>>> getEnterpriseInfo(@RequestParam Long userId) {
if (userId == null) {
return R.fail("用户ID不能为空");
}
List<EnterpriseUserRefVo> refList = enterpriseUserRefService.queryListByUserId(userId);
List<Map<String, Object>> dataList = new java.util.ArrayList<>();
if (refList != null && !refList.isEmpty()) {
for (EnterpriseUserRefVo ref : refList) {
Map<String, Object> data = new HashMap<>();
data.put("enterpriseId", ref.getEnterpriseId());
data.put("enterpriseName", ref.getEnterpriseName());
data.put("enterpriseNumber", ref.getEnterpriseNumber());
dataList.add(data);
}
}
return R.ok(dataList);
}
}

4
ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/AppEnterpriseMerchantAuthorizationController.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppEnterpriseMerchantAuthorizationController.java

@ -1,4 +1,4 @@
package com.zdxt.enforcementcode.appcontroller.enterprise; package com.zdxt.enforcementcode.controller.app.enterprise;
import com.zdxt.enforcementcode.domain.bo.EnterpriseMerchantAuthorizationBo; import com.zdxt.enforcementcode.domain.bo.EnterpriseMerchantAuthorizationBo;
import com.zdxt.enforcementcode.service.IEnterpriseMerchantAuthorizationService; import com.zdxt.enforcementcode.service.IEnterpriseMerchantAuthorizationService;
@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import java.util.List; import java.util.List;
@Controller @Controller
@RequestMapping("/app/code/authorization") @RequestMapping("/app/enterprise/authorization")
public class AppEnterpriseMerchantAuthorizationController { public class AppEnterpriseMerchantAuthorizationController {
@Resource @Resource
IEnterpriseMerchantAuthorizationService enterpriseMerchantAuthorizationService; IEnterpriseMerchantAuthorizationService enterpriseMerchantAuthorizationService;

17
ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/AppLoginController.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppLoginController.java

@ -1,20 +1,19 @@
package com.zdxt.enforcementcode.appcontroller.enterprise; package com.zdxt.enforcementcode.controller.app.enterprise;
import cn.dev33.satoken.annotation.SaIgnore; import cn.dev33.satoken.annotation.SaIgnore;
import cn.dev33.satoken.stp.StpUtil; import cn.dev33.satoken.stp.StpUtil;
import cn.dev33.satoken.stp.parameter.SaLoginParameter; import cn.dev33.satoken.stp.parameter.SaLoginParameter;
import cn.hutool.crypto.digest.DigestUtil; import cn.hutool.crypto.digest.DigestUtil;
import com.zdxt.enforcementcode.domain.vo.EnterpriseUserVo; import com.zdxt.enforcementcode.domain.vo.EnterpriseUserVo;
import com.zdxt.enforcementcode.domain.vo.EnterpriseUserRefVo;
import com.zdxt.enforcementcode.service.IEnterpriseUserService; import com.zdxt.enforcementcode.service.IEnterpriseUserService;
import com.zdxt.enforcementcode.service.IEnterpriseUserRefService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.core.domain.model.LoginUser;
import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.satoken.utils.LoginHelper;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.crypto.Cipher; import javax.crypto.Cipher;
import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.IvParameterSpec;
@ -22,6 +21,7 @@ import javax.crypto.spec.SecretKeySpec;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.Base64; import java.util.Base64;
import java.util.HashMap; import java.util.HashMap;
import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
@ -30,11 +30,12 @@ import java.util.Map;
@Slf4j @Slf4j
@RequiredArgsConstructor @RequiredArgsConstructor
@RestController @RestController
@RequestMapping("/app/enterprise") @RequestMapping("/app/enterprise/login")
public class AppLoginController { public class AppLoginController {
private final IEnterpriseUserService enterpriseUserService; private final IEnterpriseUserService enterpriseUserService;
/** /**
* AES密钥(与前端一致) * AES密钥(与前端一致)
*/ */
@ -47,8 +48,8 @@ public class AppLoginController {
* @return 登录结果(token + 用户信息) * @return 登录结果(token + 用户信息)
*/ */
@SaIgnore @SaIgnore
@PostMapping("/login") @PostMapping("/do")
public R<Map<String, Object>> login(@RequestBody Map<String, String> params) { public R<Map<String, Object>> validate(@RequestBody Map<String, String> params) {
String secretName = params.get("secretName"); String secretName = params.get("secretName");
String secretKey = params.get("secretKey"); String secretKey = params.get("secretKey");

8
ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/appcontroller/enterprise/AppThirdLogin.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enterprise/AppThirdLoginController.java

@ -1,4 +1,4 @@
package com.zdxt.enforcementcode.appcontroller.enterprise; package com.zdxt.enforcementcode.controller.app.enterprise;
import org.dromara.common.core.domain.R; import org.dromara.common.core.domain.R;
@ -11,8 +11,8 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
@Controller @Controller
@RequestMapping("/app/thirdLogin") @RequestMapping("/app/enterprise/thirdLogin")
public class AppThirdLogin { public class AppThirdLoginController {
/** /**
* 获取深i企包裹的code * 获取深i企包裹的code
*/ */
@ -26,6 +26,4 @@ public class AppThirdLogin {
result.put("accessSecret", accessSecret); result.put("accessSecret", accessSecret);
return R.ok("获取成功", result); return R.ok("获取成功", result);
} }
} }

2
ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseComplaintController.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseComplaintController.java

@ -1,4 +1,4 @@
package com.zdxt.enforcementcode.controller; package com.zdxt.enforcementcode.controller.web.supervision;
import java.util.List; import java.util.List;

2
ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseEvaluateController.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseEvaluateController.java

@ -1,4 +1,4 @@
package com.zdxt.enforcementcode.controller; package com.zdxt.enforcementcode.controller.web.supervision;
import java.util.List; import java.util.List;

2
ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseInformationController.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseInformationController.java

@ -1,4 +1,4 @@
package com.zdxt.enforcementcode.controller; package com.zdxt.enforcementcode.controller.web.supervision;
import java.util.List; import java.util.List;

2
ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseLawEnforcementController.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseLawEnforcementController.java

@ -1,4 +1,4 @@
package com.zdxt.enforcementcode.controller; package com.zdxt.enforcementcode.controller.web.supervision;
import java.util.List; import java.util.List;

2
ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/EnterpriseMerchantAuthorizationController.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/EnterpriseMerchantAuthorizationController.java

@ -1,4 +1,4 @@
package com.zdxt.enforcementcode.controller; package com.zdxt.enforcementcode.controller.web.supervision;
import java.util.List; import java.util.List;

2
ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/LawEnforcementEnterpriseController.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/LawEnforcementEnterpriseController.java

@ -1,4 +1,4 @@
package com.zdxt.enforcementcode.controller; package com.zdxt.enforcementcode.controller.web.supervision;
import java.util.List; import java.util.List;

2
ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/QrCodeGenerateHistoryController.java → ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/web/supervision/QrCodeGenerateHistoryController.java

@ -1,4 +1,4 @@
package com.zdxt.enforcementcode.controller; package com.zdxt.enforcementcode.controller.web.supervision;
import java.util.List; import java.util.List;

16
ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/IEnterpriseUserRefService.java

@ -65,4 +65,20 @@ public interface IEnterpriseUserRefService {
* @return 是否删除成功 * @return 是否删除成功
*/ */
Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid); Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid);
/**
* 根据用户ID查询关联的企业信息
*
* @param userId 用户ID
* @return 企业用户关联信息
*/
EnterpriseUserRefVo queryByUserId(Long userId);
/**
* 根据用户ID查询关联的所有企业信息
*
* @param userId 用户ID
* @return 企业用户关联信息列表
*/
List<EnterpriseUserRefVo> queryListByUserId(Long userId);
} }

20
ruoyi-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EnterpriseUserRefServiceImpl.java

@ -133,4 +133,24 @@ public class EnterpriseUserRefServiceImpl implements IEnterpriseUserRefService {
} }
return baseMapper.deleteByIds(ids) > 0; return baseMapper.deleteByIds(ids) > 0;
} }
/**
* 根据用户ID查询关联的企业信息
*/
@Override
public EnterpriseUserRefVo queryByUserId(Long userId) {
LambdaQueryWrapper<EnterpriseUserRef> lqw = Wrappers.lambdaQuery();
lqw.eq(EnterpriseUserRef::getUserId, userId);
return baseMapper.selectVoOne(lqw);
}
/**
* 根据用户ID查询关联的所有企业信息
*/
@Override
public List<EnterpriseUserRefVo> queryListByUserId(Long userId) {
LambdaQueryWrapper<EnterpriseUserRef> lqw = Wrappers.lambdaQuery();
lqw.eq(EnterpriseUserRef::getUserId, userId);
return baseMapper.selectVoList(lqw);
}
} }

12
zdxt-web-client/zdxt-enforcement-code-app/src/App.vue

@ -13,16 +13,10 @@
</template> </template>
<script setup name="App"> <script setup name="App">
onMounted(async () => { const handleLoadUrl = inject('$provideLoadUrl')
const handleLoadUrl = inject('$provideLoadUrl')
const getGoodsnum = inject('$provideGoodsnum')
const getLang = inject('$provideLang')
const path = handleLoadUrl()
if (!['/', '/login'].includes(path)) {
await getGoodsnum();
await getLang();
}
onMounted(async () => {
handleLoadUrl()
}); });
</script> </script>

12
zdxt-web-client/zdxt-enforcement-code-app/src/api/Home.js

@ -4,24 +4,14 @@ export const boutiqueGoods = "/boutiqueGoods"
export const recommendGoods = "/recommendGoods" export const recommendGoods = "/recommendGoods"
export const userLogin = (params, success, error) => _post("/appLogin", params, success, error); export const userLogin = (params, success, error) => _post("/appLogin", params, success, error);
export const testLogin = (params, success, error) => _post("/app/thirdLogin/testLogin", params, success, error); export const testLogin = (params, success, error) => _post("/app/thirdLogin/testLogin", params, success, error);
// 企业端用户登录
export const enterpriseLogin = (params, success, error) => _post("/app/enterprise/login", params, success, error);
//查询字典 //查询字典
export const getDict = (params, success, error) => _get("/app/queryDict",params,success,error); export const getDict = (params, success, error) => _get("/app/queryDict",params,success,error);
//获取级联街道字典 //获取级联街道字典
export const getRegionCascade = (params, success, error) => _get("/app/code/item/getRegionCascade",params,success,error); export const getRegionCascade = (params, success, error) => _get("/app/code/item/getRegionCascade",params,success,error);
//查询用户关联企业授权信息
export const getEnterpriseMerchantAuthorization = (params, success, error) => _get("/app/code/authorization/queryList",params,success,error);
//深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 getSzyptLoginAuth = (code, success, error) => _get("/app/thirdLogin/szyptLogin/"+code,null,success,error); export const getSzyptLoginAuth = (code, success, error) => _get("/app/thirdLogin/szyptLogin/"+code,null,success,error);
export const szyptGetToken = (params, success, error) => _get("/app/thirdLogin/szyptGetToken",params,success,error); export const szyptGetToken = (params, success, error) => _get("/app/thirdLogin/szyptGetToken",params,success,error);
// 获取包裹的数据
export const siqCode = (params, success, error) => _get("/app/thirdLogin/getSiqCode",params,success,error);

3
zdxt-web-client/zdxt-enforcement-code-app/src/api/administrative.js → zdxt-web-client/zdxt-enforcement-code-app/src/api/enforce/administrative.js

@ -1,4 +1,4 @@
import { _get, _post,_form,_delete } from "../http/index"; import { _get, _post,_form,_delete } from "../../http/index";
//行政检查预约登记 //行政检查预约登记
export const addEnterpriseLawEnforcement = (params, success, error) => _post("/app/code/enforcement/add",params,success,error) export const addEnterpriseLawEnforcement = (params, success, error) => _post("/app/code/enforcement/add",params,success,error)
@ -16,4 +16,3 @@ export const queryEnterpriseLawEnforcementList = (params, success, error) => _po
export const queryTotal = (params, success, error) => _get("/app/code/enforcement/queryTotal",params,success,error) export const queryTotal = (params, success, error) => _get("/app/code/enforcement/queryTotal",params,success,error)

4
zdxt-web-client/zdxt-enforcement-code-app/src/api/enforce.js → zdxt-web-client/zdxt-enforcement-code-app/src/api/enforce/index.js

@ -1,7 +1,7 @@
/** /**
* 执法端接口 * 执法端接口
*/ */
import { _get, _post,_form,_delete } from "../http/index"; import { _get, _post,_form,_delete } from "../../http/index";
/** /**
* 执法计划列表 * 执法计划列表
@ -192,4 +192,4 @@ export const addNonEnforcementRegistration = (params, success, error) => _post("
export const queryNonRegistrationList = (params, success, error) => _post("/app/code/nonRegistration/queryList",params,success,error) export const queryNonRegistrationList = (params, success, error) => _post("/app/code/nonRegistration/queryList",params,success,error)
export const queryNonRegistrationById = (id, success, error) => _get("/app/code/nonRegistration/queryById/"+id,null,success,error) export const queryNonRegistrationById = (id, success, error) => _get("/app/code/nonRegistration/queryById/"+id,null,success,error)

134
zdxt-web-client/zdxt-enforcement-code-app/src/api/enterprise.js → zdxt-web-client/zdxt-enforcement-code-app/src/api/enterprise/index.js

@ -1,4 +1,24 @@
import { _get, _post,_form,_delete } from "../http/index"; 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 getEnterpriseInfo = (params, success, error) => _get(enterpriseAppBaseUrl + "/enterpriseInfo/getEnterpriseInfo", params, success, error);
//查询用户关联企业授权信息
export const getEnterpriseMerchantAuthorization = (params, success, error) => _get(enterpriseAppBaseUrl + "/authorization/queryList",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 addEnterpriseInformation = (params, success, error) => _post("/app/enterpriseInformation/add", params, success, error);
@ -21,10 +41,10 @@ export const queryListWithFiveDay = (params, success, error) => _get("/app/code/
/** /**
* 查询企业执法登记列表-不分页 * 查询企业执法登记列表-不分页
* @param {*} params * @param {*} params
* @param {*} success * @param {*} success
* @param {*} error * @param {*} error
* @returns * @returns
*/ */
export const selectRegistrationList = (params, success, error) => _get("/app/code/registration/selectList",params,success,error) export const selectRegistrationList = (params, success, error) => _get("/app/code/registration/selectList",params,success,error)
@ -53,79 +73,79 @@ export const mssqDownFiles = (params, success, error) => _post("/app/satisfy/mss
export const mssqDownFile = (params, success, error) => _post("/app/satisfy/mssqDownFile",params,success,error) export const mssqDownFile = (params, success, error) => _post("/app/satisfy/mssqDownFile",params,success,error)
/** /**
* 查询企业行政执法通知记录 * 查询企业行政执法通知记录
* @param {*} params * @param {*} params
* @param {*} success * @param {*} success
* @param {*} error * @param {*} error
* @returns * @returns
*/ */
export const queryEnforcementList = (params, success, error) => _post("/app/code/enforcement/queryList",params,success,error) export const queryEnforcementList = (params, success, error) => _post("/app/code/enforcement/queryList",params,success,error)
/** /**
* 查询企业信息 * 查询企业信息
* @returns * @returns
*/ */
export const getEnterpriseInformation = (id,success,error) => _get("/app/enterpriseInformation/getEnterpriseInformation/" + id,null,success,error) export const getEnterpriseInformation = (id,success,error) => _get("/app/enterpriseInformation/getEnterpriseInformation/" + id,null,success,error)
/** /**
* 查询企业列表 * 查询企业列表
* @param {} params * @param {} params
* @param {*} success * @param {*} success
* @param {*} error * @param {*} error
* @returns * @returns
*/ */
export const queryEnterpriseInfoList = (params, success, error) =>_get("/app/enterpriseInformation/queryList",params, success, error) export const queryEnterpriseInfoList = (params, success, error) =>_get("/app/enterpriseInformation/queryList",params, success, error)
/** /**
* 查询企业列表 * 查询企业列表
* @param {} params * @param {} params
* @param {*} success * @param {*} success
* @param {*} error * @param {*} error
* @returns * @returns
*/ */
export const queryEnterpriseInfoListAndQrInfo = (params, success, error) =>_post("/app/enterpriseInformation/queryListAndQrInfo",params, success, error) export const queryEnterpriseInfoListAndQrInfo = (params, success, error) =>_post("/app/enterpriseInformation/queryListAndQrInfo",params, success, error)
/** /**
* 查询企业历史二维码生成记录 * 查询企业历史二维码生成记录
* @param {*} params * @param {*} params
* @param {*} success * @param {*} success
* @param {*} error * @param {*} error
* @returns * @returns
*/ */
export const queryHistoryQrCodeList = (params, success, error) =>_get("/app/enterpriseInformation/queryHistoryQrCodeList",params, success, error) export const queryHistoryQrCodeList = (params, success, error) =>_get("/app/enterpriseInformation/queryHistoryQrCodeList",params, success, error)
/** /**
* 查询历史检查案件 * 查询历史检查案件
* @param {*} params * @param {*} params
* @param {*} success * @param {*} success
* @param {*} error * @param {*} error
* @returns * @returns
*/ */
export const queryXzjcjbxxList = (params, success, error) =>_post("/app/xzjcjbxx/queryList", params,success, error) export const queryXzjcjbxxList = (params, success, error) =>_post("/app/xzjcjbxx/queryList", params,success, error)
/** /**
* 查询强制案件 * 查询强制案件
* @param {*} enterpriseNumber * @param {*} enterpriseNumber
* @param {*} success * @param {*} success
* @param {*} error * @param {*} error
* @returns * @returns
*/ */
export const queryQZAJList = (params, success, error) =>_post("/app/xzjcjbxx/queryQZAJList", params,success, error) export const queryQZAJList = (params, success, error) =>_post("/app/xzjcjbxx/queryQZAJList", params,success, error)
/** /**
* 查询历史处罚案件 * 查询历史处罚案件
* @param {*} enterpriseNumber * @param {*} enterpriseNumber
* @param {*} success * @param {*} success
* @param {*} error * @param {*} error
* @returns * @returns
*/ */
export const queryCFAJList = (params, success, error) =>_post("/app/xzjcjbxx/queryCFAJList",params,success, error) export const queryCFAJList = (params, success, error) =>_post("/app/xzjcjbxx/queryCFAJList",params,success, error)
/** /**
* 查询企业是否存在 * 查询企业是否存在
* @param {*} enterpriseNumber 企业统一信用代码 * @param {*} enterpriseNumber 企业统一信用代码
* @param {*} success * @param {*} success
* @param {*} error * @param {*} error
* @returns * @returns
*/ */
export const checkIsExists = (enterpriseNumber, success, error) =>_get("/app/enterpriseInformation/checkIsExists/" + enterpriseNumber,null,success, error) export const checkIsExists = (enterpriseNumber, success, error) =>_get("/app/enterpriseInformation/checkIsExists/" + enterpriseNumber,null,success, error)
@ -133,9 +153,9 @@ export const checkIsExists = (enterpriseNumber, success, error) =>_get("/app/ent
/** /**
* 保存企业对行政执法的评价 * 保存企业对行政执法的评价
* @param {*} enterpriseNumber 企业统一信用代码 * @param {*} enterpriseNumber 企业统一信用代码
* @param {*} success * @param {*} success
* @param {*} error * @param {*} error
* @returns * @returns
*/ */
export const addEvaluateInfo = (params, success, error) =>_post("/app/evaluate/add",params,success, error) export const addEvaluateInfo = (params, success, error) =>_post("/app/evaluate/add",params,success, error)
@ -143,40 +163,40 @@ export const addEvaluateInfo = (params, success, error) =>_post("/app/evaluate/a
/** /**
* 查询民生诉求执法部门列表 * 查询民生诉求执法部门列表
* @param {*} params * @param {*} params
* @param {*} success * @param {*} success
* @param {*} error * @param {*} error
* @returns * @returns
*/ */
export const queryComplaintItemList = (params, success, error) =>_get("/app/code/item/queryList",params,success, error) export const queryComplaintItemList = (params, success, error) =>_get("/app/code/item/queryList",params,success, error)
/** /**
* 查询执法人员统计数据 * 查询执法人员统计数据
* @param {*} params * @param {*} params
* @param {*} success * @param {*} success
* @param {*} error * @param {*} error
* @returns * @returns
*/ */
export const queryStatisticsIndicatorPart1 = (params, success, error) =>_get("/app/enforcementCheckStatistics/statisticsIndicatorPart1",params,success,error) export const queryStatisticsIndicatorPart1 = (params, success, error) =>_get("/app/enforcementCheckStatistics/statisticsIndicatorPart1",params,success,error)
/** /**
* 查询统计个人分析数据 * 查询统计个人分析数据
* @param {*} params * @param {*} params
* @param {*} success * @param {*} success
* @param {*} error * @param {*} error
* @returns * @returns
*/ */
export const queryStatisticsIndicatorPart2 = (params, success, error) =>_get("/app/enforcementCheckStatistics/statisticsIndicatorPart2",params,success,error) export const queryStatisticsIndicatorPart2 = (params, success, error) =>_get("/app/enforcementCheckStatistics/statisticsIndicatorPart2",params,success,error)
/** /**
* 查询统计部门分析数据 * 查询统计部门分析数据
* @param {*} params * @param {*} params
* @param {*} success * @param {*} success
* @param {*} error * @param {*} error
* @returns * @returns
*/ */
export const queryStatisticsIndicatorPart3 = (params, success, error) =>_get("/app/enforcementCheckStatistics/statisticsIndicatorPart3",params,success,error) 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) export const getAllEnforceDept = (params, success, error) => _post("/app/code/registration/getAllEnforceDept",params,success,error)

4
zdxt-web-client/zdxt-enforcement-code-app/src/http/http.js

@ -1,6 +1,6 @@
import axios from 'axios'; import axios from 'axios';
import { $globalStore } from "../common/globalStore" import { $globalStore } from "../common/globalStore"
// import router from '@/router/home'; import { $globalRouter } from "../common/globalRouter"
// import {cache} from '@/store/store'; // import {cache} from '@/store/store';
// axios.defaults.withCredentials = true // axios.defaults.withCredentials = true
//const source = axios.CancelToken.source() //const source = axios.CancelToken.source()
@ -9,7 +9,7 @@ const http = axios.create({
contentType : "application/json", contentType : "application/json",
timeout: 1000 * 500000, // 1 秒 timeout: 1000 * 500000, // 1 秒
}); });
const router = useRouter(); const router = $globalRouter;
//请求拦截器添加head //请求拦截器添加head
http.interceptors.request.use( http.interceptors.request.use(
config => { config => {

6
zdxt-web-client/zdxt-enforcement-code-app/src/router/enforce.js

@ -65,10 +65,10 @@ const routes = [
name: "noAccess", name: "noAccess",
component: () => import("@/views/noAccess.vue"), component: () => import("@/views/noAccess.vue"),
}, },
// 市外企业信息登记 // 市外企业信息登记(执法端)
{ {
path: "/outsideRegister", path: "/enforce/outsideRegister",
name: "outsideRegister", name: "enforceOutsideRegister",
component: () => import("@/views/enforce/outsideRegister.vue"), component: () => import("@/views/enforce/outsideRegister.vue"),
}, },
]; ];

6
zdxt-web-client/zdxt-enforcement-code-app/src/router/enforceHome.js

@ -48,14 +48,14 @@ const routes = [
}, },
}, },
//执法端扫码页面-深圳易 //执法端扫码页面-深圳易
{ /*{
path: "/enforce/scanPage_szy", path: "/enforce/scanPage_szy",
name: "scanPage", name: "scanPage",
component: () => import("@/views/enforce/scanPage_szy.vue"), component: () => import("@/views/enforce/scanPage_szy.vue"),
meta: { meta: {
isKeepAlive: false, isKeepAlive: false,
}, },
}, },*/
//执法端扫码页面 //执法端扫码页面
// { // {
// path: "/enforce/scanPageTest", // path: "/enforce/scanPageTest",
@ -157,4 +157,4 @@ const routes = [
}, },
] ]
export {routes} export {routes}

8
zdxt-web-client/zdxt-enforcement-code-app/src/store/Common.js

@ -11,6 +11,8 @@ export default defineStore('useCommon', {
enterpriseNumber:"", enterpriseNumber:"",
//企业名称 //企业名称
enterpriseName:"", enterpriseName:"",
//企业ID
enterpriseId:"",
//当前登录用户ID //当前登录用户ID
userId:"", userId:"",
//执法主体 //执法主体
@ -46,6 +48,10 @@ export default defineStore('useCommon', {
SET_USER_ENTERPRISE_NAME(data){ SET_USER_ENTERPRISE_NAME(data){
this.enterpriseName = data; this.enterpriseName = data;
}, },
//设置企业ID
SET_USER_ENTERPRISE_ID(data){
this.enterpriseId = data;
},
//设置用户ID //设置用户ID
SET_USER_ID(data){ SET_USER_ID(data){
this.userId = data; this.userId = data;
@ -112,6 +118,6 @@ export default defineStore('useCommon', {
}, },
persist: { persist: {
storage: sessionStorage, storage: sessionStorage,
pick: ['token', 'userId', 'enterpriseNumber', 'enterpriseName', 'phonenumber', 'orgId', 'hasLaw'], pick: ['token', 'userId', 'enterpriseNumber', 'enterpriseName', 'enterpriseId', 'phonenumber', 'orgId', 'hasLaw'],
}, },
}); });

2
zdxt-web-client/zdxt-enforcement-code-app/src/views/Home.vue

@ -53,7 +53,7 @@
import * as w6s from 'szient-js-sdk'; import * as w6s from 'szient-js-sdk';
import sha1 from 'crypto-js/sha1'; import sha1 from 'crypto-js/sha1';
import { Loading } from 'vant'; import { Loading } from 'vant';
import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, siqCode} from '../api/Home'; import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, siqCode} from '../api/enterprise';
import {showSuccessToast} from "vant"; import {showSuccessToast} from "vant";
import 'vant/es/toast/style'; import 'vant/es/toast/style';
const {useCommon} = $globalStore; const {useCommon} = $globalStore;

2
zdxt-web-client/zdxt-enforcement-code-app/src/views/HomeWx.vue

@ -50,7 +50,7 @@
import Vconsolefrom from 'vconsole'; import Vconsolefrom from 'vconsole';
import * as w6s from 'szient-js-sdk'; import * as w6s from 'szient-js-sdk';
import sha1 from 'crypto-js/sha1'; import sha1 from 'crypto-js/sha1';
import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, getSiqLoginAuthTest} from '../api/Home'; import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, getSiqLoginAuthTest} from '../api/enterprise';
import {showSuccessToast} from "vant"; import {showSuccessToast} from "vant";
import 'vant/es/toast/style'; import 'vant/es/toast/style';

2
zdxt-web-client/zdxt-enforcement-code-app/src/views/administrative/appointment-bak.vue

@ -207,7 +207,7 @@
addEnterpriseLawEnforcement, addEnterpriseLawEnforcement,
editEnterpriseLawEnforcement, editEnterpriseLawEnforcement,
queryEnterpriseLawEnforcementList queryEnterpriseLawEnforcementList
} from '../../api/administrative' } from '../../api/enforce/administrative'
import {queryUserInfo} from '../../api/enforce' import {queryUserInfo} from '../../api/enforce'
import {queryEnterpriseInfoList} from '../../api/enterprise' import {queryEnterpriseInfoList} from '../../api/enterprise'
import {reactive, ref} from "vue"; import {reactive, ref} from "vue";

2
zdxt-web-client/zdxt-enforcement-code-app/src/views/administrative/appointment.vue

@ -217,7 +217,7 @@
addEnterpriseLawEnforcement, addEnterpriseLawEnforcement,
editEnterpriseLawEnforcement, editEnterpriseLawEnforcement,
queryEnterpriseLawEnforcementList queryEnterpriseLawEnforcementList
} from '../../api/administrative' } from '../../api/enforce/administrative'
import {queryUserInfo} from '../../api/enforce' import {queryUserInfo} from '../../api/enforce'
import {queryEnterpriseInfoList} from '../../api/enterprise' import {queryEnterpriseInfoList} from '../../api/enterprise'
import {reactive, ref} from "vue"; import {reactive, ref} from "vue";

2
zdxt-web-client/zdxt-enforcement-code-app/src/views/administrative/appointmentDetail.vue

@ -186,7 +186,7 @@
editEnterpriseLawEnforcementDeputyOrder, editEnterpriseLawEnforcementDeputyOrder,
getByIdToDataFillIn, getByIdToDataFillIn,
cancelEnterpriseLawEnforcement cancelEnterpriseLawEnforcement
} from '@/api/administrative' } from '@/api/enforce/administrative'
import {queryUserInfo} from '../../api/enforce' import {queryUserInfo} from '../../api/enforce'
import { queryEnterpriseInfoList } from '@/api/enterprise' import { queryEnterpriseInfoList } from '@/api/enterprise'
import { reactive, ref } from "vue"; import { reactive, ref } from "vue";

2
zdxt-web-client/zdxt-enforcement-code-app/src/views/administrative/appointmentEdit.vue

@ -265,7 +265,7 @@
import { showSuccessToast } from 'vant'; import { showSuccessToast } from 'vant';
import 'vant/es/toast/style'; import 'vant/es/toast/style';
import {getByUserIdAndZero, addEnterpriseLawEnforcement, editEnterpriseLawEnforcement, editEnterpriseLawEnforcementDeputyOrder, getByIdToDataFillIn} from '../../api/administrative' import {getByUserIdAndZero, addEnterpriseLawEnforcement, editEnterpriseLawEnforcement, editEnterpriseLawEnforcementDeputyOrder, getByIdToDataFillIn} from '../../api/enforce/administrative'
import {queryUserInfo} from '../../api/enforce' import {queryUserInfo} from '../../api/enforce'
import { queryEnterpriseInfoList } from '../../api/enterprise' import { queryEnterpriseInfoList } from '../../api/enterprise'
import { reactive, ref } from "vue"; import { reactive, ref } from "vue";

2
zdxt-web-client/zdxt-enforcement-code-app/src/views/administrative/appointmentList.vue

@ -116,7 +116,7 @@
<script setup name="registrationList"> <script setup name="registrationList">
import {showToast, Toast,showSuccessToast} from "vant"; import {showToast, Toast,showSuccessToast} from "vant";
import {queryEnterpriseLawEnforcementList, queryTotal,cancelEnterpriseLawEnforcement} from '@/api/administrative'; import {queryEnterpriseLawEnforcementList, queryTotal,cancelEnterpriseLawEnforcement} from '@/api/enforce/administrative';
import {setGoodsNum} from "@/util/util"; import {setGoodsNum} from "@/util/util";
import {getDict} from "@/api/Home"; import {getDict} from "@/api/Home";
import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage"; import {queryLinkage, queryLinkageById, queryLinkageDictByValueAndParentId} from "@/api/linkage";

2
zdxt-web-client/zdxt-enforcement-code-app/src/views/administrative/appointmentRelaunch.vue

@ -267,7 +267,7 @@
import { showSuccessToast } from 'vant'; import { showSuccessToast } from 'vant';
import 'vant/es/toast/style'; import 'vant/es/toast/style';
import { getByUserIdAndZero,addEnterpriseLawEnforcement,editEnterpriseLawEnforcement,editEnterpriseLawEnforcementDeputyOrder,getByIdToDataFillIn } from '@/api/administrative' import { getByUserIdAndZero,addEnterpriseLawEnforcement,editEnterpriseLawEnforcement,editEnterpriseLawEnforcementDeputyOrder,getByIdToDataFillIn } from '@/api/enforce/administrative'
import {queryUserInfo} from '@/api/enforce' import {queryUserInfo} from '@/api/enforce'
import { queryEnterpriseInfoList } from '@/api/enterprise' import { queryEnterpriseInfoList } from '@/api/enterprise'
import { reactive, ref } from "vue"; import { reactive, ref } from "vue";

2
zdxt-web-client/zdxt-enforcement-code-app/src/views/common/pdfPngPreview.vue

@ -7,7 +7,7 @@
<script > <script >
import {baseUrl} from "@/config/env"; import {baseUrl} from "@/config/env";
import {transPdf} from "@/api/enforce.js"; import {transPdf} from "@/api/enforce";
export default { export default {
name: 'PdfViewer', name: 'PdfViewer',

2
zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/earlyWarning.vue

@ -170,7 +170,7 @@
queryRegistrationByEpId queryRegistrationByEpId
} from '@/api/enforce'; } from '@/api/enforce';
import { formattedTimeYYYYmmdd } from'@/util/util'; import { formattedTimeYYYYmmdd } from'@/util/util';
import {queryTotal} from "@/api/administrative"; import {queryTotal} from "@/api/enforce/administrative";
const {useCommon, useShopCard} = $globalStore; const {useCommon, useShopCard} = $globalStore;

2
zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/earlyWarningBak.vue

@ -133,7 +133,7 @@
queryListByEnterpriseNumberNew queryListByEnterpriseNumberNew
} from '@/api/enforce'; } from '@/api/enforce';
import { formattedTimeYYYYmmdd } from'@/util/util'; import { formattedTimeYYYYmmdd } from'@/util/util';
import {queryTotal} from "@/api/administrative"; import {queryTotal} from "@/api/enforce/administrative";
const {useCommon, useShopCard} = $globalStore; const {useCommon, useShopCard} = $globalStore;

2
zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/enforceNoticeBase.vue

@ -17,7 +17,7 @@
<script setup name="enforceNoticeBase"> <script setup name="enforceNoticeBase">
import enforcementPlanAdd from '@/views/enforce/enforceNotice.vue'; import enforcementPlanAdd from '@/views/enforce/enforceNotice.vue';
import enforcementPlanList from '@/views/enforce/enforceNoticeSystem.vue'; import enforcementPlanList from '@/views/enforce/enforceNoticeSystem.vue';
import {detail} from "@/api/enforce.js"; import {detail} from "@/api/enforce";
const {useCommon} = $globalStore; const {useCommon} = $globalStore;
//路由参数 //路由参数

2
zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/enterpriseScanPreview.vue

@ -42,7 +42,7 @@
</template> </template>
<script setup name="Home"> <script setup name="Home">
import {getEnterpriseMerchantAuthorization} from '@/api/Home'; import {getEnterpriseMerchantAuthorization} from '@/api/enterprise';
import {queryEarlyWarning} from '../../api/enforce'; import {queryEarlyWarning} from '../../api/enforce';
import {getEnterpriseInformation} from '../../api/enterprise' import {getEnterpriseInformation} from '../../api/enterprise'
import enterpriseBaseInfo from './enterpriseBaseInfo.vue' import enterpriseBaseInfo from './enterpriseBaseInfo.vue'

2
zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/noScanFilter.vue

@ -204,7 +204,7 @@ const props = defineProps( {
} }
const toRegister = () => { const toRegister = () => {
router.push({ router.push({
path: "/outsideRegister", path: "/enforce/outsideRegister",
query: { query: {
to_path: "/enterpriseScanPreview", to_path: "/enterpriseScanPreview",
to_reason: reason.value, to_reason: reason.value,

2
zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/scanQrCode.vue

@ -79,7 +79,7 @@
<script setup name="Home"> <script setup name="Home">
import Vconsole from "vconsole"; import Vconsole from "vconsole";
import {showFailToast,showToast} from 'vant'; import {showFailToast,showToast} from 'vant';
import {getEnterpriseMerchantAuthorization} from '@/api/Home'; import {getEnterpriseMerchantAuthorization} from '@/api/enterprise';
import {checkIsExists} from '@/api/enterprise'; import {checkIsExists} from '@/api/enterprise';
import {checkIsState,getEnterpriseInfoBySj} from '@/api/enforce'; import {checkIsState,getEnterpriseInfoBySj} from '@/api/enforce';
import {szyptGetToken} from "@/api/Home"; import {szyptGetToken} from "@/api/Home";

2
zdxt-web-client/zdxt-enforcement-code-app/src/views/enforce/sign.vue

@ -346,7 +346,7 @@
addEnterpriseLawEnforcement, addEnterpriseLawEnforcement,
getByUserIdAndZero, getByUserIdAndZero,
queryEnterpriseLawEnforcementList queryEnterpriseLawEnforcementList
} from "../../api/administrative"; } from "../../api/enforce/administrative";
import entrustFilter from '@/views/enforce/selectEntrustFilter'; import entrustFilter from '@/views/enforce/selectEntrustFilter';
const {useCommon, useMy} = $globalStore const {useCommon, useMy} = $globalStore

3
zdxt-web-client/zdxt-enforcement-code-app/src/views/enforceHome.vue

@ -56,7 +56,8 @@
<script setup name="Home"> <script setup name="Home">
import Vconsolefrom from 'vconsole'; import Vconsolefrom from 'vconsole';
import {Loading, showFailToast,showToast, showSuccessToast} from 'vant'; import {Loading, showFailToast,showToast, showSuccessToast} from 'vant';
import {getEnterpriseMerchantAuthorization, getSzyptLoginAuth} from '../api/Home'; import {getEnterpriseMerchantAuthorization} from '../api/enterprise';
import {getSzyptLoginAuth} from '../api/Home';
import {queryEnforcementNotice} from "@/api/enforce"; import {queryEnforcementNotice} from "@/api/enforce";
const isLoading = ref(true); const isLoading = ref(true);

2
zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/companyFilter.vue

@ -121,7 +121,7 @@
}, },
toRegister() { toRegister() {
this.router.push({ this.router.push({
path: "/outsideRegister", path: "/enforce/outsideRegister",
query: { query: {
to_path: "/appointmentBase", to_path: "/appointmentBase",
} }

638
zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/enterpriseHome.vue

@ -1,7 +1,7 @@
<template> <template>
<!-- <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/> <!-- <Loading class="loading-div" type="spinner" v-show="isLoading" color="#1989fa"/>
<div class="home app_content" v-if="!isLoading"> --> <div class="home app_content" v-if="!isLoading"> -->
<div class="home app_content"> <div class="home app_content">
<!-- 导航栏 --> <!-- 导航栏 -->
<!-- <div class="header_body">--> <!-- <div class="header_body">-->
<!-- <header-nav :leftArrow="false" titelText="执法监督码"></header-nav>--> <!-- <header-nav :leftArrow="false" titelText="执法监督码"></header-nav>-->
@ -43,319 +43,294 @@
</template> </template>
<script setup name="enterpriseHome"> <script setup name="enterpriseHome">
import Vconsolefrom from 'vconsole'; import Vconsolefrom from 'vconsole';
import * as w6s from 'szient-js-sdk'; import * as w6s from 'szient-js-sdk';
import sha1 from 'crypto-js/sha1'; import sha1 from 'crypto-js/sha1';
import { Loading } from 'vant'; import {Loading} from 'vant';
import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, siqCode} from '../../api/Home'; import {getEnterpriseMerchantAuthorization, getSiqLoginAuth, siqCode} from '../../api/enterprise';
import {showSuccessToast} from "vant"; import {showSuccessToast} from "vant";
import 'vant/es/toast/style'; import 'vant/es/toast/style';
const {useCommon} = $globalStore;
const router = useRouter(); const {useCommon} = $globalStore;
const route = useRoute(); const router = useRouter();
let carouselList = reactive([]); // 轮播列表 const route = useRoute();
const isLoading = ref(true); let carouselList = reactive([]); // 轮播列表
let freshMap = reactive({ const isLoading = ref(true);
refreshLoad: false, // 是否刷新 let freshMap = reactive({
listLoading: false, // 是否加载中 refreshLoad: false, // 是否刷新
listFinished: false, // 是否加载完成标识 listLoading: false, // 是否加载中
}); listFinished: false, // 是否加载完成标识
const data = reactive({}); });
const boutiqueAttr = reactive({ const data = reactive({});
columnNum: 4, const boutiqueAttr = reactive({
itemClass: "boutique_item", columnNum: 4,
goodsCradclass: "boutique-crad", itemClass: "boutique_item",
}); // 商品卡片展示 goodsCradclass: "boutique-crad",
}); // 商品卡片展示
//获取轮播
const getCarousel = async () => { //获取轮播
}; const getCarousel = async () => {
};
//精品
const boutiqueGoods = async () => { //精品
}; const boutiqueGoods = async () => {
};
const toRegisterView = async () => {
if (useCommon.enterpriseNumber == null || useCommon.enterpriseNumber == "") { const toRegisterView = async () => {
router.push({path: "/enterprise/register"}); if (useCommon.enterpriseNumber == null || useCommon.enterpriseNumber == "") {
} else { router.push({path: "/enterprise/register"});
router.push({ } else {
path: "/enterprise/qrCode",
query: {
enterpriseNumber: useCommon.enterpriseNumber,
}
});
}
};
const toRegistrationListView = async () => {
router.push({ router.push({
path: "/enterprise/registrationList", path: "/enterprise/qrCode",
});
}
const toComplaintView = async () => {
router.push({
path: "/enterprise/complaint",
query: { query: {
comOrOpi: 0, enterpriseNumber: useCommon.enterpriseNumber,
isSelect: true
} }
}); });
} }
};
//下拉刷新 const toRegistrationListView = async () => {
const onRefresh = () => { router.push({
freshMap.listFinished = false; path: "/enterprise/registrationList",
freshMap.listLoading = true; });
freshMap.refreshLoad = true; }
}; const toComplaintView = async () => {
router.push({
// 触底加载 path: "/enterprise/complaint",
const onLoad = () => { query: {
}; comOrOpi: 0,
isSelect: true
const generateRandomNumber = () => { }
const min = 100000; });
const max = 999999; }
const randomNum = (Math.floor(Math.random() * (max - min + 1)) + min);
return randomNum.toString().padStart(6, '0'); //下拉刷新
} const onRefresh = () => {
freshMap.listFinished = false;
const getEnterpriseMerchant = (enterpriseNum, phoneNumber) => { freshMap.listLoading = true;
getEnterpriseMerchantAuthorization({enterpriseNumber: enterpriseNum, merchantTel: phoneNumber}, success => { freshMap.refreshLoad = true;
console.log('------------->>>: ', success.data[0].enterpriseNumber) };
if (!(success.data == null && success.data.length == 0)) {
useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber); // 触底加载
} const onLoad = () => {
}, error => { };
})
const generateRandomNumber = () => {
const min = 100000;
const max = 999999;
const randomNum = (Math.floor(Math.random() * (max - min + 1)) + min);
return randomNum.toString().padStart(6, '0');
}
const getEnterpriseMerchant = (enterpriseNum, phoneNumber) => {
getEnterpriseMerchantAuthorization({enterpriseNumber: enterpriseNum, merchantTel: phoneNumber}, success => {
//debugger;
//console.log('------------->>>: ', success.data[0].enterpriseNumber)
if (success.data != null && success.data.length > 0) {
useCommon.SET_USER_ENTERPRISE_NUMBER(success.data[0].enterpriseNumber);
}
}, error => {
})
}
// 判断用户信息是否已完整(企业端登录后已写入store)
const hasUserInfo = () => {
return useCommon.userId
&& useCommon.enterpriseName
&& useCommon.enterpriseNumber
&& useCommon.enterpriseId;
};
onMounted(() => {
console.log(useCommon.firstLoad);
console.log(useCommon);
isLoading.value = useCommon.firstLoad;
// 如果store中已存在完整的用户和企业信息,则跳过w6s鉴权
if (hasUserInfo()) {
console.log("用户信息已存在,跳过w6s鉴权");
isLoading.value = false;
getEnterpriseMerchant(useCommon.enterpriseNumber.toString(), useCommon.phonenumber.toString());
useCommon.SET_IS_FIRST_LOAD(false);
return;
} }
onMounted(() => { siqCode(null, success => {
console.log(useCommon.firstLoad); let access_key = "";
isLoading.value = useCommon.firstLoad; let access_secret = "";
siqCode(null, success => { if (success.success) {
let access_key = ""; access_key = success.data.accessKey;
let access_secret = ""; access_secret = success.data.accessSecret;
if (success.success) { }
access_key = success.data.accessKey;
access_secret = success.data.accessSecret;
}
const nonce = generateRandomNumber(); const nonce = generateRandomNumber();
const timestamp = `${Date.now()}`; const timestamp = `${Date.now()}`;
const str = [access_secret, nonce, timestamp] const str = [access_secret, nonce, timestamp]
.sort() .sort()
.reduce((str, item) => str += item, ''); .reduce((str, item) => str += item, '');
// 最终还需要转成全小写 // 最终还需要转成全小写
const signature = sha1(str).toString().toLowerCase(); const signature = sha1(str).toString().toLowerCase();
w6s.config({ w6s.config({
access_key: access_key, access_key: access_key,
nonce: nonce, nonce: nonce,
timestamp: timestamp, timestamp: timestamp,
signature: signature, signature: signature,
}).then((res) => { }).then((res) => {
console.log("鉴权", res); console.log("鉴权", res);
}).catch((err) => { }).catch((err) => {
console.log("鉴权", err); console.log("鉴权", err);
getEnterpriseMerchant(useCommon.enterpriseNumber.toString(), useCommon.phonenumber.toString()); //getEnterpriseMerchant(useCommon.enterpriseNumber.toString(), useCommon.phonenumber.toString());
}); });
w6s.ready(() => { w6s.ready(() => {
w6s.header.setTitle('深圳市行政执法监督码'); w6s.header.setTitle('深圳市行政执法监督码');
w6s.szient.getAuthCode({ w6s.szient.getAuthCode({
success: function (res) { success: function (res) {
console.log(res) console.log(res)
console.log("认证", res); console.log("认证", res);
console.log("code: " + res.result.result.code); console.log("code: " + res.result.result.code);
getSiqLoginAuth({code: res.result.result.code}, success => { getSiqLoginAuth({code: res.result.result.code}, success => {
useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString()); useCommon.SET_USER_PHONENUMBER(success.data.phonenumber.toString());
useCommon.SET_USER_ID(success.data.userId); useCommon.SET_USER_ID(success.data.userId);
useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber); useCommon.SET_USER_ENTERPRISE_NUMBER(success.data.enterpriseNumber);
console.log(success.data); console.log(success.data);
useCommon.SET_TOKEN(success.data.token); useCommon.SET_TOKEN(success.data.token);
console.log(useCommon.userId); console.log(useCommon.userId);
console.log(useCommon.firstLoad); console.log(useCommon.firstLoad);
if(useCommon.firstLoad){ if (useCommon.firstLoad) {
isLoading.value = false; isLoading.value = false;
} }
//设置已经初始化 //设置已经初始化
useCommon.SET_IS_FIRST_LOAD(false) useCommon.SET_IS_FIRST_LOAD(false)
getEnterpriseMerchant(success.data.enterpriseNumber.toString(), success.data.phonenumber.toString()); getEnterpriseMerchant(success.data.enterpriseNumber.toString(), success.data.phonenumber.toString());
if(useCommon.firstLoad){ if (useCommon.firstLoad) {
isLoading.value = false; isLoading.value = false;
} }
}, error => { }, error => {
console.log("error : " + error) console.log("error : " + error)
}) })
}, },
fail: function (err) { fail: function (err) {
console.log(err) console.log(err)
console.log("认证", err); console.log("认证", err);
}, },
});
}); });
}); });
const { VITE_BASE_URL,access_key,access_secret } = import.meta.env;
console.log(VITE_BASE_URL);
const apiUrl = ref(import.meta.env.accessKey);
console.log(access_key);
console.log(access_secret);
}); });
const {VITE_BASE_URL, access_key, access_secret} = import.meta.env;
console.log(VITE_BASE_URL);
const apiUrl = ref(import.meta.env.accessKey);
console.log(access_key);
console.log(access_secret);
});
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.home { .home {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
height: 100%;
overflow: hidden;
background-color: #f4f4f4;
.warp_body {
position: relative;
margin: 0;
width: 100%;
height: 100%; height: 100%;
overflow: hidden; background: #c6e6ff url("../../assets/images/bg_c.jpg") no-repeat top;
background-color: #f4f4f4; background-size: auto 100%;
overflow-x: hidden;
overflow-y: auto;
.warp_body { .carousel_box {
position: relative; height: 4rem;
margin: 0;
width: 100%; width: 100%;
height: 100%; padding-bottom: 0.27rem;
background: #c6e6ff url("../../assets/images/bg_c.jpg") no-repeat top;
background-size: auto 100%;
overflow-x: hidden;
overflow-y: auto;
.carousel_box {
height: 4rem;
width: 100%;
padding-bottom: 0.27rem;
}
} }
.boutique_box { }
position: absolute;
width: 100%;
bottom: 1%;
.boutique_body { .boutique_box {
padding: 0 0 0.27rem 0; position: absolute;
display: flex; width: 100%;
justify-content: center; bottom: 1%;
}
.box-qr-code { .boutique_body {
position: relative; padding: 0 0 0.27rem 0;
margin: 2% 0; display: flex;
width: 90%; justify-content: center;
height: 3.67rem; }
text-align: right;
border-radius: 0.27rem;
.box-qr-code-text {
position: absolute;
z-index: 10;
top: 0.35rem;
right: 0.35rem;
display: block;
font-size: 0.5rem;
}
}
.box-qr-code::before { .box-qr-code {
content: ""; position: relative;
position: absolute; margin: 2% 0;
top: -0.14rem; width: 90%;
left: -0.14rem; height: 3.67rem;
z-index: 0; text-align: right;
width: calc(100% + 0.13rem); border-radius: 0.27rem;
height: calc(100% + 0.13rem);
background-color: #fff;
border: 0.14rem solid rgba(255, 255, 255, 0.5);
border-radius: 0.27rem;
}
.box-qr-code::after { .box-qr-code-text {
content: "";
position: absolute; position: absolute;
top: 0; z-index: 10;
left: 0; top: 0.35rem;
z-index: 1; right: 0.35rem;
width: 100%; display: block;
height: 100%; font-size: 0.5rem;
border-radius: 0.27rem;
background: #fff url("../../assets/images/item_code.jpg") no-repeat left;
background-size: auto 100%;
border: 1px solid #8db4ff;
} }
}
.box-info { .box-qr-code::before {
position: relative; content: "";
margin-right: 2%; position: absolute;
width: 50%; top: -0.14rem;
height: 3.67rem; left: -0.14rem;
text-align: right; z-index: 0;
border-radius: 0.27rem; width: calc(100% + 0.13rem);
height: calc(100% + 0.13rem);
.box-info-text { background-color: #fff;
position: absolute; border: 0.14rem solid rgba(255, 255, 255, 0.5);
z-index: 10; border-radius: 0.27rem;
top: 0.35rem; }
right: 0.35rem;
display: block;
font-size: 0.5rem;
}
}
.box-info::before { .box-qr-code::after {
content: ""; content: "";
position: absolute; position: absolute;
top: -0.14rem; top: 0;
left: -0.14rem; left: 0;
z-index: 0; z-index: 1;
width: calc(100% + 0.13rem); width: 100%;
height: calc(100% + 0.13rem); height: 100%;
background-color: #fff; border-radius: 0.27rem;
border: 0.14rem solid rgba(255, 255, 255, 0.5); background: #fff url("../../assets/images/item_code.jpg") no-repeat left;
border-radius: 0.27rem; background-size: auto 100%;
} border: 1px solid #8db4ff;
}
.box-info::after { .box-info {
content: ""; position: relative;
position: absolute; margin-right: 2%;
top: 0; width: 50%;
left: 0; height: 3.67rem;
z-index: 1; text-align: right;
width: 100%; border-radius: 0.27rem;
height: 100%;
border-radius: 0.27rem;
background: #fff url("../../assets/images/item_checkc.jpg") no-repeat left;
background-size: auto 100%;
border: 1px solid #8db4ff;
}
.box-complaint { .box-info-text {
position: relative; position: absolute;
margin-left: 3%; z-index: 10;
width: 35%; top: 0.35rem;
height: 3.67rem; right: 0.35rem;
text-align: right; display: block;
border-radius: 0.27rem; font-size: 0.5rem;
.box-complaint-text {
position: absolute;
z-index: 10;
top: 0.35rem;
right: 0.35rem;
display: block;
font-size: 0.5rem;
}
} }
} }
.box-complaint::before { .box-info::before {
content: ""; content: "";
position: absolute; position: absolute;
top: -0.14rem; top: -0.14rem;
@ -368,7 +343,7 @@
border-radius: 0.27rem; border-radius: 0.27rem;
} }
.box-complaint::after { .box-info::after {
content: ""; content: "";
position: absolute; position: absolute;
top: 0; top: 0;
@ -377,46 +352,93 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
border-radius: 0.27rem; border-radius: 0.27rem;
background: #fff url("../../assets/images/item_complain.jpg") no-repeat left; background: #fff url("../../assets/images/item_checkc.jpg") no-repeat left;
background-size: auto 100%; background-size: auto 100%;
border: 1px solid #8db4ff; border: 1px solid #8db4ff;
} }
.recommend_box { .box-complaint {
.recommend_body { position: relative;
width: 100%; margin-left: 3%;
width: 35%;
height: 3.67rem;
text-align: right;
border-radius: 0.27rem;
.box-complaint-text {
position: absolute;
z-index: 10;
top: 0.35rem;
right: 0.35rem;
display: block;
font-size: 0.5rem;
} }
} }
} }
.logobox { .box-complaint::before {
position: relative; content: "";
top: 4%; position: absolute;
left: 5%; top: -0.14rem;
z-index: 99; left: -0.14rem;
width: 82%; z-index: 0;
height: 10vh; width: calc(100% + 0.13rem);
background: url("../../assets/images/logo.png") no-repeat; height: calc(100% + 0.13rem);
background-size: 100% auto; background-color: #fff;
border: 0.14rem solid rgba(255, 255, 255, 0.5);
border-radius: 0.27rem;
} }
@media screen and (max-width: 380px) { .box-complaint::after {
.home .warp_body { content: "";
background: #c6e6ff url("../../assets/images/bg_c.jpg") no-repeat top; position: absolute;
background-size: 100% auto; top: 0;
} left: 0;
z-index: 1;
width: 100%;
height: 100%;
border-radius: 0.27rem;
background: #fff url("../../assets/images/item_complain.jpg") no-repeat left;
background-size: auto 100%;
border: 1px solid #8db4ff;
} }
@media screen and (min-width: 540px) { .recommend_box {
.home .warp_body { .recommend_body {
background: #c6e6ff url("../../assets/images/bg_c.jpg") no-repeat top; width: 100%;
background-size: 100% auto;
} }
} }
.loading-div{ }
position: absolute;
top: 45%; .logobox {
left: 48%; position: relative;
top: 4%;
left: 5%;
z-index: 99;
width: 82%;
height: 10vh;
background: url("../../assets/images/logo.png") no-repeat;
background-size: 100% auto;
}
@media screen and (max-width: 380px) {
.home .warp_body {
background: #c6e6ff url("../../assets/images/bg_c.jpg") no-repeat top;
background-size: 100% auto;
} }
}
@media screen and (min-width: 540px) {
.home .warp_body {
background: #c6e6ff url("../../assets/images/bg_c.jpg") no-repeat top;
background-size: 100% auto;
}
}
.loading-div {
position: absolute;
top: 45%;
left: 48%;
}
</style> </style>

2
zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/enterpriseInspectionDetail.vue

@ -134,7 +134,7 @@
<script setup name="register"> <script setup name="register">
import {getEnterpriseLawEnforcement, cancelEnterpriseLawEnforcement} from '../../api/administrative' import {getEnterpriseLawEnforcement, cancelEnterpriseLawEnforcement} from '../../api/enforce/administrative'
import { reactive, ref } from "vue"; import { reactive, ref } from "vue";
import {getDict} from "../../api/Home"; import {getDict} from "../../api/Home";
import {queryLinkageById} from "../../api/linkage"; import {queryLinkageById} from "../../api/linkage";

25
zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/login.vue

@ -23,9 +23,9 @@
</template> </template>
<script setup> <script setup>
import {reactive} from 'vue'; import {reactive} from 'vue';
import {enterpriseLogin} from '../../api/Home'; import {enterpriseLogin, getEnterpriseInfo} from '../../api/enterprise';
import CryptoJS from "crypto-js"; import CryptoJS from "crypto-js";
import {showFailToast} from 'vant'; import {showFailToast, showToast} from 'vant';
import 'vant/es/toast/style'; import 'vant/es/toast/style';
const {useCommon} = $globalStore; const {useCommon} = $globalStore;
@ -39,11 +39,28 @@
values.secretKey = Encrypt(values.secretKey); values.secretKey = Encrypt(values.secretKey);
enterpriseLogin({"secretName": loginParam.secretName, "secretKey": values.secretKey}, response => { enterpriseLogin({"secretName": loginParam.secretName, "secretKey": values.secretKey}, response => {
if (response.code === 200) { if (response.code === 200) {
// 企业端登录成功 → 跳转企业端首页 // 企业端登录成功 → 赋值用户基本信息
useCommon.SET_USER_PHONENUMBER(response.data.phonenumber.toString()); useCommon.SET_USER_PHONENUMBER(response.data.phonenumber.toString());
useCommon.SET_USER_ID(response.data.userId); useCommon.SET_USER_ID(response.data.userId);
useCommon.SET_TOKEN(response.data.token); useCommon.SET_TOKEN(response.data.token);
router.push({name: "enterpriseHome"}); //debugger;
console.log("message",useCommon.userId);
// 分离调用:获取关联的企业信息
getEnterpriseInfo({userId: response.data.userId}, res => {
if (res.code === 200 && res.data && Array.isArray(res.data) && res.data.length > 0) {
const firstEnterprise = res.data[0];
useCommon.SET_USER_ENTERPRISE_NUMBER(firstEnterprise.enterpriseNumber || "");
useCommon.SET_USER_ENTERPRISE_NAME(firstEnterprise.enterpriseName || "");
useCommon.SET_USER_ENTERPRISE_ID(firstEnterprise.enterpriseId || "");
if (res.data.length > 1) {
showToast('您关联了多个企业,已默认选择企业:' + (firstEnterprise.enterpriseName || ''));
}
}
router.push({name: "enterpriseHome"});
}, () => {
// 获取企业信息失败也照常跳转
router.push({name: "enterpriseHome"});
});
} else { } else {
showFailToast(response.msg || "登录失败"); showFailToast(response.msg || "登录失败");
} }

2
zdxt-web-client/zdxt-enforcement-code-app/src/views/enterprise/registrationEdit.vue

@ -402,7 +402,7 @@ import {showFailToast, showSuccessToast} from 'vant';
addEnterpriseLawEnforcement, addEnterpriseLawEnforcement,
getByUserIdAndZero, getByUserIdAndZero,
queryEnterpriseLawEnforcementList queryEnterpriseLawEnforcementList
} from "../../api/administrative"; } from "../../api/enforce/administrative";
import { baseUrl } from "@/config/env"; import { baseUrl } from "@/config/env";
import entrustFilter from '@/views/enforce/selectEntrustFilter'; import entrustFilter from '@/views/enforce/selectEntrustFilter';

2
zdxt-web-client/zdxt-enforcement-code-app/vite-env/.env.enforcement-dev

@ -1,4 +1,4 @@
# 执法端开发环境 # 执法端开发环境
VITE_PORT = 12002 VITE_PORT = 12002
VITE_BASE_URL = 'http://localhost:8181' VITE_BASE_URL = 'http://localhost:17000/enf-ep'
VITE_DEFAULT_LOGIN = '/enforce/login' VITE_DEFAULT_LOGIN = '/enforce/login'

2
zdxt-web-client/zdxt-enforcement-code-app/vite-env/.env.enterprise-dev

@ -1,4 +1,4 @@
# 企业端开发环境 # 企业端开发环境
VITE_PORT = 12001 VITE_PORT = 12001
VITE_BASE_URL = 'http://localhost:17000/enterprise' VITE_BASE_URL = 'http://localhost:17000/ent-ep'
VITE_DEFAULT_LOGIN = '/enterprise/login' VITE_DEFAULT_LOGIN = '/enterprise/login'

2
zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-enforcement.yml

@ -4,4 +4,4 @@ server:
port: 18002 port: 18002
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: /enforcement context-path: /enf-ep

2
zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-enterprise.yml

@ -4,4 +4,4 @@ server:
port: 18000 port: 18000
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: /enterprise context-path: /ent-ep

2
zdxt-web-server/zdxt-admin-web-server/src/main/resources/application-dev-supervision.yml

@ -4,4 +4,4 @@ server:
port: 18001 port: 18001
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: /supervision context-path: /sup-ep

6
zdxt-web-server/zdxt-gateway-web-server/src/main/resources/application.yml

@ -25,21 +25,21 @@ spring:
- id: enterprise-service - id: enterprise-service
uri: http://localhost:18000 uri: http://localhost:18000
predicates: predicates:
- Path=/enterprise/** - Path=/ent-ep/**
filters: filters:
- StripPrefix=0 - StripPrefix=0
- DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin, RETAIN_UNIQUE - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin, RETAIN_UNIQUE
- id: supervision-service - id: supervision-service
uri: http://localhost:18001 uri: http://localhost:18001
predicates: predicates:
- Path=/supervision/** - Path=/sup-ep/**
filters: filters:
- StripPrefix=0 - StripPrefix=0
- DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin, RETAIN_UNIQUE - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin, RETAIN_UNIQUE
- id: enforcement-service - id: enforcement-service
uri: http://localhost:18002 uri: http://localhost:18002
predicates: predicates:
- Path=/enforcement/** - Path=/enf-ep/**
filters: filters:
- StripPrefix=0 - StripPrefix=0
- DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin, RETAIN_UNIQUE - DedupeResponseHeader=Access-Control-Allow-Credentials Access-Control-Allow-Origin, RETAIN_UNIQUE

Loading…
Cancel
Save