From 8c809434d01ffcad89296b5e038e7f14e022665d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Wed, 24 Sep 2025 10:16:13 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=9F=9F=E5=90=8D=E5=9C=B0?= =?UTF-8?q?=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- .env.development_h5 | 5 ++++ .env.production | 2 +- package.json | 1 + src/api/request.js | 2 +- src/components/examination/es-analysis.vue | 27 +++++++++++----------- 6 files changed, 23 insertions(+), 18 deletions(-) create mode 100644 .env.development_h5 diff --git a/.env.development b/.env.development index 8ef29d20..148c3d27 100644 --- a/.env.development +++ b/.env.development @@ -2,7 +2,7 @@ ENV = 'development' # 'development' -VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7002' +VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # VITE_APP_BASE_API_Url = ' http://25.18.122.66:9786' #sit # VITE_APP_BASE_API_Url = 'http://25.18.122.91:9786' @@ -25,6 +25,6 @@ VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786' # VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602' -VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605' +# VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605' diff --git a/.env.development_h5 b/.env.development_h5 new file mode 100644 index 00000000..3b50f23b --- /dev/null +++ b/.env.development_h5 @@ -0,0 +1,5 @@ +# 开发环境 +ENV = 'development' +# 'development' + +VITE_APP_BASE_API_Url = '' diff --git a/.env.production b/.env.production index 6cbcc735..143ff549 100644 --- a/.env.production +++ b/.env.production @@ -2,4 +2,4 @@ ENV = 'production' # base api -VITE_APP_BASE_API_Url = 'http://localhost:7000' \ No newline at end of file +VITE_APP_BASE_API_Url = 'https://aits.jlbank.com.cn:7001' \ No newline at end of file diff --git a/package.json b/package.json index dbc667a0..cc24343e 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "build:app-plus:sit": "uni build -p app-plus --mode sit", "build:app-plus:uat": "uni build -p app-plus --mode uat", "build:app-plus:prod": "uni build -p app-plus", + "build:h5:dev": "uni build -p app-plus --mode development_h5", "build:h5": "uni build" }, "dependencies": { diff --git a/src/api/request.js b/src/api/request.js index 519dfdf0..1d2ff316 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -6,7 +6,7 @@ import common from '@/common/common.js' const ENV = import.meta.env export const get_base_url = (url = '') => { - + return '' if (ENV.MODE === 'development') { // 开发环境 // #ifdef H5 if (url) { diff --git a/src/components/examination/es-analysis.vue b/src/components/examination/es-analysis.vue index 169031ba..0e22662b 100644 --- a/src/components/examination/es-analysis.vue +++ b/src/components/examination/es-analysis.vue @@ -12,8 +12,7 @@ {{ item.gradeDimens }}： {{ item.anlyGrade }} - 关键词：{{ passKeyword }} - + @@ -50,20 +49,20 @@ if (!props.value.relKeyword) return []; return props.value.relKeyword.split(/[,、]/).map((key) => key.trim()); }); + + const highlightedText = computed(() => { + // 如果没有关键词，直接返回原文本 + if (!keywords.value.length) return '你的答案：' + props.answerText; + // 构建正则表达式，匹配所有关键词（不区分大小写） + // 对关键词进行转义，避免特殊字符影响正则 + const escapedKeywords = keywords.value.map((keyword) => keyword.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')); - // const highlightedText = computed(() => { - // // 如果没有关键词，直接返回原文本 - // if (!keywords.value.length) return '你的答案：' + props.answerText; - // // 构建正则表达式，匹配所有关键词（不区分大小写） - // // 对关键词进行转义，避免特殊字符影响正则 - // const escapedKeywords = keywords.value.map((keyword) => keyword.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')); + // 创建正则表达式，g表示全局匹配，i表示不区分大小写 + const regex = new RegExp(`(${escapedKeywords.join('|')})`, 'gi'); - // // 创建正则表达式，g表示全局匹配，i表示不区分大小写 - // const regex = new RegExp(`(${escapedKeywords.join('|')})`, 'gi'); - - // // 替换匹配到的关键词，用span包裹并添加高亮样式 - // return '你的答案：' + props.answerText.replace(regex, (match) => `${match}`); - // }); + // 替换匹配到的关键词，用span包裹并添加高亮样式 + return '你的答案：' + props.answerText.replace(regex, (match) => `${match}`); + }); const dimension_all_score = computed(() => { return ( evalSettingVos.value From c2cca24ea0c7232a578f4f4db49776fa77b24235 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Wed, 24 Sep 2025 10:21:18 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/manifest.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/manifest.json b/src/manifest.json index dc47c470..1df64dec 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,16 +2,16 @@ "name" : "tra-app", "appid" : "__UNI__EDE0E52", "description" : "", - "versionName" : "0.0.1", - "versionCode" : 1, + "versionName" : "0.0.2", + "versionCode" : 2, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { "usingComponents" : true, "nvueStyleCompiler" : "uni-app", "compilerVersion" : 3, - "renderer": "auto", - "orientation": ["portrait-primary"], + "renderer" : "auto", + "orientation" : [ "portrait-primary" ], "splashscreen" : { "alwaysShowBeforeRender" : true, "waiting" : false, From 555c0d43a2a2916f9c636ad2e8b778c00b9f1163 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Wed, 24 Sep 2025 10:47:55 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E7=AD=94?= =?UTF-8?q?=E9=A2=98=E5=85=B3=E9=94=AE=E8=AF=8D=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/request.js | 1 - src/components/examination/es-analysis.vue | 15 ++++++++++----- src/components/examination/subject.vue | 1 + 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/api/request.js b/src/api/request.js index 1d2ff316..50e865f0 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -6,7 +6,6 @@ import common from '@/common/common.js' const ENV = import.meta.env export const get_base_url = (url = '') => { - return '' if (ENV.MODE === 'development') { // 开发环境 // #ifdef H5 if (url) { diff --git a/src/components/examination/es-analysis.vue b/src/components/examination/es-analysis.vue index 0e22662b..e1a82d6c 100644 --- a/src/components/examination/es-analysis.vue +++ b/src/components/examination/es-analysis.vue @@ -11,7 +11,7 @@ {{ item.gradeDimens }}： {{ item.anlyGrade }} - + @@ -33,9 +33,13 @@ type: Boolean, default: false, required: false + }, + anserResult: { + type: String, + required: true } }); - const passKeyword = computed(() => props.value.passKeyword); + const evalSettingVos = computed(() => props.value.evalSettingVos); const status = computed(() => (props.judgeResult ? 'success' : 'error')); const select_status_icon = computed(() => { @@ -45,14 +49,15 @@ return optionErrorIcon(); } }); + const keywords = computed(() => { if (!props.value.relKeyword) return []; - return props.value.relKeyword.split(/[,、]/).map((key) => key.trim()); + return props.value.relKeyword.split(/[,、/]/).map((key) => key.trim()); }); const highlightedText = computed(() => { // 如果没有关键词，直接返回原文本 - if (!keywords.value.length) return '你的答案：' + props.answerText; + if (!keywords.value.length) return '你的答案：' + props.anserResult; // 构建正则表达式，匹配所有关键词（不区分大小写） // 对关键词进行转义，避免特殊字符影响正则 const escapedKeywords = keywords.value.map((keyword) => keyword.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')); @@ -61,7 +66,7 @@ const regex = new RegExp(`(${escapedKeywords.join('|')})`, 'gi'); // 替换匹配到的关键词，用span包裹并添加高亮样式 - return '你的答案：' + props.answerText.replace(regex, (match) => `${match}`); + return '你的答案：' + props.anserResult.replace(regex, (match) => `${match}`); }); const dimension_all_score = computed(() => { return ( diff --git a/src/components/examination/subject.vue b/src/components/examination/subject.vue index dfa8370b..1505cae6 100644 --- a/src/components/examination/subject.vue +++ b/src/components/examination/subject.vue @@ -98,6 +98,7 @@ v-if="qnsTyp === 'ES'" :value="subject_data.itemVos[0]" :judgeResult="judgeResultStatus" + :anserResult="subject_data.anserResult" > From dac06ef942ba4b42a571e13c68e2aa2953c39ebc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Wed, 24 Sep 2025 13:47:38 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E9=94=AE?= =?UTF-8?q?=E5=AD=97=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.env.development b/.env.development index 148c3d27..3e4b315b 100644 --- a/.env.development +++ b/.env.development @@ -13,14 +13,13 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001' # app入口 - # VITE_APP_BASE_API_Url = 'http://25.18.122.65:7001' # VITE_APP_BASE_API_Url = 'http://25.16.122.91:9786' #VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786' # h5专用地址x2 -VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' +#VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001' # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.92:9786' # VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'