PC / tmuch · 提交

转到一个项目

作者 朱振飞
提交 528983aaa63565ed02464d99df23eab3fc658324 2 个父辈 dc9d8d75 7d62852e

Merge branch 'master' of http://114.215.101.231:8099/PC/tmuch 

# Conflicts:
#	clinical/depart_detail.html
#	research/research2.html
内嵌 并排对比
正在显示 6 个修改的文件 包含 78 行增加 和 66 行删除
@@ -305,7 +305,7 @@ @@ -305,7 +305,7 @@
305 <div class="swiper-wrapper"> 305 <div class="swiper-wrapper">
306 <div class="swiper-slide swiper-slide-active" style="height:336px;background: #727171 "> 306 <div class="swiper-slide swiper-slide-active" style="height:336px;background: #727171 ">
307 <a href="./person_detail.2.1.2.html"> 307 <a href="./person_detail.2.1.2.html">
308 - <img src="../images/" alt="" /> 308 + <!-- <img src="../images/" alt="" /> -->
309 </a> 309 </a>
310 </div> 310 </div>
311 311
@@ -316,7 +316,7 @@ @@ -316,7 +316,7 @@
316 </div> 316 </div>
317 <div class="swiper-slide" style="height:336px;background: #727171"> 317 <div class="swiper-slide" style="height:336px;background: #727171">
318 <a href="./person_detail.2.1.2.html"> 318 <a href="./person_detail.2.1.2.html">
319 - <img src="../images/" alt="" /> 319 + <!-- <img src="../images/" alt="" /> -->
320 </a> 320 </a>
321 </div> 321 </div>
322 <div class="swiper-slide swiper-slide-next" style="height:336px;"> 322 <div class="swiper-slide swiper-slide-next" style="height:336px;">
@@ -371,11 +371,18 @@ @@ -371,11 +371,18 @@
371 <div class="swiper-wrapper main_slider_container"> 371 <div class="swiper-wrapper main_slider_container">
372 <div class="swiper-slide content-four-img"> 372 <div class="swiper-slide content-four-img">
373 <img src="../images/news_1.png" width="100%" alt=""> 373 <img src="../images/news_1.png" width="100%" alt="">
374 -  
375 </div> 374 </div>
376 <div class="swiper-slide content-four-img"> 375 <div class="swiper-slide content-four-img">
377 <img src="../images/news_2.png" width="100%" alt=""> 376 <img src="../images/news_2.png" width="100%" alt="">
378 - 377 + </div>
  378 + <div class="swiper-slide content-four-img">
  379 + <img src="../images/news_3.png" width="100%" alt="">
  380 + </div>
  381 + <div class="swiper-slide content-four-img">
  382 + <img src="../images/news_1.png" width="100%" alt="">
  383 + </div>
  384 + <div class="swiper-slide content-four-img">
  385 + <img src="../images/news_2.png" width="100%" alt="">
379 </div> 386 </div>
380 <div class="swiper-slide content-four-img"> 387 <div class="swiper-slide content-four-img">
381 <img src="../images/news_3.png" width="100%" alt=""> 388 <img src="../images/news_3.png" width="100%" alt="">
@@ -362,10 +362,10 @@ @@ -362,10 +362,10 @@
362 </div> 362 </div>
363 <div class="contant"> 363 <div class="contant">
364 <div class="contant_left"> 364 <div class="contant_left">
365 - <div class="left_titles">Research Programs</div>  
366 - <div class="left_title">Achievements</div>  
367 - <div class="left_title">Key Labaratories</div>  
368 - <div class="left_title">Find a Researcher</div> 365 + <div class="left_titles"><a href="./research1.html">Research Programs</a></div>
  366 + <div class="left_title"><a href="./research2.html">Achievements</a></div>
  367 + <div class="left_title"><a href="./research3.html">Key Labaratories</a></div>
  368 + <div class="left_title"><a href="./researcher.html">Find a Researcher</a></div>
