From aa9ea39c0e00c8c317bf08a021135aa8ef55b6c5 Mon Sep 17 00:00:00 2001 From: "wangmingyong@163.com" Date: Tue, 11 Aug 2026 09:08:02 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../.env.development-wmy-cust | 4 +-- .../views/supervision/carouselBanner/add.vue | 35 ++++++++++++++++--- .../enforcement/nos/AttachmentTaskSource.vue | 4 +-- .../enforcement/nos/EnterpriseInfoSection.vue | 4 +-- .../enforcement/my/plan/cp_plan_other.vue | 2 +- 5 files changed, 38 insertions(+), 11 deletions(-) diff --git a/zdxt-web-client/zdxt-admin-plus-ui/.env.development-wmy-cust b/zdxt-web-client/zdxt-admin-plus-ui/.env.development-wmy-cust index 15186a87..98117ad2 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/.env.development-wmy-cust +++ b/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 = 执法监督码•执法监督 diff --git a/zdxt-web-client/zdxt-admin-plus-ui/src/views/supervision/carouselBanner/add.vue b/zdxt-web-client/zdxt-admin-plus-ui/src/views/supervision/carouselBanner/add.vue index 046108ff..8456e8a7 100644 --- a/zdxt-web-client/zdxt-admin-plus-ui/src/views/supervision/carouselBanner/add.vue +++ b/zdxt-web-client/zdxt-admin-plus-ui/src/views/supervision/carouselBanner/add.vue @@ -21,16 +21,26 @@ + + + + + + - + + + + +
@@ -74,6 +84,7 @@ import { useRoute } from 'vue-router'; import { addCarouselBanner } from '@/api/supervision/carouselBanner'; import { getDicts } from '@/api/system/dict/data'; import request from '@/utils/request'; +import Editor from '@/components/Editor/index.vue'; const route = useRoute(); const { proxy } = getCurrentInstance() as ComponentInternalInstance; @@ -94,13 +105,19 @@ const displayDaysOptions = [ { label: '30天', value: 30 }, { label: '永久', value: 0 } ]; +const typeOptions = [ + { label: '富文本', value: 0 }, + { label: '外部链接', value: 1 } +]; const form = reactive({ title: '', targetPlatform: undefined as number | undefined, carouselPosition: undefined as number | undefined, + type: undefined as number | undefined, displayDays: undefined as number | undefined, linkUrl: '', + content: '', imageUrl: '' }); @@ -108,11 +125,20 @@ const rules: FormRules = { title: [{ required: true, message: '请输入标题', trigger: 'blur' }], targetPlatform: [{ required: true, message: '请选择内容发布在', trigger: 'change' }], carouselPosition: [{ required: true, message: '请选择橱窗', trigger: 'change' }], + type: [{ required: true, message: '请选择类型', trigger: 'change' }], displayDays: [{ required: true, message: '请选择显示天数', trigger: 'change' }], - linkUrl: [{ required: true, message: '请输入链接', trigger: 'blur' }], + linkUrl: [{ required: true, message: '请输入跳转链接', trigger: 'blur' }], + content: [{ required: true, message: '请输入富文本内容', trigger: 'blur' }], imageUrl: [{ required: true, message: '请上传轮播图', trigger: 'change' }] }; +const handleTypeChange = () => { + form.linkUrl = ''; + form.content = ''; + formRef.value?.validateField('linkUrl'); + formRef.value?.validateField('content'); +}; + const beforeImageUpload = (file: File) => { const isImage = ['image/jpeg', 'image/jpg', 'image/png'].includes(file.type); const isLt5M = file.size / 1024 / 1024 < 5; @@ -174,11 +200,12 @@ const submitForm = async (status: number, successMessage: string) => { title: form.title, targetPlatform: form.targetPlatform, carouselPosition: form.carouselPosition, + type: form.type, displayDays: form.displayDays, - linkUrl: form.linkUrl, + linkUrl: form.type === 1 ? form.linkUrl : undefined, + content: form.type === 0 ? form.content : undefined, imageUrl: form.imageUrl, status, - type: 1, isDelete: 0 }); if (res.code === 200) { diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/AttachmentTaskSource.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/AttachmentTaskSource.vue index e62f4d13..0e27747b 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/AttachmentTaskSource.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/AttachmentTaskSource.vue @@ -121,8 +121,8 @@ const onAfterReadImage = (file) => { overflow: hidden; :deep(.van-field__label) { - width: 64px; - margin-right: 22px; + width: 70px; + margin-right: 18px; color: #000; font-size: 14px; } diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/EnterpriseInfoSection.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/EnterpriseInfoSection.vue index 9f7f097b..b2166b62 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/EnterpriseInfoSection.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/components/enforcement/nos/EnterpriseInfoSection.vue @@ -61,8 +61,8 @@ const handleClick = () => { overflow: hidden; :deep(.van-field__label) { - width: 64px; - margin-right: 22px; + width: 70px; + margin-right: 18px; color: #000; // font-size: 14px; } diff --git a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_other.vue b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_other.vue index 13c58bdd..c71f0e43 100644 --- a/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_other.vue +++ b/zdxt-web-client/zdxt-efcode-enforcement-app/src/views/enforcement/my/plan/cp_plan_other.vue @@ -249,7 +249,7 @@ const onReservePlan = (item) => { // 提示无法预约：仅当服务端返回500且消息为"请先添加我的计划再进行预约"时，才显示"添加计划"按钮 const showCannotReserveDialog = (item, code, msg) => { - const needAddPlanBtn = code === 500 && msg === '请先添加计划再进行预约'; + const needAddPlanBtn = code === 500 && msg.includes('请先添加我的计划再进行预约'); if (needAddPlanBtn) { showDialog({ title: '提示',