PC / tmuch · 提交

转到一个项目

作者 王毅
提交 7d62852e48334b3e0b85a5321757648a9f628557 2 个父辈 84bf8c18 4e74dbab

合并分支 'Branch_wy' 到 'master' 

Branch wy



查看合并请求 !9
内嵌 并排对比
正在显示 5 个修改的文件 包含 67 行增加 和 68 行删除
@@ -354,22 +354,18 @@ @@ -354,22 +354,18 @@
354 <div class="swiper-wrapper main_slider_container"> 354 <div class="swiper-wrapper main_slider_container">
355 <div class="swiper-slide content-four-img"> 355 <div class="swiper-slide content-four-img">
356 <img src="../images/news_1.png" width="100%" alt=""> 356 <img src="../images/news_1.png" width="100%" alt="">
357 -  
358 </div> 357 </div>
359 <div class="swiper-slide content-four-img"> 358 <div class="swiper-slide content-four-img">
360 <img src="../images/news_2.png" width="100%" alt=""> 359 <img src="../images/news_2.png" width="100%" alt="">
361 -  
362 </div> 360 </div>
363 <div class="swiper-slide content-four-img"> 361 <div class="swiper-slide content-four-img">
364 <img src="../images/news_3.png" width="100%" alt=""> 362 <img src="../images/news_3.png" width="100%" alt="">
365 </div> 363 </div>
366 <div class="swiper-slide content-four-img"> 364 <div class="swiper-slide content-four-img">
367 <img src="../images/news_1.png" width="100%" alt=""> 365 <img src="../images/news_1.png" width="100%" alt="">
368 -  
369 </div> 366 </div>
370 <div class="swiper-slide content-four-img"> 367 <div class="swiper-slide content-four-img">
371 <img src="../images/news_2.png" width="100%" alt=""> 368 <img src="../images/news_2.png" width="100%" alt="">
372 -  
373 </div> 369 </div>
374 <div class="swiper-slide content-four-img"> 370 <div class="swiper-slide content-four-img">
375 <img src="../images/news_3.png" width="100%" alt=""> 371 <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">
@@ -208,13 +214,11 @@ @@ -208,13 +214,11 @@
208 </li> 214 </li>
209 <li class="btn navbtnActive navbtn-a" role="button"> 215 <li class="btn navbtnActive navbtn-a" role="button">
210 <a href="javascript:;">RESEARCH & EDUCATION</a> 216 <a href="javascript:;">RESEARCH & EDUCATION</a>
211 - <div class='sec_menu_items'>  
212 - 217 + <div class="sec_menu_items">
213 <a href="../research/nationalCancer.html" class="inner_item"> 218 <a href="../research/nationalCancer.html" class="inner_item">
214 National Cancer Clinical Research Center 219 National Cancer Clinical Research Center
215 </a> 220 </a>
216 - <div href="../research/research.html"  
217 - onclick="location.href='../research/research.html'" class="inner_item"> 221 + <div href="../research/research.html" onclick="location.href='../research/research.html'" class="inner_item">
218 Research 222 Research
219 <div class="third_menu_items"> 223 <div class="third_menu_items">
220 <a href="../research/research1.html" class="inner_item"> 224 <a href="../research/research1.html" class="inner_item">
@@ -231,8 +235,7 @@ @@ -231,8 +235,7 @@
231 </a> 235 </a>
232 </div> 236 </div>
233 </div> 237 </div>
234 - <div  
235 - class="inner_item"> 238 + <div class="inner_item">
236 Education 239 Education
237 <div class="third_menu_items"> 240 <div class="third_menu_items">
238 <a href="../research/education.html" class="inner_item"> 241 <a href="../research/education.html" class="inner_item">
@@ -253,7 +256,7 @@ @@ -253,7 +256,7 @@
253 </li> 256 </li>
254 <li class="btn navbtn-a" role="button"> 257 <li class="btn navbtn-a" role="button">
255 <a href="javascript:;">TIANJIN CANCER INSTITUTE</a> 258 <a href="javascript:;">TIANJIN CANCER INSTITUTE</a>
256 - <div class='sec_menu_items'> 259 + <div class="sec_menu_items">
257 <div href="javascript:;" class="inner_item"> 260 <div href="javascript:;" class="inner_item">
258 About Us 261 About Us
259 <div class="third_menu_items"> 262 <div class="third_menu_items">
@@ -285,18 +288,15 @@ @@ -285,18 +288,15 @@
285 </a> 288 </a>
286 </div> 289 </div>
287 </div> 290 </div>
288 -  
289 </div> 291 </div>
290 </li> 292 </li>
291 <li class="btn navbtn-a" role="button"> 293 <li class="btn navbtn-a" role="button">
292 <a href="../contact.html">NURSING CARE</a> 294 <a href="../contact.html">NURSING CARE</a>
293 - <div class='sec_menu_items'> 295 + <div class="sec_menu_items">
294 <a href="../care/history_time.html" class="inner_item"> 296 <a href="../care/history_time.html" class="inner_item">
295 About Us 297 About Us
296 </a> 298 </a>
297 299
298 -  
299 -  
300 <a href="../care/achievement.html" class="inner_item"> 300 <a href="../care/achievement.html" class="inner_item">
301 Research Achievement 301 Research Achievement
302 </a> 302 </a>
@@ -304,13 +304,11 @@ @@ -304,13 +304,11 @@
304 <a href="../care/cancer.html" class="inner_item"> 304 <a href="../care/cancer.html" class="inner_item">
305 Cancer Survivorship Support 305 Cancer Survivorship Support
306 </a> 306 </a>
307 -  
308 -  
309 </div> 307 </div>
310 </li> 308 </li>
311 <li class="btn navbtn-a" role="button"> 309 <li class="btn navbtn-a" role="button">
312 <a href="javascript:;">INTERNATIONAL AFFAIRS</a> 310 <a href="javascript:;">INTERNATIONAL AFFAIRS</a>
313 - <div class='sec_menu_items'> 311 + <div class="sec_menu_items">
314 <a href="../international/conference.html" class="inner_item"> 312 <a href="../international/conference.html" class="inner_item">
315 International Conferences 313 International Conferences
316 </a> 314 </a>
@@ -344,10 +342,18 @@ @@ -344,10 +342,18 @@
344 </div> 342 </div>
345 <div class="contant"> 343 <div class="contant">
346 <div class="contant_left"> 344 <div class="contant_left">
347 - <div class="left_title">Research Programs</div>  
348 - <div class="left_titles">Achievements</div>  
349 - <div class="left_title">Key Labaratories</div>  
350 - <div class="left_title">Find a Researcher</div> 345 + <div class="left_title">
  346 + <a href="./research1.html">Research Programs</a>
  347 + </div>
  348 + <div class="left_titles">
  349 + <a href="./research2.html">Achievements</a>
  350 + </div>
  351 + <div class="left_title">
  352 + <a href="./research3.html">Key Labaratories</a>
  353 + </div>
  354 + <div class="left_title">
  355 + <a href="./researcher.html">Find a Researcher</a>
  356 + </div>
