From 4cc93b80d747e5f9189499157a1150fefa258ab5 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 10 Mar 2022 17:23:52 +0800
Subject: [PATCH] dd

---
 src/views/components/CTable.vue               |  35 +++-
 .../modules/communityService/sqzzz/index.vue  |   2 +
 .../modules/workPc/guidance/categoryList.vue  |  13 +-
 .../modules/workPc/guidance/guidanceList.vue  | 171 ++++++++++--------
 4 files changed, 138 insertions(+), 83 deletions(-)

diff --git a/src/views/components/CTable.vue b/src/views/components/CTable.vue
index 2de9e79f..86449a94 100644
--- a/src/views/components/CTable.vue
+++ b/src/views/components/CTable.vue
@@ -4,7 +4,6 @@
               ref="table"
               class="tableLimit"
               :height="table.height"
-              :header-cell-style="{color:'#000'}"
               :data="tableData"
               :style="{width: '100%'}"
               border
@@ -18,7 +17,7 @@
               @row-click="handleRowClick">
       <!--设置index索引-->
       <div v-if="columnType==='index'">
-        <el-table-column :type="columnType"></el-table-column>
+        <el-table-column label="序号" :type="columnType" width="50"></el-table-column>
       </div>
       <!--设置checkbox-->
       <div v-if="columnType==='selection'">
@@ -87,7 +86,7 @@
                        fixed="right"
                        :min-width="operationWidth"
                        header-align="center"
-                       align="buttonAlign"
+                       :align="buttonAlign"
                        class="operate">
         <template slot-scope="scope">
           <!--传入的操作按钮属性    lyx   20190411   -->
@@ -103,12 +102,12 @@
       </el-table-column>
     </el-table>
     <!--分页-->
-    <el-row class="page "
+    <!-- <el-row class="page "
             v-if="pageVisible">
       <el-col :span="8"
               style="text-align: leftline-height: 32px">
         <slot style="text-align: left"></slot>
-        <span></span>
+        <div></div>
       </el-col>
       <el-col :span="16">
         <el-pagination @size-change="handleSizeChange"
@@ -121,7 +120,23 @@
                        layout="jumper, prev, pager, next,sizes, total"
                        :total="total"></el-pagination>
       </el-col>
-    </el-row>
+    </el-row> -->
+    <div v-if="pageVisible" class="pagination-diy">
+      <div class="pagination-left">
+        <slot></slot>
+      </div>
+      <div class="pagination-left">
+        <el-pagination @size-change="handleSizeChange"
+                       @current-change="handleCurrentChange"
+                       @prev-click="handlePrevClick"
+                       @next-click="handleNextClick"
+                       :current-page="pageNo"
+                       :page-sizes="tablePageSizes"
+                       :page-size="pageSize"
+                       layout="jumper, prev, pager, next,sizes, total"
+                       :total="total"></el-pagination>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -211,7 +226,7 @@ export default {
     //操作列对齐模式
     buttonAlign: {
       type: String,
-      default: ""
+      default: "center"
     }
 
   },
