Merge branch 'master' of http://121.36.37.70:3000/shaojiahao/Jinan_project

src/app/home/basic-info/unit-details/unit-details.component.html

@@ -408,8 +408,7 @@
           <td
             style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt;  vertical-align:middle; width:26.15pt">
             <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-                style="font-family:'Times New Roman'; font-size:9pt"><textarea [(ngModel)]="datas.facilities.supplyMode"
+                style="font-family:'Times New Roman'; font-size:9pt"><textarea [(ngModel)]="datas.facilities.supplyMode" nz-input style="width: 100%" type="text"></textarea></span></p>
-                  nz-input style="width: 100%" type="text"></textarea></span></p>
           </td>
         </tr>
         <tr style="height:21.45pt">

src/app/home/basic-info/unit-details/unit-details.component.ts

@@ -650,10 +650,10 @@ export class UnitDetailsComponent implements OnInit {
             style="font-family:宋体; font-size:9pt">补给方式</span></p>
       </td>
       <td
-        style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt; padding-left:5.4pt; padding-right:4.9pt; vertical-align:middle; width:26.15pt">
+            style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:1pt;  vertical-align:middle; width:26.15pt">
-        <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
+            <p style="line-height:12pt; margin:0pt; orphans:0; text-align:center; widows:0"><span
-            style="font-family:'Times New Roman'; font-size:9pt"`+ this.datas.facilities.supplyMode + `</span></p>
+                style="font-family:'Times New Roman'; font-size:9pt">`+this.datas.facilities.supplyMode+`</span></p>
-      </td>
+          </td>
     </tr>
     <tr style="height:21.45pt">
       <td

src/app/home/task/station-weekly-plan/station-weekly-plan.component.ts

@@ -201,6 +201,7 @@ export class StationWeeklyPlanComponent implements OnInit {
       this.http.get('/api/PlanTasks', {
         params: params
       }).subscribe((data: any) => {
+        
         this.isLoading = false
         // console.log('任务申请列表', data.items);
         data.items.forEach(element => {
@@ -244,7 +245,8 @@ export class StationWeeklyPlanComponent implements OnInit {
       this.http.get('/api/PlanTasks', {
         params: params
       }).subscribe((data: any) => {
-
+       
+        
         item.isLoading = false
         let listData = [
           { name: '双随机', background: '#1D9DFF', icon: 'suiji.png', scale: '0/0', data: [], inspected: 0, finished: 0 },