diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/trend/high-frequency/components/FreqPane.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/trend/high-frequency/components/FreqPane.vue index 49e7d89b..a07abd46 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/trend/high-frequency/components/FreqPane.vue +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/efcode/trend/high-frequency/components/FreqPane.vue @@ -348,7 +348,7 @@ defineExpose({ calcTableHeight }); v-if="detailEnterprise" :closable="false" show-icon - :title="`所属区：${detailEnterprise.district || '-'} ｜ 所属街道：${detailEnterprise.street || '-'} ｜ 行政执法次数：${detailEnterprise.xzzfcs ?? 0}次 ｜ 时段：${queryParams.year}年${queryParams.month}`" + :title="`所属区：${detailEnterprise.district || '-'} ｜ 所属街道：${detailEnterprise.street || '-'} ｜ 行政执法次数：${detailEnterprise.xzzfcs ?detailEnterprise.xzzfcs : detailEnterprise.jccs}次 ｜ 时段：${queryParams.year}年${queryParams.month}`" type="info" class="mb-4" /> diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/supervision/statistical/city-direct/index.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/supervision/statistical/city-direct/index.vue index 53de7be5..e6ef9fe8 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/supervision/statistical/city-direct/index.vue +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/supervision/statistical/city-direct/index.vue @@ -105,12 +105,12 @@
-

评价

+

反馈

满意{{ stats.eva?.high ?? '-' }}{{ evaRates.high }}%
较满意{{ stats.eva?.mid ?? '-' }}{{ evaRates.mid }}%
不满意{{ stats.eva?.low ?? '-' }}{{ evaRates.low }}%
-
未评价{{ stats.eva?.un ?? '-' }}{{ evaRates.un }}%
+
未反馈{{ stats.eva?.un ?? '-' }}{{ evaRates.un }}%
diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/api/enterprise/index.js b/zdxt-web-client/zdxt-efcode-enterprise-app/src/api/enterprise/index.js index 597411c9..3fdef916 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/api/enterprise/index.js +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/api/enterprise/index.js @@ -25,6 +25,9 @@ export const getEnterpriseEnforcementRegistrationList = (params, success, error) //执法登记列表 export const queryEnforcementRegistrationPageList = (params, success, error) => _get(enterpriseAppBaseUrl+"/enforcement_registration/queryEnforcementRegistrationPageList",params,success,error) +//非行政执法登记列表（独立接口，与行政接口解耦） +export const queryNonEnforcementRegistrationList = (params, success, error) => _get(enterpriseAppBaseUrl+"/nonEnfRegistraionInfo/list",params,success,error) + //执法信息详情 export const getLawDetail = (params, success, error) => _get(enterpriseAppBaseUrl+"/lawEnforcementCase/lawDetail",params,success,error) @@ -40,6 +43,9 @@ export const submitEvaluate = (params, success, error) => _post(enterpriseAppBas //企业消息 / 执法消息详情 export const getEnforcementRegistrationDetailById = (params, success, error) => _get(enterpriseAppBaseUrl + "/enforcement_registration/queryDetailById", params, success, error) +//非行政执法登记详情（独立接口） +export const queryNonEnforcementRegistrationDetailById = (params, success, error) => _get(enterpriseAppBaseUrl + "/nonEnfRegistraionInfo/queryById", params, success, error) + //普法服务列表 export const getEducationServicesList = (params, success, error) => _get(enterpriseAppBaseUrl +"/enforcementcode/educationServices/list",params,success,error) diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluateDetail.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluateDetail.vue index b6279b6c..8d591455 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluateDetail.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementEvaluateDetail.vue @@ -1,194 +1,175 @@ @@ -209,6 +190,7 @@ import badUnselectImg from '@/assets/images/onbad.png'; import { getEvaluateDetail, getEnforcementRegistrationDetailById, + queryNonEnforcementRegistrationDetailById, submitEvaluate, } from '@/api/enterprise'; import { loadDict, getDictText } from '@/util/dictUtil'; @@ -218,6 +200,8 @@ const router = useRouter(); const route = useRoute(); const id = route.query.id; +// 行政/非行政分流标识：列表页跳过来时 lawType='1' 表示行政 +const isAdmin = computed(() => String(route.query.lawType || '1') === '1'); // 只读标识：hasEvaluate=1 已反馈只能查看，0/空 为待反馈可提交 const readonly = computed(() => String(route.query.hasEvaluate) === '1'); // 已反馈返回的反馈信息对象（后端 enterpriseEvaluateInfoVo） @@ -253,7 +237,6 @@ const detail = ref({ result: '', attachments: [], }); - // ========== 反馈表单（默认值：满意=3 / 5 星 / 其他问题打开）========== // 满意度数值：1=不满意，2=较满意，3=满意 const evaluateForm = ref({ @@ -308,12 +291,24 @@ const getEnforcers = (data) => { // 获取执法详情 const fetchRegistrationDetail = () => { if (!id) return; - getEnforcementRegistrationDetailById({ id }, (res) => { + const lawType = String(route.query.lawType || ''); + const isAdmin = lawType === '1'; + const api = isAdmin + ? getEnforcementRegistrationDetailById + : queryNonEnforcementRegistrationDetailById; + + api({ id }, (res) => { + // 兼容多种返回包裹：行政接口是 { data: { enforcementRegistrationVo, enterpriseEvaluateInfoVo } } + // 非行政接口可能是 { data: 详情对象 } 或 直接就是详情对象，这里做统一兜底 const data = (res && (res.data || res.rows?.[0] || res)) || {}; - detail.value = data.enforcementRegistrationVo - || {}; - // 保存企业反馈信息（可能为 null），用于已反馈识别反馈卡片是否显示 - evaluateInfo.value = data.enterpriseEvaluateInfoVo || null; + // 详情对象：优先取行政接口的 enforcementRegistrationVo，否则 data 本身就是详情 + const detailData = data.enforcementRegistrationVo + || data.nonEnforcementRegistrationVo + || data.vo + || data; + detail.value = detailData; + // 反馈信息 + evaluateInfo.value = data.enterpriseEvaluateInfoVo || data.evaluateInfo || null; // 已反馈：将后端反馈数据回填到表单供只读展示 if (evaluateInfo.value) fillEvaluateFormFromInfo(evaluateInfo.value); }, () => { diff --git a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue index 6a0e3c9d..d4b05267 100644 --- a/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue +++ b/zdxt-web-client/zdxt-efcode-enterprise-app/src/views/enterprise/enforcement/enforcementRegistrationList.vue @@ -67,7 +67,7 @@