Commit e3d190acce03f2093a4f554b35a928e578ebc164
1 parent
92b3de35e9
Exists in
master
фиксы для пдф
Showing 2 changed files with 24 additions and 54 deletions Side-by-side Diff
app/Http/Controllers/WorkerController.php
| ... | ... | @@ -257,7 +257,7 @@ class WorkerController extends Controller |
| 257 | 257 | $status_work = $this->status_work; |
| 258 | 258 | $infoblocks = infobloks::query()->get(); |
| 259 | 259 | |
| 260 | - | |
| 260 | + //return view('layout.pdf', compact('Query', 'status_work', 'infoblocks')); | |
| 261 | 261 | $pdf = PDF::loadView('layout.pdf', [ |
| 262 | 262 | 'Query' => $Query, |
| 263 | 263 | 'status_work' => $status_work, |
resources/views/layout/pdf.blade.php
| ... | ... | @@ -25,11 +25,6 @@ |
| 25 | 25 | |
| 26 | 26 | .thing { |
| 27 | 27 | color: #3a3b3c; |
| 28 | - /* background-color: #f2f5fc; */ | |
| 29 | - } | |
| 30 | - | |
| 31 | - .thing__profile { | |
| 32 | - | |
| 33 | 28 | } |
| 34 | 29 | |
| 35 | 30 | .thing__profile-photo { |
| ... | ... | @@ -39,10 +34,6 @@ |
| 39 | 34 | margin-right: 20px; |
| 40 | 35 | } |
| 41 | 36 | |
| 42 | - .thing__profile-body { | |
| 43 | - | |
| 44 | - } | |
| 45 | - | |
| 46 | 37 | .thing__title { |
| 47 | 38 | width: 100%; |
| 48 | 39 | font-size: 32px; |
| ... | ... | @@ -61,10 +52,6 @@ |
| 61 | 52 | margin: 0px 0px 32px 0px; |
| 62 | 53 | } |
| 63 | 54 | |
| 64 | - .main__spoiler-body { | |
| 65 | - | |
| 66 | - } | |
| 67 | - | |
| 68 | 55 | .main__table { |
| 69 | 56 | border-collapse: collapse; |
| 70 | 57 | table-layout: fixed; |
| ... | ... | @@ -110,6 +97,15 @@ |
| 110 | 97 | width: 25% !important; |
| 111 | 98 | } |
| 112 | 99 | |
| 100 | + .main__table_experience td { | |
| 101 | + width: 25% !important; | |
| 102 | + hyphens: auto; | |
| 103 | + overflow: hidden; | |
| 104 | + } | |
| 105 | + .main__table_experience body td:nth-child(1){ | |
| 106 | + width: 50% !important; | |
| 107 | + } | |
| 108 | + | |
| 113 | 109 | .main__table_three td:last-child { |
| 114 | 110 | width: 50% !important; |
| 115 | 111 | } |
| ... | ... | @@ -127,32 +123,6 @@ |
| 127 | 123 | margin: 15px 0 0 0; |
| 128 | 124 | } |
| 129 | 125 | |
| 130 | - .main__resume-profile-info { | |
| 131 | - margin: 30px 0px 0px 0px; | |
| 132 | - } | |
| 133 | - | |
| 134 | - .main__resume-profile-info-title { | |
| 135 | - margin-bottom: 20px !important; | |
| 136 | - color: #3a3b3c; | |
| 137 | - } | |
| 138 | - | |
| 139 | - .main__resume-profile-info-body-item { | |
| 140 | - margin: 0px 0px 20px 0px; | |
| 141 | - } | |
| 142 | - | |
| 143 | - .main__resume-profile-info-body-subtitle { | |
| 144 | - color: #4d88d9; | |
| 145 | - margin: 0px 0px 10px 0px; | |
| 146 | - font-weight: 700; | |
| 147 | - font-size: 22px; | |
| 148 | - } | |
| 149 | - | |
| 150 | - .main__resume-profile-info-body-inner { | |
| 151 | - margin: 0; | |
| 152 | - padding: 0; | |
| 153 | - font-size: 12px; | |
| 154 | - } | |
| 155 | - | |
| 156 | 126 | .main__resume-profile-info-body-inner li { |
| 157 | 127 | list-style-type: none; |
| 158 | 128 | margin: 0px 0px 20px 0px; |
| ... | ... | @@ -373,7 +343,7 @@ |
| 373 | 343 | |
| 374 | 344 | <div class="main__spoiler"> |
| 375 | 345 | <div class="main__spoiler-body"> |
| 376 | - <table class="main__table main__table_three"> | |
| 346 | + <table class="main__table main__table_experience"> | |
| 377 | 347 | <thead> |
| 378 | 348 | <tr> |
| 379 | 349 | <th colspan="9">Опыт работы</th> |
| ... | ... | @@ -381,15 +351,15 @@ |
| 381 | 351 | </thead> |
| 382 | 352 | <tbody> |
| 383 | 353 | <tr> |
| 384 | - <td><b>Должность:</b></td> | |
| 385 | - <td><b>Название т/х:</b></td> | |
| 386 | - <td><b>Тип судна:</b></td> | |
| 387 | - <td><b>Марка ГД:</b></td> | |
| 388 | - <td><b>Мощность ГД (кВТ):</b></td> | |
| 389 | - <td><b>Водоизмещение (DWT):</b></td> | |
| 390 | - <td><b>Название компании:</b></td> | |
| 391 | - <td><b>Начало контракта:</b></td> | |
| 392 | - <td><b>Окончание контракта:</b></td> | |
| 354 | + <td style="width: 20.1%;"><b>Должность</b></td> | |
| 355 | + <td style="width: 11.1%;"><b>Название т/х</b></td> | |
| 356 | + <td style="width: 11.1%;"><b>Тип судна</b></td> | |
| 357 | + <td style="width: 11.1%;"><b>Марка ГД</b></td> | |
| 358 | + <td style="width: 11.1%;"><b>Мощность ГД (кВТ)</b></td> | |
| 359 | + <td style="width: 11.1%;"><b>Водо- измещение (DWT)</b></td> | |
| 360 | + <td style="width: 11.1%;"><b>Название компании</b></td> | |
| 361 | + <td style="width: 11.1%;"><b>Начало контракта</b></td> | |
| 362 | + <td style="width: 11.1%;"><b>Окончание контракта</b></td> | |
| 393 | 363 | </tr> |
| 394 | 364 | @if (count($Query[0]->place_worker) > 0) |
| 395 | 365 | @foreach($Query[0]->place_worker as $it) |
| ... | ... | @@ -431,10 +401,10 @@ |
| 431 | 401 | </thead> |
| 432 | 402 | <tbody> |
| 433 | 403 | <tr> |
| 434 | - <td><b>Название компании:</b></td> | |
| 435 | - <td><b>ФИО сотрудника:</b></td> | |
| 436 | - <td><b>Должность сотрудника:</b></td> | |
| 437 | - <td><b>Телефон сотрудника:</b></td> | |
| 404 | + <td><b>Название компании</b></td> | |
| 405 | + <td><b>ФИО сотрудника</b></td> | |
| 406 | + <td><b>Должность сотрудника</b></td> | |
| 407 | + <td><b>Телефон сотрудника</b></td> | |
| 438 | 408 | </tr> |
| 439 | 409 | @if ((isset($worker->prev_company)) && ($worker->prev_company->count())) |
| 440 | 410 | @foreach ($worker->prev_company as $prev_company) |