Przeglądaj źródła

资源发布、字段匹配更改正确

luyanan 8 lat temu
rodzic
commit
54e47d01f4

BIN
src/main/webapp/images/progressing.png


+ 13 - 6
src/main/webapp/js/information.brow.js

@ -1,7 +1,8 @@
1 1
$(function(){
2 2
//loginStatus();
3 3
	 	var userid = $.cookie("userid");
4
	 	var professorId = GetQueryString("professorId");	 
4
	 	var professorId = GetQueryString("professorId");
5
	 	var name;
5 6
	 	if(professorId){
6 7
	 		$(".portrait-p").attr("src","/images/head/"+userid+"_m.jpg");
7 8
			$(".portrait-p").load(function(){									
@ -179,7 +180,7 @@ $(function(){
179 180
						
180 181
						if($photos.length>0){
181 182
							for(var j =0 ; j< $photos.length;++j){
182
								showDiv += "<span class='like-people'><img class='like-h' src='/images/head/"+$photos[j]+"_s.jpg'></span>";
183
								showDiv += "<span class='like-people'><img class='like-h' src='"+servPath+"/images/head/"+$photos[j]+"_s.jpg'></span>";
183 184
								
184 185
							} 
185 186
						}
@ -189,7 +190,7 @@ $(function(){
189 190
						$(".like-h").load(function(){								
190 191
						})
191 192
						.error(function(){
192
							$(this).attr("src","/images/default-photo.jpg");
193
							$(this).attr("src",servPath+"/images/default-photo.jpg");
193 194
						});	
194 195
							
195 196
					}
@ -250,6 +251,7 @@ $(function(){
250 251
								});
251 252
							$("#descpS").text($info.descp);
252 253
							//显示专家信息到保存数据
254
							name=$info.name;
253 255
							$("#name").val($info.name);
254 256
							$("#title").val($info.title);
255 257
							$("#orgId").val($info.orgId);
@ -391,6 +393,9 @@ $(".subsidebar").click(function(){
391 393
	});
392 394
	$('.introduction').on("click",'.applicant',function(){
393 395
		ResourceApply();//调用资源申请HTML创建函数
396
		console.log(name);
397
		$(".timelo").css("display","none");
398
		$(".namecon").text(name);
394 399
		$(".applysure").hide();
395 400
		$(".btnboxup").hide();
396 401
		var index1=$(this).parent().parent().parent().index();
@ -398,14 +403,16 @@ $(".subsidebar").click(function(){
398 403
		var m=console.log();
399 404
		var resourceID=$(this).attr("resourceId");
400 405
		console.log(resourceID);
401
		$(".conte").eq(index1).html($('.presou').eq(index1).text());
406
		$(".log").text($('.presou').eq(index1).text());
402 407
		$("#sendre").on("click",function()
403
				{	
408
				{	$(".dealTime").replaceWith(function(){
409
					return '<input type="text">';
410
				});
404 411
					var $data = {};
405
					$data.resourceName = "kkkk";
406 412
					$data.demandId = userid;
407 413
					$data.resourceId=resourceID;
408 414
					$data.detailDemand=$("#detailDemand").val();
415
					$data.dealTime=$(".dealTime").val();
409 416
					$.ajax({
410 417
						"url" : "/ajax/operation",
411 418
						"type" : "POST",

+ 7 - 7
src/main/webapp/js/popup.js

@ -8,8 +8,8 @@ function ResourceInfo() {
8 8
		PopHtml += '<div class="resouinfo"><form class="resoufrm">';
9 9
		PopHtml += '<div class="resoutit">资源信息</div>';
10 10
		PopHtml += '<table class="resoutab"><tr>';
11
		PopHtml += '<th class="resouinfotype" id="resourceName" scope="row">资源名称</th>';
12
		PopHtml += '<td><input type="text" class="frmtype"></td>';
11
		PopHtml += '<th class="resouinfotype" scope="row">资源名称</th>';
12
		PopHtml += '<td><input type="text" class="frmtype"id="resourceName" ></td>';
13 13
		
14 14
//		PopHtml += '<td rowspan="9">';
15 15
//		PopHtml += '<div class="resouimg" >';
@ -38,7 +38,7 @@ function ResourceInfo() {
38 38
		PopHtml += '<tr><th class="resouinfotype"  scope="row">学术领域</th><td><input type="text" class="frmtype" id="subject"></td></tr>';
39 39
		PopHtml += '<tr><th class="resouinfotype"  scope="row">应用行业</th><td><input type="text" class="frmtype" id="industry"></td></tr>'; 
40 40
		PopHtml += '<tr><th class="resouinfotype"  scope="row">期望付款方式</th><td><input type="text" class="frmtype" placeholder="例:一次性付款" id="hopePayMethod"></td></tr>';
41
		PopHtml += '<tr><th class="resouinfotype"  scope="row">详细描述</th><td colspan="2" ><textarea class="frmtype" id="hopePayMethod"></textarea></td></tr>';
41
		PopHtml += '<tr><th class="resouinfotype"  scope="row">详细描述</th><td colspan="2" ><textarea class="frmtype" id="descp"></textarea></td></tr>';
42 42
		PopHtml += '<tr><th class="resouinfotype" scope="row">合作备注</th><td colspan="2"><textarea class="frmtype" id="cooperationNotes"></textarea></td></tr>';
43 43
		PopHtml += '<tr><td colspan="3"><div class="addrebtn" style="text-align:center;"><input type="button" value="保存" class="frmtype frmbtn" id="inputb"><input type="button" value="删除资源" class="frmtype frmbtn frmrbtn" id="deletedResource"></div></td></tr>';
44 44
		PopHtml += '</table></form> <span class="workclose">关闭</span></div>';
@ -83,14 +83,14 @@ function ResourceApply(){
83 83
		CoverHtml += '<div class="blackcover"></div>';
84 84
		PopHtml += '<div class="resouapply"><form class="resoufrm">';
85 85
		PopHtml += '<div class="resoutit">资源信息</div>';
86
		PopHtml += '<table class="resoutab"><tr>';
86
		PopHtml += '<table class="resoutab"><tr class="timelo">';
87 87
		PopHtml += '<th class="resouinfotype" scope="row">合作编号</th>';
88 88
		PopHtml += '<td>00001109</td>';
89 89
		PopHtml += '<td rowspan="5"><div class="resouimg" ><img src="" width="100%" height="100%"></div></td>';
90 90
		PopHtml += '</tr>';
91
		PopHtml += '<tr><th class="resouinfotype"  scope="row">申请时间</th><td>2016-08-01</td></tr>';
92
		PopHtml += '<tr><th class="resouinfotype"  scope="row">需求资源</th><td>xxx检测仪</td> </tr>';
93
		PopHtml += '<tr><th class="resouinfotype"  scope="row">资源发布者</th><td>张三 <a href="" class="worktel">联系ta</a></td></tr>';
91
		PopHtml += '<tr class="timelo"><th class="resouinfotype"  scope="row">申请时间</th><td>2016-08-01</td></tr>';
92
		PopHtml += '<tr><th class="resouinfotype"  scope="row">需求资源</th><td class="log">xxx检测仪</td> </tr>';
93
		PopHtml += '<tr><th class="resouinfotype"  scope="row">资源发布者</th><td class="namecon">张三 <a href="" class="worktel">联系ta</a></td></tr>';
94 94
		PopHtml += '<tr><th class="resouinfotype"  scope="row">需求方</th><td>';
95 95
        PopHtml += '<select class="frmtype"><option>本人</option><option>所属机构</option></select>';
96 96
		PopHtml += '</td></tr>';

+ 22 - 21
src/main/webapp/js/workspace.js

@ -4,6 +4,7 @@
4 4
$(function(){
5 5
	
6 6
	var userid = $.cookie("userid");
7
	var name = $.cookie("userName");
7 8
	var flag;
8 9
 	if(userid){
9 10
 		$(".myWorkspace").attr("href","workspaces.html?"+userid);
@ -167,21 +168,20 @@ $(function(){
167 168
			{
168 169
				var resourceID=$(this).attr("resourceId");
169 170
				console.log(resourceID);
170
				$("#deletedResource").on("click",function(){
171
					$.ajax({
172
						"url" : "/ajax/resource/"+resourceID,
173
						"type" : "DELETE",
174
						"success" : function($data) {
175
							if ($data.success) {
176
								location.reload(true);
177
							} else {
178
								$.MsgBox.Alert('message',$data.msg);
179
							}
180
						}
181
					});
182
				})
183
			
184 171
				if(resourceID){
172
					$("#deletedResource").on("click",function(){
173
						$.ajax({
174
							"url" : "/ajax/resource/"+resourceID,
175
							"type" : "DELETE",
176
							"success" : function($data) {
177
								if ($data.success) {
178
									location.reload(true);
179
								} else {
180
									$.MsgBox.Alert('message',$data.msg);
181
								}
182
							}
183
						});
184
					})
185 185
					$.ajax({		
186 186
						"url":"/ajax/resource/"+resourceID,
187 187
						"type":"get",
@ -197,6 +197,7 @@ $(function(){
197 197
								$("#subject").val(info.data.subject);
198 198
								$("#industry").val(info.data.industry);
199 199
								$("#descp").val(info.data.descp);
200
								$("#professor").val(name);
200 201
								}
201 202
								else
202 203
								{
@ -232,7 +233,7 @@ $(function(){
232 233
											if (resourceID) {
233 234
												location.reload(true);
234 235
											} else {
235
												location.href = "resource.html?id="+ rdata.data;
236
												location.reload(true);
236 237
											}
237 238
										} else {
238 239
											$.MsgBox.Alert('message',"发布失败");
@ -245,7 +246,7 @@ $(function(){
245 246
							}
246 247
						});
247 248
			});
248
//查询的资源	
249
//查询当前用户的资源	
249 250
$.ajax({		
250 251
	"url":"/ajax/resource/qapro",
251 252
	"type":"get",
@ -258,7 +259,7 @@ $.ajax({
258 259
			for(var i=0;i<data.data.length;i++)
259 260
				{
260 261
					var add='<div class="maintab"><div class="lefttab fl"><table class="resoubrief"><tr><td><img width="100%" height="140" src=""></td>'
261
					add+='</tr><tr><td><ul><li>资源名称:'+data.data[i].resourceName+'</li><li>发布人:'+data.data[i].professorId+'</li><li>使用用途:'+data.data[i].supportedServices+'</li> '               
262
					add+='</tr><tr><td><ul><li>资源名称:'+data.data[i].resourceName+'</li><li>发布人:'+name+'</li><li>使用用途:'+data.data[i].supportedServices+'</li> '               
262 263
					add+='<li class="li1">应用行业:'+data.data[i].subject+'</li><li class="li2">可提供服务:'+data.data[i].industry+'</li><li class="li3">期望付款方式:'+data.data[i].hopePayMethod+'</li> '                   
263 264
					add+='<li class="li4">详细描述:'+data.data[i].descp+'</li><li class="li5">备注:'+data.data[i].cooperationNotes+'</li></ul></td></tr><tr>'                
264 265
					add+='<td><span class="resoumag" onclick="ResourceInfo();">资源管理</span></td></tr></table></div>'                 
@ -299,8 +300,8 @@ $.ajax({
299 300
										for(var j=0;j<data.data.length;j++){
300 301
											var addString='<tr class="workitem">'
301 302
							                    addString+='<td>'+data.data[j].deliverTime+'</td>'
302
							                     addString+='<td class="workitemsrc">tt</td>'
303
							                      addString+='<td> <a class="worktel" href="">'+data.data[j].demandId+'<span class="worktelbtn"></span></a></td>'
303
							                     addString+='<td class="workitemsrc">'+data.data[j].demandId+'</td>'
304
							                      addString+='<td> <a class="worktel" href="">'+data.data[j].professor.name+'<span class="worktelbtn"></span></a></td>'
304 305
							                     addString+='<td>'+data.data[j].operationStatus+'<br>回复</td>'
305 306
							                      addString+='<td>'+data.data[j].dealTime+'</td>'
306 307
							                       addString+='<td>'+data.data[j].dealPrice+'</td>'
@ -443,8 +444,8 @@ $.ajax({
443 444
					var stringContent="";
444 445
						stringContent +='<tr class="workitem">'
445 446
	                    stringContent +='<td>'+data.data[i].deliverTime+'</td>'
446
	                    stringContent +='<td class="workitemsrc"></td>'
447
	                    stringContent +='<td> <a class="worktel" href="">张三<span class="worktelbtn"></span></a></td>'
447
	                    stringContent +='<td class="workitemsrc">'+data.data[i].resource.resourceName+'</td>'
448
	                    stringContent +='<td> <a class="worktel" href="">'+data.data[i].professor.name+'<span class="worktelbtn"></span></a></td>'
448 449
	                    stringContent +='<td>'+data.data[i].operationStatus+'</td>'
449 450
	                    stringContent +='<td>'+data.data[i].dealTime+'</td>'      
450 451
	                    stringContent +='<td>'+data.data[i].dealPrice+'</td>'