Startseite Erkunden Hilfe
Registrieren Anmelden
jiapeng
/
console-front
Beobachten 1
Favorit hinzufügen 0
Fork 0
Code Issues 0 Pull-Requests 0 Commits 77 Releases 0 Wiki
Quellcode durchsuchen

完善细节，更改日期选择方式

XMTT vor 7 Jahren
Ursprung
801c3c3d36
Commit
be40c52b5a
14 geänderte Dateien mit 103 neuen und 60 gelöschten Zeilen
Geteilte Ansicht Diff-Statistik anzeigen
  1. 3 1
      css/model/sys/userinfo.css
  2. 16 16
      html/model/sys/userInfo/details.html
  3. 6 6
      html/model/sys/userInfo/edit.html
  4. 5 9
      html/model/sys/userInfo/edu.html
  5. 4 3
      html/model/sys/userInfo/honor.html
  6. 7 5
      html/model/sys/userInfo/job.html
  7. 3 3
      html/model/sys/userInfo/new.html
  8. 5 4
      html/model/sys/userInfo/project.html
  9. 2 5
      js/model/sys/userInfo/eduEdit.js
  10. 2 5
      js/model/sys/userInfo/eduNew.js
  11. 1 0
      js/model/sys/userInfo/examine.js
  12. 4 3
      js/model/sys/userInfo/review.js
  13. 18 0
      js/model/sys/usercount/index.js
  14. 27 0
      js/static.js

+ 3 - 1
css/model/sys/userinfo.css
Datei anzeigen 

@ -38,7 +38,9 @@
38 38 
    padding: 0 20px 10px;
