Просмотр исходного кода

Merge branch 'dev-wyf' into 'dev'

Dev wyf

See merge request product-group-fe/sfy-safety-group/sfy-safety!213
ai0197 7 месяцев назад
Родитель
Сommit
a887641853

+ 1 - 1
src/views/traffic/regulation/components/NoticeTable.vue

@@ -61,7 +61,7 @@
         </div>
         </div>
       </template>
       </template>
       <template #action="scope">
       <template #action="scope">
-        <div class="action-container--div">
+        <div class="action-container--div" style="justify-content: left;">
           <ActionButton text="查看" @click="handleViewNotice(scope.row.id)" />
           <ActionButton text="查看" @click="handleViewNotice(scope.row.id)" />
           <ActionButton
           <ActionButton
             text="编辑"
             text="编辑"

+ 3 - 3
src/views/traffic/regulation/configs/tables.ts

@@ -45,7 +45,7 @@ export const REGULATION_TABLE_COLUMNS: TableColumnProps[] = [
     prop: 'action',
     prop: 'action',
     slot: 'action',
     slot: 'action',
     fixed: 'right',
     fixed: 'right',
-    width: '200px',
+    width: '180px',
     align: 'left',
     align: 'left',
   },
   },
 ];
 ];
@@ -118,7 +118,7 @@ export const NOTICE_TABLE_COLUMNS: TableColumnProps[] = [
     prop: 'action',
     prop: 'action',
     slot: 'action',
     slot: 'action',
     fixed: 'right',
     fixed: 'right',
-    width: '260px',
+    width: '230px',
     align: 'left',
     align: 'left',
   },
   },
 ];
 ];
@@ -156,7 +156,7 @@ export const NOTICE_TABLE_COLUMNS_CHECKONLY: TableColumnProps[] = [
     prop: 'action',
     prop: 'action',
     slot: 'action',
     slot: 'action',
     fixed: 'right',
     fixed: 'right',
-    width: '200px',
+    width: '160px',
     align: 'center',
     align: 'center',
   },
   },
 ];
 ];

+ 19 - 17
src/views/traffic/violation/act/Act.vue

@@ -127,23 +127,25 @@
               </div>
               </div>
             </template>
             </template>
             <template #action="scope">
             <template #action="scope">
-              <ActionButton
-                v-if="scope.row.isNotice === ACT_NOTICE_STATE.INACTIVE"
-                text="编辑"
-                @click="handleEditAct(scope.row.id)"
-              />
-              <ActionButton
-                v-if="scope.row.isNotice === ACT_NOTICE_STATE.INACTIVE"
-                text="通知"
-                @click="handleNoticeAct(scope.row.id)"
-              />
-              <ActionButton
-                text="删除"
-                :popconfirm="{
-                  title: '确定要删除?',
-                }"
-                @confirm="handleDeleteAct(scope.row.id)"
-              />
+              <div class="action-container--div" style="justify-content: left">
+                <ActionButton
+                  v-if="scope.row.isNotice === ACT_NOTICE_STATE.INACTIVE"
+                  text="编辑"
+                  @click="handleEditAct(scope.row.id)"
+                />
+                <ActionButton
+                  v-if="scope.row.isNotice === ACT_NOTICE_STATE.INACTIVE"
+                  text="通知"
+                  @click="handleNoticeAct(scope.row.id)"
+                />
+                <ActionButton
+                  text="删除"
+                  :popconfirm="{
+                    title: '确定要删除?',
+                  }"
+                  @confirm="handleDeleteAct(scope.row.id)"
+                />
+              </div>
             </template>
             </template>
           </BasicTable>
           </BasicTable>
         </div>
         </div>

+ 2 - 2
src/views/traffic/violation/act/configs/tables.ts

@@ -95,7 +95,7 @@ export const VIOLATION_ACT_TABLE_COLUMNS: TableColumnProps[] = [
     prop: 'action',
     prop: 'action',
     slot: 'action',
     slot: 'action',
     fixed: 'right',
     fixed: 'right',
-    width: '200px',
+    width: '180px',
     align: 'left',
     align: 'left',
   },
   },
 ];
 ];
@@ -245,7 +245,7 @@ export const VIOLATION_NOTICE_TABLE_COLUMNS: TableColumnProps[] = [
     prop: 'createSource',
     prop: 'createSource',
     slot: 'createSource',
     slot: 'createSource',
     align: 'center',
     align: 'center',
-    minWidth: '200px',
+    minWidth: '120px',
   },
   },
 ];
 ];