修改用户日志界面样式且合并冲突

src/design/theme.less

@@ -133,7 +133,6 @@ html[data-theme='light'] {
 @vent-device-manager-control-btn: var(--vent-device-manager-control-btn);
 @vent-device-manager-control-btn-hover: var(--vent-device-manager-control-btn-hover);
 
-
 // 下面的代码负责将主题相关的选择器、图片前缀等 less 变量声明
 @theme-dark: ~"html[data-theme='dark2']";
 @theme-light: ~"html[data-theme='light']";

src/design/themify/dark.less

@@ -49,5 +49,8 @@ html[data-theme='dark2'] {
   --vent-warn-tab-bg: #0f376ccc;
   --vent-warn-tab-border: #166ab5;
   --vent-warn-tab-bg-actived: #209dfc;
+<<<<<<< HEAD
 
+=======
+>>>>>>> wky-dev
 }

src/design/themify/deepblue.less

@@ -63,5 +63,8 @@ html[data-theme='deepblue'] {
   --vent-warn-tab-bg: #0f376c;
   --vent-warn-tab-border: #107eec;
   --vent-warn-tab-bg-actived: #0963c1;
+<<<<<<< HEAD
 
+=======
+>>>>>>> wky-dev
 }

src/design/themify/default.less

@@ -62,8 +62,11 @@ html {
   --vent-warn-tab-bg: #0f376ccc;
   --vent-warn-tab-border: #166ab5;
   --vent-warn-tab-bg-actived: #209dfc;
+<<<<<<< HEAD
 
   --vent-balancePress-fan-bg-default: linear-gradient( to right, #071D3C22, #035EA266);
   --vent-balancePress-fan-bg-select: linear-gradient(to right, #21A6CE99, #052d3d99);
 
+=======
+>>>>>>> wky-dev
 }

src/design/themify/light.less

@@ -1,32 +1,63 @@
 html[data-theme='light'] {
   --vent-primary-color: #1580cc;
+<<<<<<< HEAD
   --vent-header-bg-color: linear-gradient(#005177, #0a344c);
+=======
+
+  --vent-header-bg-color: linear-gradient(#005177, #0a344c);
+
+>>>>>>> wky-dev
   --vent-btn-primary-hover-color: #389bd9;
   --vent-btn-primary-focus-color: #1c638a99;
   --vent-btn-primary-color: #1c638a;
   --vent-btn-primary-border-color: #56b3c96b;
+<<<<<<< HEAD
+=======
+
+>>>>>>> wky-dev
   --vent-table-thead: #3d9dd45d;
   --vent-table-thead-border: #91e9fe;
   --vent-table-hover: #0dc3ff22;
   --vent-table-no-hover: #00bfff10;
   --vent-table-action-link: #00e7ff;
+<<<<<<< HEAD
+=======
+
+>>>>>>> wky-dev
   --vent-modal-title: #39e9fe;
   --vent-modal-border: #04bdaa;
   --vent-modal-bg: #0042ab22;
   --vent-modal-box-shadow: #2b87ff;
   --vent-modal-bg2: linear-gradient(#2cd1ff55, #1eb0ff55);
+<<<<<<< HEAD
+  --vent-tabs-bg: linear-gradient(#0091aa33, #2081ff11);
+  --vent-tabs-table-thead: #3d9dd433;
+  --vent-tabs-action-link: #28f3f3;
+  --vent-form-item-border: #3ad8ff77;
+=======
+
   --vent-tabs-bg: linear-gradient(#0091aa33, #2081ff11);
   --vent-tabs-table-thead: #3d9dd433;
   --vent-tabs-action-link: #28f3f3;
+
   --vent-form-item-border: #3ad8ff77;
+
+>>>>>>> wky-dev
   --vent-text-base: #ddd;
   --vent-base-color: #09172c;
   --vent-base-border: #5cfaff;
   --vent-base-light-bg: #60f4ff;
   --vent-base-light-bg-opcity: #60f4ff55;
+<<<<<<< HEAD
   --vent-transparent: #fff0;
   --vent-font-color: #fff;
   --vent-font-action-link: #7af5ff;
+=======
+  --vent-transparent: #ffffff00;
+  --vent-font-color: #ffffff;
+  --vent-font-action-link: #7af5ff;
+
+>>>>>>> wky-dev
   --vent-configurable-bg: #09316a;
   --vent-configurable-module-bg: #3df6ff11;
   --vent-configurable-original-module-bg: #3df6ff15;
@@ -35,6 +66,10 @@ html[data-theme='light'] {
   --vent-configurable-home-bg-img: linear-gradient(to top, #39a3ff00, #0091ff99);
   --vent-configurable-home-timeline: linear-gradient(to top, #39a3ff00, #0091ff99, #39a3ff00);
   --vent-configurable-home-light-border: #3df6ff;
+<<<<<<< HEAD
+=======
+
+>>>>>>> wky-dev
   --vent-gas-list-item-bg-img: linear-gradient(to right, #39a3ff55, #3977e500);
   --vent-gas-tab-bg: #10427a;
   --vent-gas-tab-bg-avtived: #166ab5;
@@ -42,10 +77,19 @@ html[data-theme='light'] {
   --vent-gas-primary-text: #00c8d9;
   --vent-gas-primary-bg: #1673bf;
   --vent-gas-primary-trasparent-bg: #0091ff12;
+<<<<<<< HEAD
   --vent-device-manager-box-border: #44d3ff70;
   --vent-device-manager-box-bg: #fff1;
   --vent-device-manager-control-btn: linear-gradient(#1fa6cb, #127cb5);
   --vent-device-manager-control-btn-hover: linear-gradient(#2cd1ff55, #1eb0ff55);
+=======
+
+  --vent-device-manager-box-border: #44d3ff70;
+  --vent-device-manager-box-bg: #ffffff11;
+  --vent-device-manager-control-btn: linear-gradient(#1fa6cb, #127cb5);
+  --vent-device-manager-control-btn-hover: linear-gradient(#2cd1ff55, #1eb0ff55);
+
+>>>>>>> wky-dev
   --vent-warn-tab-bg: #0f376ccc;
   --vent-warn-tab-border: #166ab5;
   --vent-warn-tab-bg-actived: #209dfc;

src/views/monitor/log/index.vue

@@ -3,7 +3,7 @@
     <template #tableTitle>
       <a-tabs defaultActiveKey="1" @change="tabChange" size="small">
         <a-tab-pane tab="登录日志" key="1"></a-tab-pane>
-        <a-tab-pane tab="操作日志" key="2"></a-tab-pane>
+        <!-- <a-tab-pane tab="操作日志" key="2"></a-tab-pane> -->
       </a-tabs>
     </template>
     <template #expandedRowRender="{ record }">
@@ -72,3 +72,9 @@
     checkedKeys.value = selectedRowKeys;
   }
 </script>
+<style lang="less" scoped>
+  ::v-deep .table-form {
+    padding: 0 !important;
+    margin: 0 !important;
+  }
+</style>

src/views/monitor/log/log.data.ts

@@ -57,7 +57,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'keyWord',
     label: '搜索日志',
     component: 'Input',
-    colProps: { span: 8 },
+    colProps: { span: 4 },
   },
   {
     field: 'fieldTime',
@@ -67,7 +67,7 @@ export const searchFormSchema: FormSchema[] = [
       valueType: 'Date',
     },
     colProps: {
-      span: 8,
+      span: 4,
     },
   },
 ];

src/views/vent/monitorManager/alarmMonitor/common/closeWall.vue

@@ -105,4 +105,4 @@
     color: #fff;
   }
   </style>
-  
+  

src/views/vent/monitorManager/alarmMonitor/common/internal-fire-bot1.vue

@@ -437,7 +437,6 @@ watch(() => props.internalFireBotData, (newV, oldV) => {
         font-family: 'douyuFont';
         font-size: 14px;
         color: #fff;
-
     }
 
     .card-btn {

src/views/vent/monitorManager/balancePressMonitor/components/balancePressHome1.vue

@@ -298,7 +298,6 @@
 <style lang="less" scoped>
   @import '/@/design/vent/modal.less';
   @import '../../comment/less/workFace.less';
-
   @ventSpace: zxm;
   .monitor-container {
     margin-top: 60px;