351 </div> 357 </div>
352 <div class="wire"> 358 <div class="wire">
353 <div class="contant_right"> 359 <div class="contant_right">
@@ -363,7 +369,6 @@ @@ -363,7 +369,6 @@
363 </div> 369 </div>
364 <footer class="footer-content"> 370 <footer class="footer-content">
365 <div class="footer-main"> 371 <div class="footer-main">
366 -  
367 <ul class="list-unstyled third-ul"> 372 <ul class="list-unstyled third-ul">
368 <li>West Huan-Hu Rd, Ti Yuan Bei, Hexi District</li> 373 <li>West Huan-Hu Rd, Ti Yuan Bei, Hexi District</li>
369 <li>Tianjin 300060</li> 374 <li>Tianjin 300060</li>
@@ -372,18 +377,16 @@ @@ -372,18 +377,16 @@
372 <li>Email: info@tjmuch.com</li> 377 <li>Email: info@tjmuch.com</li>
373 </ul> 378 </ul>
374 <ul class="list-unstyled first-ul"> 379 <ul class="list-unstyled first-ul">
375 - <li><img src="../images/yikeda.png" width="160px" alt=""></li>  
376 - <li><img src="../images/tjuc.png" width="160px" alt=""></li> 380 + <li><img src="../images/yikeda.png" width="160px" alt="" /></li>
  381 + <li><img src="../images/tjuc.png" width="160px" alt="" /></li>
377 </ul> 382 </ul>
378 </div> 383 </div>
379 </footer> 384 </footer>
380 -  
381 </div> 385 </div>
382 <script src="../js/jquery-1.11.3.min.js"></script> 386 <script src="../js/jquery-1.11.3.min.js"></script>
383 <script src="../js/bootstrap.min.js"></script> 387 <script src="../js/bootstrap.min.js"></script>
384 <script src="../js/swiper-3.4.2.jquery.min.js"></script> 388 <script src="../js/swiper-3.4.2.jquery.min.js"></script>
385 <script src="../js/common.js"></script> 389 <script src="../js/common.js"></script>
386 -  
387 </body> 390 </body>
388 391
389 </html> 392 </html>
@@ -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_titles">Key Labaratories</div>  
352 - <div class="left_title">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_titles"><a href="./research3.html">Key Labaratories</a></div>
  352 + <div class="left_title"><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">
@@ -315,10 +315,10 @@ @@ -315,10 +315,10 @@
315 </div> 315 </div>
316 <div class="contant"> 316 <div class="contant">
317 <div class="contant_left"> 317 <div class="contant_left">
318 - <div class="left_title">Research Programs</div>  
319 - <div class="left_title">Achievements</div>  
320 - <div class="left_title">Key Labaratories</div>  
321 - <div class="left_titles">Find a Researcher</div> 318 + <div class="left_title"><a href="./research1.html">Research Programs</a></div>
  319 + <div class="left_title"><a href="./research2.html">Achievements</a></div>
  320 + <div class="left_title"><a href="./research3.html">Key Labaratories</a></div>
  321 + <div class="left_titles"><a href="./researcher.html">Find a Researcher</a></div>
322 </div> 322 </div>
323 <div class="wire"> 323 <div class="wire">
324 <div class="contant_right"> 324 <div class="contant_right">