Merge branch 'main' of git.zdool.com:xs/ggfwjsc

src/view/dialog/dialog.vue

@@ -10,7 +10,11 @@
     >
       <template #header="{ close, titleId, titleClass }">
         <div class="my-header">
-          <el-icon size="26" color="#fff" @click="closeDialog">
+          <el-icon
+            size="26"
+            color="#fff"
+            @click="closeDialog"
+          >
             <CircleCloseFilled />
           </el-icon>
         </div>
@@ -61,7 +65,7 @@
                 :show-overflow-tooltip="true"
                 :label="item.label"
                 :property="item.property"
-                align="center"
+                :align="item.align || 'center'"
               >
                 <template #default="scope">
                   <slot
@@ -76,7 +80,7 @@
                 :property="item.property"
                 :label="item.label"
                 :show-overflow-tooltip="true"
-                align="center"
+                :align="item.align || 'center'"
               />
             </template>
           </el-table>
@@ -231,6 +235,10 @@ const handle = (current) => {
     --el-table-text-color: #fff;
     --el-table-header-text-color: #fff;
   }
+
+  // :deep(.el-table th) {
+  //   text-align: center;
+  // }
 }
 
 .pagePart {

src/view/sy.vue

@@ -1430,7 +1430,7 @@ const colorList = [
   { color2: "rgba(76,174,254,1)" },
 ];
 const bt = computed(() => {
-  return function (index) {
+  return (index)=> {
     let str = `--i:${colorList[index].color2}`;
     return str;
   };

src/view/yl.vue

@@ -354,6 +354,7 @@ const yl_column = ref([
   {
     label: "机构名称",
     property: "mc",
+    align: 'left'
   },
   {
     label: "机构地址",