From 7dd5285ea969d4e7a5b66003156703ddb76c9102 Mon Sep 17 00:00:00 2001 From: dshclm <3321914460@qq.com> Date: Mon, 12 Aug 2024 09:00:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=80=83=E8=AF=95=E6=98=8E?= =?UTF-8?q?=E7=BB=86=E7=A1=AE=E5=AE=9A=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/static/ruoyi/js/ry-ui.js | 16 ++++++++++++++++ .../system/elExam/userExam/myGrades.html | 2 +- .../system/elExam/userExam/userExam.html | 2 +- .../templates/system/examnum/countExam.html | 2 +- .../templates/system/examnum/examnum.html | 2 +- .../templates/system/trainnum/trainnum.html | 2 +- 6 files changed, 21 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js index 52cd5dc..6243ffa 100644 --- a/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js +++ b/ruoyi-admin/src/main/resources/static/ruoyi/js/ry-ui.js @@ -882,6 +882,22 @@ var table = { } }); }, + // 弹出层指定宽度 + openNOButton: function (title, url, width, height, callback) { + var _url = $.common.isEmpty(url) ? "/404.html" : url; + var options = { + title: table.options.modalName + "详细", + width: width, + height: height, + url: _url, + skin: 'layui-layer-gray', + btn: ['关闭'], + yes: function (index, layero) { + $.modal.close(index); + } + }; + $.modal.openOptions(options); + }, // 弹出层指定参数选项 openOptions: function (options) { var _url = $.common.isEmpty(options.url) ? "/404.html" : options.url; diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/myGrades.html b/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/myGrades.html index 1d12473..c08aa3a 100644 --- a/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/myGrades.html +++ b/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/myGrades.html @@ -88,7 +88,7 @@ /*资产列表-详细*/ function detail(id,userId) { var url = prefix + '/detail/' + id +'/'+userId; - $.modal.open("考试明细", url); + $.modal.openNOButton("考试明细", url); } diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/userExam.html b/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/userExam.html index f065c38..019e7fa 100644 --- a/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/userExam.html +++ b/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/userExam.html @@ -100,7 +100,7 @@ /*资产列表-详细*/ function detail(id,userId) { var url = prefix + '/detail/' + id +'/'+userId; - $.modal.open("考试明细", url); + $.modal.openNOButton("考试明细", url); } diff --git a/ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html b/ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html index 12b9581..80a8ce7 100644 --- a/ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html +++ b/ruoyi-admin/src/main/resources/templates/system/examnum/countExam.html @@ -185,7 +185,7 @@ }, handleEdit(index,row){ var url = prefix + '/examnum/' + row.examId - $.modal.openTab("考试明细", url); + $.modal.openNOButton("考试明细", url); } } }) diff --git a/ruoyi-admin/src/main/resources/templates/system/examnum/examnum.html b/ruoyi-admin/src/main/resources/templates/system/examnum/examnum.html index f52fca5..d5da2ce 100644 --- a/ruoyi-admin/src/main/resources/templates/system/examnum/examnum.html +++ b/ruoyi-admin/src/main/resources/templates/system/examnum/examnum.html @@ -94,7 +94,7 @@ /*资产列表-详细*/ function detail(id,userId) { var url = prefixUser + '/detail/' + id +'/'+userId; - $.modal.open("考试明细", url); + $.modal.openNOButton("考试明细", url); } diff --git a/ruoyi-admin/src/main/resources/templates/system/trainnum/trainnum.html b/ruoyi-admin/src/main/resources/templates/system/trainnum/trainnum.html index f78127d..1d3a9d3 100644 --- a/ruoyi-admin/src/main/resources/templates/system/trainnum/trainnum.html +++ b/ruoyi-admin/src/main/resources/templates/system/trainnum/trainnum.html @@ -310,7 +310,7 @@ }, handleEdit(index,row){ var url = prefix + '/examnum/' + row.examId - $.modal.openTab("考试明细", url); + $.modal.openNOButton("详情", url); } } })