From aec5ba381c9db7fdc8115fb716da46239925f8d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BA=84=E9=94=90=E6=B3=A2?=
 <10549902+zhuangruibo@user.noreply.gitee.com>
Date: Sun, 24 May 2026 12:18:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=AB=AF-=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/EfcodeCpPlanServiceImpl.java |   5 +-
 .../src/api/enforcement/index.js              |   8 +-
 .../src/views/enforcement/login.vue           | 295 +++++++++---------
 .../vite-config/index.js                      |   4 +-
 .../vite-env/.env.enforcement-dev             |   2 +-
 5 files changed, 158 insertions(+), 156 deletions(-)

diff --git a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanServiceImpl.java b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanServiceImpl.java
index 202694dd..092e8f62 100644
--- a/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanServiceImpl.java
+++ b/zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/service/impl/EfcodeCpPlanServiceImpl.java
@@ -134,9 +134,8 @@ public class EfcodeCpPlanServiceImpl implements IEfcodeCpPlanService {
             return;
         }
         for (EfcodeCpPlanVo vo : records) {
-            // 默认：待预约状态均可预约
-            vo.setCanReserve(true);
-            // TODO 后续可扩展：例如判断当天计划已过期、人员已满等业务规则
+            // 只有联合执法的计划才可以预约
+            vo.setCanReserve(vo.getIsUnion() != null && vo.getIsUnion() == 1L);
         }
     }
 
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js b/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js
index 19ebc3b9..061e8943 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js
@@ -1,11 +1,11 @@
 import { _get, _post } from "@/http/index";
 
-const baseUrl = "/api/app-enf";
+const baseUrl = "/app-enf";
 
 // region 认证模块
 
-export const enforcementLogin = (params, success, error) => _post(baseUrl + "/login/szyptLogin", params, success, error);
-
+// export const enforcementLogin = (params, success, error) => _post(baseUrl + "/login/szyptLogin", params, success, error);
+export const enforcementLogin = (params, success, error) => _post(baseUrl + "/login/do", params, success, error);
 // endregion
 
 // region 企业模块
