执法人员修改

zdxt-web-client/zdxt-admin-plus-ui/.env.development-wmy-cust

@@ -1,6 +1,6 @@
 # VITE_APP_PROXY_TARGET = 'http://139.186.148.21:8080'
-# VITE_APP_PROXY_TARGET = 'http://10.132.108.3:85/efcode20-sup-web/prod-api'
-VITE_APP_PROXY_TARGET = 'http://172.16.21.213:8080'
+VITE_APP_PROXY_TARGET = 'http://10.132.108.3:85/efcode20-sup-web/prod-api'
+# VITE_APP_PROXY_TARGET = 'http://172.16.21.213:8080'
 # 页面标题
 VITE_APP_TITLE = 执法监督码•执法监督
 VITE_APP_LOGO_TITLE = 执法监督码•执法监督

zdxt-web-client/zdxt-efcode-enforcement-app/src/api/enforcement/index.js

@@ -90,6 +90,9 @@ export const queryEvaluateDetail = (params, success, error) => _get("/app-ent/ev
 
 export const queryUsersByPage = (params, success, error) => _get(baseUrl + "/system/queryUsersByPage", params, success, error);
 
+// 查询执法单位下的用户列表
+export const getBureauUnitUsers = (params, success, error) => _get("/enforcementcode/bureauUnit/users", params, success, error);
+
 // 获取部门列表
 export const queryDeptList = (params, success, error) => _get(baseUrl +"/system/dept", params, success, error);
 

zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/register/RegisterPopups.vue

@@ -117,10 +117,12 @@
 <script setup name="RegisterPopups">
 import { ref, reactive, watch, computed, onMounted } from 'vue';
 import { showToast } from 'vant';
-import { queryEnforcementNoticeList, queryUsersByPage, queryAccordingList, queryDeptList } from '@/api/enforcement/index';
+import { queryEnforcementNoticeList, getBureauUnitUsers, queryAccordingList, queryDeptList } from '@/api/enforcement/index';
 import { loadDict } from '@/util/dictUtil';
 import EnterpriseSelector from './EnterpriseSelector.vue';
 
+const { useCommon } = $globalStore;
+
 const props = defineProps({
     visible: {
         type: Object,
@@ -228,13 +230,17 @@ const loadPersonList = () => {
     const selectedIds = props.selectedPersons.map(p => p.userId).filter(Boolean);
     const notUserId = selectedIds.length > 0 ? selectedIds.join(',') : undefined;
     const params = {
+        sysDeptId: useCommon.bureauUnitId || '',
+        keyword: personSearchKeyword.value || '',
+        globalSearch: 'false',
         pageNum: personPageNum.value,
         pageSize: personPageSize.value,
-        notUserId,
-        userName: personSearchKeyword.value || undefined
     };
+    if (notUserId) {
+        params.notUserId = notUserId;
+    }
     console.log(params);
-    queryUsersByPage(params, (res) => {
+    getBureauUnitUsers(params, (res) => {
         if (res.code === 200 || res.code === 0) {
             const data = res.data || res.rows || [];
             const total = res.total || res.count || 0;

zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/home/enforcementHome.vue

@@ -38,7 +38,7 @@
                 <div class="card-scan-box">
                  <div class="enforcement-card" @click="toScanEntQRCode('enforcement')">
                     <div class="card-text">行政执法</div>
-                    <div class="card-title">执法人员入企登记</div>
+                    <div class="card-title">行政执法入企登记</div>
                     <!-- <div class="card-content">
                         <div class="card-text">行政执法</div>
                     </div> -->
@@ -47,7 +47,7 @@
                 <!-- 非行政执法 - 扫码入企 -->
                 <div class="other-card" @click="toScanEntQRCode('non-enforcement')">
                         <div class="card-text">非行政执法</div>
-                       <div class="card-title">非执法人员入企登记</div>
+                         <div class="card-title">非行政执法入企登记</div> 
                 </div>
                 </div>
 
@@ -58,8 +58,8 @@
                 <!-- 行政执法信息 -->
                 <div class="function-card information-card" @click="toEnforcementList">
                     <div class="card-content">
-                        <div class="cardOther-text">行政执法信息</div>
-                        <div class="cardOther-title">执法历史信息</div>
+                        <div class="cardOther-text">历史执法登记信息</div>
+                        <!-- <div class="cardOther-title">历史执法信息</div> -->
                     </div>
                     <div class="card-icon"></div>
                 </div>
@@ -67,8 +67,8 @@
                 <!-- 统计分析 -->
                 <div class="function-card statistics-card" @click="toStatisticsAnalysis">
                     <div class="card-content">
-                        <div class="cardOther-text">统计分析</div>
-                        <div class="cardOther-title">执法人员统计信息</div>
+                        <div class="cardOther-text">行政执法统计信息</div>
+                        <!-- <div class="cardOther-title">执法人员统计信息</div> -->
                     </div>
                      <div class="cardOther-icon"></div>
                 </div>
@@ -201,6 +201,11 @@ onMounted(() => {
     console.log(fullUrl)
     let code = fullUrl.substring(fullUrl.indexOf("code=") + 5, fullUrl.indexOf("&state="));
     console.log(code)
+    if(useCommon.token){
+        fetchNoticeList();
+        fetchBannerList();
+        return;
+    }
     // isLoading.value = useCommon.firstLoad;
     getSzyptLoginAuth(code, (success) => {
         console.log("登录成功: ", success.data);
@@ -408,6 +413,7 @@ onMounted(() => {
         font-size: 16px;
         color:  rgba(0, 0, 0, 0.9);
         font-weight: bold;
+        // text-align: center;
       }
       .card-title{
         margin-top: 2px;
@@ -441,6 +447,9 @@ onMounted(() => {
     background: url('@/assets/images/historical_law_enforcement_bg.png')center center;
     background-size: 100% 100%;
     margin-right: 10px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 
 .statistics-card {
@@ -448,6 +457,9 @@ onMounted(() => {
     height: 80px;
     background: url('@/assets/images/statistic_analysis_bg.png')center center;
     background-size: 100% 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
 }
 
 /* 功能卡片 */