diff --git a/src/app/routes/data-v/second1/second1.component.html b/src/app/routes/data-v/second1/second1.component.html
index 33d3586..5b82493 100644
--- a/src/app/routes/data-v/second1/second1.component.html
+++ b/src/app/routes/data-v/second1/second1.component.html
@@ -1,7 +1,7 @@
 <div nz-row [nzGutter]="[12, 12]">
   <lj-app-ag-grid-component
     style="width: 50%"
-    title="代办任务"
+    title="待办任务"
     [defaultColDef]="defaultColDef"
     [rowData]="rowData"
     [columnDefs]="colDefs1"
diff --git a/src/app/routes/data-v/workstation/lj-ag-grid-component/lj-ag-grid-component.component.html b/src/app/routes/data-v/workstation/lj-ag-grid-component/lj-ag-grid-component.component.html
index 4a6e3c0..8da50cc 100644
--- a/src/app/routes/data-v/workstation/lj-ag-grid-component/lj-ag-grid-component.component.html
+++ b/src/app/routes/data-v/workstation/lj-ag-grid-component/lj-ag-grid-component.component.html
@@ -16,7 +16,7 @@
   <!-- <app-data-v-lj-table [columns]="tableColumns" [data]="tableData" /> -->
   <br />
   <!-- 分页 -->
-  <!-- <div class="grid-pagination">
+  <div class="grid-pagination">
     <div class="page-total-style">共 {{ pageRowTotal }} 项数据</div>
     <nz-pagination
       [nzPageIndex]="pageIndex"
@@ -27,5 +27,5 @@
       [className]="paginationThemeClass"
       nzShowSizeChanger
     />
-  </div> -->
+  </div>
 </lj-data-v-card>
diff --git a/src/app/routes/data-v/workstation/workstation.component.html b/src/app/routes/data-v/workstation/workstation.component.html
index 501a6a5..5c824af 100644
--- a/src/app/routes/data-v/workstation/workstation.component.html
+++ b/src/app/routes/data-v/workstation/workstation.component.html
@@ -10,31 +10,31 @@
   />
 
   <!-- </data-v-card> -->
-  <data-v-card nz-col nzSpan="24" nzXs="24" nzSm="24" nzMd="12" nzLg="12" nzXl="12" nzXXl="12" title="已办任务">
-    <app-ag-grid-component
-      style="width: 100%"
-      [defaultColDef]="defaultColDef"
-      [rowData]="rowData"
-      [columnDefs]="colDefs2"
-      gridThemeClass="ag-theme-quartz ag-theme-datav"
-    />
-  </data-v-card>
-  <data-v-card nz-col nzSpan="24" nzXs="24" nzSm="24" nzMd="12" nzLg="12" nzXl="12" nzXXl="12" title="报警信息">
-    <app-ag-grid-component
-      style="width: 100%"
-      [defaultColDef]="defaultColDef"
-      [rowData]="rowData"
-      [columnDefs]="colDefs3"
-      gridThemeClass="ag-theme-quartz ag-theme-datav"
-    />
-  </data-v-card>
-  <data-v-card nz-col nzSpan="24" nzXs="24" nzSm="24" nzMd="12" nzLg="12" nzXl="12" nzXXl="12" title="通知">
-    <app-ag-grid-component
-      style="width: 100%"
-      [defaultColDef]="defaultColDef"
-      [rowData]="rowData"
-      [columnDefs]="colDefs4"
-      gridThemeClass="ag-theme-quartz ag-theme-datav"
-    />
-  </data-v-card>
+
+  <lj-app-ag-grid-component
+    style="width: 50%"
+    [title]="'已办任务'"
+    [defaultColDef]="defaultColDef"
+    [rowData]="rowData"
+    [columnDefs]="colDefs2"
+    [gridThemeClass]="gridThemedClass"
+  />
+
+  <lj-app-ag-grid-component
+    style="width: 50%"
+    [title]="'报警信息'"
+    [defaultColDef]="defaultColDef"
+    [rowData]="rowData"
+    [columnDefs]="colDefs3"
+    [gridThemeClass]="gridThemedClass"
+  />
+
+  <lj-app-ag-grid-component
+    style="width: 50%"
+    [title]="'通知'"
+    [defaultColDef]="defaultColDef"
+    [rowData]="rowData"
+    [columnDefs]="colDefs4"
+    [gridThemeClass]="gridThemedClass"
+  />
 </div>
diff --git a/src/app/routes/data-v/workstation/workstation.component.ts b/src/app/routes/data-v/workstation/workstation.component.ts
index 4d02207..354f131 100644
--- a/src/app/routes/data-v/workstation/workstation.component.ts
+++ b/src/app/routes/data-v/workstation/workstation.component.ts
@@ -45,27 +45,47 @@ export class DataVWorkstationComponent implements OnInit, AfterViewInit {
 
   rowData: object[] = [];
 
+  // colDefs1: ColDef[] = [
+  //   {
+  //     headerName: '序号',
+  //     valueGetter: function (params: any) {
+  //       return parseInt(params.node.id) + 1;
+  //     },
+  //     width: 90,
+  //     // flex: 2,
+  //     sortable: true,
+  //     unSortIcon: true,
+  //     field: 'xh'
+  //   },
+
+  //   { headerName: '任务名称', unSortIcon: true, width: 120, field: 'rwmc' },
+  //   { headerName: '任务描述', unSortIcon: true, field: 'rwms', width: 120 },
+  //   { headerName: '开始时间', headerClass: 'ag-header-center', unSortIcon: true, field: 'kssj', width: 180 },
+  //   { headerName: '计划完成时间', unSortIcon: true, field: 'jhwcsj', width: 180 },
+  //   { headerName: '超期', width: 70, field: 'sfcq' },
+  //   { headerName: '操作', width: 90, autoHeaderHeight: true, field: 'cz', cellRenderer: GridButtonValueRenderer }
+  // ];
+
   colDefs1: ColDef[] = [
     {
       headerName: '序号',
       valueGetter: function (params: any) {
         return parseInt(params.node.id) + 1;
       },
-      width: 90,
+      // width: 90,
       // flex: 2,
       sortable: true,
       unSortIcon: true,
       field: 'xh'
     },
 
-    { headerName: '任务名称', unSortIcon: true, width: 120, field: 'rwmc' },
-    { headerName: '任务描述', unSortIcon: true, field: 'rwms', width: 120 },
-    { headerName: '开始时间', headerClass: 'ag-header-center', unSortIcon: true, field: 'kssj', width: 180 },
-    { headerName: '计划完成时间', unSortIcon: true, field: 'jhwcsj', width: 180 },
-    { headerName: '超期', width: 70, field: 'sfcq' },
-    { headerName: '操作', width: 90, autoHeaderHeight: true, field: 'cz', cellRenderer: GridButtonValueRenderer }
+    { headerName: '任务名称', unSortIcon: true, field: 'rwmc' },
+    { headerName: '任务描述', unSortIcon: true, field: 'rwms' },
+    { headerName: '开始时间', headerClass: 'ag-header-center', unSortIcon: true, field: 'kssj' },
+    { headerName: '计划完成时间', unSortIcon: true, field: 'jhwcsj' },
+    { headerName: '超期', field: 'sfcq' },
+    { headerName: '操作', autoHeaderHeight: true, field: 'cz', cellRenderer: GridButtonValueRenderer }
   ];
-
   colDefs2: ColDef[] = [
     {
       headerName: '序号',