Просмотр исходного кода

1、资源发布/修改的应用行业及学术领域ok
2、搜索资源的应用行业,学术领域,地址ok
3、我的工作台的申请时的所属机构及个人已经ok

luyanan лет назад: 8
Родитель
Сommit
8c16a36230

+ 4 - 0
src/main/webapp/css/popup.css

@ -1,6 +1,10 @@
1 1
@charset "utf-8";
2 2
/* CSS Document */
3 3
.frmtype{ width:100%; border-radius:5px; border:1px #dadada solid; padding:0 10px; min-height:30px;font-size:14px;line-height:30px;}
4
#resouinforcon .frmtype,.subCla{width:80%;}
5
.addIndusry,.addSubject{ width:16%; height:30px; background:#ff8400;box-shadow:none; border:none;cursor:pointer; color:#fff; border-radius:5px;font-size:14px;line-height:26px;  margin-left:10px;cursor:pointer; }
6
.deleteIndustry,.deleteSubject{  height:30px;border:1px #c9c9c9 solid; border-radius:5px; text-align:center;font-size:14px;line-height:30px;color:#3e3e3e; margin:6px 0; margin-left:15px; float:left;cursor:pointer;padding:0 8px;}
7
.removeNu{margin-left:5px;}
4 8
.frmtype:focus{ border:1px solid #ff8500;}
5 9
.frmbtn{ width:100px; margin:10px; background:#ff8400; color:#fff;  border:1px solid transparent; }
6 10
.frmrbtn{ background:none; color:#303030; border:1px solid transparent; }

+ 1 - 1
src/main/webapp/css/workspace.css

@ -95,7 +95,7 @@
95 95

96 96
/*资源、项目*/
97 97
.sharesrcbox11{ overflow:hidden; width:100%; padding:10px; height:320px;}
98
.sharesrcbox11 .sharesrc{ width:200px; margin:10px 20px; float:left;}
98
.sharesrcbox11 .sharesrc{ width:200px; margin:10px 20px; float:left;cursor:pointer;}
99 99
.sharesrcbox11 .briefinfor{ width:100%; max-height:100px; text-overflow:ellipsis; overflow:hidden; }
100 100
.sharesrcbox11 .shareshow{ position:relative; overflow:hidden;border-radius: 4px;margin: 8px;}
101 101
.sharesrcbox11 .shareopeart{ position:absolute;background:rgba(0,0,0,.4); line-height:30px; text-align:center; bottom:-30px; left:0px; z-index:100; overflow:hidden; width:100%; cursor:pointer;}

+ 4 - 2
src/main/webapp/js/popup.js

@ -20,8 +20,10 @@ function ResourceInfo() {
20 20
		PopHtml += '<tr class="respublisher"><th class="resouinfotype"  scope="row">资源发布者</th><td><div class="resouinforcon" id="professor" ></div></td></tr>';
21 21
		PopHtml += '<tr><th class="resouinfotype"  scope="row">可提供服务</th><td><div class="resouinforcon"><input type="text" class="frmtype"  id="supportedServices"><span class="requiredcon">*</span></div></td></tr>';
22 22
		PopHtml += '<tr class="workmsgbox"><th></th><td><div class="resouinforcon"><div class="workmsg workmsg3"></div></div></td></tr>  ';
23
		PopHtml += '<tr><th class="resouinfotype"  scope="row">学术领域</th><td><div class="resouinforcon"><input type="text" class="frmtype" id="subject"></div></td></tr>';
24
		PopHtml += '<tr><th class="resouinfotype"  scope="row">应用行业</th><td><div class="resouinforcon"><input type="text" class="frmtype" id="industry"></div></td></tr>'; 
23
		PopHtml += '<tr><th class="resouinfotype"  scope="row">学术领域</th><td><div class="resouinforcon"><input type="text" class="frmtype subCla" id="subject"><input type="button" value="添加" class="addIndusry" id="subjectAdd"></div></td></tr>';
24
		PopHtml += '<tr><th></th><td><div class="addlist" id="SubjectList"></div></td></tr>'
25
		PopHtml += '<tr><th class="resouinfotype"  scope="row">应用行业</th><td><div class="resouinforcon" id="resouinforcon"><input type="text" class="frmtype" id="industry"><input type="button" value="添加" class="addIndusry" id="industryAdd"></div></td></tr>'; 	
26
		PopHtml += '<tr><th></th><td><div class="addlist" id="industryList"></div></td></tr>';
25 27
		PopHtml += '<tr><th class="resouinfotype"  scope="row">期望付款方式</th><td><div class="resouinforcon"><input type="text" class="frmtype" placeholder="例:一次性付款"  id="hopePayMethod"></div></td></tr>';
26 28
		PopHtml += '<tr class="limitBox"><th class="resouinfotype"  scope="row">详细描述</th><td class="limitwordbox"><div class="resouinforcon limitwords"><textarea class="frmtype" id="descp"></textarea></div></td></tr>';
27 29
		PopHtml += '<tr class="limitBox"><th class="resouinfotype" scope="row">合作备注</th><td class="limitwordbox"><div class="resouinforcon limitwords"><textarea class="frmtype" id="cooperationNotes"></textarea></div></td></tr>';

+ 59 - 7
src/main/webapp/js/sciresource.js

@ -49,11 +49,50 @@ $(function(){
49 49
		 supportedServices();
50 50
	});		
51 51

52

52
	function industryShow(data,industryList,deleteIndustry)
53
	{
54
				if(data != undefined && data.length != 0  )
55
				{
56
					var subs = new Array();
57
					if(data.indexOf(','))
58
					{
59
						subs = data.split(',');
60
					}
61
					else
62
					{
63
						subs[0] = data;
64
					}
65
					if(subs.length>0)
66
					{
67
						for (var i = 0; i < subs.length; i++) 
68
						{
69
							$("#"+industryList+"").append("<div class='"+deleteIndustry+"'>"+ subs[i] +"<span class='removeNu'><img src='images/move.png'></span></div>");																
70
						};
71
					}	
72
				}			
73
	}
74
	//添加或者删除应用行业及学术领域
75
	function addDele(){
76
		$("#industryList").on("click",".removeNu",function(){					
77
			$(this).parent().remove();
78
			});	
79
		$("#industryAdd").click(function(){
80
			var val=$("#industry").val();
81
			$("#industryList").append("<div class='deleteIndustry'>"+ val +"<span class='removeNu'><img src='images/move.png'></span></div>")							
82
			});
83
		$("#SubjectList").on("click",".removeNu",function(){					
84
			$(this).parent().remove();
85
			});	
86
		$("#subjectAdd").click(function(){				
87
			var val=$("#subject").val();
88
			$("#SubjectList").append("<div class='deleteSubject'>"+ val +"<span class='removeNu'><img src='images/move.png'></span></div>")							
89
			});
90
	}
53 91
//我的资源的删除,修改
54 92
	$("#workmysrc").on("click",".resoumag",function()
55 93
			{ 		
56 94
				ResourceInfo();
95
				addDele()
57 96
				$(".limitBox").removeClass("limitBox");
58 97
		        $(".limitwords").removeClass("limitwords");
59 98
		        $(".limitwordbox").removeClass("limitwordbox");
@ -94,8 +133,8 @@ $(function(){
94 133
								$("#supportedServices").val(info.data.supportedServices);
95 134
								$("#hopePayMethod").val(info.data.hopePayMethod) ;
96 135
								$("#cooperationNotes").val(info.data.cooperationNotes) ;
97
								$("#subject").val(info.data.subject);
98
								$("#industry").val(info.data.industry);
136
								industryShow(info.data.subject,"SubjectList","deleteSubject");
137
								 industryShow(info.data.industry,"industryList","deleteIndustry");								
99 138
								$("#descp").val(info.data.descp);
100 139
								$("#professor").text(name);
101 140
								$(".resouImage").attr("src","/images/resource/"+resourceID+".jpg");
@ -113,16 +152,29 @@ $(function(){
113 152
					});
114 153
				}
115 154
				
116
				
155
				function captiureSubInd(subIndu)
156
				{
157
					var industrys = $("#"+subIndu+"");
158
					var industryAll = "";
159
					if(industrys.size()>0){
160
						for (var i = 0; i <industrys.size(); i++) {
161
							industryAll += industrys[i].innerText;
162
							industryAll += ',';
163
						};
164
						industryAll = industryAll.substring(0, industryAll.length-1);
165
					}
166
					return industryAll;
167
				}		
117 168
				$("#inputb").on("click",function()
118
						{	var $data = {};
169
						{						
170
								var $data = {};
119 171
								$data.resourceName = $("#resourceName").val();
120 172
								$data.supportedServices = $("#supportedServices").val();
121 173
								$data.professorId = userid;
122 174
								$data.hopePayMethod = $("#hopePayMethod").val();
123 175
								$data.cooperationNotes = $("#cooperationNotes").val();
124
								$data.subject=$("#subject").val();
125
								$data.industry=$("#industry").val();
176
								$data.subject=captiureSubInd("SubjectList .deleteSubject");
177
								$data.industry=captiureSubInd("industryList .deleteIndustry");
126 178
								$data.descp=$("#descp").val();
127 179
								$data.fn=cacheImageKey;
128 180
								

+ 1 - 1
src/main/webapp/search.html

@ -76,7 +76,7 @@
76 76
                    <div class="class1">
77 77
                        <div class="title">所在地点:</div>
78 78
                        <div class="area-con" id="address">
79
                        <a href="#"  class="colorbg"title="">不限</a>                        
79
                        <a href="#"  class="colorbg no3"title="">不限</a>                        
80 80
                        </div>
81 81
                        <span class="andmore">更多<span class="updown"></span></span>
82 82