From aa6b7a10028355a1ef75d48f1101b97b9f3aabe6 Mon Sep 17 00:00:00 2001
From: jiangyy <jiang478938504@126.com>
Date: Tue, 13 Dec 2022 08:26:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/management/edit-main.scss    |   2 +-
 .../scss/modules/management/list-main.scss    |  15 ++
 src/views/components/resiChangeTransfer.vue   |   2 +-
 .../modules/base/community/buildForm.vue      |   2 +-
 .../modules/base/community/communityForm.vue  |   2 +-
 src/views/modules/base/community/roomForm.vue |   2 +-
 .../modules/base/huji/chusheng/cpts/edit.vue  |   2 +-
 .../modules/base/huji/immigration/edit.vue    |   2 +-
 .../modules/plugins/change/resideath.vue      |   1 -
 src/views/modules/workSys/dataOpenConfig.vue  | 146 ++++++++----------
 10 files changed, 83 insertions(+), 93 deletions(-)

diff --git a/src/assets/scss/modules/management/edit-main.scss b/src/assets/scss/modules/management/edit-main.scss
index f181050a6..1e11def0d 100644
--- a/src/assets/scss/modules/management/edit-main.scss
+++ b/src/assets/scss/modules/management/edit-main.scss
@@ -41,7 +41,7 @@
 }
 
 