39 39 
}
40 40
41 
.sys_userinfo_details .requiredSpan{
41 
.sys_userinfo_details .requiredSpan, .sys_userinfo_honor .requiredSpan,
42 
.sys_userinfo_project .requiredSpan, .sys_userinfo_job .requiredSpan,
43 
.sys_userinfo_edu .requiredSpan{
42 44 
    color: #ff0000;
43 45 
    position:relative;
44 46 
    top:6px;

+ 16 - 16
html/model/sys/userInfo/details.html
Datei anzeigen 

@ -6,34 +6,34 @@
6 6 
        <div class="row">
7 7 
            <div class="col-2 item-caption">专家姓名</div>
8 8 
            <div class="col-4">
9 
                <div class="form-item text required" defVal="" name="name"></div>
9 
                <div class="form-item text required" placeholder="姓名最长为10个字" name="name"></div>
10 10 
            </div>
11 11 
            <span class="requiredSpan">*</span>
12 12 
        </div>
13 13 
        <div class="row">
14 14 
            <div class="col-2 item-caption">职称</div>
15 15 
            <div class="col-4">
16 
                <div class="form-item text" defVal="" name="title"></div>
16 
                <div class="form-item text" placeholder="职称不得超过20个字" name="title"></div>
17 17 
            </div>
18 18 
            <div class="col-2 item-caption">职位</div>
19 19 
            <div class="col-4">
20 
                <div class="form-item text" defVal="" name="office"></div>
20 
                <div class="form-item text" placeholder="职位不得超过20个字" name="office"></div>
21 21 
            </div>
22 22 
        </div>
23 23 
        <div class="row">
24 24 
            <div class="col-2 item-caption">所在机构</div>
25 25 
            <div class="col-4">
26 
                <div class="form-item text" defVal="" name="orgName"></div>
26 
                <div class="form-item text" placeholder="所在机构不得超过50个字" name="orgName"></div>
27 27 
            </div>
28 28 
            <div class="col-2 item-caption">所属部门</div>
29 29 
            <div class="col-4">
30 
                <div class="form-item text" defVal="" name="department"></div>
30 
                <div class="form-item text" placeholder="所在部门不得超过20个字" name="department"></div>
31 31 
            </div>
32 32 
        </div>
33 33 
        <div class="row me">
34 34 
            <div class="col-2 item-caption">联系电话</div>
35 35 
            <div class="col-4">
36 
                <div class="form-item text" defVal="" name="pMobile"></div>
36 
                <div class="form-item text" placeholder="联系电话不得超过50个字" name="pMobile"></div>
37 37 
            </div>
38 38 
            <div class="col-2 item-caption">联系邮箱</div>
39 39 
            <div class="col-4">
 
@ -73,13 +73,13 @@
73 73 
        <div class="row">
74 74 
            <div class="col-2 item-caption">个人简介</div>
75 75 
            <div class="col-6">
76 
                <div class="form-item textarea" name="descp"></div>
76 
                <div class="form-item textarea" placeholder="个人简介不得超过500个字" name="descp"></div>
77 77 
            </div>
78 78 
        </div>
79 79 
        <div class="row">
80 80 
            <div class="col-2 item-caption">学术领域</div>
81 81 
            <div class="col-4">
82 
                <div class="form-item text" defVal="" name="newSubject"></div>
82 
                <div class="form-item text" placeholder="添加内容不能超过10个字" name="newSubject"></div>
83 83 
            </div>
84 84 
            <div class="col-2">
85 85 
                <div class="btn pull-right opt-subject">
 
@ -94,12 +94,12 @@
94 94 
            </div>
95 95 
        </div>
96 96 
        <div class="row">
97 
            <div class="col-2 item-caption">行业领域</div>
97 
            <div class="col-2 item-caption">研究方向</div>
98 98 
            <div class="col-4">
99 
                <div class="form-item text" defVal="" name="newIndustry"></div>
99 
                <div class="form-item text" placeholder="添加内容不能超过20个字" name="newResearchArea"></div>
100 100 
            </div>
101 101 
            <div class="col-2">
102 
                <div class="btn pull-right opt-industry">
102 
                <div class="btn pull-right opt-ra">
103 103 
                    <i class="icon-check"></i> 添加
104 104 
                </div>
105 105 
            </div>
 
@ -107,16 +107,16 @@
107 107 
        <div class="row">
108 108 
            <div class="col-2"></div>
109 109 
            <div class="col-6">
110 
                <div class="form-item dyn-mselect orgSize" name="industryList"></div>
110 
                <div class="form-item dyn-mselect orgSize" name="researchAreaList"></div>
111 111 
            </div>
112 112 
        </div>
113 113 
        <div class="row">
114 
            <div class="col-2 item-caption">研究方向</div>
114 
            <div class="col-2 item-caption">行业领域</div>
115 115 
            <div class="col-4">
116 
                <div class="form-item text" defVal="" name="newResearchArea"></div>
116 
                <div class="form-item text" placeholder="添加内容不能超过10个字" name="newIndustry"></div>
117 117 
            </div>
118 118 
            <div class="col-2">
119 
                <div class="btn pull-right opt-ra">
119 
                <div class="btn pull-right opt-industry">
120 120 
                    <i class="icon-check"></i> 添加
121 121 
                </div>
122 122 
            </div>
 
@ -124,7 +124,7 @@
124 124 
        <div class="row">
125 125 
            <div class="col-2"></div>
126 126 
            <div class="col-6">
127 
                <div class="form-item dyn-mselect orgSize" name="researchAreaList"></div>
127 
                <div class="form-item dyn-mselect orgSize" name="industryList"></div>
128 128 
            </div>
129 129 
        </div>
130 130 
        <div class="container">

+ 6 - 6
html/model/sys/userInfo/edit.html
Datei anzeigen 

@ -4,21 +4,21 @@
4 4 
    </div>
5 5 
    <div class="container newForm">
6 6 
        <div class="row">
7 
            <div class="col-2 item-caption">用户名</div>
7 
            <div class="col-2 item-caption">手机</div>
8 8 
            <div class="col-6">
9 
                <div class="form-item text required" defVal="" name="name"></div>
9 
                <div class="form-item text" placeholder="手机或邮箱至少输入一项" name="mobile"></div>
10 10 
            </div>
11 11 
        </div>
12 12 
        <div class="row">
13 
            <div class="col-2 item-caption">手机</div>
13 
            <div class="col-2 item-caption">邮箱</div>
14 14 
            <div class="col-6">
15 
                <div class="form-item text" defVal="" name="mobile"></div>
15 
                <div class="form-item text" placeholder="手机或邮箱至少输入一项" name="email"></div>
16 16 
            </div>
17 17 
        </div>
18 18 
        <div class="row">
19 
            <div class="col-2 item-caption">邮箱</div>
19 
            <div class="col-2 item-caption">用户名</div>
20 20 
            <div class="col-6">
21 
                <div class="form-item text" defVal="" name="email"></div>
21 
                <div class="form-item text required" placeholder="姓名最长为10个字" name="name"></div>
22 22 
            </div>
23 23 
        </div>
24 24 
        <div class="row">

+ 5 - 9
html/model/sys/userInfo/edu.html
Datei anzeigen 

@ -6,19 +6,20 @@
6 6 
        <div class="row">
7 7 
            <div class="col-2 item-caption">学校名称</div>
8 8 
            <div class="col-6">
9 
                <div class="form-item text" defVal="" name="eduSchool"></div>
9 
                <div class="form-item text" placeholder="学校名称不得超过50个字" name="eduSchool"></div>
10 10 
            </div>
11 
            <span class="requiredSpan">*</span>
11 12 
        </div>
12 13 
        <div class="row">
13 14 
            <div class="col-2 item-caption">院系名称</div>
14 15 
            <div class="col-6">
15 
                <div class="form-item text" defVal="" name="eduCollege"></div>
16 
                <div class="form-item text" placeholder="院系名称不得超过20个字" name="eduCollege"></div>
16 17 
            </div>
17 18 
        </div>
18 19 
        <div class="row">
19 20 
            <div class="col-2 item-caption">专业名称</div>
20 21 
            <div class="col-6">
21 
                <div class="form-item text" defVal="" name="eduMajor"></div>
22 
                <div class="form-item text" placeholder="专业名称不得超过20个字" name="eduMajor"></div>
22 23 
            </div>
23 24 
        </div>
24 25 
        <div class="row">
 
@ -30,12 +31,7 @@
30 31 
        <div class="row">
31 32 
            <div class="col-2 item-caption ">毕业时间</div>
32 33 
            <div class="col-4">
33 
                <div class="form-item date" defVal="" name="eduYear"></div>
34 
            </div>
35 
            <div class="col-6">
36 
                <div class="btn pull-right opt-on">
37 
                    <i class="icon-check"></i> 至今在读
38 
                </div>
34 
                <div class="form-item select tree" dictCode="edu_year" name="eduYear"></div>
39 35 
            </div>
40 36 
        </div>
41 37 
        <div class="row">

+ 4 - 3
html/model/sys/userInfo/honor.html
Datei anzeigen 

@ -6,19 +6,20 @@
6 6 
        <div class="row">
7 7 
            <div class="col-2 item-caption">奖项名称</div>
8 8 
            <div class="col-6">
9 
                <div class="form-item text" defVal="" name="honorName"></div>
9 
                <div class="form-item text" placeholder="奖项名称不得超过50个字" name="honorName"></div>
10 10 
            </div>
11 
            <span class="requiredSpan">*</span>
11 12 
        </div>
12 13 
        <div class="row">
13 14 
            <div class="col-2 item-caption ">获奖时间</div>
14 15 
            <div class="col-4">
15 
                <div class="form-item date" defVal="" name="honorYear"></div>
16 
                <div class="form-item select" dictCode="honor_year" name="honorYear"></div>
16 17 
            </div>
17 18 
        </div>
18 19 
        <div class="row">
19 20 
            <div class="col-2 item-caption">备注</div>
20 21 
            <div class="col-6">
21 
                <div class="form-item textarea" defVal="" name="honorDescp"></div>
22 
                <div class="form-item textarea" placeholder="项目描述不得超过200个字" name="honorDescp"></div>
22 23 
            </div>
23 24 
        </div>
24 25 
        <div class="row">

+ 7 - 5
html/model/sys/userInfo/job.html
Datei anzeigen 

@ -6,29 +6,31 @@
6 6 
        <div class="row">
7 7 
            <div class="col-2 item-caption">机构名称</div>
8 8 
            <div class="col-6">
9 
                <div class="form-item text" defVal="" name="jobCompany"></div>
9 
                <div class="form-item text" placeholder="机构名称不得超过50个字" name="jobCompany"></div>
10 10 
            </div>
11 
            <span class="requiredSpan">*</span>
11 12 
        </div>
12 13 
        <div class="row">
13 14 
            <div class="col-2 item-caption">所在部门</div>
14 15 
            <div class="col-6">
15 
                <div class="form-item text" defVal="" name="jobDepartment"></div>
16 
                <div class="form-item text" placeholder="部门名称不得超过50个字" name="jobDepartment"></div>
16 17 
            </div>
17 18 
        </div>
18 19 
        <div class="row">
19 20 
            <div class="col-2 item-caption">职位</div>
20 21 
            <div class="col-6">
21 
                <div class="form-item text" defVal="" name="jobTitle"></div>
22 
                <div class="form-item text" placeholder="职位不得超过50个字" name="jobTitle"></div>
22 23 
            </div>
24 
            <span class="requiredSpan">*</span>
23 25 
        </div>
24 26 
        <div class="row">
25 27 
            <div class="col-2 item-caption ">任职时间</div>
26 28 
            <div class="col-4">
27 
                <div class="form-item date" defVal="" name="jobStart"></div>
29 
                <div class="form-item select tree" dictCode="date_start" name="jobStart"></div>
28 30 
            </div>
29 31 
            <div class="col-1 item-caption center">至</div>
30 32 
            <div class="col-4">
31 
                <div class="form-item date" defVal="" name="jobStop"></div>
33 
                <div class="form-item select tree" dictCode="date_stop" name="jobStop"></div>
32 34 
            </div>
33 35 
        </div>
34 36 
        <div class="row">

+ 3 - 3
html/model/sys/userInfo/new.html
Datei anzeigen 

@ -6,19 +6,19 @@
6 6 
        <div class="row">
7 7 
            <div class="col-2 item-caption">手机</div>
8 8 
            <div class="col-6">
9 
                <div class="form-item text" defVal="" name="mobile"></div>
9 
                <div class="form-item text" placeholder="手机或邮箱至少输入一项" name="mobile"></div>
10 10 
            </div>
11 11 
        </div>
12 12 
        <div class="row">
13 13 
            <div class="col-2 item-caption">邮箱</div>
14 14 
            <div class="col-6">
15 
                <div class="form-item text" defVal="" name="email"></div>
15 
                <div class="form-item text" placeholder="手机或邮箱至少输入一项" name="email"></div>
16 16 
            </div>
17 17 
        </div>
18 18 
        <div class="row">
19 19 
            <div class="col-2 item-caption">用户名</div>
20 20 
            <div class="col-6">
21 
                <div class="form-item text required" defVal="" name="name"></div>
21 
                <div class="form-item text required" placeholder="姓名最长为10个字" name="name"></div>
22 22 
            </div>
23 23 
        </div>
24 24 
        <div class="row">

+ 5 - 4
html/model/sys/userInfo/project.html
Datei anzeigen 

@ -6,23 +6,24 @@
6 6 
        <div class="row">
7 7 
            <div class="col-2 item-caption">项目名称</div>
8 8 
            <div class="col-6">
9 
                <div class="form-item text" defVal="" name="projectName"></div>
9 
                <div class="form-item text" placeholder="项目名称不得超过50个字" name="projectName"></div>
10 10 
            </div>
11 
            <span class="requiredSpan">*</span>
11 12 
        </div>
12 13 
        <div class="row">
13 14 
            <div class="col-2 item-caption ">项目时间</div>
14 15 
            <div class="col-4">
15 
                <div class="form-item date" defVal="" name="projectStart"></div>
16 
                <div class="form-item select tree" dictCode="date_start" name="projectStart"></div>
16 17 
            </div>
17 18 
            <div class="col-1 item-caption center">至</div>
18 19 
            <div class="col-4">
19 
                <div class="form-item date" defVal="" name="projectStop"></div>
20 
                <div class="form-item select tree" dictCode="date_stop" name="projectStop"></div>
20 21 
            </div>
21 22 
        </div>
22 23 
        <div class="row">
23 24 
            <div class="col-2 item-caption">备注</div>
24 25 
            <div class="col-6">
25 
                <div class="form-item textarea" defVal="" name="projectDescp"></div>
26 
                <div class="form-item textarea" placeholder="项目描述不得超过200个字" name="projectDescp"></div>
26 27 
            </div>
27 28 
        </div>
28 29 
        <div class="row">

+ 2 - 5
js/model/sys/userInfo/eduEdit.js
Datei anzeigen 

@ -24,7 +24,7 @@ spa_define(function () {
24 24 
                        if (form.val().eduCollege) {
25 25 
                            var eduCollege = trim(form.val().eduCollege);
26 26 
                            if (eduCollege.length > 20) {
27 
                                util.alert("项目描述不得超过20个字");
27 
                                util.alert("院系名称不得超过20个字");
28 28 
                                return;
29 29 
                            }
30 30 
                            data.data.eduCollege = eduCollege;
 
@ -34,7 +34,7 @@ spa_define(function () {
34 34 
                        if (form.val().eduMajor) {
35 35 
                            var eduMajor = trim(form.val().eduMajor);
36 36 
                            if (eduMajor.length > 20) {
37 
                                util.alert("项目描述不得超过20个字");
37 
                                util.alert("专业名称不得超过20个字");
38 38 
                                return;
39 39 
                            }
40 40 
                            data.data.eduMajor = eduMajor;
 
@ -53,9 +53,6 @@ spa_define(function () {
53 53 
                root.find(".modal-ctrl .icon-times").on("click", function () {
54 54 
                    spa.closeModal();
55 55 
                });
56 
                root.find(".opt-on").on("click", function () {
57 
                    form.val({eduYear: "至今"})
58 
                });
59 56 
                saveBtn.on("click", save);
60 57 
                form.val(data.data);
61 58 
                function trim(str) { //删除左右两端的空格			　　

+ 2 - 5
js/model/sys/userInfo/eduNew.js
Datei anzeigen 

@ -23,14 +23,14 @@ spa_define(function () {
23 23 
                        if (form.val().eduCollege) {
24 24 
                            var eduCollege = trim(form.val().eduCollege);
25 25 
                            if (eduCollege.length > 20) {
26 
                                util.alert("项目描述不得超过20个字");
26 
                                util.alert("院系名称不得超过20个字");
27 27 
                                return;
28 28 
                            }
29 29 
                        }
30 30 
                        if (form.val().eduMajor) {
31 31 
                            var eduMajor = trim(form.val().eduMajor);
32 32 
                            if (eduMajor.length > 20) {
33 
                                util.alert("项目描述不得超过20个字");
33 
                                util.alert("专业名称不得超过20个字");
34 34 
                                return;
35 35 
                            }
36 36 
                        }
 
@ -46,9 +46,6 @@ spa_define(function () {
46 46 
                root.find(".modal-ctrl .icon-times").on("click", function () {
47 47 
                    spa.closeModal();
48 48 
                });
49 
                root.find(".opt-on").on("click", function () {
50 
                    form.val({eduYear: "至今"})
51 
                });
52 49 
                saveBtn.on("click", save);
53 50 
                function trim(str) { //删除左右两端的空格			　　
54 51 
                    return str.replace(/(^\s*)|(\s*$)/g, "");

+ 1 - 0
js/model/sys/userInfo/examine.js
Datei anzeigen 

@ -21,6 +21,7 @@ spa_define(function () {
21 21 
                    '</div>');
22 22 
                $(".sys_userinfo_details .form-item").addClass("readOnly");
23 23 
                $(".sys_userinfo_details .btn").hide();
24 
                $(".sys_userinfo_details .form-item").attr("placeholder", "");
24 25 
                var id = util.data("loginUser").id;
25 26 
                var ca = {ready: true, items: []};
26 27 
                var dp = code.parseCode(root.find(".dt-project"));

+ 4 - 3
js/model/sys/userInfo/review.js
Datei anzeigen 

@ -37,11 +37,12 @@ spa_define(function () {
37 37 
                                email: form.val().email
38 38 
                            }, function (success) {
39 39 
                                if (success) {
40 
                                    form.doPost("../ajax/userinfo/import", closeThis, function (code) {
40 
                                    form.doPost("../ajax/userinfo/import", function (code) {
41 41 
                                        if (code==1) {
42 
                                            util.alert("审核成功，并已导入正式数据库");
42 
                                            closeThis();
43 
                                            alert("审核成功，并已导入正式数据库");
43 44 
                                        } else if (code == 2){
44 
                                            util.alert("导入失败，只有这次审核通过的可以导入");
45 
                                            util.alert("导入失败，只有本次审核通过的可以导入");
45 46 
                                        }else if(code == 3){
46 47 
                                            util.alert("导入失败，信息不存在");
47 48 
                                        }

+ 18 - 0
js/model/sys/usercount/index.js
Datei anzeigen 

@ -35,6 +35,24 @@ spa_define(function () {
35 35 
                    cr.val(tableData.data);
36 36 
                };
37 37
38 
                /*
39 
                用户流量统计表格 时间倒序
40 
                 */
41 
                // var query = function () {
42 
                //     if(allData != null) {
43 
                //         var td = tableData.data = [];
44 
                //         for(var i = allData.length; i >= allData.length-7; --i) {
45 
                //             var item = allData[i];
46 
                //             if(item) {
47 
                //                 td.push(item);
48 
                //             }
49 
                //         }
50 
                //     } else {
51 
                //         tableData.data = allData;
52 
                //     }
53 
                //     cr.val(tableData.data);
54 
                // };
55
38 56 
                var load = function () {
39 57 
                    util.get("../ajax/operation/statist/userCount", null, function (data) {
40 58 
                        allData = data || [];

+ 27 - 0
js/static.js
Datei anzeigen 

@ -47,6 +47,33 @@
47 47 
            code: "0", caption: "未认证", enabled: true
48 48 
        }, {
49 49 
            code: "3", caption: "已认证", enabled: true}]);
50
51 
        var y = new Date().getFullYear();
52 
        var eduYear = [];
53 
        eduYear.push({code: "至今", caption: "至今", enabled: true});
54 
        for(var i = y; i > y - 60; i--) {
55 
            eduYear.push({code: String(i), caption: String(i), enabled: true});
56 
        }
57 
        dict.set("edu_year", eduYear);
58
59 
        var honorYear = [];
60 
        for(var i = y; i > y - 60; i--) {
61 
            honorYear.push({code: String(i), caption: String(i), enabled: true});
62 
        }
63 
        dict.set("honor_year", honorYear);
64
65 
        var dateStart = [];
66 
        for(var i = y; i > y - 60; i--) {
67 
            dateStart.push({code: String(i), caption: String(i), enabled: true,children:[{code:String(i)+"01",caption:String(i)+"年1月","enabled":true},{code:String(i)+"02",caption:String(i)+"年2月","enabled":true},{code:String(i)+"03",caption:String(i)+"年3月","enabled":true},{code:String(i)+"04",caption:String(i)+"年4月","enabled":true},{code:String(i)+"05",caption:String(i)+"年5月","enabled":true},{code:String(i)+"06",caption:String(i)+"年6月","enabled":true},{code:String(i)+"07",caption:String(i)+"年7月","enabled":true},{code:String(i)+"08",caption:String(i)+"年8月","enabled":true},{code:String(i)+"09",caption:String(i)+"年9月","enabled":true},{code:String(i)+"10",caption:String(i)+"年10月","enabled":true},{code:String(i)+"11",caption:String(i)+"年11月","enabled":true},{code:String(i)+"12",caption:String(i)+"年12月","enabled":true}]});
68 
        }
69 
        dict.set("date_start", dateStart);
70
71 
        var dateStop = [];
72 
        dateStop.push({code: "至今", caption: "至今", enabled: true});
73 
        for(var i = y; i > y - 60; i--) {
74 
            dateStop.push({code: String(i), caption: String(i), enabled: true,children:[{code:String(i)+"01",caption:String(i)+"年1月","enabled":true},{code:String(i)+"02",caption:String(i)+"年2月","enabled":true},{code:String(i)+"03",caption:String(i)+"年3月","enabled":true},{code:String(i)+"04",caption:String(i)+"年4月","enabled":true},{code:String(i)+"05",caption:String(i)+"年5月","enabled":true},{code:String(i)+"06",caption:String(i)+"年6月","enabled":true},{code:String(i)+"07",caption:String(i)+"年7月","enabled":true},{code:String(i)+"08",caption:String(i)+"年8月","enabled":true},{code:String(i)+"09",caption:String(i)+"年9月","enabled":true},{code:String(i)+"10",caption:String(i)+"年10月","enabled":true},{code:String(i)+"11",caption:String(i)+"年11月","enabled":true},{code:String(i)+"12",caption:String(i)+"年12月","enabled":true}]});
75 
        }
76 
        dict.set("date_stop", dateStop);
50 77 
    });
51 78
52 79 
})();