369 </div> 369 </div>
370 <div class="wire"> 370 <div class="wire">
371 <div class="contant_right"> 371 <div class="contant_right">
@@ -2,57 +2,64 @@ @@ -2,57 +2,64 @@
2 <html lang="en"> 2 <html lang="en">
3 3
4 <head> 4 <head>
5 - <meta charset="UTF-8">  
6 - <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">  
7 - <meta http-equiv="X-UA-Compatible" content="ie=edge">  
8 - <link rel="stylesheet" href="../css/bootstrap.min.css">  
9 - <link rel="stylesheet" href="../css/swiper-3.4.2.min.css">  
10 - <link rel="stylesheet" href="../css/base.css">  
11 - <link rel="stylesheet" href="../css/index.css"> 5 + <meta charset="UTF-8" />
  6 + <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
  7 + <meta http-equiv="X-UA-Compatible" content="ie=edge" />
  8 + <link rel="stylesheet" href="../css/bootstrap.min.css" />
  9 + <link rel="stylesheet" href="../css/swiper-3.4.2.min.css" />
  10 + <link rel="stylesheet" href="../css/base.css" />
  11 + <link rel="stylesheet" href="../css/index.css" />
12 <title>Tianjin Medical University Cancer Institute & Hospital</title> 12 <title>Tianjin Medical University Cancer Institute & Hospital</title>
13 <style> 13 <style>
14 - .left_ship_box{ 14 + .left_ship_box {
15 width: 330px; 15 width: 330px;
16 } 16 }
  17 +
