lyn7568 5 years ago
parent
commit
a20108c28f
2 changed files with 14 additions and 10 deletions
  1. 8 7
      js/unPatentList.js
  2. 6 3
      js/userInforShow.js

+ 8 - 7
js/unPatentList.js

71
			var oTime, pageview = "",
71
			var oTime, pageview = "",
72
				draftLable = "",
72
				draftLable = "",
73
				oHtml, oLi = '',
73
				oHtml, oLi = '',
74
				mg = '';
74
				gl = ''
75
			mg = '';
75
			if ($data[i].pic)
76
			if ($data[i].pic)
76
				var imgSrc = "/data/researchResult" + $data[i].pic.split(",")[0];
77
				var imgSrc = "/data/researchResult" + $data[i].pic.split(",")[0];
77
			if ($data[i].status == '2') {
78
			if ($data[i].status == '2') {
79
				$('.deteleThis3').css('display', 'none')
78
				oTime = "修改于 " + TimeTr($data[i].modifyTime);
80
				oTime = "修改于 " + TimeTr($data[i].modifyTime);
79
				draftLable = '<span class="draftLable" style="margin-left: 20px;">草稿</span>';
81
				draftLable = '<span class="draftLable " style="margin-left: 20px;">草稿</span>';
80
				oHtml = "unPatentIssue.html";
82
				oHtml = "unPatentIssue.html";
81
				oLi = "class='draftList'"
83
				oLi = "class='draftList'"
82
				mg = '<li><span>' + oTime + '</span>' + draftLable + '</li>'
84
				mg = '<li><span>' + oTime + '</span>' + draftLable + '</li>'
85
83
			} else if ($data[i].status == '1') {
86
			} else if ($data[i].status == '1') {
84
				oHtml = "unPatentShow.html"
87
				oHtml = "unPatentShow.html"
88
				gl = '<li><span class="deteleThis3" data-id="' + $data[i].id + '">取消关联</span></li>'
89
85
			}
90
			}
86
			var oStr = '<li ' + oLi + '>' +
91
			var oStr = '<li ' + oLi + '>' +
87
				'<a href="' + oHtml + '?id=' + $data[i].id + '&flag=' + $data[i].state + '" target="_blank">' +
92
				'<a href="' + oHtml + '?id=' + $data[i].id + '&flag=' + $data[i].state + '" target="_blank">' +
96
				'</div>' +
101
				'</div>' +
97
				'</a>' +
102
				'</a>' +
98
				'<ul class="madiaEdit">' +
103
				'<ul class="madiaEdit">' +
99
				'<li><span class="deteleThis3" data-id="' + $data[i].id + '">取消关联</span></li>' +
104
				gl +
100
				'<li><span class="editThis" data-id="' + $data[i].id + '"></span></li>' +
105
				'<li><span class="editThis" data-id="' + $data[i].id + '"></span></li>' +
101
				'<li><span class="deteleThis2" data-id="' + $data[i].id + '"></span></li>' +
106
				'<li><span class="deteleThis2" data-id="' + $data[i].id + '"></span></li>' +
102
				'</ul>' +
107
				'</ul>' +
108
113
109
			}
114
			}
110
			$oStr.find(".editThis").attr("data-state", $data[i].status);
115
			$oStr.find(".editThis").attr("data-state", $data[i].status);
111
			var caogao = $('.draftLable').html()
112
			if (caogao == '草稿') {
113
				$('.deteleThis3').css('display','none')
114
			}
115
116
116
		}
117
		}
117
	}
118
	}

+ 6 - 3
js/userInforShow.js

1420
				$("#"+aimId).parent().find(".js-load-more").removeAttr("disabled");
1420
				$("#"+aimId).parent().find(".js-load-more").removeAttr("disabled");
1421
	        	$("#"+aimId).parent().find(".js-load-more").removeClass("active");
1421
	        	$("#"+aimId).parent().find(".js-load-more").removeClass("active");
1422
			})
1422
			})
1423
    	},
1423
		},
1424
		collectSorts=function(type,isbind){
1424
		collectSorts=function(type,isbind){
1425
			var aimId="",newStr=""
1425
			var aimId="",newStr=""
1426
			oAjax("/ajax/watch/proList",{//我关注的列表
1426
			oAjax("/ajax/watch/proList",{//我关注的列表
1427
				"professorId": professorId,
1427
				"professorId": professorId,
1428
				"watchType":type,
1428
				"watchType":type,
1429
				"createTime": watchO.watchTime,
1429
				"createTime": watchO.watchTime,
1430
				"watchObject":watchO.watchObjId,
1430
				// "watchObject":watchO.watchObjId,
1431
				"watchObject":1,
1431
				"rows":rows
1432
				"rows":rows
1432
			}, "GET", function(res){
1433
			}, "GET", function(res){
1434
		console.log(professorId)
1435
				
1433
				var $info = res.data;
1436
				var $info = res.data;
1434
				var arr=[];
1437
				var arr=[];
1435
				if($info.length > 0) {
1438
				if($info.length > 0) {
1438
					watchO.watchObjId = $info[$info.length - 1].watchObject;
1441
					watchO.watchObjId = $info[$info.length - 1].watchObject;
1439
					for(var i in $info) {
1442
					for(var i in $info) {
1440
						arr[i]=$info[i].watchObject;
1443
						arr[i]=$info[i].watchObject;
1444
						console.log()
1441
					}
1445
					}
1442
				}
1446
				}
1443
				if(type==1){
1447
				if(type==1){
2288
					operatTab();
2292
					operatTab();
2289
					closeLog();
2293
					closeLog();
2290
				}
2294
				}
2291
	
2292
			})
2295
			})
2293
			
2296
			
2294
			//点击每个研究方向弹出研究方向详情窗口
2297
			//点击每个研究方向弹出研究方向详情窗口