bug修复

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)

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)
 
 /**
  * 查询执法登记信息详情

src/common/globalRouter.js

@@ -55,12 +55,13 @@ $globalRouter.beforeEach((to, from, next) => {
 	// 	}
 	// }
 
-	if (to.path.includes('src')) {
+	// if (to.path.includes('src')) {
-		// 可以重定向或者做其他处理
+	// 	// 可以重定向或者做其他处理
-		next('/'); // 或者 next(from.path) 返回之前的路径
+	// 	next('/'); // 或者 next(from.path) 返回之前的路径
-	} else {
+	// } else {
-		next(); // 允许路由继续
+	// 	next(); // 允许路由继续
-	}
+	// }
+	next(); // 允许路由继续
 
 });
 

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",

src/views/Home.vue

@@ -164,24 +164,24 @@ onMounted(() => {
     console.log("鉴权",err);
   });
 
-//   w6s.ready(() => {
+  w6s.ready(() => {
-//     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(res.result.result.code)
+        console.log(res.result.result.code)
-//         getSiqLoginAuth({code: res.result.result.code},success =>{
+        getSiqLoginAuth({code: res.result.result.code},success =>{
-//           console.log(success.data)
+          console.log(success.data)
-//         },error =>{
+        },error =>{
 
-//         })
+        })
-//       },
+      },
-//       fail: function(err) {
+      fail: function(err) {
-//         console.log(err)
+        console.log(err)
-//         console.log("认证",err);
+        console.log("认证",err);
-//       },
+      },
-//   });
+  });
-// });
+});
 
   // getSiqLoginAuth({code:""},success =>{
   //     console.log(success.data)

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%;

src/views/enforce/enforcementPlan.vue

@@ -68,7 +68,7 @@
                     <p><span class="card_box_label">执法部门：</span> {{ item.enforcementDepartment }}</p>
                   </div>
                   <div class="card_box_span">
-                    <p><span class="card_box_label">执法计划：</span> <a style="color: green;">{{ item.fileObject.fileName }}</a></p>
+                    <p><span class="card_box_label">执法计划：</span> <a style="color: green;">{{ null!=item.fileObject?item.fileObject.fileName:"" }}</a></p>
                   </div>
                   <!-- <div class="card_box_span">
                     <p><span class="card_box_label">执法计划：</span> {{ item.fileObject.fileName }}</p>

src/views/enforce/historyCheck.vue

@@ -93,6 +93,7 @@
 	let refreshLoad = ref(false); // 是否加载中
 
 	let searchParam = reactive({
+		userId: useCommon.userId,
 		//执法事件
 		// lawEnforcementIncident:"",
 		//执法部门
@@ -149,7 +150,6 @@
 		},error=>{});
 	}
 	const queryList = () =>{
-    console.log(data.ga_columns)
 		queryRegistrationList(searchParam,success =>{
 			data.dataList = success.data;
       for (var i=0; i<success.data.length; i++) {

src/views/login.vue

@@ -46,8 +46,8 @@ const onSubmit = async (values) => {
         // router.push({ name: "Home" });
         router.push({ name: "enforceHome" });
         //设置全局变量
-        // 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_TOKEN(success.data.token);
         // 监听uni-app发送的消息
         window.addEventListener('message', (event) => {