竞赛辅导

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Controllers/CompetitionInfoController.cs

@@ -62,6 +62,20 @@ namespace Learun.Application.Web.Areas.CustomFunction.Controllers
             };
             return Success(jsonData);
         }
+
+        /// <summary>
+        /// 获取表单数据
+        /// </summary>
+        /// <param name="keyValue">主键</param>
+        /// <returns></returns>
+        [HttpGet]
+        [AjaxOnly]
+        public ActionResult GetList()
+        {
+            var data = competitionInfoIBLL.GetList("");
+           
+            return Success(data);
+        }
         /// <summary>
         /// 获取表单数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContestCoachGroup/Form.js

@@ -15,9 +15,32 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            $('#CompetitionInfoId').lrDataSourceSelect({ code: 'Acc_RoomData',value: 'id',text: 'name' });
-            $('#Teacher1').lrDataSourceSelect({ code: 'EmpInfo',value: 'empid',text: 'empname' });
-            $('#Teachers').lrDataSourceSelect({ code: 'EmpInfo',value: 'empid',text: 'empname' });
+            $('#CompetitionInfoId').lrselect({
+                text: 'Name',
+                value: 'Id',
+                url: top.$.rootUrl + '/CustomFunction/CompetitionInfo/GetList',
+                maxHeight: 180,
+                allowSearch: true
+            });
+            
+            $('#Teacher1').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo',
+                param: { strWhere: "1=1 " },
+                value: "empid",
+                text: "empname"
+            });
+            $('#Teachers').lrselect({
+                allowSearch: true,
+                url: top.$.rootUrl + '/LR_SystemModule/DataSource/GetDataTable?code=EmpInfo',
+                param: { strWhere: "1=1 " },
+                value: "empid",
+                text: "empname",
+                type: 'multiple',// default,tree,treemultiple,gird,multiple
+            });
+
+            //$('#Teacher1').lrDataSourceSelect({ code: 'EmpInfo',value: 'empid',text: 'empname' });
+            //$('#Teachers').lrDataSourceSelect({ code: 'EmpInfo',value: 'empid',text: 'empname' });
         },
         initData: function () {
             if (!!keyValue) {

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/CustomFunction/Views/ContestCoachGroup/Index.js

@@ -70,20 +70,10 @@ var bootstrap = function ($, learun) {
         },
         // 初始化列表
         initGird: function () {
-            $('#gridtable').lrAuthorizeJfGrid({
+            $('#gridtable').jfGrid({
                 url: top.$.rootUrl + '/CustomFunction/ContestCoachGroup/GetPageList',
                 headData: [
-                    { label: "竞赛项目", name: "CompetitionInfoId", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('custmerData', {
-                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'Acc_RoomData',
-                                 key: value,
-                                 keyId: 'id',
-                                 callback: function (_data) {
-                                     callback(_data['name']);
-                                 }
-                             });
-                        }},
+                    { label: "竞赛项目", name: "CompetitionInfoName", width: 100, align: "left"},
                     { label: "竞赛学科", name: "Subject", width: 100, align: "left"},
                     { label: "辅导小组名称", name: "Name", width: 100, align: "left"},
                     { label: "辅导专任老师", name: "Teacher1", width: 100, align: "left",
@@ -97,16 +87,36 @@ var bootstrap = function ($, learun) {
                                  }
                              });
                         }},
-                    { label: "其他辅导老师", name: "Teachers", width: 100, align: "left",
-                        formatterAsync: function (callback, value, row, op,$cell) {
-                             learun.clientdata.getAsync('custmerData', {
-                                 url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
-                                 key: value,
-                                 keyId: 'empid',
-                                 callback: function (_data) {
-                                     callback(_data['empname']);
-                                 }
-                             });
+                    { label: "其他辅导老师", name: "Teachers", width: 150, align: "left",
+                        formatterAsync: function (callback, value, row, op, $cell) {
+                            if (value.indexOf(',') != -1) {
+                                var content = '';
+                                var timearr = value.split(',');
+                                for (var i = 0; i < timearr.length; i++) {
+                                    learun.clientdata.getAsync('custmerData',
+                                        {
+                                            url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
+                                            key: timearr[i],
+                                            keyId: 'empid',
+                                            callback: function (_data) {
+                                                content += _data['empname'] + ',';
+
+                                            }
+                                        });
+                                }
+                                content = content.substring(0, content.length - 1);
+                                callback(content);
+                            } else {
+                                learun.clientdata.getAsync('custmerData', {
+                                    url: '/LR_SystemModule/DataSource/GetDataTable?code=' + 'EmpInfo',
+                                    key: value,
+                                    keyId: 'empid',
+                                    callback: function (_data) {
+                                        callback(_data['empname']);
+                                    }
+                                });
+                            }
+                            
                         }},
                     { label: "描述", name: "Desc", width: 100, align: "left"},
                 ],

Learun.Framework.Ultimate V7/Learun.Application.Web/Learun.Application.Web.csproj

@@ -4140,6 +4140,7 @@
     <Content Include="Views\LR_Content\script\lr-admin.js" />
     <Content Include="Views\LR_Content\script\lr-authorize.js" />
     <Content Include="Views\LR_Content\script\lr-chartshelper.js" />
+    <Content Include="Views\LR_Content\script\lr-clientdata.js" />
     <Content Include="Views\LR_Content\script\lr-date.js" />
     <Content Include="Views\LR_Content\script\lr-fileupload.js" />
     <Content Include="Views\LR_Content\script\lr-form.js" />
@@ -4159,7 +4160,6 @@
     <Content Include="Views\LR_Content\style\lr-iframe-index.css" />
     <Content Include="Views\LR_Content\script\lr-ajax.js" />
     <Content Include="Views\LR_Content\script\lr-base.js" />
-    <Content Include="Views\LR_Content\script\lr-clientdata.js" />
     <Content Include="Views\LR_Content\style\lr-common.css" />
     <Content Include="favicon.ico" />
     <Content Include="Global.asax" />

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-clientdata - 副本.js

@@ -0,0 +1,683 @@
+
+
+(function ($, learun) {
+    "use strict";
+
+    var loadSate = {
+        no: -1,  // 还未加载
+        yes: 1,  // 已经加载成功
+        ing: 0,  // 正在加载中
+        fail: 2  // 加载失败
+    };
+
+    var clientDataFn = {};
+    var clientAsyncData = {};
+
+    var clientData = {};
+
+
+    function initLoad(callback) {
+        var res = loadSate.yes;
+        for (var id in clientDataFn) {
+            var _fn = clientDataFn[id];
+            if (_fn.state == loadSate.fail) {
+                res = loadSate.fail;
+                break;
+            }
+            else if (_fn.state == loadSate.no) {
+                res = loadSate.ing;
+                _fn.init();
+            }
+            else if (_fn.state == loadSate.ing) {
+                res = loadSate.ing;
+            }
+        }
+        if (res == loadSate.yes) {
+            callback(true);
+        } else if (res == loadSate.fail) {
+            callback(false);
+        }
+        else {
+            setTimeout(function () {
+                initLoad(callback);
+            }, 100);
+        }
+    }
+    function get(key, data) {
+        var res = "";
+        var len = data.length;
+        if (len == undefined) {
+            res = data[key];
+        }
+        else {
+            for (var i = 0; i < len; i++) {
+                if (key(data[i])) {
+                    res = data[i];
+                    break;
+                }
+            }
+        }
+        return res;
+    }
+
+    learun.clientdata = {
+        init: function (callback) {
+            initLoad(function (res) {
+                callback(res);
+                if (res) {// 开始异步加载数据
+                    clientAsyncData.company.init();
+                }
+            });
+        },
+        get: function (nameArray) {//[key,function (v) { return v.key == value }]
+            var res = "";
+            if (!nameArray) {
+                return res;
+            }
+            var len = nameArray.length;
+            var data = clientData;
+            for (var i = 0; i < len; i++) {
+                res = get(nameArray[i], data);
+                if (res != "" && res != undefined) {
+                    data = res;
+                }
+                else {
+                    break;
+                }
+            }
+            res = res || "";
+            return res;
+        },
+        getAsync: function (name, op) {//
+            return clientAsyncData[name].get(op);
+        },
+        getAllAsync: function (name, op) {//
+            return clientAsyncData[name].getAll(op);
+        },
+        getsAsync: function (name, op) {//
+            return clientAsyncData[name].gets(op);
+        },
+        update: function (name) {
+            clientAsyncData[name].update && clientAsyncData[name].update();
+        },
+        getAsyncReal:function(name, op) {
+            clientAsyncData[name].states = 1;
+            return clientAsyncData[name].get(op);
+        }
+    };
+
+
+    /*******************登录后数据***********************/
+    // 注册数据的加载方法
+    // 功能模块数据
+    clientDataFn.modules = {
+        state: loadSate.no,
+        init: function () {
+            //初始化加载数据
+            clientDataFn.modules.state = loadSate.ing;
+            learun.httpAsyncGet($.rootUrl + '/LR_SystemModule/Module/GetModuleList', function (res) {
+                if (res.code == learun.httpCode.success) {
+                    clientData.modules = res.data;
+                    clientDataFn.modules.toMap();
+                    clientDataFn.modules.state = loadSate.yes;
+                }
+                else {
+                    clientData.modules = [];
+                    clientDataFn.modules.toMap();
+                    clientDataFn.modules.state = loadSate.fail;
+                }
+            });
+        },
+        toMap: function () {
+            //转化成树结构 和 转化成字典结构
+            var modulesTree = {};
+            var modulesMap = {};
+            var _len = clientData.modules.length;
+            for (var i = 0; i < _len; i++) {
+                var _item = clientData.modules[i];
+                if (_item.F_EnabledMark == 1) {
+                    modulesTree[_item.F_ParentId] = modulesTree[_item.F_ParentId] || [];
+                    modulesTree[_item.F_ParentId].push(_item);
+                    modulesMap[_item.F_ModuleId] = _item;
+                }
+            }
+            clientData.modulesTree = modulesTree;
+            clientData.modulesMap = modulesMap;
+        }
+    };
+    // 登录用户信息
+    clientDataFn.userinfo = {
+        state: loadSate.no,
+        init: function () {
+            //初始化加载数据
+            clientDataFn.userinfo.state = loadSate.ing;
+            learun.httpAsyncGet($.rootUrl + '/Login/GetUserInfo', function (res) {
+                if (res.code == learun.httpCode.success) {
+                    clientData.userinfo = res.data;
+                    clientDataFn.userinfo.state = loadSate.yes;
+                }
+                else {
+                    clientDataFn.userinfo.state = loadSate.fail;
+                }
+            });
+        }
+    };
+
+    /*******************使用时异步获取*******************/
+    var storage = {
+        get: function (name) {
+            if (localStorage) {
+                return JSON.parse(localStorage.getItem(name)) || {};
+            }
+            else {
+                return clientData[name] || {};
+            }
+        },
+        set: function (name, data) {
+            if (localStorage) {
+                localStorage.setItem(name, JSON.stringify(data));
+            }
+            else {
+                clientData[name] = data;
+            }
+        }
+    };
+    // 公司信息
+    clientAsyncData.company = {
+        states: loadSate.no,
+        init: function () {
+            if (clientAsyncData.company.states == loadSate.no) {
+                clientAsyncData.company.states = loadSate.ing;
+                var ver = storage.get("companyData").ver || "";
+                learun.httpAsync('GET', top.$.rootUrl + '/LR_OrganizationModule/Company/GetMap', { ver: ver }, function (data) {
+                    if (!data) {
+                        clientAsyncData.company.states = loadSate.fail;
+                    } else {
+                        if (data.ver) {
+                            storage.set("companyData", data);
+                        }
+                        clientAsyncData.company.states = loadSate.yes;
+                        clientAsyncData.department.init();
+                    }
+                });
+            }
+        },
+        get: function (op) {
+            clientAsyncData.company.init();
+            if (clientAsyncData.company.states == loadSate.ing) {
+                setTimeout(function () {
+                    clientAsyncData.company.get(op);
+                }, 100);// 如果还在加载100ms后再检测
+            }
+            else {
+                var data = storage.get("companyData").data || {};
+                op.callback(data[op.key] || {}, op);
+            }
+        },
+        getAll: function (op) {
+            clientAsyncData.company.init();
+            if (clientAsyncData.company.states == loadSate.ing) {
+                setTimeout(function () {
+                    clientAsyncData.company.getAll(op);
+                }, 100);// 如果还在加载100ms后再检测
+            }
+            else {
+                var data = storage.get("companyData").data || {};
+                op.callback(data, op);
+            }
+        }
+    };
+    // 部门信息
+    clientAsyncData.department = {
+        states: loadSate.no,
+        init: function () {
+            if (clientAsyncData.department.states == loadSate.no) {
+                clientAsyncData.department.states = loadSate.ing;
+                var ver = storage.get("departmentData").ver || "";
+                learun.httpAsync('GET', top.$.rootUrl + '/LR_OrganizationModule/Department/GetMap', { ver: ver }, function (data) {
+                    if (!data) {
+                        clientAsyncData.department.states = loadSate.fail;
+                    } else {
+                        if (data.ver) {
+                            storage.set("departmentData", data);
+                        }
+                        clientAsyncData.department.states = loadSate.yes;
+                        clientAsyncData.user.init();
+                    }
+                });
+            }
+        },
+        get: function (op) {
+            clientAsyncData.department.init();
+            if (clientAsyncData.department.states == loadSate.ing) {
+                setTimeout(function () {
+                    clientAsyncData.department.get(op);
+                }, 100);// 如果还在加载100ms后再检测
+            }
+            else {
+                var data = storage.get("departmentData").data || {};
+                op.callback(data[op.key] || {}, op);
+            }
+        },
+        getAll: function (op) {
+            clientAsyncData.department.init();
+            if (clientAsyncData.department.states == loadSate.ing) {
+                setTimeout(function () {
+                    clientAsyncData.department.getAll(op);
+                }, 100);// 如果还在加载100ms后再检测
+            }
+            else {
+                var data = storage.get("departmentData").data || {};
+                op.callback(data, op);
+            }
+        }
+    };
+    // 人员信息
+    clientAsyncData.user = {
+        states: loadSate.no,
+        init: function () {
+            if (clientAsyncData.user.states == loadSate.no) {
+                clientAsyncData.user.states = loadSate.ing;
+                var ver = storage.get("userData").ver || "";
+                learun.httpAsync('GET', top.$.rootUrl + '/LR_OrganizationModule/User/GetMap', { ver: ver }, function (data) {
+                    if (!data) {
+                        clientAsyncData.user.states = loadSate.fail;
+                    } else {
+                        if (data.ver) {
+                            storage.set("userData", data);
+                        }
+                        clientAsyncData.user.states = loadSate.yes;
+                        clientAsyncData.dataItem.init();
+                    }
+                });
+            }
+        },
+        get: function (op) {
+            clientAsyncData.user.init();
+            if (clientAsyncData.user.states == loadSate.ing) {
+                setTimeout(function () {
+                    clientAsyncData.user.get(op);
+                }, 100);// 如果还在加载100ms后再检测
+            }
+            else {
+                var data = storage.get("userData").data || {};
+                var keys = (op.key || '').split(',');
+                var array=new Array();
+                if (keys.length > 1) {
+                    $.each(keys,
+                        function (i, item) {
+
+                            array.push(data[item]);
+                        })
+                    op.callback(array || {}, op);
+
+                } else {
+
+                    op.callback(data[op.key] || {}, op);
+                }
+            }
+        },
+        getAll: function (op) {
+            clientAsyncData.user.init();
+            if (clientAsyncData.user.states == loadSate.ing) {
+                setTimeout(function () {
+                    clientAsyncData.user.getAll(op);
+                }, 100);// 如果还在加载100ms后再检测
+            }
+            else {
+                var data = storage.get("userData").data || {};
+                op.callback(data, op);
+            }
+        }
+    };
+    // 数据字典
+    clientAsyncData.dataItem = {
+        states: loadSate.no,
+        init: function () {
+            if (clientAsyncData.dataItem.states == loadSate.no) {
+                clientAsyncData.dataItem.states = loadSate.ing;
+                var ver = storage.get("dataItemData").ver || "";
+                learun.httpAsync('GET', top.$.rootUrl + '/LR_SystemModule/DataItem/GetMap', { ver: ver }, function (data) {
+                    if (!data) {
+                        clientAsyncData.dataItem.states = loadSate.fail;
+                    } else {
+                        if (data.ver) {
+                            storage.set("dataItemData", data);
+                        }
+                        clientAsyncData.dataItem.states = loadSate.yes;
+                        clientAsyncData.db.init();
+                    }
+                });
+            }
+        },
+        get: function (op) {
+            clientAsyncData.dataItem.init();
+            if (clientAsyncData.dataItem.states == loadSate.ing) {
+                setTimeout(function () {
+                    clientAsyncData.dataItem.get(op);
+                }, 100);// 如果还在加载100ms后再检测
+            }
+            else {
+                var data = storage.get("dataItemData").data || {};
+
+                // 数据字典翻译
+                var _item = clientAsyncData.dataItem.find(op.key, data[op.code] || {});
+                if (_item) {
+                    top.learun.language.get(_item.text, function (text) {
+                        _item.text = text;
+                        op.callback(_item, op);
+                    });
+                }
+                else {
+                    op.callback({}, op);
+                }
+            }
+        },
+        getAll: function (op) {
+            clientAsyncData.dataItem.init();
+            if (clientAsyncData.dataItem.states == loadSate.ing) {
+                setTimeout(function () {
+                    clientAsyncData.dataItem.getAll(op);
+                }, 100);// 如果还在加载100ms后再检测
+            }
+            else {
+                var data = storage.get("dataItemData").data || {};
+                var res = {};
+                $.each(data[op.code] || {}, function (_index, _item) {
+                    _item.text = top.learun.language.getSyn(_item.text);
+                    res[_index] = _item;
+                });
+                op.callback(res, op);
+            }
+        },
+        gets: function (op) {
+            clientAsyncData.dataItem.init();
+            if (clientAsyncData.dataItem.states == loadSate.ing) {
+                setTimeout(function () {
+                    clientAsyncData.dataItem.get(op);
+                }, 100);// 如果还在加载100ms后再检测
+            }
+            else {
+                var data = storage.get("dataItemData").data || {};
+
+                var keyList = (op.key || "").split(',');
+                var _text = []
+                $.each(keyList, function (_index, _item) {
+                    var _item = clientAsyncData.dataItem.find(_item, data[op.code] || {});
+                    top.learun.language.get(_item.text, function (text) {
+                        _text.push(text);
+                    });
+                });
+                op.callback(String(_text), op);
+            }
+        },
+        find: function (key, data) {
+            var res = {};
+            for (var id in data) {
+                if (data[id].value == key) {
+                    res = data[id];
+
+
+                    break;
+                }
+            }
+            return res;
+        },
+        update: function () {
+            clientAsyncData.dataItem.states = loadSate.no;
+            clientAsyncData.dataItem.init();
+        }
+    };
+    // 数据库连接数据
+    clientAsyncData.db = {
+        states: loadSate.no,
+        init: function () {
+            if (clientAsyncData.db.states == loadSate.no) {
+                clientAsyncData.db.states = loadSate.ing;
+                var ver = storage.get("dbData").ver || "";
+                learun.httpAsync('GET', top.$.rootUrl + '/LR_SystemModule/DatabaseLink/GetMap', { ver: ver }, function (data) {
+                    if (!data) {
+                        clientAsyncData.db.states = loadSate.fail;
+                    } else {
+                        if (data.ver) {
+                            storage.set("dbData", data);
+                        }
+                        clientAsyncData.db.states = loadSate.yes;
+                    }
+                });
+            }
+        },
+        get: function (op) {
+            clientAsyncData.db.init();
+            if (clientAsyncData.db.states == loadSate.ing) {
+                setTimeout(function () {
+                    clientAsyncData.db.get(op);
+                }, 100);// 如果还在加载100ms后再检测
+            }
+            else {
+                var data = storage.get("dbData").data || {};
+                op.callback(data[op.key] || {}, op);
+            }
+        },
+        getAll: function (op) {
+            clientAsyncData.db.init();
+            if (clientAsyncData.db.states == loadSate.ing) {
+                setTimeout(function () {
+                    clientAsyncData.db.getAll(op);
+                }, 100);// 如果还在加载100ms后再检测
+            }
+            else {
+                var data = storage.get("dbData").data || {};
+                op.callback(data, op);
+            }
+        }
+    };
+    // 数据源数据
+    clientAsyncData.sourceData = {
+        states: {},
+        get: function (op) {
+            if (clientAsyncData.sourceData.states[op.code] == undefined || clientAsyncData.sourceData.states[op.code] == loadSate.no) {
+                clientAsyncData.sourceData.states[op.code] = loadSate.ing;
+                clientAsyncData.sourceData.load(op.code);
+            }
+
+            if (clientAsyncData.sourceData.states[op.code] == loadSate.ing) {
+                setTimeout(function () {
+                    clientAsyncData.sourceData.get(op);
+                }, 100);// 如果还在加载100ms后再检测
+            }
+            else {
+                var data = storage.get("sourceData_" + op.code).data || [];
+                if (!!data) {
+                    op.callback(clientAsyncData.sourceData.find(op.key, op.keyId, data) || {}, op);
+                } else {
+                    op.callback({}, op);
+                }
+            }
+        },
+        getAll: function (op) {
+            if (clientAsyncData.sourceData.states[op.code] == undefined || clientAsyncData.sourceData.states[op.code] == loadSate.no) {
+                clientAsyncData.sourceData.states[op.code] = loadSate.ing;
+                clientAsyncData.sourceData.load(op.code);
+            }
+
+            if (clientAsyncData.sourceData.states[op.code] == loadSate.ing) {
+                setTimeout(function () {
+                    clientAsyncData.sourceData.getAll(op);
+                }, 100);// 如果还在加载100ms后再检测
+            }
+            else if (clientAsyncData.sourceData.states[op.code] == loadSate.yes) {
+                var data = storage.get("sourceData_" + op.code).data || [];
+
+                if (!!data) {
+                    op.callback(data, op);
+                } else {
+                    op.callback({}, op);
+                }
+            }
+        },
+        load: function (code) {
+            var ver = storage.get("sourceData_" + code).ver || "";
+            learun.httpAsync('GET', top.$.rootUrl + '/LR_SystemModule/DataSource/GetMap', { code: code, ver: ver }, function (data) {
+                if (!data) {
+                    clientAsyncData.sourceData.states[code] = loadSate.fail;
+                } else {
+                    if (data.ver) {
+                        storage.set("sourceData_" + code, data);
+                    }
+                    clientAsyncData.sourceData.states[code] = loadSate.yes;
+                }
+            });
+        },
+        find: function (key, keyId, data) {
+            var res = {};
+            for (var i = 0, l = data.length; i < l; i++) {
+                if (data[i][keyId] == key) {
+                    res = data[i];
+                    break;
+                }
+            }
+            return res;
+        }
+    };
+    // 获取自定义数据 url key valueId
+    clientAsyncData.custmerData = {
+        states: {},
+        get: function (op) {
+            if (clientAsyncData.custmerData.states[op.url] == undefined || clientAsyncData.custmerData.states[op.url] == loadSate.no || op.sync == true) {
+                clientAsyncData.custmerData.states[op.url] = loadSate.ing;
+                if (!!op.sync) {
+                    clientAsyncData.custmerData.loadsync(op.url, op);
+                } else {
+                    clientAsyncData.custmerData.load(op.url);
+                }
+
+            }
+            if (clientAsyncData.custmerData.states[op.url] == loadSate.ing) {
+                setTimeout(function () {
+                    clientAsyncData.custmerData.get(op);
+                }, 100);// 如果还在加载100ms后再检测
+            }
+            else {
+                var data = clientData[op.url] || [];
+                if (!!data) {
+                    op.callback(clientAsyncData.custmerData.find(op.key, op.keyId, data) || {}, op);
+                } else {
+                    op.callback({}, op);
+                }
+            }
+        },
+        gets: function (op) {
+            if (clientAsyncData.custmerData.states[op.url] == undefined || clientAsyncData.custmerData.states[op.url] == loadSate.no) {
+                clientAsyncData.custmerData.states[op.url] = loadSate.ing;
+                clientAsyncData.custmerData.load(op.url);
+            }
+            if (clientAsyncData.custmerData.states[op.url] == loadSate.ing) {
+                setTimeout(function () {
+                    clientAsyncData.custmerData.get(op);
+                }, 100);// 如果还在加载100ms后再检测
+            }
+            else {
+                var data = clientData[op.url] || [];
+                if (!!data) {
+                    var keyList = op.key.split(',');
+                    var _text = []
+                    $.each(keyList, function (_index, _item) {
+                        var _item = clientAsyncData.custmerData.find(op.key, op.keyId, data) || {};
+                        if (_item[op.textId]) {
+                            _text.push(_item[op.textId]);
+                        }
+
+                    });
+                    op.callback(String(_text), op);
+                } else {
+                    op.callback('', op);
+                }
+            }
+        },
+        getAll: function (op) {
+            if (clientAsyncData.custmerData.states[op.url] == undefined || clientAsyncData.custmerData.states[op.url] == loadSate.no) {
+                clientAsyncData.custmerData.states[op.url] = loadSate.ing;
+                clientAsyncData.custmerData.load(op.url);
+            }
+            if (clientAsyncData.custmerData.states[op.url] == loadSate.ing) {
+                setTimeout(function () {
+                    clientAsyncData.custmerData.get(op);
+                }, 100);// 如果还在加载100ms后再检测
+            }
+            else {
+                var data = clientData[op.url] || [];
+                if (!!data) {
+                    op.callback(data, op);
+                } else {
+                    op.callback([], op);
+                }
+            }
+        },
+        load: function (url) {
+            learun.httpAsync('GET', top.$.rootUrl + url, {}, function (data) {
+                if (!!data) {
+                    clientData[url] = data;
+                }
+                clientAsyncData.custmerData.states[url] = loadSate.yes;
+            });
+        },
+        loadsync: function (url, op) {
+            learun.httpSync('GET', top.$.rootUrl + url, {}, function (data) {
+                if (!!data) {
+                    clientAsyncData.custmerData.states[url] = loadSate.yes;
+                    clientData[url] = data;
+                    op.callback(clientAsyncData.custmerData.find(op.key, op.keyId, data) || {}, op);
+                } else {
+                    op.callback({}, op);
+                }
+            });
+        },
+        find: function (key, keyId, data) {
+            var res = {};
+            for (var i = 0, l = data.length; i < l; i++) {
+                if (data[i][keyId] == key) {
+                    res = data[i];
+                    break;
+                }
+            }
+            return res;
+        }
+    };
+    //桌面
+    clientAsyncData.desktop = {
+        states: loadSate.no,
+        init: function () {
+            if (clientAsyncData.desktop.states == loadSate.no) {
+                clientAsyncData.desktop.states = loadSate.ing;
+                var j = storage.get("desktopData").ver || "";
+                learun.httpAsync("GET",
+                    top.$.rootUrl + "/LR_Desktop/DTTarget/GetMap",
+                    {
+                        ver: j
+                    },
+                    function (k) {
+                        if (!k) {
+                            clientAsyncData.desktop.states = loadSate.fail;
+                        } else {
+                            if (k.ver) {
+                                storage.set("desktopData", k);
+                            }
+                            clientAsyncData.desktop.states = loadSate.yes;
+                            clientAsyncData.department.init();
+                        }
+                    });
+            }
+        }, get: function (k) {
+            clientAsyncData.desktop.init();
+            if (clientAsyncData.desktop.states == loadSate.ing) {
+                setTimeout(function () {
+                    clientAsyncData.desktop.get(k);
+                }, 100)
+            } else {
+                var j = storage.get("desktopData").data || {};
+                k.callback(j || {}, k);
+            }
+        }
+    }
+})(window.jQuery, top.learun);

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/LR_Content/script/lr-clientdata.js

@@ -14,7 +14,9 @@
     var clientAsyncData = {};
 
     var clientData = {};
-
+    var desktopData = {};
+    var sourceData = {};
+    var userData = {};
 
     function initLoad(callback) {
         var res = loadSate.yes;
@@ -278,13 +280,19 @@
         init: function () {
             if (clientAsyncData.user.states == loadSate.no) {
                 clientAsyncData.user.states = loadSate.ing;
-                var ver = storage.get("userData").ver || "";
+                //var ver = storage.get("userData").ver || "";
+                var ver = "";
+                if (userData) {
+                    ver = userData.ver || "";
+                }
+
                 learun.httpAsync('GET', top.$.rootUrl + '/LR_OrganizationModule/User/GetMap', { ver: ver }, function (data) {
                     if (!data) {
                         clientAsyncData.user.states = loadSate.fail;
                     } else {
                         if (data.ver) {
-                            storage.set("userData", data);
+                            userData = data;
+                            //storage.set("userData", data);
                         }
                         clientAsyncData.user.states = loadSate.yes;
                         clientAsyncData.dataItem.init();
@@ -300,7 +308,8 @@
                 }, 100);// 如果还在加载100ms后再检测
             }
             else {
-                var data = storage.get("userData").data || {};
+                //var data = storage.get("userData").data || {};
+                var data = userData.data || {};
                 var keys = (op.key || '').split(',');
                 var array=new Array();
                 if (keys.length > 1) {
@@ -325,7 +334,8 @@
                 }, 100);// 如果还在加载100ms后再检测
             }
             else {
-                var data = storage.get("userData").data || {};
+                //var data = storage.get("userData").data || {};
+                var data = userData.data || {};
                 op.callback(data, op);
             }
         }
@@ -487,8 +497,9 @@
                 }, 100);// 如果还在加载100ms后再检测
             }
             else {
-                var data = storage.get("sourceData_" + op.code).data || [];
+                var data = sourceData["sourceData_" + code] || [];// storage.get("sourceData_" + op.code).data || [];
                 if (!!data) {
+                    //op.callback(sourceData["sourceData_" + code].find(op.key, op.keyId, data) || {}, op);
                     op.callback(clientAsyncData.sourceData.find(op.key, op.keyId, data) || {}, op);
                 } else {
                     op.callback({}, op);
@@ -507,7 +518,8 @@
                 }, 100);// 如果还在加载100ms后再检测
             }
             else if (clientAsyncData.sourceData.states[op.code] == loadSate.yes) {
-                var data = storage.get("sourceData_" + op.code).data || [];
+                //var data = storage.get("sourceData_" + op.code).data || [];
+                var data = sourceData["sourceData_" + op.code].data || [];
 
                 if (!!data) {
                     op.callback(data, op);
@@ -517,13 +529,19 @@
             }
         },
         load: function (code) {
-            var ver = storage.get("sourceData_" + code).ver || "";
+           // var ver = storage.get("sourceData_" + code).ver || "";
+            var ver = "";
+            if (sourceData["sourceData_" + code]) {
+                ver = sourceData["sourceData_" + code].ver || "";
+            }
+            //var ver = sourceData["sourceData_" + code].ver || "";//storage.get("sourceData_" + code).ver || "";
             learun.httpAsync('GET', top.$.rootUrl + '/LR_SystemModule/DataSource/GetMap', { code: code, ver: ver }, function (data) {
                 if (!data) {
                     clientAsyncData.sourceData.states[code] = loadSate.fail;
                 } else {
                     if (data.ver) {
-                        storage.set("sourceData_" + code, data);
+                        sourceData["sourceData_" + code] = data;
+                        //storage.set("sourceData_" + code, data);
                     }
                     clientAsyncData.sourceData.states[code] = loadSate.yes;
                 }
@@ -650,7 +668,7 @@
         init: function () {
             if (clientAsyncData.desktop.states == loadSate.no) {
                 clientAsyncData.desktop.states = loadSate.ing;
-                var j = storage.get("desktopData").ver || "";
+                var j = "";//storage.get("desktopData").ver || "";
                 learun.httpAsync("GET",
                     top.$.rootUrl + "/LR_Desktop/DTTarget/GetMap",
                     {
@@ -661,7 +679,8 @@
                             clientAsyncData.desktop.states = loadSate.fail;
                         } else {
                             if (k.ver) {
-                                storage.set("desktopData", k);
+                                desktopData = k;
+                                //storage.set("desktopData", k);
                             }
                             clientAsyncData.desktop.states = loadSate.yes;
                             clientAsyncData.department.init();
@@ -675,7 +694,7 @@
                     clientAsyncData.desktop.get(k);
                 }, 100)
             } else {
-                var j = storage.get("desktopData").data || {};
+                var j = desktopData;//storage.get("desktopData").data || {};
                 k.callback(j || {}, k);
             }
         }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/CompetitionInfo/CompetitionInfoBLL.cs

@@ -43,6 +43,29 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <param name="queryJson">查询参数</param>
+        /// <returns></returns>
+        public IEnumerable<CompetitionInfoEntity> GetList( string queryJson)
+        {
+            try
+            {
+                return competitionInfoService.GetList(queryJson);
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowBusinessException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取CompetitionInfo表实体数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/CompetitionInfo/CompetitionInfoIBLL.cs

@@ -21,6 +21,7 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         /// <param name="queryJson">查询参数</param>
         /// <returns></returns>
         IEnumerable<CompetitionInfoEntity> GetPageList(Pagination pagination, string queryJson);
+        IEnumerable<CompetitionInfoEntity> GetList(string queryJson);
         /// <summary>
         /// 获取CompetitionInfo表实体数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/CompetitionInfo/CompetitionInfoService.cs

@@ -81,6 +81,28 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
             }
         }
 
+        /// <summary>
+        /// 获取页面显示列表数据
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<CompetitionInfoEntity> GetList(string queryJson)
+        {
+            try
+            {
+                return this.BaseRepository("CollegeMIS").FindList<CompetitionInfoEntity>();
+            }
+            catch (Exception ex)
+            {
+                if (ex is ExceptionEx)
+                {
+                    throw;
+                }
+                else
+                {
+                    throw ExceptionEx.ThrowServiceException(ex);
+                }
+            }
+        }
         /// <summary>
         /// 获取CompetitionInfo表实体数据
         /// </summary>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/ContestCoachGroup/ContestCoachGroupEntity.cs

@@ -11,7 +11,7 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
     /// 日 期：2021-08-11 18:00
     /// 描 述：竞赛辅导小组
     /// </summary>
-    public class ContestCoachGroupEntity 
+    public class ContestCoachGroupEntity
     {
         #region 实体成员
         /// <summary>
@@ -78,6 +78,10 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         public void Create()
         {
             this.Id = Guid.NewGuid().ToString();
+            this.CreateTime = DateTime.Now;
+            var userinfo = LoginUserInfo.Get();
+            this.CreateUserId = userinfo.userId;
+            this.CreateUserName = userinfo.realName;
         }
         /// <summary>
         /// 编辑调用
@@ -89,6 +93,9 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
         }
         #endregion
         #region 扩展字段
+        [NotMapped]
+        public string CompetitionInfoName { get; set; }
+
         #endregion
     }
 }

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/CustomFunction/ContestCoachGroup/ContestCoachGroupService.cs

@@ -38,9 +38,10 @@ namespace Learun.Application.TwoDevelopment.CustomFunction
                 t.Name,
                 t.Teacher1,
                 t.Teachers,
-                t.Desc
+                t.[Desc],c.Name as CompetitionInfoName 
                 ");
                 strSql.Append("  FROM ContestCoachGroup t ");
+                strSql.Append("  left join CompetitionInfo c on t.CompetitionInfoId=c.id ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数