From cc37295bc67b3332869cafb22f86c63fd22a9ae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E5=AF=92?= <823756726@qq.com>
Date: Sun, 29 Sep 2024 12:55:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=8A=9F=E8=83=BD=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CompetitionGroupManager/Index.cshtml      |  1 -
 .../Views/CompetitionGroupManager/Index.js    | 34 +++++++++++++------
 .../Views/CompetitionInfoManager/Index.cshtml |  1 -
 .../Views/CompetitionManager/Index.cshtml     |  1 -
 .../Views/CompetitionManager/Index.js         |  4 +--
 .../Views/MajorAchievement/Index.js           |  4 +--
 .../Views/VariousIsm/Index.js                 |  4 +--
 .../Views/VocationalProgram/Index.cshtml      |  8 ++---
 8 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.cshtml
index ecb228a6b..dcef7ba10 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.cshtml	
@@ -35,7 +35,6 @@
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_export"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;导出</a>
-                        <a id="lr_import"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp;导入</a>
                     </div>
                 </div>
             </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.js
index d5ed8b849..5a4ee2e20 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionGroupManager/Index.js	
@@ -106,18 +106,32 @@ var bootstrap = function ($, learun) {
                     { label: "分组名称", name: "GroupName", width: 100, align: "left"},
                     { label: "当前积分", name: "Integral", width: 100, align: "left"},
                     {
-                        label: "证书", name: "Path", width: 100, align: "left",
+                        label: "证书", name: "Path", width:400, align: "left",
                         formatterAsync: function (callback, value, row, op, $cell) {
-                                learun.clientdata.getAsync('custmerData',
-                                    {
-                                        url: '/LR_SystemModule/Annexes/GetAnnexesFileList?folderId=' + value,
-                                        sync: true,
-                                        callback: function (_data) {
-                                            if (_data.F_FileName) {
-                                                callback('<span onclick="downLoad(\'' + _data['F_Id'] + '\',\'' + value + '\',\'' + $.lrToken + '\')" style="color:blue">' + _data['F_FileName'] + '</span>');
-                                            }
-                                        }
+                            $.ajax({
+                                url: top.$.rootUrl + '/LR_SystemModule/Annexes/GetAnnexesFileList?folderId=' + value,
+                                type: "GET",
+                                dataType: "json",
+                                async: true,
+                                success: function (result) {
+                                    var html = "";
+                                    result.data.forEach((_data) => {
+                                        html+=('<span onclick="downLoad(\'' + _data['F_Id'] + '\',\'' + value + '\',\'' + $.lrToken + '\')" style="color:blue">' + _data['F_FileName'] + '</span>、');
                                     });
+                                    callback(html.slice(0, -1));
+                                }
+                            });
+                                //learun.clientdata.getAsync('custmerData',
+                                //    {
+                                //        url: '/LR_SystemModule/Annexes/GetAnnexesFileList?folderId=' + value,
+                                //        sync: true,
+                                //        callback: function (_data) {
+                                //            console.log(_data)
+                                //            if (_data.F_FileName) {
+                                //                callback('<span onclick="downLoad(\'' + _data['F_Id'] + '\',\'' + value + '\',\'' + $.lrToken + '\')" style="color:blue">' + _data['F_FileName'] + '</span>');
+                                //            }
+                                //        }
+                                //    });
                             }
                         //    learun.clientdata.getAsync('custmerData',
                         //        {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionInfoManager/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionInfoManager/Index.cshtml
index f32d640a4..fb1d01933 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionInfoManager/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionInfoManager/Index.cshtml	
@@ -34,7 +34,6 @@
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_export"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 导出</a>
-                        <a id="lr_import"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 导入</a>
                     </div>
                 </div>
             </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.cshtml
index 6a453a0b2..4499a7f5e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.cshtml	
@@ -38,7 +38,6 @@
                     </div>
                     <div class=" btn-group btn-group-sm" learun-authorize="yes">
                         <a id="lr_export"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 导出</a>
-                        <a id="lr_import"   class="btn btn-default"><i class="fa fa-plus"></i>&nbsp; 导入</a>
                     </div>
                 </div>
             </div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.js
index 3eead4a77..5afa7d346 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/CompetitionManager/Index.js	
@@ -56,7 +56,7 @@ var bootstrap = function ($, learun) {
                     title: '新增',
                     url: top.$.rootUrl + '/EducationalAdministration/CompetitionManager/Form',
                     width: 600,
-                    height: 400,
+                    height: 500,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -71,7 +71,7 @@ var bootstrap = function ($, learun) {
                         title: '编辑',
                         url: top.$.rootUrl + '/EducationalAdministration/CompetitionManager/Form?keyValue=' + keyValue,
                         width: 600,
-                        height: 400,
+                        height: 500,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MajorAchievement/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MajorAchievement/Index.js
index 7292901d4..ed6f04a25 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MajorAchievement/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/MajorAchievement/Index.js	
@@ -56,7 +56,7 @@ var bootstrap = function ($, learun) {
                     title: '新增',
                     url: top.$.rootUrl + '/EducationalAdministration/MajorAchievement/Form',
                     width: 600,
-                    height: 400,
+                    height:500,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -71,7 +71,7 @@ var bootstrap = function ($, learun) {
                         title: '编辑',
                         url: top.$.rootUrl + '/EducationalAdministration/MajorAchievement/Form?keyValue=' + keyValue,
                         width: 600,
-                        height: 400,
+                        height: 500,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VariousIsm/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VariousIsm/Index.js
index 435384e59..0813eed68 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VariousIsm/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VariousIsm/Index.js	
@@ -27,7 +27,7 @@ var bootstrap = function ($, learun) {
                     title: '新增',
                     url: top.$.rootUrl + '/EducationalAdministration/VariousIsm/Form',
                     width: 600,
-                    height: 400,
+                    height: 500,
                     callBack: function (id) {
                         return top[id].acceptClick(refreshGirdData);
                     }
@@ -42,7 +42,7 @@ var bootstrap = function ($, learun) {
                         title: '编辑',
                         url: top.$.rootUrl + '/EducationalAdministration/VariousIsm/Form?keyValue=' + keyValue,
                         width: 600,
-                        height: 400,
+                        height: 500,
                         callBack: function (id) {
                             return top[id].acceptClick(refreshGirdData);
                         }
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VocationalProgram/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VocationalProgram/Index.cshtml
index a7dbb1367..6865b4edd 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VocationalProgram/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/VocationalProgram/Index.cshtml	
@@ -13,12 +13,12 @@
                     <div class="lr-layout-tool-item">
                         <div id="multiple_condition_query">
                             <div class="lr-query-formcontent">
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">专业</div>
+                                <div class="col-xs-12 lr-form-item" style="padding: 5px 0 5px 100px;">
+                                    <div class="lr-form-item-title" style="width:100px">专业</div>
                                     <div id="Major"></div>
                                 </div>
-                                <div class="col-xs-12 lr-form-item">
-                                    <div class="lr-form-item-title">对口高职专业</div>
+                                <div class="col-xs-12 lr-form-item" style="padding: 5px 0 5px 100px;">
+                                    <div class="lr-form-item-title" style="width:100px">对口高职专业</div>
                                     <input id="HigherVocational" type="text" class="form-control" />
                                 </div>
                             </div>