Browse Source

修改LOGO

wanghui 8 years ago
parent
commit
c29b686808

File diff suppressed because it is too large
+ 1 - 2
src/main/webapp/WEB-INF/views/portal/index.html


+ 8 - 8
src/main/webapp/WEB-INF/views/portal/residentIntegration/index.html

@@ -77,11 +77,8 @@
 						<li th:each="it: ${jmrhProjectList}">
 							<a th:href="${basePath+ '/portal/detail/achievementDetail.html?id=' + it.id +'&type=' + it.ownerType}">
 								<span class="note" th:text="${it.name}"></span>
-								<span th:if="${it.maturity == '1'}" class="node" >正在研发</span>
-								<span th:if="${it.maturity == '2'}" class="node" >已有样品</span>
-								<span th:if="${it.maturity == '3'}" class="node" >通过小试</span>
-								<span th:if="${it.maturity == '4'}" class="node" >通过中试</span>
-								<span th:if="${it.maturity == '5'}" class="node" >可以量产</span>
+								<span class="node" th:text="${it.industry}"></span>
+						   <!-- <span class="note" th:text="${it.residenceCity}"></span> -->
 							</a>
 						</li>
 					</ul>
@@ -99,9 +96,12 @@
 					<ul>
 						<li th:each="it: ${jmrhTechnologyList}">
 							<a th:href="${basePath+ '/portal/detail/achievementDetail.html?id=' + it.id +'&type=' + it.ownerType}">
-								<span class="note" th:text="${it.name}"></span>
-								<span class="node" th:text="${it.industry}"></span>
-<!-- 								<span class="note" th:text="${it.residenceCity}"></span> -->
+							<span class="note" th:text="${it.name}"></span>
+								<span th:if="${it.maturity == '1'}" class="node" >正在研发</span>
+								<span th:if="${it.maturity == '2'}" class="node" >已有样品</span>
+								<span th:if="${it.maturity == '3'}" class="node" >通过小试</span>
+								<span th:if="${it.maturity == '4'}" class="node" >通过中试</span>
+								<span th:if="${it.maturity == '5'}" class="node" >可以量产</span>
 							</a>
 						</li>
 					</ul>