-.div_btn {
+.div_edit_btn {
   display: flex;
   margin-top: 20px;
   margin-right:16px;
diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss
index 747ec9b0b..c51798644 100644
--- a/src/assets/scss/modules/management/list-main.scss
+++ b/src/assets/scss/modules/management/list-main.scss
@@ -5,6 +5,7 @@
   .marginl-20{
     margin-left: 16px;
   }
+ 
 
   .div_search {
     padding: 10px;
@@ -13,6 +14,8 @@
     box-shadow: 0px 6px 16px 0px rgba(0,0,0,0.08), 0px 3px 6px -4px rgba(0,0,0,0.12);
     margin:7px 7px;
 
+    overflow:hidden;
+
     /deep/ .el-form-item{
       margin-bottom:14px;
     }
@@ -68,6 +71,18 @@
     position: relative;
     padding:24px 16px 10px;
 
+    // /deep/ .el-table th>.cell{
+    //   margin-left:24px;
+    // }
+
+    // /deep/ .el-table .cell, .el-table--border td:first-child .cell, .el-table--border th:first-child .cell{
+    //   margin-left:24px;
+    // }
+
+    /deep/ .el-table th, .el-table tr{
+      height:54px;
+    }
+
     .div_btn {
       display: flex;
       // margin-top: 10px;
diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue
index fbecaf644..655050a24 100644
--- a/src/views/components/resiChangeTransfer.vue
+++ b/src/views/components/resiChangeTransfer.vue
@@ -146,7 +146,7 @@
       </el-form>
 
     </div>
-    <div class="div_btn">
+    <div class="div_edit_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
       <el-button type="primary"
diff --git a/src/views/modules/base/community/buildForm.vue b/src/views/modules/base/community/buildForm.vue
index c3dd653d5..b226dda75 100644
--- a/src/views/modules/base/community/buildForm.vue
+++ b/src/views/modules/base/community/buildForm.vue
@@ -146,7 +146,7 @@
       </el-form>
 
     </div>
-    <div class="div_btn">
+    <div class="div_edit_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
       <el-button size="small"
diff --git a/src/views/modules/base/community/communityForm.vue b/src/views/modules/base/community/communityForm.vue
index 816936a39..b3f7759df 100644
--- a/src/views/modules/base/community/communityForm.vue
+++ b/src/views/modules/base/community/communityForm.vue
@@ -177,7 +177,7 @@
         </el-form>
       </div>
     </div>
-    <div class="div_btn">
+    <div class="div_edit_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
       <el-button size="small"
diff --git a/src/views/modules/base/community/roomForm.vue b/src/views/modules/base/community/roomForm.vue
index 9e3b8470e..58e131037 100644
--- a/src/views/modules/base/community/roomForm.vue
+++ b/src/views/modules/base/community/roomForm.vue
@@ -177,7 +177,7 @@
       </el-form>
 
     </div>
-    <div class="div_btn">
+    <div class="div_edit_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
       <el-button size="small"
diff --git a/src/views/modules/base/huji/chusheng/cpts/edit.vue b/src/views/modules/base/huji/chusheng/cpts/edit.vue
index d2af60fd8..1e2692a0e 100644
--- a/src/views/modules/base/huji/chusheng/cpts/edit.vue
+++ b/src/views/modules/base/huji/chusheng/cpts/edit.vue
@@ -262,7 +262,7 @@
       </el-form>
     </div>
 
-    <div class="div_btn">
+    <div class="div_edit_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
       <el-button type="primary"
diff --git a/src/views/modules/base/huji/immigration/edit.vue b/src/views/modules/base/huji/immigration/edit.vue
index 815168082..aac6b060c 100644
--- a/src/views/modules/base/huji/immigration/edit.vue
+++ b/src/views/modules/base/huji/immigration/edit.vue
@@ -252,7 +252,7 @@
         </el-form-item>
       </el-form>
     </div>
-    <div class="div_btn">
+    <div class="div_edit_btn">
       <el-button size="small"
                  @click="handleCancle">取 消</el-button>
       <el-button type="primary"
diff --git a/src/views/modules/plugins/change/resideath.vue b/src/views/modules/plugins/change/resideath.vue
index 5c33bbafc..575ea6c1a 100644
--- a/src/views/modules/plugins/change/resideath.vue
+++ b/src/views/modules/plugins/change/resideath.vue
@@ -307,7 +307,6 @@
           <el-button type="primary"
                      size="small"
                      class="diy-button--blue"
-                     :disabled="btnDisable"
                      @click="confirmJoinDeathlist">保 存</el-button>
         </div>
 
diff --git a/src/views/modules/workSys/dataOpenConfig.vue b/src/views/modules/workSys/dataOpenConfig.vue
index 54bcfba5a..a5e979db5 100644
--- a/src/views/modules/workSys/dataOpenConfig.vue
+++ b/src/views/modules/workSys/dataOpenConfig.vue
@@ -1,66 +1,65 @@
 <template>
-  <div class="resi-container">
-    <el-card class="resi-card-table">
-      <div class="mod-sys__menu">
-        <el-table class="table"
-                  ref="ref_table"
-                  :data="dataList"
-                  border
-                  :height="tableHeight"
-                  v-loading="dataListLoading"
-                  :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
-                  style="width: 100%">
-          <el-table-column label="序号"
-                           header-align="center"
-                           align="center"
-                           type="index"
-                           width="50"></el-table-column>
-
-          <el-table-column prop="deptName"
-                           header-align="center"
-                           align="center"
-                           label="部门"
-                           min-width="100">
-          </el-table-column>
-          <el-table-column prop="dataName"
-                           header-align="center"
-                           align="center"
-                           label="数据名称"
-                           min-width="110">
-          </el-table-column>
-
-          <el-table-column label="操作"
-                           fixed="right"
-                           header-align="center"
-                           align="center"
-                           width="350">
-            <template slot-scope="scope">
-              <el-switch v-model="scope.row.stateShow"
-                         @change="disableCategory(scope.row,scope.$index)">
-              </el-switch>
-
-              <el-button type="text"
-                         size="small"
-                         class="div-table-button--edit"
-                         style="margin-left:20px"
-                         @click="editShow(scope.row)">配置</el-button>
-
-            </template>
-          </el-table-column>
-        </el-table>
-        <div>
-          <el-pagination @size-change="handleSizeChange"
-                         @current-change="handleCurrentChange"
-                         :current-page.sync="pageNo"
-                         :page-sizes="[20, 50, 100, 200]"
-                         :page-size="pageSize"
-                         layout="sizes, prev, pager, next, total"
-                         :total="total">
-          </el-pagination>
-        </div>
-
+  <div class="div_main">
+    <div class="div_table">
+
+      <el-table ref="ref_table"
+                :data="dataList"
+                border
+                :height="tableHeight"
+                class="div_table_item"
+                v-loading="dataListLoading"
+                style="width: 100%">
+        <el-table-column label="序号"
+                         header-align="center"
+                         align="center"
+                         type="index"
+                         width="100"></el-table-column>
+
+        <el-table-column prop="deptName"
+                         header-align="center"
+                         align="center"
+                         label="部门"
+                         min-width="100">
+        </el-table-column>
+        <el-table-column prop="dataName"
+                         header-align="center"
+                         align="center"
+                         label="数据名称"
+                         min-width="110">
+        </el-table-column>
+
+        <el-table-column label="操作"
+                         fixed="right"
+                         header-align="center"
+                         align="center"
+                         width="350">
+          <template slot-scope="scope">
+            <el-switch style="margin-left:20px"
+                       v-model="scope.row.stateShow"
+                       @change="disableCategory(scope.row,scope.$index)">
+            </el-switch>
+
+            <el-button size="small"
+                       type="text"
+                       class="div-table-button--blue"
+                       style="margin-left:20px"
+                       @click="editShow(scope.row)">配置</el-button>
+
+          </template>
+        </el-table-column>
+      </el-table>
+      <div>
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       :current-page.sync="pageNo"
+                       :page-sizes="[20, 50, 100, 200]"
+                       :page-size="pageSize"
+                       layout="sizes, prev, pager, next, total"
+                       :total="total">
+        </el-pagination>
       </div>
-    </el-card>
+
+    </div>
 
     <!-- 修改弹出框 -->
     <el-dialog :visible.sync="formShow"
@@ -349,28 +348,5 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.div_form {
-  height: 300px;
-  padding-top: 50px;
-}
-.item_width_1 {
-  width: 500px;
-}
-.div-btn {
-  margin-top: 50px;
-  // margin-bottom:20px;
-  display: flex;
-  justify-content: center;
-
-  .item_btn {
-    font-size: 14px;
-    padding: 8px 16px;
-    cursor: pointer;
-    color: #fff;
-
-    border: 1px dashed #0c81fe;
-    border-radius: 6px;
-    background-color: #0c81fe;
-  }
-}
+@import "@/assets/scss/modules/management/list-main.scss";
 </style>