From 417f6788a334f982c14be28476c6d41e29032b72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=B2=E4=B9=88=E4=BA=86?= <zhongchunyang@rocan.com.cn>
Date: Mon, 29 Jan 2024 16:30:24 +0800
Subject: [PATCH] border-card

---
 src/components/table/header/index.vue     |  2 +-
 src/components/wangEditor/index.vue       |  2 +-
 src/styles/app.scss                       |  2 ++
 src/styles/element.scss                   |  4 ++++
 src/views/govern/alarm/Device.vue         |  2 +-
 src/views/govern/alarm/Steady.vue         |  2 +-
 src/views/govern/alarm/Transient.vue      |  2 +-
 src/views/govern/alarm/index.vue          |  2 +-
 src/views/govern/device/control/index.vue |  5 +++--
 src/views/govern/device/manage/index.vue  |  4 ++--
 src/views/govern/setting/app/index.vue    | 16 ++++++++--------
 11 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue
index c8e3774..9f57055 100644
--- a/src/components/table/header/index.vue
+++ b/src/components/table/header/index.vue
@@ -143,7 +143,7 @@ defineExpose({ onComSearch, areaRef })
     width: 100%;
     max-width: 100%;
     background-color: var(--ba-bg-color-overlay);
-    border: 1px solid var(--ba-border-color);
+    border: 1px solid var(--el-border-color);
     border-bottom: none;
     padding: 13px 15px;
     font-size: 14px;
diff --git a/src/components/wangEditor/index.vue b/src/components/wangEditor/index.vue
index b9eb053..fc9ca22 100644
--- a/src/components/wangEditor/index.vue
+++ b/src/components/wangEditor/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div style='border: 1px solid #e4e4e4;height: 100%'>
         <Toolbar
-            style='border-bottom: 1px solid #e4e4e4'
+            style='border-bottom: 1px solid #e4e4e4;border-top: 1px solid #e4e4e4'
             :editor='editorRef'
             :defaultConfig='toolbarConfig'
             mode='default'
diff --git a/src/styles/app.scss b/src/styles/app.scss
index 75d5652..b060e32 100644
--- a/src/styles/app.scss
+++ b/src/styles/app.scss
@@ -301,9 +301,11 @@ body,
 /* 自适应-e */
 
 .custom-table-header {
+    box-sizing: border-box;
     display: flex;
     padding: 13px 15px;
     align-items: center;
+    border: 1px solid var(--el-border-color);
 }
 
 
diff --git a/src/styles/element.scss b/src/styles/element.scss
index e6d37de..97ea20c 100644
--- a/src/styles/element.scss
+++ b/src/styles/element.scss
@@ -116,4 +116,8 @@
 
 .el-form--inline .el-form-item {
   margin-bottom: 10px;
+}
+
+.el-tabs--border-card>.el-tabs__content{
+  padding: 10px;
 }
\ No newline at end of file
diff --git a/src/views/govern/alarm/Device.vue b/src/views/govern/alarm/Device.vue
index 54760a1..288a732 100644
--- a/src/views/govern/alarm/Device.vue
+++ b/src/views/govern/alarm/Device.vue
@@ -104,7 +104,7 @@ onMounted(() => {
     tableStore.index()
 })
 setTimeout(() => {
-    tableStore.table.height = mainHeight(180).height as any
+    tableStore.table.height = mainHeight(200).height as any
 }, 0)
 const addMenu = () => {}
 </script>
diff --git a/src/views/govern/alarm/Steady.vue b/src/views/govern/alarm/Steady.vue
index f4d0430..a3941e2 100644
--- a/src/views/govern/alarm/Steady.vue
+++ b/src/views/govern/alarm/Steady.vue
@@ -103,7 +103,7 @@ onMounted(() => {
     tableStore.index()
 })
 setTimeout(() => {
-    tableStore.table.height = mainHeight(180).height as any
+    tableStore.table.height = mainHeight(200).height as any
 }, 0)
 const addMenu = () => {}
 </script>
diff --git a/src/views/govern/alarm/Transient.vue b/src/views/govern/alarm/Transient.vue
index ff92ea8..cfbe361 100644
--- a/src/views/govern/alarm/Transient.vue
+++ b/src/views/govern/alarm/Transient.vue
@@ -241,7 +241,7 @@ onMounted(() => {
 })
 const bxecharts = mainHeight(155).height as any
 setTimeout(() => {
-    tableStore.table.height = mainHeight(180).height as any
+    tableStore.table.height = mainHeight(200).height as any
 }, 0)
 
 const addMenu = () => {}