17 .header-title-right { 18 .header-title-right {
18 padding-left: 50px; 19 padding-left: 50px;
19 width: 300px; 20 width: 300px;
20 margin-bottom: 80px; 21 margin-bottom: 80px;
21 } 22 }
22 - .header-title-right h3{  
23 - color:#00A16C; 23 +
  24 + .header-title-right h3 {
  25 + color: #00a16c;
24 font-size: 21px; 26 font-size: 21px;
25 } 27 }
26 - .content{ 28 +
  29 + .content {
27 min-height: 500px; 30 min-height: 500px;
28 } 31 }
29 -.content-word-left p{ 32 +
  33 + .content-word-left p {
30 font-size: 14px; 34 font-size: 14px;
31 line-height: 2; 35 line-height: 2;
32 -}  
33 - .prof_item{ 36 + }
  37 +
  38 + .prof_item {
34 width: 300px; 39 width: 300px;
35 - height: auto 40 + height: auto;
36 } 41 }
37 - .prof_img_box{ 42 +
  43 + .prof_img_box {
38 height: auto; 44 height: auto;
39 } 45 }
40 -.prof_desc{ 46 +
  47 + .prof_desc {
41 font-size: 14px; 48 font-size: 14px;
42 color: #232323; 49 color: #232323;
43 font-weight: bold; 50 font-weight: bold;
44 -}  
45 - .content_model{ 51 + }
  52 +
  53 + .content_model {
46 width: 1000px; 54 width: 1000px;
47 margin: 0 auto; 55 margin: 0 auto;
48 } 56 }
49 - .search_part{ 57 +
  58 + .search_part {
50 margin-bottom: 25px; 59 margin-bottom: 25px;
51 width: 100%; 60 width: 100%;
52 } 61 }
53 62
54 -  
55 -  
56 .contant { 63 .contant {
57 width: 100%; 64 width: 100%;
58 display: -webkit-box; 65 display: -webkit-box;
@@ -127,23 +134,22 @@ @@ -127,23 +134,22 @@
127 <nav class="navbar navbar-default bgf mb0"> 134 <nav class="navbar navbar-default bgf mb0">
128 <div class="container-fluid top_pc_brand"> 135 <div class="container-fluid top_pc_brand">
129 <div class="navbar-header"> 136 <div class="navbar-header">
130 - <button type="button" class="navbar-toggle mtperc10 menuPage" data-toggle="collapse" data-target="#bs-example-navbar-collapse-4"  
131 - aria-expanded="true"> 137 + <button type="button" class="navbar-toggle mtperc10 menuPage" data-toggle="collapse" data-target="#bs-example-navbar-collapse-4" aria-expanded="true">
132 <span class="sr-only">Toggle navigation</span> 138 <span class="sr-only">Toggle navigation</span>
133 <span class="icon-bar"></span> 139 <span class="icon-bar"></span>
134 <span class="icon-bar"></span> 140 <span class="icon-bar"></span>
135 <span class="icon-bar"></span> 141 <span class="icon-bar"></span>
136 </button> 142 </button>
137 <a class="navbar-brand logo" href="../index.html"> 143 <a class="navbar-brand logo" href="../index.html">
138 - <img class="brand-logo" src="../images/logo.png" alt=""> 144 + <img class="brand-logo" src="../images/logo.png" alt="" />
139 </a> 145 </a>
140 </div> 146 </div>
141 <div class="navbar-collapse collapse in" id="bs-example-navbar-collapse-4" aria-expanded="true"> 147 <div class="navbar-collapse collapse in" id="bs-example-navbar-collapse-4" aria-expanded="true">
142 <div class="search-group mt30 form-group navbar-text navbar-right"> 148 <div class="search-group mt30 form-group navbar-text navbar-right">
143 <a href="http://www.tjmuch.com/" class="langue">中文</a> 149 <a href="http://www.tjmuch.com/" class="langue">中文</a>
144 - <input type="text" class="form-control search-input" placeholder="Search"> 150 + <input type="text" class="form-control search-input" placeholder="Search" />
145 <div class="magnifier"> 151 <div class="magnifier">
146 - <img src="../images/search_btn.png" alt=""> 152 + <img src="../images/search_btn.png" alt="" />
147 </div> 153 </div>
148 </div> 154 </div>
149 </div> 155 </div>
@@ -155,7 +161,7 @@ @@ -155,7 +161,7 @@
155 <ul class="nav_menu_items"> 161 <ul class="nav_menu_items">
156 <li class="btn navbtn-a" role="button"> 162 <li class="btn navbtn-a" role="button">
157 <a href="javascript:;">ABOUT US</a> 163 <a href="javascript:;">ABOUT US</a>
158 - <div class='sec_menu_items'> 164 + <div class="sec_menu_items">
159 <a href="../about/welcome.html" class="inner_item"> 165 <a href="../about/welcome.html" class="inner_item">
160 Welcome Message 166 Welcome Message
161 </a> 167 </a>
@@ -174,7 +180,7 @@ @@ -174,7 +180,7 @@
174 </li> 180 </li>
175 <li class="btn navbtn-a" role="button"> 181 <li class="btn navbtn-a" role="button">
176 <a href="JavaScript:;">CLINICAL RESOURCES</a> 182 <a href="JavaScript:;">CLINICAL RESOURCES</a>
177 - <div class='sec_menu_items'> 183 + <div class="sec_menu_items">
178 <div class="inner_item"> 184 <div class="inner_item">
179 Clinical Departments 185 Clinical Departments
180 <div class="third_menu_items"> 186 <div class="third_menu_items">
@@ -225,13 +231,11 @@ @@ -225,13 +231,11 @@
225 </li> 231 </li>
226 <li class="btn navbtnActive navbtn-a" role="button"> 232 <li class="btn navbtnActive navbtn-a" role="button">
227 <a href="javascript:;">RESEARCH & EDUCATION</a> 233 <a href="javascript:;">RESEARCH & EDUCATION</a>
228 - <div class='sec_menu_items'>  
229 - 234 + <div class="sec_menu_items">
230 <a href="../research/nationalCancer.html" class="inner_item"> 235 <a href="../research/nationalCancer.html" class="inner_item">
231 National Cancer Clinical Research Center 236 National Cancer Clinical Research Center
232 </a> 237 </a>
233 - <div href="../research/research.html"  
234 - onclick="location.href='../research/research.html'" class="inner_item"> 238 + <div href="../research/research.html" onclick="location.href='../research/research.html'" class="inner_item">
235 Research 239 Research
236 <div class="third_menu_items"> 240 <div class="third_menu_items">
237 <a href="../research/research1.html" class="inner_item"> 241 <a href="../research/research1.html" class="inner_item">
@@ -248,8 +252,7 @@ @@ -248,8 +252,7 @@
248 </a> 252 </a>
249 </div> 253 </div>
250 </div> 254 </div>
251 - <div  
252 - class="inner_item"> 255 + <div class="inner_item">
253 Education 256 Education
254 <div class="third_menu_items"> 257 <div class="third_menu_items">
255 <a href="../research/education.html" class="inner_item"> 258 <a href="../research/education.html" class="inner_item">
@@ -270,7 +273,7 @@ @@ -270,7 +273,7 @@
270 </li> 273 </li>
271 <li class="btn navbtn-a" role="button"> 274 <li class="btn navbtn-a" role="button">
272 <a href="javascript:;">TIANJIN CANCER INSTITUTE</a> 275 <a href="javascript:;">TIANJIN CANCER INSTITUTE</a>
273 - <div class='sec_menu_items'> 276 + <div class="sec_menu_items">
274 <div href="javascript:;" class="inner_item"> 277 <div href="javascript:;" class="inner_item">
275 About Us 278 About Us
276 <div class="third_menu_items"> 279 <div class="third_menu_items">
@@ -302,12 +305,11 @@ @@ -302,12 +305,11 @@
302 </a> 305 </a>
303 </div> 306 </div>
304 </div> 307 </div>
305 -  
306 </div> 308 </div>
307 </li> 309 </li>
308 <li class="btn navbtn-a" role="button"> 310 <li class="btn navbtn-a" role="button">
309 <a href="javascript:;">NURSING CARE</a> 311 <a href="javascript:;">NURSING CARE</a>
310 - <div class='sec_menu_items'> 312 + <div class="sec_menu_items">
311 <a href="../care/history_time.html" class="inner_item"> 313 <a href="../care/history_time.html" class="inner_item">
312 About Us 314 About Us
313 </a> 315 </a>
@@ -335,13 +337,11 @@ @@ -335,13 +337,11 @@
335 <a href="../care/cancer.html" class="inner_item"> 337 <a href="../care/cancer.html" class="inner_item">
336 Cancer Survivorship Support 338 Cancer Survivorship Support
337 </a> 339 </a>
338 -  
339 -  
340 </div> 340 </div>
341 </li> 341 </li>
342 <li class="btn navbtn-a" role="button"> 342 <li class="btn navbtn-a" role="button">
343 <a href="javascript:;">INTERNATIONAL AFFAIRS</a> 343 <a href="javascript:;">INTERNATIONAL AFFAIRS</a>
344 - <div class='sec_menu_items'> 344 + <div class="sec_menu_items">
345 <a href="../international/conference.html" class="inner_item"> 345 <a href="../international/conference.html" class="inner_item">
346 International Conferences 346 International Conferences
347 </a> 347 </a>
@@ -375,10 +375,18 @@ @@ -375,10 +375,18 @@
375 </div> 375 </div>
376 <div class="contant"> 376 <div class="contant">
377 <div class="contant_left"> 377 <div class="contant_left">
378 - <div class="left_title">Research Programs</div>  
379 - <div class="left_titles">Achievements</div>  
380 - <div class="left_title">Key Labaratories</div>  
381 - <div class="left_title">Find a Researcher</div> 378 + <div class="left_title">
  379 + <a href="./research1.html">Research Programs</a>
  380 + </div>
  381 + <div class="left_titles">
  382 + <a href="./research2.html">Achievements</a>
  383 + </div>
  384 + <div class="left_title">
  385 + <a href="./research3.html">Key Labaratories</a>
  386 + </div>
  387 + <div class="left_title">
  388 + <a href="./researcher.html">Find a Researcher</a>
  389 + </div>
382 </div> 390 </div>
383 <div class="wire"> 391 <div class="wire">
384 <div class="contant_right"> 392 <div class="contant_right">
@@ -394,7 +402,6 @@ @@ -394,7 +402,6 @@
394 </div> 402 </div>
395 <footer class="footer-content"> 403 <footer class="footer-content">
396 <div class="footer-main"> 404 <div class="footer-main">
397 -  
398 <ul class="list-unstyled third-ul"> 405 <ul class="list-unstyled third-ul">
399 <li>West Huan-Hu Rd, Ti Yuan Bei, Hexi District</li> 406 <li>West Huan-Hu Rd, Ti Yuan Bei, Hexi District</li>
400 <li>Tianjin 300060</li> 407 <li>Tianjin 300060</li>
@@ -403,18 +410,16 @@ @@ -403,18 +410,16 @@
403 <li>Email: info@tjmuch.com</li> 410 <li>Email: info@tjmuch.com</li>
404 </ul> 411 </ul>
405 <ul class="list-unstyled first-ul"> 412 <ul class="list-unstyled first-ul">
406 - <li><img src="../images/yikeda.png" width="160px" alt=""></li>  
407 - <li><img src="../images/tjuc.png" width="160px" alt=""></li> 413 + <li><img src="../images/yikeda.png" width="160px" alt="" /></li>
  414 + <li><img src="../images/tjuc.png" width="160px" alt="" /></li>
408 </ul> 415 </ul>
409 </div> 416 </div>
410 </footer> 417 </footer>
411 -  
412 </div> 418 </div>
413 <script src="../js/jquery-1.11.3.min.js"></script> 419 <script src="../js/jquery-1.11.3.min.js"></script>
414 <script src="../js/bootstrap.min.js"></script> 420 <script src="../js/bootstrap.min.js"></script>
415 <script src="../js/swiper-3.4.2.jquery.min.js"></script> 421 <script src="../js/swiper-3.4.2.jquery.min.js"></script>
416 <script src="../js/common.js"></script> 422 <script src="../js/common.js"></script>
417 -  
418 </body> 423 </body>
419 424
420 </html> 425 </html>
@@ -377,10 +377,10 @@ @@ -377,10 +377,10 @@
377 </div> 377 </div>
378 <div class="contant"> 378 <div class="contant">
379 <div class="contant_left"> 379 <div class="contant_left">
380 - <div class="left_title">Research Programs</div>  
381 - <div class="left_title">Achievements</div>  
382 - <div class="left_titles">Key Labaratories</div>  
383 - <div class="left_title">Find a Researcher</div> 380 + <div class="left_title"><a href="./research1.html">Research Programs</a></div>
  381 + <div class="left_title"><a href="./research2.html">Achievements</a></div>
  382 + <div class="left_titles"><a href="./research3.html">Key Labaratories</a></div>
  383 + <div class="left_title"><a href="./researcher.html">Find a Researcher</a></div>
384 </div> 384 </div>
385 <div class="wire"> 385 <div class="wire">
386 <div class="contant_right"> 386 <div class="contant_right">
@@ -346,10 +346,10 @@ @@ -346,10 +346,10 @@
346 </div> 346 </div>
347 <div class="contant"> 347 <div class="contant">
348 <div class="contant_left"> 348 <div class="contant_left">
349 - <div class="left_title">Research Programs</div>  
350 - <div class="left_title">Achievements</div>  
351 - <div class="left_title">Key Labaratories</div>  
352 - <div class="left_titles">Find a Researcher</div> 349 + <div class="left_title"><a href="./research1.html">Research Programs</a></div>
  350 + <div class="left_title"><a href="./research2.html">Achievements</a></div>
  351 + <div class="left_title"><a href="./research3.html">Key Labaratories</a></div>
  352 + <div class="left_titles"><a href="./researcher.html">Find a Researcher</a></div>
353 </div> 353 </div>
354 <div class="wire"> 354 <div class="wire">
355 <div class="contant_right"> 355 <div class="contant_right">