Merge branch 'master' into resourceIssure

html/model/sys/article/subject.html

@@ -11,7 +11,7 @@
        <div class="row">
            <div class="col-2 item-caption">关键词</div>
            <div class="col-4">
                <div class="form-item text" placeholder="添加内容不能超过15个字" name="newSubject"></div>
                <div class="form-item text trim" placeholder="添加内容不能超过15个字" name="newSubject"></div>
            </div>
            <div class="col-2">
                <div class="btn pull-right opt-subject">

html/model/sys/paper/keyword.html

@@ -11,7 +11,7 @@
        <div class="row">
            <div class="col-2 item-caption">关键词</div>
            <div class="col-4">
                <div class="form-item text" placeholder="添加内容不能超过15个字" name="newKeyword"></div>
                <div class="form-item text trim" placeholder="添加内容不能超过15个字" name="newKeyword"></div>
            </div>
            <div class="col-2">
                <div class="btn pull-right opt-keyword">

html/model/sys/patent/keyword.html

@@ -11,7 +11,7 @@
        <div class="row">
            <div class="col-2 item-caption">关键词</div>
            <div class="col-4">
                <div class="form-item text" placeholder="添加内容不能超过15个字" name="newKeyword"></div>
                <div class="form-item text trim" placeholder="添加内容不能超过15个字" name="newKeyword"></div>
            </div>
            <div class="col-2">
                <div class="btn pull-right opt-keyword">

html/model/sys/professornew/details.html

@@ -89,7 +89,7 @@
        <div class="row">
            <div class="col-2 item-caption">学术领域</div>
            <div class="col-4">
                <div class="form-item text" placeholder="添加内容不能超过15个字" name="newSubject"></div>
                <div class="form-item text trim" placeholder="添加内容不能超过15个字" name="newSubject"></div>
            </div>
            <div class="col-2">
                <div class="btn pull-right opt-subject">
@@ -106,7 +106,7 @@
        <div class="row">
            <div class="col-2 item-caption">研究方向</div>
            <div class="col-4">
                <div class="form-item text" placeholder="添加内容不能超过20个字" name="newResearchArea"></div>
                <div class="form-item text trim" placeholder="添加内容不能超过20个字" name="newResearchArea"></div>
            </div>
            <div class="col-2">
                <div class="btn pull-right opt-ra">
@@ -123,7 +123,7 @@
        <div class="row">
            <div class="col-2 item-caption">行业领域</div>
            <div class="col-4">
                <div class="form-item text" placeholder="添加内容不能超过15个字" name="newIndustry"></div>
                <div class="form-item text trim" placeholder="添加内容不能超过15个字" name="newIndustry"></div>
            </div>
            <div class="col-2">
                <div class="btn pull-right opt-industry">

html/model/sys/resourceinfo/subject.html

@@ -11,7 +11,7 @@
        <div class="row">
            <div class="col-2 item-caption">关键词</div>
            <div class="col-4">
                <div class="form-item text" placeholder="添加内容不能超过15个字" name="newSubject"></div>
                <div class="form-item text trim" placeholder="添加内容不能超过15个字" name="newSubject"></div>
            </div>
            <div class="col-2">
                <div class="btn pull-right opt-subject">

html/model/sys/userInfo/details.html

@@ -79,7 +79,7 @@
        <div class="row">
            <div class="col-2 item-caption">学术领域</div>
            <div class="col-4">
                <div class="form-item text" placeholder="添加内容不能超过15个字" name="newSubject"></div>
                <div class="form-item text trim" placeholder="添加内容不能超过15个字" name="newSubject"></div>
            </div>
            <div class="col-2">
                <div class="btn pull-right opt-subject">
@@ -96,7 +96,7 @@
        <div class="row">
            <div class="col-2 item-caption">研究方向</div>
            <div class="col-4">
                <div class="form-item text" placeholder="添加内容不能超过30个字" name="newResearchArea"></div>
                <div class="form-item text trim" placeholder="添加内容不能超过30个字" name="newResearchArea"></div>
            </div>
            <div class="col-2">
                <div class="btn pull-right opt-ra">
@@ -113,7 +113,7 @@
        <div class="row">
            <div class="col-2 item-caption">行业领域</div>
            <div class="col-4">
                <div class="form-item text" placeholder="添加内容不能超过15个字" name="newIndustry"></div>
                <div class="form-item text trim" placeholder="添加内容不能超过15个字" name="newIndustry"></div>
            </div>
            <div class="col-2">
                <div class="btn pull-right opt-industry">

js/model/sys/article/subject.js

