From 8152c4c55987b8cc7b55e22000501c13ff4febe1 Mon Sep 17 00:00:00 2001 From: lianlonggang Date: Tue, 1 Sep 2026 11:47:01 +0800 Subject: [PATCH] =?UTF-8?q?feat(Banner=E7=AE=A1=E7=90=86):=20=E8=BD=AE?= =?UTF-8?q?=E6=92=AD=E5=9B=BE=E6=96=B0=E5=A2=9E=E8=B7=B3=E8=BD=AC=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E4=B8=8E=E8=B7=B3=E8=BD=AC=E9=93=BE=E6=8E=A5=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 列表新增"跳转方式"、"跳转链接"两列 - 表单新增跳转方式单选(不跳转/链接/app内)，选"链接"时跳转链接必填 Co-Authored-By: Claude --- .env | 4 +- .env.dev | 4 +- .env.production | 12 +++--- Dockerfile | 10 +++-- .../system/systemBanner/SysBanner.data.ts | 43 +++++++++++++++++++ 5 files changed, 60 insertions(+), 13 deletions(-) diff --git a/.env b/.env index fa1da91..11acc8e 100644 --- a/.env +++ b/.env @@ -10,7 +10,7 @@ VITE_GLOB_APP_TITLE_JD = 健康干预后台 VITE_GLOB_APP_SHORT_NAME = CqytHealthAdmin # 单点登录服务端地址 -VITE_GLOB_APP_CAS_BASE_URL=http://cas.test.com:8443/cas +VITE_GLOB_APP_CAS_BASE_URL= # 是否开启单点登录 VITE_GLOB_APP_OPEN_SSO = false @@ -19,6 +19,6 @@ VITE_GLOB_APP_OPEN_SSO = false VITE_GLOB_APP_OPEN_QIANKUN=true # 文件预览地址 -VITE_GLOB_ONLINE_VIEW_URL=http://fileview.jeecg.com/onlinePreview +VITE_GLOB_ONLINE_VIEW_URL= diff --git a/.env.dev b/.env.dev index ee47ee0..8b394f6 100644 --- a/.env.dev +++ b/.env.dev @@ -16,10 +16,10 @@ VITE_BUILD_COMPRESS = 'gzip' VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false #后台接口父地址(必填) -VITE_GLOB_API_URL=http://cqyt.dev.yg.dt.io +VITE_GLOB_API_URL=http://10.8.0.4:29990 #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=http://cqyt.dev.yg.dt.io +VITE_GLOB_DOMAIN_URL=http://10.8.0.4:29990 #食堂接口前缀 VITE_GLOB_ST_DOMAIN_URL=http://113.200.64.105:9002 diff --git a/.env.production b/.env.production index 249f839..3f38437 100644 --- a/.env.production +++ b/.env.production @@ -16,14 +16,14 @@ VITE_BUILD_COMPRESS = 'gzip' VITE_BUILD_COMPRESS_DELETE_ORIGIN_FILE = false #后台接口父地址(必填) -VITE_GLOB_API_URL=https://xj-api.mcrm.vip:8888 +VITE_GLOB_API_URL=https://test.xjygjk.com #后台接口全路径地址(必填) -VITE_GLOB_DOMAIN_URL=https://xj-api.mcrm.vip:8888 +VITE_GLOB_DOMAIN_URL=https://test.xjygjk.com #食堂接口前缀 -VITE_GLOB_ST_DOMAIN_URL=https://yyjk.cqygjk.com/gateway +VITE_GLOB_ST_DOMAIN_URL= #西安、银川应急大屏 -VITE_EMERGENCY_SCREEN=https://screen.cqygjk.com/ +VITE_EMERGENCY_SCREEN= # 接口父路径前缀 VITE_GLOB_API_URL_PREFIX= @@ -37,8 +37,8 @@ VITE_USE_PWA = false # 是否兼容旧浏览器 VITE_LEGACY = false -# 油田平台CODE +# 平台CODE VITE_PLATFORM = 'YT' # 跳转外部链接 -VITE_GLOB_OUT_URL=https://console-jkglpt.iosp.ydpt.tech/hb/healthadmin/index.html?param= +VITE_GLOB_OUT_URL=https://test.com diff --git a/Dockerfile b/Dockerfile index 98624d1..ba6cfa6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,9 +3,9 @@ MAINTAINER jeecgos@163.com VOLUME /tmp ENV LANG en_US.UTF-8 -ENV VITE_GLOB_API_URL https://xj-api.mcrm.vip:8888 -ENV VITE_GLOB_DOMAIN_URL https://xj-api.mcrm.vip:8888 -ENV VITE_GLOB_OUT_URL https://gstest.superwx.cn/healthapiadmin/index.html?param= +ENV VITE_GLOB_API_URL http://10.10.10.228:19996 +ENV VITE_GLOB_DOMAIN_URL http://10.10.10.228:19996 +ENV VITE_GLOB_OUT_URL https://gstest.superwx.cn/healthcheckadmin/index.html?param= RUN echo "server { \ #解决Router(mode: 'history')模式下，刷新路由地址不能找到页面的问题 \ @@ -17,6 +17,10 @@ RUN echo "server { \ break; \ } \ } \ + location = /.well-known/apple-app-site-association { \ + root /var/www/html; \ + default_type application/json; \ + } \ access_log /var/log/nginx/access.log ; \ } " > /etc/nginx/conf.d/default.conf \ && mkdir -p /var/www \ diff --git a/src/views/system/systemBanner/SysBanner.data.ts b/src/views/system/systemBanner/SysBanner.data.ts index 4818f0a..66cb99e 100644 --- a/src/views/system/systemBanner/SysBanner.data.ts +++ b/src/views/system/systemBanner/SysBanner.data.ts @@ -48,6 +48,22 @@ export const columns: BasicColumn[] = [ align: 'center', dataIndex: 'isLongTermEffective_dictText', }, + { + title: '跳转方式', + align: 'center', + dataIndex: 'tfJump', + customRender: ({ text }) => { + // 跳转方式文案映射：0-不跳转 1-链接 2-app内 + const map = { '0': '不跳转', '1': '链接', '2': 'app内' }; + return map[text] ?? ''; + }, + }, + { + title: '跳转链接', + align: 'center', + dataIndex: 'jumpUrl', + ellipsis: true, + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -108,6 +124,33 @@ export const formSchema: FormSchema[] = [ }, rules: [{ required: true }], }, + { + label: '跳转方式', + field: 'tfJump', + component: 'RadioButtonGroup', + defaultValue: '0', + componentProps: { + options: [ + { label: '不跳转', value: '0' }, + { label: '链接', value: '1' }, + { label: 'app内', value: '2' }, + ], + }, + rules: [{ required: true, message: '请选择跳转方式' }], + }, + { + label: '跳转链接', + field: 'jumpUrl', + component: 'Input', + componentProps: { + placeholder: '请输入跳转链接', + }, + // 仅跳转方式为"链接"时显示且必填 + ifShow: ({ model }) => model.tfJump === '1', + dynamicRules: ({ model }) => { + return [{ required: model.tfJump === '1', message: '请输入跳转链接' }]; + }, + }, { label: '是否有效', field: 'status',