Merge branch 'baiyanting1' of http://124.70.43.205:3000/xieshengjie/jn_sis_zhfx into new-power

src/views/stateMonitor/factoryMonitor/photovoltaic/lightBoosterStation/index.vue

@@ -108,7 +108,7 @@
           sortable
           :prop="item.code"
           :label="item.title"
-          align="center"
+          :align="item.align"
           :width="item.width"
           show-overflow-tooltip
         >
@@ -180,12 +180,22 @@ export default {
       end: "",
       page: { currentPage: 1, pagesize: 22, total: 0 },
       tableHeader: [
-        { title: "时间", code: "lastUpdateTime", width: "160" },
-        { title: "场站名称", code: "stationName", width: "150" },
-        { title: "报警描述", code: "description" },
-        { title: "是否解除", code: "closeTime", width: "110" },
+        {
+          title: "时间",
+          code: "lastUpdateTime",
+          width: "160",
+          align: "center",
+        },
+        {
+          title: "场站名称",
+          code: "stationName",
+          width: "150",
+          align: "center",
+        },
+        { title: "报警描述", code: "description", align: "left" },
+        { title: "是否解除", code: "closeTime", width: "110", align: "center" },
         // { title: "解除时间", code: "closeTime", width: "160" },
-        { title: "是否确认", code: "confirmed", width: "110" },
+        { title: "是否确认", code: "confirmed", width: "110", align: "center" },
       ],
     };
   },

src/views/stateMonitor/factoryMonitor/windPowerPlant/boosterStation/index.vue

@@ -88,7 +88,8 @@
           sortable
           :prop="item.code"
           :label="item.title"
-          align="center"
+          header-align="center"
+          :align="item.align"
           :width="item.width"
           show-overflow-tooltip
         >
@@ -168,11 +169,11 @@ export default {
       end: "",
       page: { currentPage: 1, pagesize: 22, total: 0 },
       tableHeader: [
-        { title: "时间", code: "lastUpdateTime", width: "160" },
-        { title: "场站名称", code: "stationName", width: "150" },
-        { title: "报警描述", code: "description" },
-        { title: "是否解除", code: "closeTime", width: "110" },
-        { title: "是否确认", code: "confirmed", width: "110" },
+        { title: "时间", code: "lastUpdateTime", width: "160" ,align:'center'},
+        { title: "场站名称", code: "stationName", width: "150" ,align:'center'},
+        { title: "报警描述", code: "description" ,align:'left'},
+        { title: "是否解除", code: "closeTime", width: "110" ,align:'center'},
+        { title: "是否确认", code: "confirmed", width: "110" ,align:'center'},
       ],
     };
   },