@@ -36,6 +36,9 @@ spa_define(function () {
                            }
                        }, {});
                    };
                var trim = function (str) { //删除左右两端的空格			　　
                    return str.replace(/(^\s*)|(\s*$)/g, "");
                };
                var part = function (one, list, num) {
                    oValue = one;
@@ -56,6 +59,9 @@ spa_define(function () {
                    } else {
                        var oValueList = oValue.split(","),
                            length = oValueList.length;
                        for (var m = 0;m<oValueList.length;m++) {
                            oValueList[m] = trim(oValueList[m]);
                        }
                        for (var j = 0; j < length; j++) {
                            for (var n = j + 1; n < oValueList.length + 1;) {
                                if (oValueList[j] == oValueList[n]) {

js/model/sys/org/details.js

@@ -133,6 +133,9 @@ spa_define(function () {
                    } else {
                        var oValueList = oValue.split(","),
                            length = oValueList.length;
                        for (var m = 0;m<oValueList.length;m++) {
                            oValueList[m] = trim(oValueList[m]);
                        }
                        for (var j = 0; j < length; j++) {
                            for (var n = j + 1; n < oValueList.length + 1;) {
                                if (oValueList[j] == oValueList[n]) {
@@ -184,6 +187,9 @@ spa_define(function () {
                    } else {
                        var oValueList = oValue.split(","),
                            length = oValueList.length;
                        for (var m = 0;m<oValueList.length;m++) {
                            oValueList[m] = trim(oValueList[m]);
                        }
                        for (var j = 0; j < length; j++) {
                            for (var n = j + 1; n < oValueList.length + 1;) {
                                if (oValueList[j] == oValueList[n]) {

js/model/sys/paper/keyword.js

@@ -35,6 +35,10 @@ spa_define(function () {
                        }, {});
                    };
                var trim = function (str) { //删除左右两端的空格			　　
                    return str.replace(/(^\s*)|(\s*$)/g, "");
                };
                var part = function (one, list, num) {
                    oValue = one;
                    oJudge = list || [];
@@ -54,6 +58,9 @@ spa_define(function () {
                    } else {
                        var oValueList = oValue.split(","),
                            length = oValueList.length;
                        for (var m = 0;m<oValueList.length;m++) {
                            oValueList[m] = trim(oValueList[m]);
                        }
                        for (var j = 0; j < length; j++) {
                            for (var n = j + 1; n < oValueList.length + 1;) {
                                if (oValueList[j] == oValueList[n]) {

js/model/sys/patent/keyword.js

@@ -35,6 +35,10 @@ spa_define(function () {
                        }, {});
                    };
                var trim = function (str) { //删除左右两端的空格			　　
                    return str.replace(/(^\s*)|(\s*$)/g, "");
                };
                var part = function (one, list, num) {
                    oValue = one;
                    oJudge = list || [];
@@ -54,6 +58,9 @@ spa_define(function () {
                    } else {
                        var oValueList = oValue.split(","),
                            length = oValueList.length;
                        for (var m = 0;m<oValueList.length;m++) {
                            oValueList[m] = trim(oValueList[m]);
                        }
                        for (var j = 0; j < length; j++) {
                            for (var n = j + 1; n < oValueList.length + 1;) {
                                if (oValueList[j] == oValueList[n]) {

js/model/sys/professornew/details.js

@@ -134,6 +134,9 @@ spa_define(function () {
                    } else {
                        var oValueList = oValue.split(","),
                            length = oValueList.length;
                        for (var m = 0;m<oValueList.length;m++) {
                            oValueList[m] = trim(oValueList[m]);
                        }
                        for (var j = 0; j < length; j++) {
                            for (var n = j + 1; n < oValueList.length + 1;) {
                                if (oValueList[j] == oValueList[n]) {
@@ -181,6 +184,9 @@ spa_define(function () {
                    } else {
                        var oValueList = oValue.split(","),
                            length = oValueList.length;
                        for (var m = 0;m<oValueList.length;m++) {
                            oValueList[m] = trim(oValueList[m]);
                        }
                        for (var j = 0; j < length; j++) {
                            for (var n = j + 1; n < oValueList.length + 1;) {
                                if (oValueList[j] == oValueList[n]) {

js/model/sys/resourceinfo/subject.js

@@ -36,6 +36,10 @@ spa_define(function () {
                        }, {});
                    };
                var trim = function (str) { //删除左右两端的空格			　　
                    return str.replace(/(^\s*)|(\s*$)/g, "");
                };
                var part = function (one, list, num) {
                    oValue = one;
                    oJudge = list || [];
@@ -55,6 +59,9 @@ spa_define(function () {
                    } else {
                        var oValueList = oValue.split(","),
                            length = oValueList.length;
                        for (var m = 0;m<oValueList.length;m++) {
                            oValueList[m] = trim(oValueList[m]);
                        }
                        for (var j = 0; j < length; j++) {
                            for (var n = j + 1; n < oValueList.length + 1;) {
                                if (oValueList[j] == oValueList[n]) {

js/model/sys/resresult/edit.js

@@ -161,6 +161,9 @@ spa_define(function () {
                    } else {
                        var oValueList = oValue.split(","),
                            length = oValueList.length;
                        for (var m = 0;m<oValueList.length;m++) {
                            oValueList[m] = trim(oValueList[m]);
                        }
                        for (var j = 0; j < length; j++) {
                            for (var n = j + 1; n < oValueList.length + 1;) {
                                if (oValueList[j] == oValueList[n]) {

js/model/sys/resresult/new.js

@@ -138,6 +138,9 @@ spa_define(function () {
                    } else {
                        var oValueList = oValue.split(","),
                            length = oValueList.length;
                        for (var m = 0;m<oValueList.length;m++) {
                            oValueList[m] = trim(oValueList[m]);
                        }
                        for (var j = 0; j < length; j++) {
                            for (var n = j + 1; n < oValueList.length + 1;) {
                                if (oValueList[j] == oValueList[n]) {

js/model/sys/userInfo/details.js

@@ -118,6 +118,9 @@ spa_define(function () {
                    } else {
                        var oValueList = oValue.split(","),
                            length = oValueList.length;
                        for (var m = 0;m<oValueList.length;m++) {
                            oValueList[m] = trim(oValueList[m]);
                        }
                        for (var j = 0; j < length; j++) {
                            for (var n = j + 1; n < oValueList.length + 1;) {
                                if (oValueList[j] == oValueList[n]) {
@@ -165,6 +168,9 @@ spa_define(function () {
                    } else {
                        var oValueList = oValue.split(","),
                            length = oValueList.length;
                        for (var m = 0;m<oValueList.length;m++) {
                            oValueList[m] = trim(oValueList[m]);
                        }
                        for (var j = 0; j < length; j++) {
                            for (var n = j + 1; n < oValueList.length + 1;) {
                                if (oValueList[j] == oValueList[n]) {