From e4af99a23d2f1e55ed24f871da23c3ec929f01e2 Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Thu, 8 Aug 2024 15:52:34 +0800
Subject: [PATCH] 1

---
 src/components/CompanyForm/index.vue    |  8 +-------
 src/components/InfoEditRecord/index.vue |  8 +-------
 src/components/InfoForm/index.vue       |  8 +-------
 src/components/PasswordForm/index.vue   |  8 +-------
 src/components/RegisterForm/index.vue   |  8 +-------
 src/views/baseSpecialAction/Form.vue    |  5 -----
 src/views/baseSystemInfo/DetailForm.vue |  2 +-
 src/views/overView/msgForm.vue          | 15 ++++-----------
 8 files changed, 10 insertions(+), 52 deletions(-)

diff --git a/src/components/CompanyForm/index.vue b/src/components/CompanyForm/index.vue
index 3210517..165eb39 100644
--- a/src/components/CompanyForm/index.vue
+++ b/src/components/CompanyForm/index.vue
@@ -14,7 +14,7 @@
       width="60%"
       top="15vh"
       :modal-append-to-body="false"
-      class="company-dialog"
+      class="NCC-dialog company-dialog"
     >
       <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right"
 				 :rules="rules" v-lodding="loading">
@@ -149,10 +149,4 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.company-dialog {
-  :deep(.el-dialog__body) {
-    max-height: 50vh;
-    overflow-y: scroll;
-  }
-}
 </style>
\ No newline at end of file
diff --git a/src/components/InfoEditRecord/index.vue b/src/components/InfoEditRecord/index.vue
index c3758d3..83265e9 100644
--- a/src/components/InfoEditRecord/index.vue
+++ b/src/components/InfoEditRecord/index.vue
@@ -12,7 +12,7 @@
       width="80%"
       top="10vh"
       :modal-append-to-body="false"
-      class="dialog-box"
+      class="NCC-dialog dialog-box"
       destroy-on-close
     >
       <el-row :gutter="20">
@@ -367,12 +367,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.dialog-box {
-  :deep(.el-dialog__body) {
-    height: 60vh;
-    overflow-y: scroll;
-  }
-}
 .company-info {
   display: flex;
   flex-direction: row;
diff --git a/src/components/InfoForm/index.vue b/src/components/InfoForm/index.vue
index e62b650..307cbab 100644
--- a/src/components/InfoForm/index.vue
+++ b/src/components/InfoForm/index.vue
@@ -12,7 +12,7 @@
       width="80%"
       top="10vh"
       :modal-append-to-body="false"
-      class="dialog-box"
+      class="NCC-dialog dialog-box"
       destroy-on-close
     >
       <el-form
@@ -475,12 +475,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.dialog-box {
-  :deep(.el-dialog__body) {
-    max-height: 60vh;
-    overflow-y: scroll;
-  }
-}
 .company-info {
   display: flex;
   flex-direction: row;
diff --git a/src/components/PasswordForm/index.vue b/src/components/PasswordForm/index.vue
index 0128ce2..ee4f9a2 100644
--- a/src/components/PasswordForm/index.vue
+++ b/src/components/PasswordForm/index.vue
@@ -11,7 +11,7 @@
       append-to-body
       width="600px"
       :modal-append-to-body="false"
-      class="dialog-box"
+      class="NCC-dialog dialog-box"
       destroy-on-close
     >
       <el-form ref="form" :model="user" :rules="rules" label-width="80px">
@@ -133,10 +133,4 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.dialog-box {
-  :deep(.el-dialog__body) {
-    max-height: 60vh;
-    overflow-y: scroll;
-  }
-}
 </style>
diff --git a/src/components/RegisterForm/index.vue b/src/components/RegisterForm/index.vue
index b94906a..7ef1518 100644
--- a/src/components/RegisterForm/index.vue
+++ b/src/components/RegisterForm/index.vue
@@ -11,7 +11,7 @@
       append-to-body
       width="600px"
       :modal-append-to-body="false"
-      class="dialog-box"
+      class="NCC-dialog dialog-box"
       destroy-on-close
     >
       <el-form
@@ -161,10 +161,4 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.dialog-box {
-  :deep(.el-dialog__body) {
-    max-height: 60vh;
-    overflow-y: scroll;
-  }
-}
 </style>
diff --git a/src/views/baseSpecialAction/Form.vue b/src/views/baseSpecialAction/Form.vue
index 638dfa2..182474d 100644
--- a/src/views/baseSpecialAction/Form.vue
+++ b/src/views/baseSpecialAction/Form.vue
@@ -328,9 +328,4 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.el-dialog__wrapper.zxDialog {
-  :deep(.el-dialog__body) {
-    max-height: unset;
-  }
-}
 </style>
diff --git a/src/views/baseSystemInfo/DetailForm.vue b/src/views/baseSystemInfo/DetailForm.vue
index 9420b1b..7f7d018 100644
--- a/src/views/baseSystemInfo/DetailForm.vue
+++ b/src/views/baseSystemInfo/DetailForm.vue
@@ -360,7 +360,7 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.systemInfoDialog {
+.NCC-dialog.systemInfoDialog {
   :deep(.el-dialog__body) {
     overflow: unset !important;
     :deep(.el-tabs__content) {
diff --git a/src/views/overView/msgForm.vue b/src/views/overView/msgForm.vue
index 6826936..e0662ef 100644
--- a/src/views/overView/msgForm.vue
+++ b/src/views/overView/msgForm.vue
@@ -7,7 +7,7 @@
     lock-scroll
     width="50%"
   >
-    <el-row :gutter="15" style="padding-top: 10px" v-if="!isDetail">
+    <div style="padding-top: 10px" v-if="!isDetail">
       <el-form
         ref="elForm"
         :model="dataForm"
@@ -79,9 +79,8 @@
           </el-form-item>
         </el-col>
       </el-form>
-    </el-row>
-    <el-row
-      :gutter="15"
+    </div>
+    <div
       style="padding-top: 10px"
       class="msg-box"
       v-loading="loading"
@@ -90,7 +89,7 @@
       <div class="msg-title">{{ dataForm.title }}</div>
       <div class="content" v-html="dataForm.bodyContent"></div>
       <div class="files"></div>
-    </el-row>
+    </div>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取 消</el-button>
       <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"
@@ -225,12 +224,6 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.msg-dialog {
-  :deep(.el-dialog__body) {
-    max-height: 50vh;
-    overflow-y: scroll;
-  }
-}
 .msg-box {
   .msg-title {
     text-align: center;
--
libgit2 0.21.4