Merge branch 'master' into resourceIssure

css/model/sys/article.css

@@ -19,7 +19,7 @@
    width: 4%;
}
.sys_article_index .table-opt .name {
.sys_article_index .table-opt .name,.sys_article_viewcount .table-opt .icon-line-chart{
    cursor:pointer;
}

html/model/sys/article/viewcount.html

@@ -20,20 +20,21 @@
        </div>
        <div class="col-3"></div>
    </div>
    <div class="row"></div>
    <div class="container tpl-btns">
        <div class="row">
            <div class="btn opt-count">
                统计图表
            </div>
        </div>
    </div>
    <!--<div class="row"></div>-->
    <!--<div class="container tpl-btns">-->
        <!--<div class="row">-->
            <!--<div class="btn opt-count">-->
                <!--统计图表-->
            <!--</div>-->
        <!--</div>-->
    <!--</div>-->
    <div class="container dt-tpl">
        <table class="table table-bordered">
            <thead>
            <tr>
                <th class="opt-check" ><i class="icon icon-st-check"></i> </th>
                <!--<th class="opt-check" ><i class="icon icon-st-check"></i> </th>-->
                <th class="number">图表</th>
                <th class="number">#</th>
                <th>文章标题</th>
                <th>作者</th>
@@ -48,7 +49,8 @@
            </thead>
            <tbody>
            <tr ch-dir="list">
                <td class="opt-check" ><i class="icon icon-st-check" articleId="{{id}}"></i></td>
                <!--<td class="opt-check" ><i class="icon icon-st-check" articleId="{{id}}"></i></td>-->
                <td class="table-opt" articleId="{{id}}"><i class="icon icon-line-chart"></i></td>
                <td class="hand-id" articleId="{{id}}">{{-_index}}</td>
                <td class="articleTitle">{{articleTitle}}</td>
                <td class="professorName">{{professorName}}</td>

js/model/sys/article/viewcount.js

@@ -107,23 +107,33 @@ spa_define(function () {
                    var $this = $(this);
                    $this.toggleClass("checked");
                });
                root.find(".opt-count").on("click", function () {
                    var $article = root.find("td.opt-check>i.checked");
                    if ($article.length) {
                        if ($article.length>1) {
                            util.alert("只能选择一篇文章");
                        }else {
                            spa.showModal("sys_article_count", {
                                id: $article.attr("articleId"),
                                hand: function () {
                                    pdg.reload();
                                }
                            });
                // root.find(".opt-count").on("click", function () {
                //     var $article = root.find("td.opt-check>i.checked");
                //     if ($article.length) {
                //         if ($article.length>1) {
                //             util.alert("只能选择一篇文章");
                //         }else {
                //             spa.showModal("sys_article_count", {
                //                 id: $article.attr("articleId"),
                //                 hand: function () {
                //                     pdg.reload();
                //                 }
                //             });
                //         }
                //     }else {
                //         util.alert("请选择一篇文章");
                //     }
                // });
                root.on("click",".icon-line-chart",function () {
                    var $this = $(this);
                    var articleId = $this.parent().attr("articleId");
                    spa.showModal("sys_article_count",{
                        id:articleId,
                        hand:function () {
                            pdg.reload();
                        }
                    }else {
                        util.alert("请选择一篇文章");
                    }
                });
                    })
                })
            },
            mainDestory: function () {
            }

js/model/sys/resresult/edit.js

@@ -36,7 +36,15 @@ spa_define(function () {
                            }
                        }
                    },
                    orgName: {keyPressInterval: 1},
                    orgName: {
                        keyPressInterval: 1,
                        hide: function () {
                            this.shown = false;
                            this.ctn.removeClass("open");
                            this.lastQuerying = null;
                            this.lastQueryed = null;
                        }
                    },
                    newSubject: {
                        keyPressInterval: 1,
                        hide: function () {
@@ -88,7 +96,7 @@ spa_define(function () {
                var saveBtn = root.find(".opt-save"),
                    headArea = root.find(".head-ctn"),
                    save = function () {
                        // console.log(form.val().researcherList);
                        // console.log($(".org").find("input").val());
                        var pic = [];
                        $('#fileList').find('img').each(function () {
                            pic.push($(this).attr("name"));
@@ -96,7 +104,8 @@ spa_define(function () {
                        form.val({pic: oString(pic), researchers: form.val().researcherList});
                        form.val({
                            industry: oString(form.val().industryList),
                            subject: oString(form.val().subjectList)
                            subject: oString(form.val().subjectList),
                            orgName: $(".org").find("input").val()
                        });
                        if (form.val().name == null) {
@@ -125,6 +134,7 @@ spa_define(function () {
                    }
                });
                form.val(data.data);
                $(".org").find("input").val(data.data.orgName);
                if (data.data.industry) {
                    form.val({industryList: split1(data.data.industry)});
                }

js/model/sys/resresult/new.js

@@ -36,9 +36,17 @@ spa_define(function () {
                            }
                        }
                    },
                    orgName:{keyPressInterval:1},
                    newSubject:{
                        keyPressInterval:1,
                    orgName: {
                        keyPressInterval: 1,
                        hide: function () {
                            this.shown = false;
                            this.ctn.removeClass("open");
                            this.lastQuerying = null;
                            this.lastQueryed = null;
                        }
                    },
                    newSubject: {
                        keyPressInterval: 1,
                        hide: function () {
                            this.shown = false;
                            this.ctn.removeClass("open");
@@ -95,7 +103,8 @@ spa_define(function () {
                        form.val({pic: oString(pic), researchers: form.val().researcherList});
                        form.val({
                            industry: oString(form.val().industryList),
                            subject: oString(form.val().subjectList)
                            subject: oString(form.val().subjectList),
                            orgName: $(".org").find("input").val()
                        });
                        if (form.val().name == null) {

js/model/sys/usercount/index.js

@@ -20,28 +20,10 @@ spa_define(function () {
                    return v;
                });
                var query = function () {
                    if(allData != null) {
                        var td = tableData.data = [];
                        for(var i = allData.length-7; i < allData.length; ++i) {
                            var item = allData[i];
                            if(item) {
                                td.push(item);
                            }
                        }
                    } else {
                        tableData.data = allData;
                    }
                    cr.val(tableData.data);
                };
                /*
                用户流量统计表格 时间倒序
                 */
                // var query = function () {
                //     if(allData != null) {
                //         var td = tableData.data = [];
                //         for(var i = allData.length; i >= allData.length-7; --i) {
                //         for(var i = allData.length-7; i < allData.length; ++i) {
                //             var item = allData[i];
                //             if(item) {
                //                 td.push(item);
@@ -53,6 +35,24 @@ spa_define(function () {
                //     cr.val(tableData.data);
                // };
                /*
                用户流量统计表格 时间倒序
                 */
                var query = function () {
                    if(allData != null) {
                        var td = tableData.data = [];
                        for(var i = allData.length; i >= allData.length-7; --i) {
                            var item = allData[i];
                            if(item) {
                                td.push(item);
                            }
                        }
                    } else {
                        tableData.data = allData;
                    }
                    cr.val(tableData.data);
                };
                var load = function () {
                    util.get("../ajax/operation/statist/userCount", null, function (data) {
                        allData = data || [];