diff --git a/src/views/govern/alarm/index.vue b/src/views/govern/alarm/index.vue
index d9e4ad2..e4ee76c 100644
--- a/src/views/govern/alarm/index.vue
+++ b/src/views/govern/alarm/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="default-main">
-        <el-tabs v-model="activeName" type="card" class="demo-tabs">
+        <el-tabs v-model="activeName" type="border-card" class="demo-tabs">
             <el-tab-pane label="设备告警" name="1">
                 <Device v-if="activeName == '1'" :deviceTree="deviceTree" />
             </el-tab-pane>
diff --git a/src/views/govern/device/control/index.vue b/src/views/govern/device/control/index.vue
index 4e9c3b0..5d10c73 100644
--- a/src/views/govern/device/control/index.vue
+++ b/src/views/govern/device/control/index.vue
@@ -23,7 +23,7 @@
                     {{ deviceData.time }}
                 </el-descriptions-item>
             </el-descriptions>
-            <el-tabs v-model="dataSet" type="card" class="device-control-box-card" @tab-click="handleClick">
+            <el-tabs v-model="dataSet" type="border-card" class="device-control-box-card" @tab-click="handleClick">
                 <el-tab-pane
                     lazy
                     :label="item.name"
@@ -128,6 +128,7 @@
                     layout="total, sizes, prev, pager, next, jumper"
                     :total="formInline.total"
                 ></el-pagination>
+                <div v-else style="height: 42px;"></div>
             </el-tabs>
         </div>
         <el-empty v-else description="请选择设备" class="device-control-right" />
@@ -160,7 +161,7 @@ const dataSet = ref('')
 const devTypeOptions = ref([])
 const devModelOptions = ref([])
 const tableData = ref<any[]>([])
-const tableHeight = mainHeight(310).height
+const tableHeight = mainHeight(330).height
 const mangePopup = ref()
 const datePickerRef = ref()
 const formInline = reactive({
diff --git a/src/views/govern/device/manage/index.vue b/src/views/govern/device/manage/index.vue
index 02ee5d2..d8eaccf 100644
--- a/src/views/govern/device/manage/index.vue
+++ b/src/views/govern/device/manage/index.vue
@@ -34,7 +34,7 @@
                     {{ deviceData.time }}
                 </el-descriptions-item>
             </el-descriptions>
-            <el-tabs v-model="dataSet" type="card" class="device-manage-box-card" @tab-click="handleClick">
+            <el-tabs v-model="dataSet" type="border-card" class="device-manage-box-card" @tab-click="handleClick">
                 <el-tab-pane
                     lazy
                     :label="item.name"
@@ -83,7 +83,7 @@ const dataSet = ref('')
 const devTypeOptions = ref([])
 const devModelOptions = ref([])
 const tableData = ref([])
-const tableHeight = mainHeight(215).height
+const tableHeight = mainHeight(235).height
 const mangePopup = ref()
 const nodeClick = (e: anyObj) => {
     if (!e) {
diff --git a/src/views/govern/setting/app/index.vue b/src/views/govern/setting/app/index.vue
index 706f48e..9750e8c 100644
--- a/src/views/govern/setting/app/index.vue
+++ b/src/views/govern/setting/app/index.vue
@@ -1,18 +1,18 @@
 <template>
     <div class='default-main'>
-        <el-tabs v-model='activeName' type='card' @tab-click='init'>
+        <el-tabs v-model='activeName' type='border-card' @tab-click='init'>
             <el-tab-pane label='用户协议' name='User_Agreement'></el-tab-pane>
             <el-tab-pane label='个人信息保护政策' name='Personal_Infor_Protect'></el-tab-pane>
             <el-tab-pane label='系统介绍' name='introduction'></el-tab-pane>
             <el-tab-pane label='使用手册' name='User_Manual'></el-tab-pane>
             <el-tab-pane label='公司介绍' name='Company_Profile'></el-tab-pane>
-        </el-tabs>
-        <div class='agreement' :style='{height:height}'>
-            <div style='margin-top: 5px; right: 10px; position: absolute; z-index: 9999999'>
-                <el-button type='primary' @click='submit' icon='el-icon-Checked'>保存</el-button>
+            <div class='agreement' :style='{height:height}'>
+                <div style='margin-top: 5px; right: 10px; position: absolute; z-index: 9999999'>
+                    <el-button type='primary' @click='submit' icon='el-icon-Checked'>保存</el-button>
+                </div>
+                <WangEditor v-model='html' style='border-top: none' />
             </div>
-            <WangEditor v-model='html' style='border-top: none' />
-        </div>
+        </el-tabs>
     </div>
 </template>
 
@@ -32,7 +32,7 @@ const dic = useDictData().getBasicData('appInformationType')
 const id = ref('')
 const activeName = ref('User_Agreement')
 const html = ref('')
-const height = mainHeight(60).height
+const height = mainHeight(80).height
 const submit = () => {
     addAppInfo({
         type: id.value,