@@ -421,4 +436,10 @@ export default {
 .el-table .cell {
   white-space: pre-line; /*保留换行符*/
 }
+.pagination-diy {
+  width: 100%;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
 </style>
diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue
index ec857ce7..e461ecb0 100644
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@@ -448,6 +448,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+
 .resi-container .resi-card-table {
   ::v-deep .el-table th {
     color: #fff;
diff --git a/src/views/modules/workPc/guidance/categoryList.vue b/src/views/modules/workPc/guidance/categoryList.vue
index c03cd029..330567e4 100644
--- a/src/views/modules/workPc/guidance/categoryList.vue
+++ b/src/views/modules/workPc/guidance/categoryList.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="role-container">
-    <el-card class="flex1">
+  <div class="role-container resi-container">
+    <el-card class="flex1 resi-card-table">
 
       <div v-if="isManager" class="resi-row-btn">
         上下拖动可改变角色顺序
@@ -20,7 +20,7 @@
                 :height="tableHeight"
                 class="resi-table"
                 style="width: 100%;margin-top:20px">
-        <el-table-column type="index"
+        <el-table-column label="序号" type="index"
                          header-align="left"
                          align="left"
                          width="50"></el-table-column>
@@ -373,6 +373,13 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+.resi-container .resi-card-table {
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
+  }
+}
 .resi-table {
   ::v-deep .el-button--text {
     text-decoration: underline;
diff --git a/src/views/modules/workPc/guidance/guidanceList.vue b/src/views/modules/workPc/guidance/guidanceList.vue
index 8295b1ce..e13a6fe6 100644
--- a/src/views/modules/workPc/guidance/guidanceList.vue
+++ b/src/views/modules/workPc/guidance/guidanceList.vue
@@ -1,79 +1,87 @@
 <template>
-  <div class="registerList">
-    <el-card shadow="never"
-             class="aui-card--fill">
-      <div v-show="!formShow"
-           class="mod-demo__demo}">
+  <div class="registerList resi-container">
+    <div v-show="!formShow">
+      <el-card  ref="searchCard" class="search-card">
         <el-form :inline="true"
-                 :model="tableParams"
-                 @keyup.enter.native="loadData()">
-          <div>
-            <el-form-item label="所属组织"
-                          :label-width="labelWidth">
-              <el-cascader v-model="agencyIdArray"
-                           style="width:480px"
-                           :key="iscascaderShow"
-                           :options="options"
-                           :props="optionProps"
-                           clearable></el-cascader>
-            </el-form-item>
-          </div>
-
-          <div>
-            <el-form-item label="问题分类"
-                          :label-width="labelWidth">
-              <el-select v-model="tableParams.categoryCode"
-                         placeholder="问题分类"
-                         clearable>
-                <el-option v-for="item in categoryList"
-                           :key="item.categoryCode"
-                           :label="item.categoryName"
-                           :value="item.categoryCode">
-                </el-option>
-              </el-select>
-            </el-form-item>
-            <el-form-item label="标题"
-                          :label-width="labelWidth">
-              <el-input v-model="tableParams.guideTitle"
-                        placeholder="标题"
-                        clearable>
-
-              </el-input>
-            </el-form-item>
-
-            <el-form-item style="margin-left:10px">
-              <el-button @click="loadData()"
-                         type="primary">查询</el-button>
-            </el-form-item>
-            <el-form-item v-if="isStaff"
-                          style="margin-left:10px">
-              <el-button @click="add()"
-                         type="primary">新增</el-button>
-            </el-form-item>
-          </div>
-        </el-form>
-
-        <c-table column-type="index"
-                 ref="table"
-                 :url="tableUrl"
-                 :params="tableParams"
-                 :operationWidth="80"
-                 keyword="guidanceList"
-                 :operations="operations"
-                 :tableHeight="tableHeight"
-                 @detail="detail"
-                 @edit="edit"
-                 @confirmDel="confirmDel">
-        </c-table>
-      </div>
-
-      <div v-show="formShow">
-        <detail-form ref="ref_edit_form"
+                  :model="tableParams"
+                  @keyup.enter.native="loadData()">
+            <div>
+              <el-form-item label="所属组织"
+                            :label-width="labelWidth">
+                <el-cascader v-model="agencyIdArray"
+                            style="width:480px"
+                            :key="iscascaderShow"
+                            :options="options"
+                            :props="optionProps"
+                            clearable></el-cascader>
+              </el-form-item>
+            </div>
+
+            <div>
+              <el-form-item label="问题分类"
+                            :label-width="labelWidth">
+                <el-select v-model="tableParams.categoryCode"
+                          placeholder="问题分类"
+                          clearable>
+                  <el-option v-for="item in categoryList"
+                            :key="item.categoryCode"
+                            :label="item.categoryName"
+                            :value="item.categoryCode">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="标题"
+                            :label-width="labelWidth">
+                <el-input v-model="tableParams.guideTitle"
+                          placeholder="标题"
+                          clearable>
+
+                </el-input>
+              </el-form-item>
+
+              <el-form-item style="margin-left:10px">
+                <el-button @click="loadData()"
+                          type="primary">查询</el-button>
+              </el-form-item>
+              <!-- <el-form-item v-if="isStaff"
+                            style="margin-left:10px">
+                <el-button @click="add()"
+                          type="primary">新增</el-button>
+              </el-form-item> -->
+            </div>
+          </el-form>
+      </el-card>
+      <el-card shadow="never">
+        <div v-if="isStaff" class="resi-row-btn">
+          <el-button type="success" @click="add">新增</el-button>
+        </div>
+         <c-table column-type="index"
+                  class="resi-card-table"
+                  ref="table"
+                  :url="tableUrl"
+                  :params="tableParams"
+                  :operationWidth="80"
+                  keyword="guidanceList"
+                  :operations="operations"
+                  columnAlign="center"
+                  :tableHeight="tableHeight"
+                  @detail="detail"
+                  @edit="edit"
+                  @confirmDel="confirmDel">
+          </c-table>
+
+        <!-- <div v-show="formShow">
+          <detail-form ref="ref_edit_form"
+                      @cancleBack="cancleBack"
+                      @refresh="loadData"></detail-form>
+        </div> -->
+      </el-card>
+    </div>
+    <el-card v-show="formShow">
+      <detail-form ref="ref_edit_form"
                      @cancleBack="cancleBack"
                      @refresh="loadData"></detail-form>
-      </div>
     </el-card>
-
   </div>
 </template>
 
@@ -183,7 +191,7 @@ export default {
   },
   computed: {
     tableHeight () {
-      return this.clientHeight - 60 - 80 - 80 - 100
+      return this.clientHeight - 420
     },
 
     ...mapGetters(['clientHeight', 'env'])
@@ -323,7 +331,7 @@ export default {
   }
 }
 </script>
-<style lang="css" scoped>
+<style lang="scss" scoped>
 .myNote {
   display: -webkit-box;
   text-overflow: ellipsis;
@@ -331,6 +339,23 @@ export default {
   -webkit-line-clamp: 3;
   -webkit-box-orient: vertical;
 }
+.resi-container .resi-card-table {
+  ::v-deep .el-table th {
+    color: #fff;
+    background-color: rgba(33, 149, 254, 1);
+    // border-right: 1px solid rgba(33, 149, 254, 1);
+  }
+}
+.resi-row-btn {
+  margin-bottom: 13px;
+  ::v-deep .el-button {
+    // margin-left: 10px;
+    border: 0;
+  }
+  .el-button--success {
+    background: rgba(34, 193, 195, 1);
+  }
+}
 /* .register .el-table .el-table__header-wrapper {
   position: absolute;
   top: 0;