From 0af19f690365e230fbeac6a2820a5d32e1989d11 Mon Sep 17 00:00:00 2001 From: dyy <807692433@qq.com> Date: Fri, 3 Jan 2025 11:25:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91?= =?UTF-8?q?=E6=88=90=E7=BB=A9=E5=BD=95=E5=85=A5=E9=80=89=E6=8B=A9=E7=BC=93?= =?UTF-8?q?=E8=80=83=E4=B8=8B=E6=8B=89=E4=BC=98=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/StuScore/InputScoreIndex.js | 11 ++++++++++- .../Views/StuScore/InputScoreIndexInTeacher.js | 11 ++++++++++- .../Views/StuScoreNotPass/InputScoreIndex.js | 11 ++++++++++- .../Views/StuScoreNotPass/InputScoreIndexInTeacher.js | 11 ++++++++++- 4 files changed, 40 insertions(+), 4 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.js index dfcc7d79b..119d13c16 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndex.js @@ -138,7 +138,16 @@ var bootstrap = function ($, learun) { edit: { type: 'select', init: function (data, $edit) {// 在点击单元格的时候触发，可以用来初始化输入控件，行数据和控件对象 - + if (data.IsSlow == true) { + $edit[0]._lrselect.dfop._index = "0"; + $edit.find('.lr-select-placeholder').html('是'); + } else if (data.IsSlow == false) { + $edit[0]._lrselect.dfop._index = "1"; + $edit.find('.lr-select-placeholder').html('否'); + } else { + $edit[0]._lrselect.dfop._index = "-1"; + $edit.find('.lr-select-placeholder').html(''); + } }, change: function (row, num, item) {// 行数据和行号,下拉框选中数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js index 878dfc854..bfe3975cc 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScore/InputScoreIndexInTeacher.js @@ -144,7 +144,16 @@ var bootstrap = function ($, learun) { edit: { type: 'select', init: function (data, $edit) {// 在点击单元格的时候触发，可以用来初始化输入控件，行数据和控件对象 - + if (data.IsSlow == true) { + $edit[0]._lrselect.dfop._index = "0"; + $edit.find('.lr-select-placeholder').html('是'); + } else if (data.IsSlow == false) { + $edit[0]._lrselect.dfop._index = "1"; + $edit.find('.lr-select-placeholder').html('否'); + } else { + $edit[0]._lrselect.dfop._index = "-1"; + $edit.find('.lr-select-placeholder').html(''); + } }, change: function (row, num, item) {// 行数据和行号,下拉框选中数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.js index 2823059e1..3133dca64 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndex.js @@ -138,7 +138,16 @@ var bootstrap = function ($, learun) { edit: { type: 'select', init: function (data, $edit) {// 在点击单元格的时候触发，可以用来初始化输入控件，行数据和控件对象 - + if (data.IsSlow == true) { + $edit[0]._lrselect.dfop._index = "0"; + $edit.find('.lr-select-placeholder').html('是'); + } else if (data.IsSlow == false) { + $edit[0]._lrselect.dfop._index = "1"; + $edit.find('.lr-select-placeholder').html('否'); + } else { + $edit[0]._lrselect.dfop._index = "-1"; + $edit.find('.lr-select-placeholder').html(''); + } }, change: function (row, num, item) {// 行数据和行号,下拉框选中数据 diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js index 8258d78a4..9162204d4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/StuScoreNotPass/InputScoreIndexInTeacher.js @@ -143,7 +143,16 @@ var bootstrap = function ($, learun) { edit: { type: 'select', init: function (data, $edit) {// 在点击单元格的时候触发，可以用来初始化输入控件，行数据和控件对象 - + if (data.IsSlow == true) { + $edit[0]._lrselect.dfop._index = "0"; + $edit.find('.lr-select-placeholder').html('是'); + } else if (data.IsSlow == false) { + $edit[0]._lrselect.dfop._index = "1"; + $edit.find('.lr-select-placeholder').html('否'); + } else { + $edit[0]._lrselect.dfop._index = "-1"; + $edit.find('.lr-select-placeholder').html(''); + } }, change: function (row, num, item) {// 行数据和行号,下拉框选中数据 From 6a3fd66331ac2bd28d0b0a204c2e736a2eacfb1e Mon Sep 17 00:00:00 2001 From: yxq Date: Thu, 9 Jan 2025 17:13:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9C=B0=E5=9B=BEak=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js index e1e5d8074..52cd68012 100644 --- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js +++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js @@ -797,7 +797,8 @@ export default { // }, //高德地图ak 两个ak交替使用 GET_AK() { - let ak = ['b07d0a74e059a6f132ede93ff3826515','6f461c2f11d1ae36ac12e4fa327c15b1'] + // let ak = ['b07d0a74e059a6f132ede93ff3826515','6f461c2f11d1ae36ac12e4fa327c15b1'] + let ak = ['4e0f7f050a74345787739b7abb403a91','bdc8eaaa7b04e77c5561f9950f0ab529'] let current = this.GET_STORAGE('gaodeAK') if(!current){ let ri = Math.floor(Math.random()*2);