Merge branch 'dev-wyf' into 'dev'

style: 样式修改

See merge request product-group-fe/sfy-safety-group/sfy-safety!239

src/api/security-confidentiality-overview/index.ts

@@ -2,14 +2,14 @@ import { http } from '@/utils/http/axios';
 
 import type { PersonOverview, VehicleOverview, RegulationItem } from '@/views/security-confidentiality/overview/types';
 
-export async function getPersonOverview() {
+export function getPersonOverview() {
   return http.request<PersonOverview>({
     url: '/overview/queryOverviewVisitorStatistics',
     method: 'get',
   });
 }
 
-export async function getVehicleOverview() {
+export function getVehicleOverview() {
   return http.request<VehicleOverview>({
     url: '/overview/queryVehicleEntryRecordOverview',
     method: 'get',
@@ -17,7 +17,7 @@ export async function getVehicleOverview() {
 }
 
 // 查询保卫规定与通知列表总览
-export async function getSecurityOverview() {
+export function getSecurityOverview() {
   return http.request<RegulationItem[]>({
     url: '/overview/queryDefenseRuleNoticeInfoOverview',
     method: 'get',
@@ -25,7 +25,7 @@ export async function getSecurityOverview() {
 }
 
 // 查询保密规定与通知列表总览
-export async function getConfidentialityOverview() {
+export function getConfidentialityOverview() {
   return http.request<RegulationItem[]>({
     url: '/overview/querySecrecyRuleNoticeInfoOverview',
     method: 'get',

src/views/security-confidentiality/confidentiality-regulation-notice/components/NoticeTable.vue

@@ -62,7 +62,7 @@
         </div>
       </template>
       <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="编辑"

src/views/security-confidentiality/overview/charts/VehicleChart.vue

@@ -66,7 +66,7 @@
             alignWithLabel: true,
           },
           axisLabel: {
-            color: 'rgba(0,0,0,0.5)',
+            color: '#909399',
             fontFamily: 'HelveticaNeue',
             fontSize: 12,
           },
@@ -78,13 +78,13 @@
           type: 'value',
           splitLine: {
             lineStyle: {
-              color: '#909399',
+              color: '#E8E8E8',
               type: 'dashed',
               width: 1,
             },
           },
           axisLabel: {
-            color: 'rgba(0,0,0,0.5)',
+            color: '#909399',
             fontFamily: 'HelveticaNeue',
             fontSize: 12,
           },

src/views/security-confidentiality/overview/components/RegulationAndNotice.vue

@@ -160,4 +160,11 @@
   :deep(.el-tabs__item) {
     font-size: 14px !important;
   }
+
+  :deep(.el-tabs__active-bar) {
+    bottom: 5px;
+    height: 3px;
+    width: 16px !important;
+    margin-left: 6px;
+  }
 </style>

src/views/security-confidentiality/person-management/inner-person/configs/table.ts

@@ -9,21 +9,21 @@ export const INNER_PERSON_TABEL_COLUMNS = [
     prop: 'employeeName',
     slot: 'employeeName',
     label: '姓名',
-    align: 'center',
+    align: 'left',
     minWidth: '120px',
   },
   {
     prop: 'staffNo',
     slot: 'staffNo',
     label: '卡号',
-    align: 'center',
+    align: 'left',
     minWidth: '120px',
   },
   {
     prop: 'deptName',
     slot: 'deptName',
     label: '部门',
-    align: 'center',
+    align: 'left',
     minWidth: '120px',
   },
   {
@@ -37,14 +37,14 @@ export const INNER_PERSON_TABEL_COLUMNS = [
     prop: 'location',
     slot: 'location',
     label: '进出地点',
-    align: 'center',
+    align: 'left',
     minWidth: '120px',
   },
   {
     prop: 'entryTime',
     slot: 'entryTime',
     label: '进门时间',
-    align: 'center',
+    align: 'left',
     minWidth: '120px',
   },
 ];

src/views/security-confidentiality/person-management/outer-person/components/RealtimePush.vue

@@ -1,9 +1,8 @@
 <template>
   <div class="realtime-push">
-    <!-- <el-tooltip effect="light" content="" placement="top">
+    <el-tooltip effect="light" content="开关开启后，当告警问题发生时将自动进行消息推送" placement="top">
       <img src="@/assets/icons/help.png" alt="" />
-    </el-tooltip> -->
-    <img src="@/assets/icons/help.png" alt="" />
+    </el-tooltip>
 
     <span class="label">告警推送：</span>
     <el-switch v-model="switchVal" class="switch" :before-change="debouncedhandleSwitchChange" />

src/views/security-confidentiality/person-management/outer-person/configs/table.ts

@@ -25,14 +25,14 @@ export const OUTER_PERSON_BREAK_TABEL_COLUMNS: TableColumnProps[] = [
     prop: 'captureLocation',
     slot: 'captureLocation',
     label: '抓拍地点',
-    align: 'center',
+    align: 'left',
     minWidth: '120px',
   },
   {
     prop: 'captureTime',
     slot: 'captureTime',
     label: '抓拍时间',
-    align: 'center',
+    align: 'left',
     minWidth: '120px',
   },
   {
@@ -54,21 +54,21 @@ export const OUTER_PERSON_BREAK_TABEL_COLUMNS: TableColumnProps[] = [
 export const OUTER_PERSON_VISITOR_TABEL_COLUMNS: TableColumnProps[] = [
   {
     label: '来访者',
-    align: 'center',
+    align: 'left',
     minWidth: '120px',
     prop: 'visitorName',
     slot: 'visitorName',
   },
   {
     label: '身份信息',
-    align: 'center',
+    align: 'left',
     minWidth: '240px',
     prop: 'identityInfor',
     slot: 'identityInfor',
   },
   {
     label: '手机号码',
-    align: 'center',
+    align: 'left',
     minWidth: '240px',
     prop: 'mobile',
     slot: 'mobile',
@@ -82,22 +82,22 @@ export const OUTER_PERSON_VISITOR_TABEL_COLUMNS: TableColumnProps[] = [
   },
   {
     label: '单位',
-    align: 'center',
+    align: 'left',
     minWidth: '360px',
     prop: 'company',
     slot: 'company',
   },
   {
     label: '来访事由',
-    align: 'center',
+    align: 'left',
     minWidth: '120px',
     prop: 'visitReason',
     slot: 'visitReason',
   },
   {
     label: '被访人',
-    align: 'center',
-    minWidth: '120px',
+    align: 'left',
+    minWidth: '180px',
     prop: 'respondentName',
     slot: 'respondentName',
   },
@@ -111,15 +111,15 @@ export const OUTER_PERSON_VISITOR_TABEL_COLUMNS: TableColumnProps[] = [
 
   {
     label: '到访时间',
-    align: 'center',
-    minWidth: '360px',
+    align: 'left',
+    minWidth: '240px',
     prop: 'visitTime',
     slot: 'visitTime',
   },
   {
     label: '离开时间',
-    align: 'center',
-    minWidth: '360px',
+    align: 'left',
+    minWidth: '240px',
     prop: 'leaveTime',
     slot: 'leaveTime',
   },

src/views/security-confidentiality/security-regulation-notice/components/NoticeTable.vue

@@ -62,7 +62,7 @@
         </div>
       </template>
       <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="编辑"

src/views/security-confidentiality/vehicle-management/configs/tables.ts

@@ -9,7 +9,7 @@ export const VEHICLE_TABEL_COLUMNS = [
     prop: 'carNum',
     slot: 'carNum',
     label: '车牌号',
-    align: 'center',
+    align: 'left',
     minWidth: '120px',
     type: 'index',
   },
@@ -17,28 +17,28 @@ export const VEHICLE_TABEL_COLUMNS = [
     prop: 'carOwnerName',
     slot: 'carOwnerName',
     label: '车主姓名',
-    align: 'center',
+    align: 'left',
     minWidth: '120px',
   },
   {
     prop: 'deptName',
     slot: 'deptName',
     label: '部门',
-    align: 'center',
+    align: 'left',
     minWidth: '120px',
   },
   {
     prop: 'entryLocation',
     slot: 'entryLocation',
     label: '进入地点',
-    align: 'center',
+    align: 'left',
     minWidth: '120px',
   },
   {
     prop: 'entryTime',
     slot: 'entryTime',
     label: '进入时间',
-    align: 'center',
+    align: 'left',
     minWidth: '120px',
   },
   {