diff --git a/src/api/administrative.js b/src/api/administrative.js
index d77c87c..386f55c 100644
--- a/src/api/administrative.js
+++ b/src/api/administrative.js
@@ -7,7 +7,7 @@ export const editEnterpriseLawEnforcement = (params, success, error) => _post("/
//行政检查预约详情
export const getEnterpriseLawEnforcement = (id, success, error) => _get("/app/code/enforcement/getById/" + id,null,success,error)
-export const getByUserIdAndZero = (id, success, error) => _get("/app/code/enforcement/getByUserIdAndZero",null,success,error)
+export const getByUserIdAndZero = (userId, success, error) => _get("/app/code/enforcement/getByUserIdAndZero/"+ userId,null,success,error)
export const getByIdToDataFillIn = (id, success, error) => _get("/app/code/enforcement/getByIdToDataFillIn/" + id,null,success,error)
//查询历史检查信息
export const queryEnterpriseLawEnforcementList = (params, success, error) => _get("/app/code/enforcement/queryList",params,success,error)
diff --git a/src/api/enforce.js b/src/api/enforce.js
index 70441ea..3438b40 100644
--- a/src/api/enforce.js
+++ b/src/api/enforce.js
@@ -48,7 +48,7 @@ export const queryEarlyWarning = (params, success, error) => _get("/app/code/Law
* @param {*} error
* @returns
*/
-export const queryUserInfo = (params, success, error) => _get("/app/getUserInfo",params,success,error)
+export const queryUserInfo = (userId, success, error) => _get("/app/getUserInfo/"+ userId, null,success,error)
/**
* 查询执法登记信息详情
diff --git a/src/common/globalRouter.js b/src/common/globalRouter.js
index 53d4787..985af8a 100644
--- a/src/common/globalRouter.js
+++ b/src/common/globalRouter.js
@@ -55,12 +55,13 @@ $globalRouter.beforeEach((to, from, next) => {
// }
// }
- if (to.path.includes('src')) {
- // 可以重定向或者做其他处理
- next('/'); // 或者 next(from.path) 返回之前的路径
- } else {
- next(); // 允许路由继续
- }
+ // if (to.path.includes('src')) {
+ // // 可以重定向或者做其他处理
+ // next('/'); // 或者 next(from.path) 返回之前的路径
+ // } else {
+ // next(); // 允许路由继续
+ // }
+ next(); // 允许路由继续
});
diff --git a/src/http/http.js b/src/http/http.js
index 3468e93..9ca7bde 100644
--- a/src/http/http.js
+++ b/src/http/http.js
@@ -2,6 +2,8 @@ import axios from 'axios';
import { $globalStore } from "../common/globalStore"
// import router from '@/router/home';
// import {cache} from '@/store/store';
+// axios.defaults.withCredentials = true
+//const source = axios.CancelToken.source()
const http = axios.create({
traditional: true,
contentType : "application/json",
diff --git a/src/views/Home.vue b/src/views/Home.vue
index bd25e04..d361045 100644
--- a/src/views/Home.vue
+++ b/src/views/Home.vue
@@ -164,24 +164,24 @@ onMounted(() => {
console.log("鉴权",err);
});
-// w6s.ready(() => {
-// w6s.szient.getAuthCode({
-// success: function(res) {
-// console.log(res)
-// console.log("认证",res);
-// console.log(res.result.result.code)
-// getSiqLoginAuth({code: res.result.result.code},success =>{
-// console.log(success.data)
-// },error =>{
+ w6s.ready(() => {
+ w6s.szient.getAuthCode({
+ success: function(res) {
+ console.log(res)
+ console.log("认证",res);
+ console.log(res.result.result.code)
+ getSiqLoginAuth({code: res.result.result.code},success =>{
+ console.log(success.data)
+ },error =>{
-// })
-// },
-// fail: function(err) {
-// console.log(err)
-// console.log("认证",err);
-// },
-// });
-// });
+ })
+ },
+ fail: function(err) {
+ console.log(err)
+ console.log("认证",err);
+ },
+ });
+});
// getSiqLoginAuth({code:""},success =>{
// console.log(success.data)
diff --git a/src/views/administrative/appointment.vue b/src/views/administrative/appointment.vue
index f85832d..863d4c7 100644
--- a/src/views/administrative/appointment.vue
+++ b/src/views/administrative/appointment.vue
@@ -202,6 +202,7 @@ const submitData = reactive({
lawEnforcerTwoId:"",
/** 备注 */
remark:"",
+ userId: useCommon.userId
})
@@ -266,7 +267,7 @@ const goBack = () => {
};
const dataFillIn = () => {
- getByUserIdAndZero(null,success =>{
+ getByUserIdAndZero(useCommon.userId,success =>{
//跳转企业二维码地址
if(success.success){
Object.keys(submitData).forEach((item) => {
@@ -285,6 +286,7 @@ const dataFillIn = () => {
const tmpSave = () => {
// showSuccessToast('临时保存');
+ submitData.lawCertificateNum = null;
addEnterpriseLawEnforcement(submitData,success =>{
//跳转企业二维码地址
if(success.success){
@@ -301,6 +303,7 @@ const tmpSave = () => {
const submit112 = () =>{
// showSuccessToast('登记成功');
+ submitData.lawCertificateNum = null;
editEnterpriseLawEnforcement(submitData,success =>{
//跳转企业二维码地址
if(success.success){
@@ -353,10 +356,10 @@ const getLinkageByParentIdToGA = (parentId) => {
//初始化参数，获取扫码的企业统一信用编码
onMounted(() =>{
// 数据填充
- // dataFillIn();
+ dataFillIn();
//查询当前登录人员信息
- queryUserInfo({},success =>{
+ queryUserInfo(useCommon.userId,success =>{
console.log(success.data)
submitData.lawEnforcer = success.data.userName;
submitData.lawCertificateNum = success.data.lawCertificateNum
@@ -436,7 +439,7 @@ export default {
font-size: var(--van-toast-icon-size) !important;
}
-/deep/ .van-button {
+:deep(.van-button) {
margin: 5% 3%;
padding: 0;
width: 94%;
diff --git a/src/views/enforce/enforcementPlan.vue b/src/views/enforce/enforcementPlan.vue
index addc34a..a8007cd 100644
--- a/src/views/enforce/enforcementPlan.vue
+++ b/src/views/enforce/enforcementPlan.vue
@@ -68,7 +68,7 @@
执法部门： {{ item.enforcementDepartment }}