@@ -48,4 +48,4 @@ export const getNoticeInfoList = (params, success, error) => _get(baseUrl + "/no
 
 export const getCarouselBannerList = (params, success, error) => _get(baseUrl + "/carouselBanner/list", params, success, error);
 
-// endregion
\ No newline at end of file
+// endregion
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/login.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/login.vue
index 1ddb2716..437adc5b 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/login.vue
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/login.vue
@@ -11,14 +11,17 @@
             <van-form @submit="onSubmit">
                 <van-field v-model="loginParam.secretName" name="secretName" label="用户名" placeholder="用户名"
                            :rules="[{ required: true, message: '请填写用户名' }]"/>
-                <van-field v-model="loginParam.secretKey" type="password" name="secretKey" label="密码" placeholder="密码"
+                <van-field v-model="loginParam.secretKey" type="password" name="secretKey" label="密码"
+                           placeholder="密码"
                            :rules="[{ required: true, message: '请填写密码' }]"/>
                 <div style="margin: 0.42rem">
                     <van-button block type="primary" native-type="submit">登录</van-button>
                 </div>
             </van-form>
             <div style="margin: 0.42rem 0.42rem 0; text-align: center;">
-                <van-button plain type="default" size="small" @click="showTestPicker = true" style="background-color: darkred;color: white">选择测试用户</van-button>
+                <van-button plain type="default" size="small" @click="showTestPicker = true"
+                            style="background-color: darkred;color: white">选择测试用户
+                </van-button>
             </div>
             <van-action-sheet v-model:show="showTestPicker" title="选择测试用户">
                 <div class="test-enterprise-list">
@@ -36,163 +39,163 @@
     </div>
 </template>
 <script setup>
-    import {reactive, ref} from 'vue';
-    import {enforcementLogin} from '../../api/enforcement';
-    import CryptoJS from "crypto-js";
-    import {showFailToast} from 'vant';
-    import 'vant/es/toast/style';
+import {reactive, ref} from 'vue';
+import {enforcementLogin} from '../../api/enforcement';
+import CryptoJS from "crypto-js";
+import {showFailToast} from 'vant';
+import 'vant/es/toast/style';
 
-    const {useCommon} = $globalStore;
-    const router = useRouter();
-    const loginParam = reactive({
-        secretName: "",
-        secretKey: ""
-    })
+const {useCommon} = $globalStore;
+const router = useRouter();
+const loginParam = reactive({
+    secretName: "",
+    secretKey: ""
+})
 
-    const showTestPicker = ref(false);
-    const testUsers = [
-        { account: 'liuqianlin', name: '刘倩琳', password: 'szsf@zfjd' },
-        { account: 'baining', name: '白宁', password: 'szsf@zfjd' },
-        { account: 'caizifan', name: '蔡梓帆', password: 'szsf@zfjd' },
-        { account: 'chenchong4', name: '陈冲', password: 'szsf@zfjd' },
-        { account: 'chenggaozhan', name: '程高展', password: 'szsf@zfjd' },
-        { account: 'chenhaitao2', name: '陈海涛', password: 'szsf@zfjd' },
-        { account: 'chenhanyu', name: '陈汉羽', password: 'szsf@zfjd' }
+const showTestPicker = ref(false);
+const testUsers = [
+    {account: 'liuqianlin', name: '刘倩琳', password: 'szsf@zfjd'},
+    {account: 'baining', name: '白宁', password: 'szsf@zfjd'},
+    {account: 'caizifan', name: '蔡梓帆', password: 'szsf@zfjd'},
+    {account: 'chenchong4', name: '陈冲', password: 'szsf@zfjd'},
+    {account: 'chenggaozhan', name: '程高展', password: 'szsf@zfjd'},
+    {account: 'chenhaitao2', name: '陈海涛', password: 'szsf@zfjd'},
+    {account: 'chenhanyu', name: '陈汉羽', password: 'szsf@zfjd'}
 
-    ];
+];
 
-    const selectTestUser = (item) => {
-        loginParam.secretName = item.account;
-        loginParam.secretKey = item.password;
-        showTestPicker.value = false;
-        // 直接触发登录
-        doLogin(item.account, item.password);
-    }
-       const doLogin = (secretName, secretKey) => {
-        const encryptedKey = Encrypt(secretKey);
-        enforcementLogin({code: '12346678985288799'}, response => {
-            if (response.code === 200) {
-                // // 验证关键组织信息
-                // if (!response.data.deptId) {
-                //     showFailToast("该用户未关联部门，无法登录");
-                //     return;
-                // }
-                // if (!response.data.organId) {
-                //     showFailToast("该用户未关联认证机构，无法登录");
-                //     return;
-                // }
-                // if (!response.data.bureauUnitId) {
-                //     showFailToast("该用户未关联执法单位，无法登录");
-                //     return;
-                // }
-                // 执法端登录成功 → 赋值用户基本信息
-                useCommon.SET_USER_PHONENUMBER(response.data.phonenumber || "");
-                useCommon.SET_USER_ID(response.data.userId);
-                useCommon.SET_USER_NAME(response.data.userName || "");
-                useCommon.SET_NICK_NAME(response.data.nickName || "");
-                useCommon.SET_TOKEN(response.data.token);
-                useCommon.SET_DEPT_ID(response.data.deptId);
-                useCommon.SET_DEPT_NAME(response.data.deptName || "");
-                useCommon.SET_ORGAN_ID(response.data.organId);
-                useCommon.SET_ORGAN_NAME(response.data.organName || "");
-                useCommon.SET_BUREAU_UNIT_ID(response.data.bureauUnitId);
-                useCommon.SET_BUREAU_UNIT_NAME(response.data.bureauUnitName || "");
-                console.log("enforcement login success", useCommon.userId);
-                router.push({name: "enforcementHome"});
-            } else {
-                showFailToast(response.msg || "登录失败");
+const selectTestUser = (item) => {
+    loginParam.secretName = item.account;
+    loginParam.secretKey = item.password;
+    showTestPicker.value = false;
+    // 直接触发登录
+    doLogin(item.account, item.password);
+}
+// const doLogin = (secretName, secretKey) => {
+//     const encryptedKey = Encrypt(secretKey);
+//     enforcementLogin({code: '12346678985288799'}, response => {
+//         if (response.code === 200) {
+//             // // 验证关键组织信息
+//             // if (!response.data.deptId) {
+//             //     showFailToast("该用户未关联部门，无法登录");
+//             //     return;
+//             // }
+//             // if (!response.data.organId) {
+//             //     showFailToast("该用户未关联认证机构，无法登录");
+//             //     return;
+//             // }
+//             // if (!response.data.bureauUnitId) {
+//             //     showFailToast("该用户未关联执法单位，无法登录");
+//             //     return;
+//             // }
+//             // 执法端登录成功 → 赋值用户基本信息
+//             useCommon.SET_USER_PHONENUMBER(response.data.phonenumber || "");
+//             useCommon.SET_USER_ID(response.data.userId);
+//             useCommon.SET_USER_NAME(response.data.userName || "");
+//             useCommon.SET_NICK_NAME(response.data.nickName || "");
+//             useCommon.SET_TOKEN(response.data.token);
+//             useCommon.SET_DEPT_ID(response.data.deptId);
+//             useCommon.SET_DEPT_NAME(response.data.deptName || "");
+//             useCommon.SET_ORGAN_ID(response.data.organId);
+//             useCommon.SET_ORGAN_NAME(response.data.organName || "");
+//             useCommon.SET_BUREAU_UNIT_ID(response.data.bureauUnitId);
+//             useCommon.SET_BUREAU_UNIT_NAME(response.data.bureauUnitName || "");
+//             console.log("enforcement login success", useCommon.userId);
+//             router.push({name: "enforcementHome"});
+//         } else {
+//             showFailToast(response.msg || "登录失败");
+//         }
+//     }, error => {
+//         showFailToast(error?.msg || "登录失败，请检查网络");
+//     })
+// };
+const doLogin = (secretName, secretKey) => {
+    const encryptedKey = Encrypt(secretKey);
+    enforcementLogin({"secretName": secretName, "secretKey": encryptedKey}, response => {
+        if (response.code === 200) {
+            // 验证关键组织信息
+            if (!response.data.deptId) {
+                showFailToast("该用户未关联部门，无法登录");
+                return;
+            }
+            if (!response.data.organId) {
+                showFailToast("该用户未关联认证机构，无法登录");
+                return;
             }
-        }, error => {
-            showFailToast(error?.msg || "登录失败，请检查网络");
-        })
-    };
-    // const doLogin = (secretName, secretKey) => {
-    //     const encryptedKey = Encrypt(secretKey);
-    //     enforcementLogin({"secretName": secretName, "secretKey": encryptedKey}, response => {
-    //         if (response.code === 200) {
-    //             // 验证关键组织信息
-    //             if (!response.data.deptId) {
-    //                 showFailToast("该用户未关联部门，无法登录");
-    //                 return;
-    //             }
-    //             if (!response.data.organId) {
-    //                 showFailToast("该用户未关联认证机构，无法登录");
-    //                 return;
-    //             }
-    //             if (!response.data.bureauUnitId) {
-    //                 showFailToast("该用户未关联执法单位，无法登录");
-    //                 return;
-    //             }
-    //             // 执法端登录成功 → 赋值用户基本信息
-    //             useCommon.SET_USER_PHONENUMBER(response.data.phonenumber || "");
-    //             useCommon.SET_USER_ID(response.data.userId);
-    //             useCommon.SET_USER_NAME(response.data.userName || "");
-    //             useCommon.SET_NICK_NAME(response.data.nickName || "");
-    //             useCommon.SET_TOKEN(response.data.token);
-    //             useCommon.SET_DEPT_ID(response.data.deptId);
-    //             useCommon.SET_DEPT_NAME(response.data.deptName || "");
-    //             useCommon.SET_ORGAN_ID(response.data.organId);
-    //             useCommon.SET_ORGAN_NAME(response.data.organName || "");
-    //             useCommon.SET_BUREAU_UNIT_ID(response.data.bureauUnitId);
-    //             useCommon.SET_BUREAU_UNIT_NAME(response.data.bureauUnitName || "");
-    //             console.log("enforcement login success", useCommon.userId);
-    //             router.push({name: "enforcementHome"});
-    //         } else {
-    //             showFailToast(response.msg || "登录失败");
-    //         }
-    //     }, error => {
-    //         showFailToast(error?.msg || "登录失败，请检查网络");
-    //     })
-    // };
+            if (!response.data.bureauUnitId) {
+                showFailToast("该用户未关联执法单位，无法登录");
+                return;
+            }
+            // 执法端登录成功 → 赋值用户基本信息
+            useCommon.SET_USER_PHONENUMBER(response.data.phonenumber || "");
+            useCommon.SET_USER_ID(response.data.userId);
+            useCommon.SET_USER_NAME(response.data.userName || "");
+            useCommon.SET_NICK_NAME(response.data.nickName || "");
+            useCommon.SET_TOKEN(response.data.token);
+            useCommon.SET_DEPT_ID(response.data.deptId);
+            useCommon.SET_DEPT_NAME(response.data.deptName || "");
+            useCommon.SET_ORGAN_ID(response.data.organId);
+            useCommon.SET_ORGAN_NAME(response.data.organName || "");
+            useCommon.SET_BUREAU_UNIT_ID(response.data.bureauUnitId);
+            useCommon.SET_BUREAU_UNIT_NAME(response.data.bureauUnitName || "");
+            console.log("enforcement login success", useCommon.userId);
+            router.push({name: "enforcementHome"});
+        } else {
+            showFailToast(response.msg || "登录失败");
+        }
+    }, error => {
+        showFailToast(error?.msg || "登录失败，请检查网络");
+    })
+};
 
-    const onSubmit = async () => {
-        doLogin(loginParam.secretName, loginParam.secretKey);
-    };
+const onSubmit = async () => {
+    doLogin(loginParam.secretName, loginParam.secretKey);
+};
 
-    const Encrypt = (passWord) => {
-        var keyStr = '1234567898745621';
-        var ivStr = keyStr;
-        var key = CryptoJS.enc.Utf8.parse(keyStr);
-        var iv = CryptoJS.enc.Utf8.parse(ivStr);
-        var srcs = CryptoJS.enc.Utf8.parse(passWord);
-        var encrypted = CryptoJS.AES.encrypt(srcs, key, {
-            iv: iv,
-            mode: CryptoJS.mode.CBC,
-            padding: CryptoJS.pad.ZeroPadding
-        });
-        return CryptoJS.enc.Base64.stringify(encrypted.ciphertext);
-    }
+const Encrypt = (passWord) => {
+    var keyStr = '1234567898745621';
+    var ivStr = keyStr;
+    var key = CryptoJS.enc.Utf8.parse(keyStr);
+    var iv = CryptoJS.enc.Utf8.parse(ivStr);
+    var srcs = CryptoJS.enc.Utf8.parse(passWord);
+    var encrypted = CryptoJS.AES.encrypt(srcs, key, {
+        iv: iv,
+        mode: CryptoJS.mode.CBC,
+        padding: CryptoJS.pad.ZeroPadding
+    });
+    return CryptoJS.enc.Base64.stringify(encrypted.ciphertext);
+}
 </script>
 
 <style lang="less" scoped>
-    .login-page {
-        width: 100%;
-        height: 100%;
-        display: flex;
-        overflow: hidden;
-        background-image: url("~@/assets/images/login.jpg");
-        background-repeat: no-repeat;
-        background-size: cover;
-        opacity: 0.9;
+.login-page {
+    width: 100%;
+    height: 100%;
+    display: flex;
+    overflow: hidden;
+    background-image: url("~@/assets/images/login.jpg");
+    background-repeat: no-repeat;
+    background-size: cover;
+    opacity: 0.9;
 
-        .login-content {
-            margin: auto;
-            padding: 0.27rem 0.27rem 0.52rem 0.27rem;
-            background-color: #fff;
-            border-radius: 0.27rem;
-            box-shadow: 0 0 0.27rem rgba(0, 0, 0, 0.2);
-            opacity: 0.9;
+    .login-content {
+        margin: auto;
+        padding: 0.27rem 0.27rem 0.52rem 0.27rem;
+        background-color: #fff;
+        border-radius: 0.27rem;
+        box-shadow: 0 0 0.27rem rgba(0, 0, 0, 0.2);
+        opacity: 0.9;
 
-            .title {
-                font-size: 0.52rem;
-                font-weight: 600;
-            }
+        .title {
+            font-size: 0.52rem;
+            font-weight: 600;
         }
     }
+}
 
-    .test-enterprise-list {
-        max-height: 60vh;
-        overflow-y: auto;
-        padding: 0.2rem;
-    }
+.test-enterprise-list {
+    max-height: 60vh;
+    overflow-y: auto;
+    padding: 0.2rem;
+}
 </style>
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-config/index.js b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-config/index.js
index 2d59123b..e6678e8e 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-config/index.js
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-config/index.js
@@ -1,6 +1,6 @@
 import { resolve, join, extname } from "path";
 import fs from "fs";
-import postCssPxToRem from "postcss-pxtorem"; 
+import postCssPxToRem from "postcss-pxtorem";
 
 // 加载插件模块
 const loadPluginModules = async () => {
@@ -43,7 +43,7 @@ const baseCfg = (viteEnv = {}) => {
 			cors: true,
 			proxy: {
 				'/api': {
-					target: 'http://139.186.148.21:8080',
+                    target: 'http://localhost:17000',
 					changeOrigin: true,
 					rewrite: (path) => path.replace(/^\/api/, '')
 				},
diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev
index dd49c224..3ff75452 100644
--- a/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev
+++ b/zdxt-web-client/zdxt-efcode-enforcement-app/vite-env/.env.enforcement-dev
@@ -1,5 +1,5 @@
 # 执法端开发环境
 VITE_PORT = 12002
-VITE_BASE_URL = '/'
+VITE_BASE_URL = '/api/enf-ep'
 VITE_DEFAULT_LOGIN = '/enforcement/login'
 VITE_APP_ENV = 'dev'