From 4275b824087a836aeb302c91f63b4874e1284a95 Mon Sep 17 00:00:00 2001 From: dshclm <3321914460@qq.com> Date: Mon, 18 Nov 2024 15:56:41 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/elExam/userExam/view.html | 25 ++++++------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/view.html b/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/view.html index 7b7fbe6..b5e8a20 100644 --- a/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/view.html +++ b/ruoyi-admin/src/main/resources/templates/system/elExam/userExam/view.html @@ -26,7 +26,7 @@ - 考试状态：{{ item.userTime}} + 考试状态：{{ item.stateName}} @@ -47,25 +47,26 @@ }, mounted(){ this.paperList = this.updatedPaperList - this.getCityList() }, computed: { updatedPaperList() { - return this.paperList.map(paper => { - const match = this.examStateList.find(function (item){ - item.dictValue == paper.state + return this.paperList.map(function(paper) { + var match = this.examStateList.find(function(item) { + return item.dictValue == paper.state; }); if (match) { var newPaper = {}; for (var key in paper) { - newPaper[key] = paper[key]; + if (paper.hasOwnProperty(key)) { + newPaper[key] = paper[key]; + } } newPaper.stateName = match.dictLabel; return newPaper; } else { return paper; } - }); + }.bind(this)); } }, methods:{ @@ -79,16 +80,6 @@ const seconds = ('0' + date.getSeconds()).slice(-2); return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; }, - getCityList(){ - $.ajax({ - url: ctx + "system/area/getSysAreaList", - type: 'GET', - data:this.params , - success:((res)=>{ - this.CityList = res.data.filter(obj => obj.id === '36625'); - }) , - }); - }, } }) From 6806ad935aee892ee422dad9338298c6d9a2f526 Mon Sep 17 00:00:00 2001 From: dshclm <3321914460@qq.com> Date: Mon, 18 Nov 2024 16:21:02 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/static/ruoyi/js/ry-ui.js | 14 +++++++++++++- .../main/resources/templates/system/user/add.html | 4 ++-- .../resources/templates/system/user/authRole.html | 2 +- .../main/resources/templates/system/user/edit.html | 6 +++--- 4 files changed, 19 insertions(+), 7 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 6243ffa..4409d9a 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 @@ -729,7 +729,19 @@ var table = { } }); return selects; - } + }, + // 获取选中单选框项 + radioCheckeds: function(name) { + var radios = ""; + $('input:radio[name="' + name + '"]:checked').each(function(i) { + if (0 == i) { + radios = $(this).val(); + } else { + radios += ("," + $(this).val()); + } + }); + return radios; + }, }, // 弹出层封装处理 modal: { diff --git a/ruoyi-admin/src/main/resources/templates/system/user/add.html b/ruoyi-admin/src/main/resources/templates/system/user/add.html index da00331..63e373d 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/add.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/add.html @@ -92,7 +92,7 @@
@@ -363,7 +363,7 @@ if ($.validate.form() && checkpwd(chrtype, password)) { var data = $("#form-user-add").serializeArray(); var status = $("input[id='status']").is(':checked') == true ? 0 : 1; - var roleIds = $.form.selectCheckeds("role"); + var roleIds = $.form.radioCheckeds("role"); var postIds = $.form.selectSelects("post"); data.push({"name": "status", "value": status}); data.push({"name": "roleIds", "value": roleIds}); diff --git a/ruoyi-admin/src/main/resources/templates/system/user/authRole.html b/ruoyi-admin/src/main/resources/templates/system/user/authRole.html index 1cc11fd..4c81d43 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/authRole.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/authRole.html @@ -61,7 +61,7 @@ clickToSelect: true, maintainSelected: true, columns: [{ - checkbox: true, + radio: true, formatter:function (value, row, index) { if($.common.isEmpty(value)) { return { checked: row.flag }; diff --git a/ruoyi-admin/src/main/resources/templates/system/user/edit.html b/ruoyi-admin/src/main/resources/templates/system/user/edit.html index a59b08b..b2ff197 100644 --- a/ruoyi-admin/src/main/resources/templates/system/user/edit.html +++ b/ruoyi-admin/src/main/resources/templates/system/user/edit.html @@ -81,8 +81,8 @@
+ +
@@ -308,7 +308,7 @@ if ($.validate.form()) { var data = $("#form-user-edit").serializeArray(); /*var status = $("input[id='status']").is(':checked') == true ? 0 : 1;*/ - var roleIds = $.form.selectCheckeds("role"); + var roleIds = $.form.radioCheckeds("role"); var postIds = $.form.selectSelects("post"); /*data.push({"name": "status", "value": status});*/ data.push({"name": "roleIds", "value": roleIds}); From 122e236a3bde96368681e7292e1c62111c874566 Mon Sep 17 00:00:00 2001 From: dshclm <3321914460@qq.com> Date: Mon, 18 Nov 2024 16:31:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/templates/main.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/resources/templates/main.html b/ruoyi-admin/src/main/resources/templates/main.html index 4c6aafc..7724caa 100644 --- a/ruoyi-admin/src/main/resources/templates/main.html +++ b/ruoyi-admin/src/main/resources/templates/main.html @@ -4,7 +4,7 @@ - 若依介绍 + 保密业务综合管理系统