From 53e79f91d0500a9e4328c17f6e99e19e7dc79aa2 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 9 May 2023 17:33:55 +0800
Subject: [PATCH 1/5] bug#304/bug#303/#bug233/bug#297

---
 .../communityParty/regionalParty/units.vue    |   8 +-
 .../regionalParty/unitsForm.vue               |   7 +-
 .../communityService/commonDemand/index.vue   |   2 +-
 .../communityService/labelConfig/addForm.vue  |  13 +-
 .../communityService/labelConfig/index.vue    | 419 +++++++++---------
 .../communityService/measure/index.vue        |   2 +-
 6 files changed, 229 insertions(+), 222 deletions(-)

diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index 80c389de4..0e3edbad0 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -236,7 +236,7 @@
               type="text"
               size="small"
               @click="handleEdit(scope.row)"
-              >修改</el-button
+              >编辑</el-button
             >
 
             <el-popover
@@ -319,7 +319,7 @@
       </div>
     </div>
 
-    <!-- 修改弹出框 -->
+    <!-- 编辑弹出框 -->
     <el-dialog
       :visible.sync="formShow"
       :close-on-click-modal="false"
@@ -573,7 +573,7 @@ export default {
     },
 
     handleEdit(row) {
-      this.formTitle = "修改";
+      this.formTitle = "编辑";
       this.formShow = true;
       this.$nextTick(() => {
         this.$refs.ref_form.initForm("edit", row.id);
@@ -725,7 +725,7 @@ export default {
       };
       this.pageSize = 10;
       this.pageNo = 0;
-      // this.loadTable()
+      this.loadTable()
     },
 
     //导出表格
diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue
index a2c2e09fb..be5071364 100644
--- a/src/views/modules/communityParty/regionalParty/unitsForm.vue
+++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue
@@ -168,6 +168,7 @@
         size="small"
         v-if="formType != 'detail'"
         type="primary"
+        style="margin-right: 16px;"
         :disabled="btnDisable"
         @click="handleComfirm"
         >确 定</el-button
@@ -318,7 +319,6 @@ export default {
       // if (this.formType === 'edit') {
       //  this.formData.id = this.unitId
       // }
-
       const { data, code, msg } = await requestPost(url, this.formData);
 
       if (code === 0) {
@@ -501,6 +501,11 @@ export default {
   top: 5px;
   left: 5px;
 }
+.div_btn{
+    display: flex;
+    width: 100%;
+    justify-content: right;
+}
 </style>
 
 <style lang="scss" scoped >
diff --git a/src/views/modules/communityService/commonDemand/index.vue b/src/views/modules/communityService/commonDemand/index.vue
index e6509fadd..17171b3e1 100644
--- a/src/views/modules/communityService/commonDemand/index.vue
+++ b/src/views/modules/communityService/commonDemand/index.vue
@@ -270,7 +270,7 @@
                  :close-on-press-escape="false"
                  :title="addDiaTitle"
                  :modal-append-to-body="false"
-                 width="850px"
+                 width="720px"
                  top="5vh"
                  class="dialog-h"
                  @closed="showAdd = false">
diff --git a/src/views/modules/communityService/labelConfig/addForm.vue b/src/views/modules/communityService/labelConfig/addForm.vue
index 03263f97b..24d4694a3 100644
--- a/src/views/modules/communityService/labelConfig/addForm.vue
+++ b/src/views/modules/communityService/labelConfig/addForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="my_form">
     <el-form
       ref="label_form"
       :inline="true"
@@ -220,12 +220,12 @@
           <el-button
             type="danger"
             @click="handleClickDelete(scope.$index)"
-            v-if="scope.$index != tableData.length - 1"
+            v-if="scope.$index != tableData.length - 1||(tableData.length - 1>=1&&scope.$index !='0' )"
             size="small"
             :disabled="infoType"
             icon="el-icon-minus"
             circle
-          ></el-button>
+          > </el-button>
           <!-- <img
             src="@/assets/img/icon-add.png"
             @click="handleClickAddRow"
@@ -316,6 +316,7 @@ export default {
         await this.getFormEdit(row.tagId);
       }else if(type == 'edit'){
         await this.getFormEdit(row.tagId);
+        this.formData.tagName = row.tagName;
       }
       this.tagId = row.tagId;
       this.tagObj = row
@@ -326,7 +327,7 @@ export default {
           this.handleChangeFieldsName(this.tableData[i], [i], type);
         }, 300);
       }
-      this.formData.tagName = row.tagName;
+      
     },
     querySearchAsync(val, cb) {
       console.log(this.searchList);
@@ -712,7 +713,9 @@ export default {
 .div_btn {
   display: flex;
   justify-content: right;
-  margin-right: 16px;
   margin-top: 10px;
 }
+.my_form{
+  padding: 10px 50px 0;
+}
 </style>
\ No newline at end of file
diff --git a/src/views/modules/communityService/labelConfig/index.vue b/src/views/modules/communityService/labelConfig/index.vue
index 3ee86c8ac..9d3098635 100644
--- a/src/views/modules/communityService/labelConfig/index.vue
+++ b/src/views/modules/communityService/labelConfig/index.vue
@@ -1,235 +1,234 @@
 <template>
-    <div class="g-main">
-        <div class="m-search">
-            <el-form :inline="true"
-               :model="formData"
-               ref="ref_searchform"
-               :label-width="'120px'">
-        <el-form-item label="标签名称"
-                      prop="tagName">
-          <el-input v-model="formData.tagName"
-                    size="small"
-                    class="u-item-width-normal"
-                    clearable
-                    placeholder="请输入">
+  <div class="g-main">
+    <div class="m-search">
+      <el-form
+        :inline="true"
+        :model="formData"
+        ref="ref_searchform"
+        :label-width="'120px'"
+      >
+        <el-form-item label="标签名称" prop="tagName">
+          <el-input
+            v-model="formData.tagName"
+            size="small"
+            class="u-item-width-normal"
+            clearable
+            placeholder="请输入"
+          >
           </el-input>
-
         </el-form-item>
-          <el-row type="flex" >
-            <el-col :span="24" align="right">
-                <el-button style="margin-left:30px"
-                   size="small"
-                   type="primary "
-                   @click="handleSearchFrom">查询</el-button>
-            </el-col>
-          </el-row>
-        
-
+        <el-row type="flex">
+          <el-col :span="24" align="right">
+            <el-button
+              style="margin-left: 30px"
+              size="small"
+              type="primary "
+              @click="handleSearchFrom"
+              >查询</el-button
+            >
+          </el-col>
+        </el-row>
       </el-form>
-        </div>
-        <div class="m-table">
-            <div class="div_btn">
-                <el-button
-                    style="height:32px;"
-                    size="small"
-                    @click="handleAdd({},'add')"
-                    type="primary"
-                    icon="el-icon-plus"
-                >
-                    新增</el-button
+    </div>
+    <div class="m-table">
+      <div class="div_btn">
+        <el-button
+          style="height: 32px"
+          size="small"
+          @click="handleAdd({}, 'add')"
+          type="primary"
+          icon="el-icon-plus"
+        >
+          新增</el-button
+        >
+      </div>
+      <el-table
+        ref="config_table"
+        border
+        :data="tableData"
+        v-loading="tableLoading"
+        style="width: 100%"
+        :height="tableHeight"
+      >
+        <el-table-column
+          label="标签名称"
+          prop="tagName"
+          fixed="left"
+          align="center"
+          key="tagName"
+        />
+        <el-table-column fixed="right" label="操作" align="center" width="200">
+          <template slot-scope="scope">
+            <el-button
+              style="margin-right: 10px"
+              @click="handleAdd(scope.row, 'edit')"
+              size="small"
+              type="text"
+              >修改</el-button
+            >
+            <!--   按钮权限-->
+            <template>
+              <el-popconfirm
+                title="删除之后无法回复，确认删除？"
+                @onConfirm="handleDel(scope.row)"
+              >
+                <el-button size="small" type="text" slot="reference"
+                  >删除</el-button
                 >
-             </div> 
-             <el-table
-             ref="config_table"
-             border
-            :data="tableData"
-             v-loading="tableLoading"
-             style="width: 100%"
-             :height="tableHeight"
-             >  
-                 <el-table-column
-                    label="标签名称"
-                    prop="tagName"
-                    fixed="left"
-                    align="center"
-                    key="tagName"
-                />
-                <el-table-column fixed="right" label="操作" align="center" width="200">
-                    <template slot-scope="scope">
-                        <el-button
-                            style="margin-right: 10px"
-                            @click="handleAdd(scope.row,'edit')"
-                            size="small"
-                            type="text"
-                            >修改</el-button
-                        >
-                        <!--   按钮权限-->
-                        <template >
-                       
-                        <el-popconfirm
-                            title="删除之后无法回复，确认删除？"
-                            @onConfirm="handleDel(scope.row)"
-                        >
-                            <el-button
-                            size="small"
-                            type="text"
-                            slot="reference"
-                            >删除</el-button
-                            >
-                        </el-popconfirm>
-                        </template>
-                    </template>
-                 </el-table-column>
+              </el-popconfirm>
+            </template>
+          </template>
+        </el-table-column>
+      </el-table>
 
-             </el-table> 
-
-             <div class="div-flex">
-                <div class="m-page">
-                    <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>
+      <div class="div-flex">
+        <div class="m-page">
+          <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-dialog :visible.sync="formShow"
-               :close-on-click-modal="false"
-               :close-on-press-escape="false"
-               :title="formTitle"
-               destroy-on-close
-               width="900px"
-               top="5vh"
-               class="dialog-h"
-               @closed="diaClose"
-               
-               >
-             <add-form 
-                        v-if="formShow"
-                        ref="Config_form"
-                       :row-obj="rowObj"
-                      @dialogCancle="addFormCancle"
-                      @dialogOk="addFormOk"></add-form>
-    </el-dialog>
+      </div>
     </div>
+    <el-dialog
+      :visible.sync="formShow"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      :title="formTitle"
+      destroy-on-close
+      width="950px"
+      top="5vh"
+      class="dialog-h"
+      @closed="diaClose"
+    >
+      <add-form
+        v-if="formShow"
+        ref="Config_form"
+        :row-obj="rowObj"
+        @dialogCancle="addFormCancle"
+        @dialogOk="addFormOk"
+      ></add-form>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import { requestPost } from "@/js/dai/request";
 import { mapGetters } from "vuex";
-import addForm from "./addForm.vue"
+import addForm from "./addForm.vue";
 export default {
-    name:"labelConfig",
-    data(){
-        return{
-            formData:{
-                tagName:""
-            },
-            tableData:[],
-            pageNo:1,
-            pageSize:20,
-            tableLoading:true,
-            total:0,
-            searchH:115,
-            formShow:false,
-            formTitle:"",
-            rowObj:{}
-        }
-
+  name: "labelConfig",
+  data() {
+    return {
+      formData: {
+        tagName: "",
+      },
+      tableData: [],
+      pageNo: 1,
+      pageSize: 20,
+      tableLoading: true,
+      total: 0,
+      searchH: 115,
+      formShow: false,
+      formTitle: "",
+      rowObj: {},
+    };
+  },
+  created() {},
+  components: { addForm },
+  methods: {
+    async getlabelConfigList() {
+      const url = "/governance/resiSearchTag/listResiSearchTags";
+      let params = {
+        pageNo: this.pageNo,
+        pageSize: this.pageSize,
+        tagName: this.formData.tagName,
+      };
+      let { data, msg, code } = await requestPost(url, params);
+      this.tableLoading = false;
+      if (code == 0) {
+        this.tableData = data.list;
+        this.total = data.total;
+      } else {
+        this.$message.error(msg);
+      }
     },
-    created(){
+    addFormCancle() {
+      this.formShow = false;
     },
-    components:{addForm},
-    methods:{
-      async getlabelConfigList(){
-          const url = "/governance/resiSearchTag/listResiSearchTags"   
-          let params = {
-            pageNo:this.pageNo,
-            pageSize:this.pageSize,
-            tagName:this.formData.tagName
-          } 
-          let {data,msg,code} = await requestPost(url,params)
-          this.tableLoading = false
-          if(code == 0 ){
-            this.tableData = data.list
-            this.total = data.total
-          }else{
-            this.$message.error(msg)
-          }
-        },
-        addFormCancle () {
-            this.formShow = false
-        },
-        addFormOk () {
-            this.formShow = false
-            this.getlabelConfigList()
-        },
-        handleAdd (row,type) {
-            if(type=="add"){
-            this.formTitle = '新增标签'
-            this.formShow = true
-            this.$nextTick(() => {
-            this.$refs.Config_form.initForm(type, row)
-            })
-            }else {
-            this.formTitle = '修改标签'
-            this.formShow = true
-            console.log(row);
-            this.rowObj = row
-            this.$nextTick(() => {
-            this.$refs.Config_form.initForm(type, row)
-            })
-            }
-      },
-        handleSizeChange(val) {
-            console.log(`每页 ${val} 条`);
-            this.pageSize = val;
-            this.getlabelConfigList()
-        },
-        async handleDel(row){
-            const url = `/governance/resiSearchTag/deleteResiSearchTag/${row.tagId}`
-            let {code,msg} = await requestPost(url)
-            if(code == 0 ){
-                this.$message.success('删除成功')
-            }else {
-                this.$message.error(msg)
-                
-            }
-            this.getlabelConfigList()
-        },
-        handleSearchFrom(){
-            this.getlabelConfigList()
-        },
-        handleCurrentChange(val) {
-            this.pageNo = val;
-            this.getlabelConfigList();
-        },
-        diaClose () {
-            this.formShow = false
-        },  
+    addFormOk() {
+      this.formShow = false;
+      this.getlabelConfigList();
+    },
+    handleAdd(row, type) {
+      if (type == "add") {
+        this.formTitle = "新增标签";
+        this.formShow = true;
+        this.$nextTick(() => {
+          this.$refs.Config_form.initForm(type, row);
+        });
+      } else {
+        this.formTitle = "修改标签";
+        this.formShow = true;
+        console.log(row);
+        this.rowObj = row;
+        this.$nextTick(() => {
+          this.$refs.Config_form.initForm(type, row);
+        });
+      }
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.pageSize = val;
+      this.getlabelConfigList();
+    },
+    async handleDel(row) {
+      const url = `/governance/resiSearchTag/deleteResiSearchTag/${row.tagId}`;
+      let { code, msg } = await requestPost(url);
+      if (code == 0) {
+        this.$message.success("删除成功");
+      } else {
+        this.$message.error(msg);
+      }
+      this.getlabelConfigList();
     },
-    async mounted(){
-          this.getlabelConfigList()
+    handleSearchFrom() {
+      this.getlabelConfigList();
     },
-    computed:{
+    handleCurrentChange(val) {
+      this.pageNo = val;
+      this.getlabelConfigList();
+    },
+    diaClose() {
+      this.formShow = false;
+    },
+  },
+  async mounted() {
+    this.getlabelConfigList();
+  },
+  computed: {
     ...mapGetters(["clientHeight", "iframeHeight"]),
-        tableHeight() {
-            const h = this.clientHeight - this.searchH - 275 + this.iframeHeight;
-            const _h = this.clientHeight - 275 - this.searchH;
-            return this.$store.state.inIframe ? h : _h;
-        },
+    tableHeight() {
+      const h = this.clientHeight - this.searchH - 275 + this.iframeHeight;
+      const _h = this.clientHeight - 275 - this.searchH;
+      return this.$store.state.inIframe ? h : _h;
     },
-    watch:{}
-}
+  },
+  watch: {},
+};
 </script>
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/list-main.scss";
-.div_btn{
-    margin-bottom: 12px;
+.div_btn {
+  margin-bottom: 12px;
+}
+.dialog-h{
+    padding: 0 50px;
 }
 </style>
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index 38ed6a844..8a10518f6 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -283,7 +283,7 @@
                :close-on-press-escape="false"
                :title="addDiaTitle"
                :modal-append-to-body="false"
-               width="850px"
+               width="720px"
                top="5vh"
                class="dialog-h"
                @closed="showAdd = false">

From b858e3702693e918f40d1ea79931359ebd6b1bfc Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 9 May 2023 18:11:48 +0800
Subject: [PATCH 2/5] bug#300

---
 .../regionalParty/finishList.vue              | 39 ++++++++++++++++---
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/communityParty/regionalParty/finishList.vue b/src/views/modules/communityParty/regionalParty/finishList.vue
index 4ac9d1dfb..3224eb85b 100644
--- a/src/views/modules/communityParty/regionalParty/finishList.vue
+++ b/src/views/modules/communityParty/regionalParty/finishList.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="dialog-h-content scroll-h">
-    <div class="m-table">
+  <div class="dialog-h-content">
+    <div class="m-table  scroll-h">
       <el-button type="primary"
                  size="small"
                  @click="handleAdd">新增</el-button>
@@ -166,7 +166,18 @@
       <el-button @click="handleCancle">取 消</el-button>
   
     </div> -->
+    <el-pagination
+          @size-change="handleSizeChange"
+          @current-change="handleCurrentChange"
+          :current-page.sync="pageNo"
+          :page-sizes="[10, 20, 50]"
+          :page-size="pageSize"
+          layout="sizes, prev, pager, next, total"
+          :total="total"
+        >
+        </el-pagination>
   </div>
+ 
 </template>
 
 <script>
@@ -225,7 +236,9 @@ export default {
       ],
 
       tableData: [],
-
+      pageSize:20,
+      pageNo:1,
+      total:0
 
     }
   },
@@ -303,7 +316,9 @@ export default {
       const url = '/actual/base/icpartyunitcompletion/list'
       // const url = 'http://yapi.elinkservice.cn/mock/245/actual/base/icpartyunitcompletion/list'
       let params = {
-        unitId: this.unitId
+        unitId: this.unitId,
+        pageSize:this.pageSize,
+        pageNo:this.pageNo
       }
 
       const { data, code, msg } = await requestPost(url, params)
@@ -320,6 +335,8 @@ export default {
           });
 
           this.tableData = [...data.list]
+          this.total = data.total
+          console.log(this.total);
         } else {
           this.tableData = []
         }
@@ -358,7 +375,16 @@ export default {
       }
     },
 
-
+    
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.pageNo = 1;
+      this.loadTable();
+    },
+    handleCurrentChange(val) {
+      this.pageNo = val;
+      this.loadTable();
+    },
     async handleComfirm (row, tableIndex) {
       let valiMsg = this.validata(row)
       if (valiMsg) {
@@ -554,4 +580,7 @@ export default {
     width: 140px;
   }
 }
+.dialog-h-content{
+  max-height: calc(83vh - 30px) !important;
+}
 </style>

From 9e374cd502cea82faf30259158818beb3b86ecd5 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 11 May 2023 15:16:20 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=85=A8=E5=B1=80=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F=E5=8F=8A=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/scss/buttonstyle.scss              | 76 +++++++++----------
 .../scss/modules/management/list-main.scss    |  3 +
 .../base/huji/houseChange/houseChangeList.vue |  2 +-
 .../modules/communityParty/elegant/index.vue  | 44 +++++------
 .../communityParty/heart/heartAudit.vue       |  2 +-
 .../communityParty/heart/heartFinish.vue      |  2 +-
 .../communityParty/heart/heartList.vue        | 11 +--
 .../communityParty/heart/heartPerson.vue      |  2 +-
 .../modules/communityParty/members/index.vue  | 42 +++++-----
 .../modules/communityParty/members/points.vue | 14 ++--
 .../activivityList/activivityList.vue         | 16 ++--
 .../orgActivity/activivityList/addRule.vue    |  2 +-
 .../activivityList/scheduleList.vue           | 16 ++--
 .../activivityList/yearplanList.vue           |  2 +-
 .../regionalParty/activitys.vue               |  9 +--
 .../communityParty/regionalParty/units.vue    | 14 ++--
 .../modules/communityParty/stas/index.vue     | 15 ++--
 .../communityService/fuwujilu/fuwuList.vue    | 11 +--
 .../communityService/fuwujiluOld/fuwuList.vue |  2 +-
 .../communityService/fuwuxiangmu/index.vue    | 10 +--
 .../communityService/fuwuzuzhi/index.vue      | 11 ++-
 .../ninePlaces/inspect/inspect.vue            | 11 ++-
 .../ninePlaces/inspect/inspectReview.vue      |  2 +-
 .../ninePlaces/places/places.vue              | 12 +--
 .../communityService/ninePlaces/team/team.vue |  9 +--
 .../modules/communityService/shzz/index.vue   | 10 +--
 .../communityService/worklog/workLog.vue      | 13 ++--
 src/views/modules/cpts/base/index.vue         | 17 ++---
 src/views/modules/home/cpts/people-more.vue   |  6 +-
 .../icpartymemberpayrecorddetail.vue          | 29 ++-----
 .../partymember/icpartymemberpoint.vue        | 33 ++------
 .../modules/partymember/icpartyorgtree.vue    |  2 +-
 src/views/modules/partymember/lookMember.vue  |  2 +-
 .../modules/plugins/change/changedeath.vue    |  2 +-
 .../plugins/change/changerelocation.vue       |  2 +-
 .../point/icpointnucleicmonitoring.vue        |  2 +-
 .../point/icpointvaccinesinoculation.vue      |  2 +-
 .../power/kernelhouseholdAddMember.vue        |  2 +-
 .../plugins/power/kernelhouseholdForm.vue     |  2 +-
 .../plugins/power/kernelhouseholdTable.vue    |  2 +-
 src/views/modules/plugins/power/poweraxis.vue | 12 +--
 .../plugins/power/servicestationTable.vue     |  2 +-
 .../modules/plugins/rent/rentblacklist.vue    | 30 ++++----
 .../modules/plugins/rent/rentcontractinfo.vue | 30 ++++----
 .../plugins/rent/rentcontractreview.vue       | 30 ++++----
 src/views/modules/plugins/rent/renthouse.vue  | 37 ++++-----
 .../modules/plugins/rent/renttenantinfo.vue   | 30 ++++----
 .../stats/factagencyuserhousedaily.vue        | 32 ++++----
 .../plugins/union/customerrelation.vue        |  2 +-
 .../difficulty/difficultyList.vue             |  2 +-
 .../secretaryLog/humanisticCare/careList.vue  |  2 +-
 .../modules/secretaryLog/workLog/index.vue    |  2 +-
 src/views/modules/shequzhili/csgltc/csgl.vue  |  2 +-
 src/views/modules/shequzhili/ggfwtc/ggfw.vue  |  2 +-
 .../issue/cpts/evaluationDetail.vue           |  2 +-
 .../modules/shequzhili/statics/cEvent.vue     | 14 ++--
 .../modules/shequzhili/statics/gridEvent.vue  | 15 ++--
 .../modules/shequzhili/statics/index.vue      | 14 ++--
 .../serviceMatter/service.vue                 |  2 +-
 .../modules/workPc/guidance/categoryList.vue  | 62 ++++++---------
 .../modules/workPc/guidance/guidanceList.vue  | 28 ++-----
 src/views/modules/workSys/demandCate.vue      | 32 ++++----
 src/views/modules/workSys/elegantCate.vue     | 28 +++----
 src/views/modules/workSys/operAuth.vue        | 12 +--
 .../modules/workSys/pointAditive/rule.vue     | 44 +++++------
 src/views/modules/workSys/resiCate.vue        | 25 +++---
 src/views/modules/workSys/role/role.vue       | 14 ++--
 src/views/modules/workSys/workLog/list.vue    | 28 +++----
 src/views/modules/worklog/icworklog.vue       | 39 +++-------
 69 files changed, 468 insertions(+), 572 deletions(-)

diff --git a/src/assets/scss/buttonstyle.scss b/src/assets/scss/buttonstyle.scss
index 8235961ea..892933149 100644
--- a/src/assets/scss/buttonstyle.scss
+++ b/src/assets/scss/buttonstyle.scss
@@ -29,7 +29,7 @@
 //蓝色
 .diy-button--blue {
   background: #0056D6 !important;
-  border-radius: 2px !important;
+  border-radius: 3px !important;
   font-size: 14px !important;
   color: #fff !important;
   min-width: 60px !important;
@@ -202,18 +202,18 @@
 //新增
 .diy-button--add {
   color: #fff !important;
-  background-color: #22c1c3 !important;
-  border-color: #22c1c3 !important;
+  background-color: #0056d6 !important;
+  border-color: #0056d6 !important;
 }
 .diy-button--add:hover {
   color: #fff !important;
-  background-color: #22c1c3 !important;
-  border-color: #22c1c3 !important;
+  background-color: #0056d6 !important;
+  border-color: #0056d6 !important;
 }
 .diy-button--add:focus {
   color: #fff !important;
-  background-color: #22c1c3 !important;
-  border-color: #22c1c3 !important;
+  background-color: #0056d6 !important;
+  border-color: #0056d6 !important;
 }
 
 //删除、导入
@@ -263,43 +263,43 @@
 //table按钮样式
 
 //查看
-.div-table-button--detail {
-  color: #3e8ef7 !important;
-  text-decoration: underline !important;
-}
+// .div-table-button--detail {
+//   color: #3e8ef7 !important;
+//   text-decoration: underline !important;
+// }
 
-//修改
-.div-table-button--edit {
-  color: #00a7a9 !important;
-  text-decoration: underline !important;
-}
+// //修改
+// .div-table-button--edit {
+//   color: #00a7a9 !important;
+//   text-decoration: underline !important;
+// }
 
-//删除
-.div-table-button--delete {
-  color: #d51010 !important;
-  text-decoration: underline !important;
-}
+// //删除
+// .div-table-button--delete {
+//   color: #d51010 !important;
+//   text-decoration: underline !important;
+// }
 
-//查看
-.div-table-button--detail--noline {
-  color: #3e8ef7 !important;
-}
+// //查看
+// .div-table-button--detail--noline {
+//   color: #3e8ef7 !important;
+// }
 
-//更多
-.div-table-button--more {
-  color: #333333 !important;
-  text-decoration: underline !important;
-}
+// //更多
+// .div-table-button--more {
+//   color: #333333 !important;
+//   text-decoration: underline !important;
+// }
 
-//修改
-.div-table-button--edit--noline {
-  color: #00a7a9 !important;
-}
+// //修改
+// .div-table-button--edit--noline {
+//   color: #00a7a9 !important;
+// }
 
-//删除
-.div-table-button--delete--noline {
-  color: #d51010 !important;
-}
+// //删除
+// .div-table-button--delete--noline {
+//   color: #d51010 !important;
+// }
 
 //
 .div-table-button--qr {
diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss
index f0989da24..7929ce3ca 100644
--- a/src/assets/scss/modules/management/list-main.scss
+++ b/src/assets/scss/modules/management/list-main.scss
@@ -342,3 +342,6 @@
   overflow: hidden;
 }
 
+.div_btn{
+  display: flex;
+}
diff --git a/src/views/modules/base/huji/houseChange/houseChangeList.vue b/src/views/modules/base/huji/houseChange/houseChangeList.vue
index d7f61dfe7..98c4d825d 100644
--- a/src/views/modules/base/huji/houseChange/houseChangeList.vue
+++ b/src/views/modules/base/huji/houseChange/houseChangeList.vue
@@ -126,7 +126,7 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                
                 style="width: 100%">
 
         <el-table-column label="序号"
diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
index 2df87bda6..893adaa0c 100644
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@@ -57,12 +57,13 @@
                       clearable></el-input>
           </el-form-item>
           <el-form-item>
-            <el-button class="diy-button--search"
-                       size="small"
-                       @click="handleSearch">查询</el-button>
-            <el-button class="diy-button--reset"
+            <el-button class="diy-button--blue"
                        size="small"
                        @click="resetForm('searchForm')">重置</el-button>
+            <el-button class="diy-button--white"
+                       size="small"
+                       @click="handleSearch">查询</el-button>
+         
           </el-form-item>
         </el-form>
       </div>
@@ -70,10 +71,10 @@
     <el-card class="resi-card-table">
 
       <div class="resi-row-btn">
-        <el-button class="diy-button--add"
+        <el-button class="diy-button--blue"
                    size="small"
                    @click="handleAdd">新增</el-button>
-        <el-button class="diy-button--export"
+        <el-button class="diy-button--white"
                    size="small"
                    @click="handleExportModule('room')">下载模板</el-button>
         <el-upload :headers="$getElUploadHeaders()"
@@ -89,10 +90,10 @@
                    :before-upload="beforeExcelUpload"
                    :http-request="uploadHttpRequest">
           <el-button size="small"
-                     class="diy-button--delete"
+                     class="diy-button--blue"
                      :loading="importLoading">{{importBtnTitle}}</el-button>
         </el-upload>
-        <el-button class="diy-button--reset"
+        <el-button class="diy-button--white"
                    size="small"
                    :loading="exportBtn"
                    @click="handleExport">{{ exportBtnTitle }}</el-button>
@@ -132,7 +133,7 @@
             <el-button @click="handleEdit(scope.row, 'edit')"
                        type="text"
                        size="small"
-                       class="btn-color-edit">修改</el-button>
+                       class="btn-color-edit">编辑</el-button>
             <el-popconfirm title="删除之后无法恢复，确认删除？"
                            @onConfirm="handleDel(scope.row)">
               <el-button slot="reference"
@@ -878,23 +879,11 @@ export default {
 @import "@/assets/scss/buttonstyle.scss";
 
 .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;
-  }
-  ::v-deep .btn-color-del {
-    margin-left: 10px;
-    color: rgba(213, 16, 16, 1);
-  }
-  ::v-deep .btn-color-edit {
-    color: rgba(0, 167, 169, 1);
-  }
+  // ::v-deep .el-table th {
+  //   color: #fff;
+  //   background-color: rgba(33, 149, 254, 1);
+  //   // border-right: 1px solid rgba(33, 149, 254, 1);
+  // }
 }
 .form-wr {
   .input-width {
@@ -987,4 +976,7 @@ export default {
   margin-top: 20px;
   text-align: center;
 }
+.btn-color-del{
+  margin-left: 10px;
+}
 </style>
diff --git a/src/views/modules/communityParty/heart/heartAudit.vue b/src/views/modules/communityParty/heart/heartAudit.vue
index 11fa03ed8..94f1c8087 100644
--- a/src/views/modules/communityParty/heart/heartAudit.vue
+++ b/src/views/modules/communityParty/heart/heartAudit.vue
@@ -14,7 +14,7 @@
                 @selection-change="selectionChange"
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                
                 style="width: 100%">
         <el-table-column type="selection"
                          :selectable="checkSelect"
diff --git a/src/views/modules/communityParty/heart/heartFinish.vue b/src/views/modules/communityParty/heart/heartFinish.vue
index fbdda0819..2d5a68277 100644
--- a/src/views/modules/communityParty/heart/heartFinish.vue
+++ b/src/views/modules/communityParty/heart/heartFinish.vue
@@ -41,7 +41,7 @@
                     border
                     :height="tableHeight"
                     v-loading="tableLoading"
-                    :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}">
+                    >
             <el-table-column label="序号"
                              header-align="center"
                              align="center"
diff --git a/src/views/modules/communityParty/heart/heartList.vue b/src/views/modules/communityParty/heart/heartList.vue
index 2c6a3f96c..ab57d9464 100644
--- a/src/views/modules/communityParty/heart/heartList.vue
+++ b/src/views/modules/communityParty/heart/heartList.vue
@@ -57,12 +57,13 @@
 
         <el-button style="margin-left:30px"
                    size="small"
-                   class="diy-button--search"
-                   @click="handleSearch">查询</el-button>
+                   class="diy-button--white"
+                   @click="resetSearch">重置</el-button>
         <el-button style="margin-left:10px"
                    size="small"
-                   class="diy-button--reset"
-                   @click="resetSearch">重置</el-button>
+                   class="diy-button--add"
+                   @click="handleSearch">查询</el-button>
+       
 
       </el-form>
     </div>
@@ -76,7 +77,7 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                
                 style="width: 100%">
         <el-table-column label="序号"
                          header-align="center"
diff --git a/src/views/modules/communityParty/heart/heartPerson.vue b/src/views/modules/communityParty/heart/heartPerson.vue
index d90f1c7eb..01be4e6f8 100644
--- a/src/views/modules/communityParty/heart/heartPerson.vue
+++ b/src/views/modules/communityParty/heart/heartPerson.vue
@@ -7,7 +7,7 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                
                 style="width: 100%">
 
         <el-table-column label="序号"
diff --git a/src/views/modules/communityParty/members/index.vue b/src/views/modules/communityParty/members/index.vue
index 64bc3cbc4..286bde4c2 100644
--- a/src/views/modules/communityParty/members/index.vue
+++ b/src/views/modules/communityParty/members/index.vue
@@ -167,12 +167,13 @@
 
           </el-form-item>
           <el-form-item>
-            <el-button class="diy-button--search"
-                       size="small"
-                       @click="handleSearch">查询</el-button>
-            <el-button class="diy-button--reset"
+            <el-button class="diy-button--white"
                        size="small"
                        @click="resetForm('searchForm')">重置</el-button>
+            <el-button class="diy-button--blue"
+                       size="small"
+                       @click="handleSearch">查询</el-button>
+           
           </el-form-item>
         </el-form>
       </div>
@@ -183,7 +184,7 @@
         <el-button class="diy-button--add"
                    size="small"
                    @click="handleAdd">新增</el-button>
-        <el-button class="diy-button--export"
+        <el-button class="diy-button--white"
                    size="small"
                    @click="handleExportModule('room')">下载模板</el-button>
         <el-upload :headers="$getElUploadHeaders()"
@@ -199,10 +200,10 @@
                    :before-upload="beforeExcelUpload"
                    :http-request="uploadHttpRequest">
           <el-button size="small"
-                     class="diy-button--delete"
+                     class="diy-button--add"
                      :loading="importLoading">{{importBtnTitle}}</el-button>
         </el-upload>
-        <el-button class="diy-button--reset"
+        <el-button class="diy-button--white"
                    size="small"
                    :loading="exportBtn"
                    @click="handleExport">{{ exportBtnTitle }}</el-button>
@@ -215,7 +216,7 @@
                 border
                 :height="tableHeight"
                 style="width: 100%"
-                class="resi-table">
+                >
         <el-table-column label="序号"
                          type="index"
                          align="center"
@@ -900,23 +901,11 @@ export default {
 @import "@/assets/scss/buttonstyle.scss";
 
 .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;
-  }
-  ::v-deep .btn-color-del {
-    margin-left: 10px;
-    color: rgba(213, 16, 16, 1);
-  }
-  ::v-deep .btn-color-edit {
-    color: rgba(0, 167, 169, 1);
-  }
+  // ::v-deep .el-table th {
+  //   color: #fff;
+  //   background-color: rgba(33, 149, 254, 1);
+  //   // border-right: 1px solid rgba(33, 149, 254, 1);
+  // }
 }
 .form-wr {
   .input-width {
@@ -1009,4 +998,7 @@ export default {
   margin-top: 20px;
   text-align: center;
 }
+.btn-color-del{
+  margin-left: 10px;
+}
 </style>
diff --git a/src/views/modules/communityParty/members/points.vue b/src/views/modules/communityParty/members/points.vue
index 1091370b8..6e1a1c30d 100644
--- a/src/views/modules/communityParty/members/points.vue
+++ b/src/views/modules/communityParty/members/points.vue
@@ -48,8 +48,8 @@
           </el-form-item>
           
           <el-form-item>
-            <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
-            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
+            <el-button class="diy-button--white" size="small" @click="resetForm('searchForm')">重置</el-button>
+            <el-button class="diy-button--blue" size="small" @click="handleSearch">查询</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -586,11 +586,11 @@ export default {
 @import "@/assets/scss/buttonstyle.scss";
 
 .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);
-  }
+  // ::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 {
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
index dd3b0b23a..d130f24c4 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/activivityList.vue
@@ -92,12 +92,12 @@
 
             <el-button style="margin-left:30px"
                        size="small"
-                       class="diy-button--search"
-                       @click="handleSearch">查询</el-button>
-            <el-button style="margin-left:10px"
-                       size="small"
-                       class="diy-button--reset"
+                       class="diy-button--white"
                        @click="resetSearch">重置</el-button>
+             <el-button style="margin-left:10px"
+                       size="small"
+                       class="diy-button--add"
+                       @click="handleSearch">查询</el-button>
           </div>
         </el-form>
       </div>
@@ -115,18 +115,18 @@
                      size="small"
                      @click="handleAddSchedule">添加日程提醒</el-button> -->
           <el-button style="float:left;margin-left:10px"
-                     class="diy-button--delete"
+                     class="diy-button--white"
                      size="small"
                      @click="deleteBatch">批量删除</el-button>
           <el-button @click="handleExport"
-                     class="diy-button--reset"
+                     class="diy-button--add"
                      size="small">导出</el-button>
         </div>
 
         <el-table :data="tableData"
                   border
                   v-loading="tableLoading"
-                  :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                  
                   class="table"
                   style="width: 100%"
                   @select-all="selectAll"
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
index 0a86fc515..01059e9e3 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/addRule.vue
@@ -38,7 +38,7 @@
                   border
                   :height="tableHeight"
                   v-loading="tableLoading"
-                  :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                  
                   style="width: 100%">
           <el-table-column label="序号"
                            header-align="center"
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue b/src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue
index 16c9a45fe..217303169 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/scheduleList.vue
@@ -50,15 +50,15 @@
                 </el-option>
               </el-select>
             </el-form-item>
-
             <el-button style="margin-left:30px"
                        size="small"
-                       class="diy-button--search"
-                       @click="handleSearch">查询</el-button>
+                       class="diy-button--white"
+                       @click="resetSearch">重置</el-button>
             <el-button style="margin-left:10px"
                        size="small"
-                       class="diy-button--reset"
-                       @click="resetSearch">重置</el-button>
+                       class="diy-button--add"
+                       @click="handleSearch">查询</el-button>
+           
           </div>
         </el-form>
       </div>
@@ -70,18 +70,18 @@
                      size="small"
                      @click="handleAddSchedule">添加日程提醒</el-button>
           <el-button style="float:left;margin-left:10px"
-                     class="diy-button--delete"
+                     class="diy-button--white"
                      size="small"
                      @click="deleteBatch">批量删除</el-button>
           <el-button @click="handleExport"
-                     class="diy-button--reset"
+                     class="diy-button--add"
                      size="small">导出</el-button>
         </div>
 
         <el-table :data="tableData"
                   border
                   v-loading="tableLoading"
-                  :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                  
                   class="table"
                   style="width: 100%"
                   @select-all="selectAll"
diff --git a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
index 4a010a0a0..bbaf8abda 100644
--- a/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
+++ b/src/views/modules/communityParty/orgActivity/activivityList/yearplanList.vue
@@ -51,7 +51,7 @@
         <el-table :data="tableData"
                   border
                   v-loading="tableLoading"
-                  :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                  
                   class="table"
                   style="width: 100%"
                   :span-method="objectSpanMethod"
diff --git a/src/views/modules/communityParty/regionalParty/activitys.vue b/src/views/modules/communityParty/regionalParty/activitys.vue
index 5fbda8bbe..d57971c75 100644
--- a/src/views/modules/communityParty/regionalParty/activitys.vue
+++ b/src/views/modules/communityParty/regionalParty/activitys.vue
@@ -81,13 +81,13 @@
 
           </el-form-item>
           <el-button style="margin-left:10px"
-                     class="diy-button--search"
+                     class="diy-button--white"
                      size="small"
-                     @click="handleSearch">查询</el-button>
+                     @click="resetSearch">重置</el-button>
           <el-button style="margin-left:10px"
-                     class="diy-button--reset"
+                     class="diy-button--blue"
                      size="small"
-                     @click="resetSearch">重置</el-button>
+                     @click="handleSearch">查询</el-button>
         </div>
       </el-form>
     </div>
@@ -125,7 +125,6 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
                 style="width: 100%">
 
         <el-table-column label="序号"
diff --git a/src/views/modules/communityParty/regionalParty/units.vue b/src/views/modules/communityParty/regionalParty/units.vue
index 0e3edbad0..5132b9e59 100644
--- a/src/views/modules/communityParty/regionalParty/units.vue
+++ b/src/views/modules/communityParty/regionalParty/units.vue
@@ -76,19 +76,20 @@
       </el-form>
       <el-row type="flex" style="margin: 0px">
         <el-col span="24" align="right">
-
           <el-button
             style="margin-left: 10px;"
             size="small"
-            type="primary"
-            @click="handleSearch"
-            >查询</el-button
+            @click="resetSearch"
+            class="diy-button--white"
+            >重置</el-button
           >
           <el-button
             style="margin-left: 10px;"
             size="small"
-            @click="resetSearch"
-            >重置</el-button
+            type="primary"
+            class="diy-button--blue"
+            @click="handleSearch"
+            >查询</el-button
           >
         </el-col>
       </el-row>
@@ -866,6 +867,7 @@ export default {
 </script>
 <style lang="scss" scoped >
 @import "@/assets/scss/modules/management/list-main.scss";
+@import "@/assets/scss/buttonstyle.scss";
 .g-main {
   width: 100%;
 }
diff --git a/src/views/modules/communityParty/stas/index.vue b/src/views/modules/communityParty/stas/index.vue
index 84aff440d..4c10e7255 100644
--- a/src/views/modules/communityParty/stas/index.vue
+++ b/src/views/modules/communityParty/stas/index.vue
@@ -35,21 +35,22 @@
                             end-placeholder="结束日期">
             </el-date-picker>
           </el-form-item>
-          <el-button style="margin-left:10px"
-                     class="diy-button--search"
+          <el-button style="margin-left:30px"
+                     class="diy-button--white"
                      size="small"
-                     @click="handleSearch">查询</el-button>
+                     @click="resetSearch">重置</el-button>
           <el-button style="margin-left:10px"
-                     class="diy-button--reset"
+                     class="diy-button--add"
                      size="small"
-                     @click="resetSearch">重置</el-button>
+                     @click="handleSearch">查询</el-button>
+        
         </div>
       </el-form>
     </div>
     <div class="m-table">
       <div class="div_btn">
         <el-button style="margin-left:10px"
-                   class="diy-button--reset"
+                   class="diy-button--add"
                    size="small"
                    @click="handleExport">导出</el-button>
       </div>
@@ -58,7 +59,7 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                
                 style="width: 100%">
         <el-table-column label="序号"
                          header-align="center"
diff --git a/src/views/modules/communityService/fuwujilu/fuwuList.vue b/src/views/modules/communityService/fuwujilu/fuwuList.vue
index 7aa7a436b..77710e5e9 100644
--- a/src/views/modules/communityService/fuwujilu/fuwuList.vue
+++ b/src/views/modules/communityService/fuwujilu/fuwuList.vue
@@ -100,12 +100,13 @@
             </el-form-item>
             <el-button style="margin-left:30px"
                        size="small"
-                       class="diy-button--search"
-                       @click="handleSearch">查询</el-button>
+                       class="diy-button--white"
+                       @click="resetSearch">重置</el-button>
             <el-button style="margin-left:10px"
                        size="small"
-                       class="diy-button--reset"
-                       @click="resetSearch">重置</el-button>
+                       class="diy-button--add"
+                       @click="handleSearch">查询</el-button>
+          
           </div>
         </el-form>
       </div>
@@ -125,7 +126,7 @@
         <el-table :data="tableData"
                   border
                   v-loading="tableLoading"
-                  :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                  
                   class="table"
                   style="width: 100%"
                   :height="maxTableHeight">
diff --git a/src/views/modules/communityService/fuwujiluOld/fuwuList.vue b/src/views/modules/communityService/fuwujiluOld/fuwuList.vue
index dc4a2e6df..f1580ca1b 100644
--- a/src/views/modules/communityService/fuwujiluOld/fuwuList.vue
+++ b/src/views/modules/communityService/fuwujiluOld/fuwuList.vue
@@ -122,7 +122,7 @@
         <el-table :data="tableData"
                   border
                   v-loading="tableLoading"
-                  :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                  
                   class="table"
                   style="width: 100%"
                   :height="maxTableHeight">
diff --git a/src/views/modules/communityService/fuwuxiangmu/index.vue b/src/views/modules/communityService/fuwuxiangmu/index.vue
index c6b48929c..3b380fe13 100644
--- a/src/views/modules/communityService/fuwuxiangmu/index.vue
+++ b/src/views/modules/communityService/fuwuxiangmu/index.vue
@@ -50,15 +50,14 @@
                         placeholder="请输入">
               </el-input>
             </el-form-item>
-
             <el-button style="margin-left: 30px"
                        size="small"
-                       class="diy-button--search"
-                       @click="handleSearch">查询</el-button>
+                       class="diy-button--white"
+                       @click="resetSearch">重置</el-button>
             <el-button style="margin-left: 10px"
                        size="small"
-                       class="diy-button--reset"
-                       @click="resetSearch">重置</el-button>
+                       class="diy-button--add"
+                       @click="handleSearch">查询</el-button>
           </div>
         </el-form>
       </div>
@@ -79,7 +78,6 @@
 
         <el-table :data="tableData"
                   border
-                  :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
                   class="table"
                   style="width: 100%"
                   :height="maxTableHeight">
diff --git a/src/views/modules/communityService/fuwuzuzhi/index.vue b/src/views/modules/communityService/fuwuzuzhi/index.vue
index 6baeb8cc6..cf29b3cc6 100644
--- a/src/views/modules/communityService/fuwuzuzhi/index.vue
+++ b/src/views/modules/communityService/fuwuzuzhi/index.vue
@@ -50,15 +50,15 @@
                         placeholder="请输入">
               </el-input>
             </el-form-item>
-
             <el-button style="margin-left: 30px"
                        size="small"
-                       class="diy-button--search"
-                       @click="handleSearch">查询</el-button>
+                       class="diy-button--white"
+                       @click="resetSearch">重置</el-button>
             <el-button style="margin-left: 10px"
                        size="small"
-                       class="diy-button--reset"
-                       @click="resetSearch">重置</el-button>
+                       class="diy-button--add"
+                       @click="handleSearch">查询</el-button>
+           
           </div>
         </el-form>
       </div>
@@ -79,7 +79,6 @@
 
         <el-table :data="tableData"
                   border
-                  :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
                   class="table"
                   style="width: 100%"
                   :height="maxTableHeight">
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
index 59740f539..47469fae5 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspect.vue
@@ -80,12 +80,12 @@
 
         <el-button style="margin-left:30px"
                    size="small"
-                   class="diy-button--search"
-                   @click="handleSearch">查询</el-button>
+                   class="diy-button--white"
+                   @click="resetSearch">重置</el-button>
         <el-button style="margin-left:10px"
                    size="small"
-                   class="diy-button--reset"
-                   @click="resetSearch">重置</el-button>
+                   class="diy-button--add"
+                   @click="handleSearch">查询</el-button>
 
       </el-form>
     </div>
@@ -99,7 +99,6 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
                 style="width: 100%">
         <el-table-column label="序号"
                          header-align="center"
@@ -170,7 +169,7 @@
 
         <el-table-column label="操作"
                          fixed="right"
-                         width="140"
+                         width="160"
                          header-align="center"
                          align="center"
                          class="operate">
diff --git a/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
index 68d57ae28..01013c285 100644
--- a/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
+++ b/src/views/modules/communityService/ninePlaces/inspect/inspectReview.vue
@@ -10,7 +10,7 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                
                 style="width: 100%">
         <el-table-column label="序号"
                          header-align="center"
diff --git a/src/views/modules/communityService/ninePlaces/places/places.vue b/src/views/modules/communityService/ninePlaces/places/places.vue
index ebddd696c..cc7980228 100644
--- a/src/views/modules/communityService/ninePlaces/places/places.vue
+++ b/src/views/modules/communityService/ninePlaces/places/places.vue
@@ -74,15 +74,15 @@
           </el-select>
 
         </el-form-item>
-
         <el-button style="margin-left:30px"
                    size="small"
-                   class="diy-button--search"
-                   @click="handleSearch">查询</el-button>
+                   class="diy-button--white"
+                   @click="resetSearch">重置</el-button>
         <el-button style="margin-left:10px"
                    size="small"
-                   class="diy-button--reset"
-                   @click="resetSearch">重置</el-button>
+                   class="diy-button--add"
+                   @click="handleSearch">查询</el-button>
+       
 
       </el-form>
     </div>
@@ -96,7 +96,7 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                
                 style="width: 100%">
         <el-table-column label="序号"
                          header-align="center"
diff --git a/src/views/modules/communityService/ninePlaces/team/team.vue b/src/views/modules/communityService/ninePlaces/team/team.vue
index 2a9821ec3..4f18e2fbb 100644
--- a/src/views/modules/communityService/ninePlaces/team/team.vue
+++ b/src/views/modules/communityService/ninePlaces/team/team.vue
@@ -63,12 +63,12 @@
 
           <el-button style="margin-left:30px"
                      size="small"
-                     class="diy-button--search"
-                     @click="handleSearch">查询</el-button>
+                     class="diy-button--white"
+                     @click="resetSearch">重置</el-button>
           <el-button style="margin-left:10px"
                      size="small"
-                     class="diy-button--reset"
-                     @click="resetSearch">重置</el-button>
+                     class="diy-button--add"
+                     @click="handleSearch">查询</el-button>
         </div>
       </el-form>
     </div>
@@ -82,7 +82,6 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
                 style="width: 100%">
         <el-table-column label="序号"
                          header-align="center"
diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue
index 44fd068ee..0ba62f381 100644
--- a/src/views/modules/communityService/shzz/index.vue
+++ b/src/views/modules/communityService/shzz/index.vue
@@ -13,8 +13,8 @@
             <el-input v-model="fmData.serviceTimeStr" placeholder="请输入" class="input-width" clearable></el-input>
           </el-form-item>
           <el-form-item>
-            <el-button class="diy-button--search" size="small" @click="handleSearch">查询</el-button>
-            <el-button class="diy-button--reset" size="small" @click="resetForm('fmData')">重置</el-button>
+            <el-button class="diy-button--white" size="small" @click="resetForm('fmData')">重置</el-button>
+            <el-button class="diy-button--add" size="small" @click="handleSearch">查询</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -83,7 +83,7 @@
                    size="small"
                    @click="handleAdd">新增
         </el-button>
-        <el-button class="diy-button--search"
+        <el-button class="diy-button--white"
                    style="margin-left:10px"
                    size="small"
                    @click="handleExportModule('room')">下载模板
@@ -99,7 +99,7 @@
                    :on-success="handleExcelSuccess"
                    :before-upload="beforeExcelUpload"
                    :http-request="uploadHttpRequest">
-          <el-button class="diy-button--delete"
+          <el-button class="diy-button--add"
                      size="small"
                      :loading="importLoading">{{
               importBtnTitle
@@ -108,7 +108,7 @@
         </el-upload>
 
         <el-button @click="handleChu"
-                   class="diy-button--reset"
+                   class="diy-button--white"
                    size="small">导出
         </el-button>
       </div>
diff --git a/src/views/modules/communityService/worklog/workLog.vue b/src/views/modules/communityService/worklog/workLog.vue
index 36b55cc5b..a241d2780 100644
--- a/src/views/modules/communityService/worklog/workLog.vue
+++ b/src/views/modules/communityService/worklog/workLog.vue
@@ -84,14 +84,15 @@
                             end-placeholder="结束日期">
             </el-date-picker>
           </el-form-item>
-          <el-button style="margin-left:10px"
-                     class="diy-button--search"
+          <el-button style="margin-left:30px"
+                     class="diy-button--white"
                      size="small"
-                     @click="handleSearch">查询</el-button>
+                     @click="resetSearch">重置</el-button>
           <el-button style="margin-left:10px"
-                     class="diy-button--reset"
+                     class="diy-button--add"
                      size="small"
-                     @click="resetSearch">重置</el-button>
+                     @click="handleSearch">查询</el-button>
+         
         </div>
       </el-form>
     </div>
@@ -130,7 +131,7 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                
                 style="width: 100%">
         <el-table-column label="序号"
                          header-align="center"
diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue
index 9d57a5c46..531d1a3ab 100644
--- a/src/views/modules/cpts/base/index.vue
+++ b/src/views/modules/cpts/base/index.vue
@@ -66,11 +66,11 @@
 
             <el-button style="margin-left: 30px; margin-bottom: 20px"
                        size="small"
-                       class="diy-button--search"
+                       class="diy-button--add"
                        @click="handleSearch">查询</el-button>
             <el-button style="margin-left: 10px; margin-bottom: 20px"
                        size="small"
-                       class="diy-button--reset"
+                       class="diy-button--white"
                        @click="resetSearch">重置</el-button>
           </div>
         </el-form>
@@ -85,7 +85,7 @@
                      @click="handleAdd">新增</el-button>
 
           <el-button v-if="mubanUrl"
-                     class="u-btn-upload diy-button--export"
+                     :class="addUrl?'diy-button--white':'diy-button--add'"
                      size="small"
                      @click="handleExportModule('room')">下载模板</el-button>
 
@@ -102,16 +102,16 @@
                      :before-upload="beforeExcelUpload"
                      :http-request="uploadHttpRequest">
             <el-button size="small"
-                       class="u-btn-upload diy-button--delete">导入</el-button>
+            :class="mubanUrl?'diy-button--add':'diy-button--white'" style="margin-left:10px">导入</el-button>
           </el-upload>
 
           <el-button v-if="exportUrl"
                      @click="handleExport"
-                     class="u-btn-upload diy-button--reset"
-                     size="small">导出</el-button>
+                     :class="importUrl?'diy-button--white':'diy-button--add'"
+                     size="small" style="margin-left:10px">导出</el-button>
           <el-button v-if="qrCodeExportUrl"
                      @click="handleExportQrcode"
-                     class="u-btn-upload diy-button--reset"
+                     :class="exportUrl?'diy-button--add':'diy-button--white'"
                      size="small">导出员工登记码</el-button>
           <el-button v-if="delMultipleUrl"
                      size="small"
@@ -119,11 +119,10 @@
           <slot name="listBtn"
                 v-bind:multipleSelection="multipleSelection"></slot>
         </div>
-
+        <!--"  -->
         <el-table ref="ref_table"
                   :data="tableData"
                   border
-                  :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
                   class="table"
                   style="width: 100%"
                   :height="maxTableHeight"
diff --git a/src/views/modules/home/cpts/people-more.vue b/src/views/modules/home/cpts/people-more.vue
index e8d50fcc7..f8462012c 100644
--- a/src/views/modules/home/cpts/people-more.vue
+++ b/src/views/modules/home/cpts/people-more.vue
@@ -133,7 +133,7 @@
                       :data="natList"
                       border
                       height="400"
-                      :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+                      "
                       style="width: 100%">
               <el-table-column label="序号"
                                header-align="center"
@@ -168,7 +168,7 @@
                       :data="tripList"
                       border
                       height="400"
-                      :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+                      "
                       style="width: 100%">
               <el-table-column label="序号"
                                header-align="center"
@@ -217,7 +217,7 @@
                       :data="vaccineList"
                       border
                       height="400"
-                      :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+                      "
                       style="width: 100%">
               <el-table-column label="序号"
                                header-align="center"
diff --git a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
index abb81a911..c80ff32e8 100644
--- a/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
+++ b/src/views/modules/partymember/icpartymemberpayrecorddetail.vue
@@ -72,11 +72,12 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button class="diy-button--search" @click="getDataList()" size="small">{{ $t('query') }}</el-button>
+          <el-button class="diy-button--white" size="small" @click="resetForm">重置</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
+          <el-button class="diy-button--add" @click="getDataList()" size="small">{{ $t('query') }}</el-button>
         </el-form-item>
+       
         <!--<el-form-item>-->
           <!--<el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>-->
         <!--</el-form-item>-->
@@ -87,9 +88,9 @@
       </el-card>
       <el-card class="resi-card-table">
         <div class="resi-row-btn">
-          <el-button type="warning" size="small" :loading="exportBtn" class="diy-button--reset" @click="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button type="warning" size="small" :loading="exportBtn" class="diy-button--add" @click="exportHandle()">{{ $t('export') }}</el-button>
         </div>
-      <el-table class="resi-table" :height="tableHeight" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+      <el-table :height="tableHeight" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
         <!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
         <el-table-column label="序号" header-align="center" align="center" width="50px">
           <template slot-scope="scope">
@@ -284,25 +285,7 @@
 <style lang="scss" scoped>
   @import "@/assets/scss/buttonstyle.scss";
 
-  .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;
-    }
-    ::v-deep .btn-color-del {
-      margin-left: 10px;
-      color: rgba(213, 16, 16, 1);
-    }
-    ::v-deep .btn-color-edit {
-      color: rgba(0, 167, 169, 1);
-    }
-  }
+ 
   .form-wr {
     .input-width {
       width: 260px;
diff --git a/src/views/modules/partymember/icpartymemberpoint.vue b/src/views/modules/partymember/icpartymemberpoint.vue
index c854380ac..0257fa1d5 100644
--- a/src/views/modules/partymember/icpartymemberpoint.vue
+++ b/src/views/modules/partymember/icpartymemberpoint.vue
@@ -67,24 +67,23 @@
           >
           </el-date-picker>
         </el-form-item>
+        <el-form-item>
+          <el-button class="diy-button--white" size="small" @click="resetForm"
+            >重置</el-button
+          >
+        </el-form-item>
         <el-form-item>
           <el-button
-            class="diy-button--search"
+            class="diy-button--add"
             @click="getDataList()"
             size="small"
             >{{ $t('query') }}</el-button
           >
         </el-form-item>
-        <el-form-item>
-          <el-button class="diy-button--reset" size="small" @click="resetForm"
-            >重置</el-button
-          >
-        </el-form-item>
       </el-form>
     </el-card>
     <el-card class="resi-card-table">
       <el-table
-        class="resi-table"
         v-loading="dataListLoading"
         :data="dataList"
         border
@@ -282,25 +281,7 @@ export default {
 <style lang="scss" scoped>
 @import '@/assets/scss/buttonstyle.scss';
 
-.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;
-  }
-  ::v-deep .btn-color-del {
-    margin-left: 10px;
-    color: rgba(213, 16, 16, 1);
-  }
-  ::v-deep .btn-color-edit {
-    color: rgba(0, 167, 169, 1);
-  }
-}
+
 .form-wr {
   .input-width {
     width: 260px;
diff --git a/src/views/modules/partymember/icpartyorgtree.vue b/src/views/modules/partymember/icpartyorgtree.vue
index 7b5f5450d..f605f1176 100644
--- a/src/views/modules/partymember/icpartyorgtree.vue
+++ b/src/views/modules/partymember/icpartyorgtree.vue
@@ -13,7 +13,7 @@
           :default-expand-all="true"
           row-key="id"
           :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-          :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+          
           :height="tableHeight">
           <el-table-column prop="partyOrgName" min-width="250" label="党组织名称"></el-table-column>
           <el-table-column prop="partyOrgType" min-width="150" label="类别">
diff --git a/src/views/modules/partymember/lookMember.vue b/src/views/modules/partymember/lookMember.vue
index fb1ed9615..1162fe506 100644
--- a/src/views/modules/partymember/lookMember.vue
+++ b/src/views/modules/partymember/lookMember.vue
@@ -151,7 +151,7 @@
                     v-loading="tableLoading"
                     border
                     :height="tableHeight"
-                    :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                    
                     style="width: 100%"
                     class="resi-table">
             <el-table-column label="序号"
diff --git a/src/views/modules/plugins/change/changedeath.vue b/src/views/modules/plugins/change/changedeath.vue
index c0aa64eef..b579016b8 100644
--- a/src/views/modules/plugins/change/changedeath.vue
+++ b/src/views/modules/plugins/change/changedeath.vue
@@ -91,7 +91,7 @@
       <div class="u-table-btn1">
         <el-button
           size="small"
-          class="diy-button--white"
+          class="diy-button--blue"
           @click="exportHandle()"
           >{{ $t("export") }}</el-button
         >
diff --git a/src/views/modules/plugins/change/changerelocation.vue b/src/views/modules/plugins/change/changerelocation.vue
index 2540fe3ad..a15e6a885 100644
--- a/src/views/modules/plugins/change/changerelocation.vue
+++ b/src/views/modules/plugins/change/changerelocation.vue
@@ -177,7 +177,7 @@
       <div class="u-table-btn1">
         <el-button
           size="small"
-          class="diy-button--white"
+          class="diy-button--blue"
           @click="exportHandle()"
           >{{ $t("export") }}</el-button
         >
diff --git a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
index 15352d4fd..c223fbb99 100644
--- a/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
+++ b/src/views/modules/plugins/point/icpointnucleicmonitoring.vue
@@ -88,7 +88,7 @@
                 :data="dataList"
                 border
                 :row-key="row => { return row.id.toString() }"
-                :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+                "
                 style="width: 100%; height: 564px;overflow: auto;">
         <el-table-column label="序号"
                          header-align="center"
diff --git a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
index 8eb2fe2f9..386a6cfac 100644
--- a/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
+++ b/src/views/modules/plugins/point/icpointvaccinesinoculation.vue
@@ -80,7 +80,7 @@
                 :data="dataList"
                 border
                 :row-key="row => { return row.id.toString() }"
-                :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
+                "
                 style="width: 100%; height: 564px;overflow: auto;">
         <el-table-column label="序号"
                          header-align="center"
diff --git a/src/views/modules/plugins/power/kernelhouseholdAddMember.vue b/src/views/modules/plugins/power/kernelhouseholdAddMember.vue
index dea7ebdce..813942a45 100644
--- a/src/views/modules/plugins/power/kernelhouseholdAddMember.vue
+++ b/src/views/modules/plugins/power/kernelhouseholdAddMember.vue
@@ -8,7 +8,7 @@
                     border
                     :height="tableHeight"
                     v-loading="tableLoading"
-                    :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                    
                     style="width: 100%"
                     highlight-current-row
                     @selection-change="selectionChange">
diff --git a/src/views/modules/plugins/power/kernelhouseholdForm.vue b/src/views/modules/plugins/power/kernelhouseholdForm.vue
index f22d642dd..f7e33e02a 100644
--- a/src/views/modules/plugins/power/kernelhouseholdForm.vue
+++ b/src/views/modules/plugins/power/kernelhouseholdForm.vue
@@ -26,7 +26,7 @@
                     border
                     :height="tableHeight"
                     v-loading="tableLoading"
-                    :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                    
                     style="width: 100%"
                     @selection-change="selectionChange">
             <el-table-column type="selection"
diff --git a/src/views/modules/plugins/power/kernelhouseholdTable.vue b/src/views/modules/plugins/power/kernelhouseholdTable.vue
index 638cc8100..cf287f4d6 100644
--- a/src/views/modules/plugins/power/kernelhouseholdTable.vue
+++ b/src/views/modules/plugins/power/kernelhouseholdTable.vue
@@ -29,7 +29,7 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                
                 style="width: 100%">
         <el-table-column prop="ownerName"
                          label="户主"
diff --git a/src/views/modules/plugins/power/poweraxis.vue b/src/views/modules/plugins/power/poweraxis.vue
index a048edff4..4ecf03125 100644
--- a/src/views/modules/plugins/power/poweraxis.vue
+++ b/src/views/modules/plugins/power/poweraxis.vue
@@ -21,13 +21,13 @@
                     size="small" />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary"
-                     icon="el-icon-search"
-                     size="mini"
-                     @click="getDataList()">搜索</el-button>
           <el-button style="margin-left:10px"
-                     class="diy-button--reset"
+                     class="diy-button--white"
                      size="small">重置</el-button>
+          <el-button type="primary"
+                     size="small"
+                     @click="getDataList()">搜索</el-button>
+          
         </el-form-item>
       </el-form>
     </div>
@@ -45,7 +45,7 @@
                 :default-expand-all="true"
                 row-key="id"
                 :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}">
+                >
         <el-table-column prop="name"
                          label="动力主轴"></el-table-column>
         <el-table-column prop="categoryCode"
diff --git a/src/views/modules/plugins/power/servicestationTable.vue b/src/views/modules/plugins/power/servicestationTable.vue
index b28460cc8..ad1819927 100644
--- a/src/views/modules/plugins/power/servicestationTable.vue
+++ b/src/views/modules/plugins/power/servicestationTable.vue
@@ -29,7 +29,7 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                
                 style="width: 100%">
         <el-table-column prop="name"
                          label="服务站名称"
diff --git a/src/views/modules/plugins/rent/rentblacklist.vue b/src/views/modules/plugins/rent/rentblacklist.vue
index ac0f52393..d3a1fc088 100644
--- a/src/views/modules/plugins/rent/rentblacklist.vue
+++ b/src/views/modules/plugins/rent/rentblacklist.vue
@@ -208,23 +208,23 @@ export default {
   @import "@/assets/scss/buttonstyle.scss";
 
   .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);
-    }
+    // ::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;
-    }
-    ::v-deep .btn-color-del {
-      margin-left: 10px;
-      color: rgba(213, 16, 16, 1);
-    }
-    ::v-deep .btn-color-edit {
-      color: rgba(0, 167, 169, 1);
-    }
+    // ::v-deep .el-button--text {
+    //   text-decoration: underline;
+    // }
+    // ::v-deep .btn-color-del {
+    //   margin-left: 10px;
+    //   color: rgba(213, 16, 16, 1);
+    // }
+    // ::v-deep .btn-color-edit {
+    //   color: rgba(0, 167, 169, 1);
+    // }
   }
   .form-wr {
     .input-width {
diff --git a/src/views/modules/plugins/rent/rentcontractinfo.vue b/src/views/modules/plugins/rent/rentcontractinfo.vue
index 85977cc70..fd492d6e1 100644
--- a/src/views/modules/plugins/rent/rentcontractinfo.vue
+++ b/src/views/modules/plugins/rent/rentcontractinfo.vue
@@ -453,23 +453,23 @@ export default {
   @import "@/assets/scss/buttonstyle.scss";
 
   .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);
-    }
+    // ::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;
-    }
-    ::v-deep .btn-color-del {
-      margin-left: 10px;
-      color: rgba(213, 16, 16, 1);
-    }
-    ::v-deep .btn-color-edit {
-      color: rgba(0, 167, 169, 1);
-    }
+    // ::v-deep .el-button--text {
+    //   text-decoration: underline;
+    // }
+    // ::v-deep .btn-color-del {
+    //   margin-left: 10px;
+    //   color: rgba(213, 16, 16, 1);
+    // }
+    // ::v-deep .btn-color-edit {
+    //   color: rgba(0, 167, 169, 1);
+    // }
   }
   .form-wr {
     .input-width {
diff --git a/src/views/modules/plugins/rent/rentcontractreview.vue b/src/views/modules/plugins/rent/rentcontractreview.vue
index 8d05fca5a..fe6c71fa4 100644
--- a/src/views/modules/plugins/rent/rentcontractreview.vue
+++ b/src/views/modules/plugins/rent/rentcontractreview.vue
@@ -462,23 +462,23 @@ export default {
   @import "@/assets/scss/buttonstyle.scss";
 
   .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);
-    }
+    // ::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;
-    }
-    ::v-deep .btn-color-del {
-      margin-left: 10px;
-      color: rgba(213, 16, 16, 1);
-    }
-    ::v-deep .btn-color-edit {
-      color: rgba(0, 167, 169, 1);
-    }
+    // ::v-deep .el-button--text {
+    //   text-decoration: underline;
+    // }
+    // ::v-deep .btn-color-del {
+    //   margin-left: 10px;
+    //   color: rgba(213, 16, 16, 1);
+    // }
+    // ::v-deep .btn-color-edit {
+    //   color: rgba(0, 167, 169, 1);
+    // }
   }
   .form-wr {
     .input-width {
diff --git a/src/views/modules/plugins/rent/renthouse.vue b/src/views/modules/plugins/rent/renthouse.vue
index 6d628d7b8..fcd64d58d 100644
--- a/src/views/modules/plugins/rent/renthouse.vue
+++ b/src/views/modules/plugins/rent/renthouse.vue
@@ -146,11 +146,12 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button class="diy-button--white" size="small" @click="resetForm">重置</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
+          <el-button type="primary" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
+       
         <!--<el-form-item>-->
           <!--<el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>-->
         <!--</el-form-item>-->
@@ -159,7 +160,7 @@
       <el-card class="resi-card-table">
         <div style="margin-bottom: 13px;">
           <el-button type="primary" size="small" @click="handleEdit()">{{ '购房登记' }}</el-button>
-          <el-button type="warning" size="small" @click="exportHandle()">{{ $t('export') }}</el-button>
+          <el-button type="primary" class="diy-button-white" size="small" @click="exportHandle()">{{ $t('export') }}</el-button>
         </div>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
         <el-table-column label="序号"
@@ -526,23 +527,23 @@ export default {
   @import "@/assets/scss/buttonstyle.scss";
 
   .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);
-    }
+    // ::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;
-    }
-    ::v-deep .btn-color-del {
-      margin-left: 10px;
-      color: rgba(213, 16, 16, 1);
-    }
-    ::v-deep .btn-color-edit {
-      color: rgba(0, 167, 169, 1);
-    }
+    // ::v-deep .el-button--text {
+    //   text-decoration: underline;
+    // }
+    // ::v-deep .btn-color-del {
+    //   margin-left: 10px;
+    //   color: rgba(213, 16, 16, 1);
+    // }
+    // ::v-deep .btn-color-edit {
+    //   color: rgba(0, 167, 169, 1);
+    // }
   }
   .form-wr {
     .input-width {
diff --git a/src/views/modules/plugins/rent/renttenantinfo.vue b/src/views/modules/plugins/rent/renttenantinfo.vue
index feee98855..c5ec1fe73 100644
--- a/src/views/modules/plugins/rent/renttenantinfo.vue
+++ b/src/views/modules/plugins/rent/renttenantinfo.vue
@@ -168,23 +168,23 @@ export default {
   @import "@/assets/scss/buttonstyle.scss";
 
   .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);
-    }
+    // ::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;
-    }
-    ::v-deep .btn-color-del {
-      margin-left: 10px;
-      color: rgba(213, 16, 16, 1);
-    }
-    ::v-deep .btn-color-edit {
-      color: rgba(0, 167, 169, 1);
-    }
+    // ::v-deep .el-button--text {
+    //   text-decoration: underline;
+    // }
+    // ::v-deep .btn-color-del {
+    //   margin-left: 10px;
+    //   color: rgba(213, 16, 16, 1);
+    // }
+    // ::v-deep .btn-color-edit {
+    //   color: rgba(0, 167, 169, 1);
+    // }
   }
   .form-wr {
     .input-width {
diff --git a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
index 101e7dff6..06a46e706 100644
--- a/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
+++ b/src/views/modules/plugins/stats/factagencyuserhousedaily.vue
@@ -50,7 +50,7 @@
                      class="diy-button--add"
                      size="small">总计</el-button>
           <el-button @click="exportHandle"
-                     class="diy-button--reset"
+                     class="diy-button--white"
                      size="small">导出</el-button>
         </div>
       <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%">
@@ -254,23 +254,23 @@ export default {
   @import "@/assets/scss/buttonstyle.scss";
 
   .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);
-    }
+    // ::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;
-    }
-    ::v-deep .btn-color-del {
-      margin-left: 10px;
-      color: rgba(213, 16, 16, 1);
-    }
-    ::v-deep .btn-color-edit {
-      color: rgba(0, 167, 169, 1);
-    }
+    // ::v-deep .el-button--text {
+    //   text-decoration: underline;
+    // }
+    // ::v-deep .btn-color-del {
+    //   margin-left: 10px;
+    //   color: rgba(213, 16, 16, 1);
+    // }
+    // ::v-deep .btn-color-edit {
+    //   color: rgba(0, 167, 169, 1);
+    // }
   }
   .form-wr {
     .input-width {
diff --git a/src/views/modules/plugins/union/customerrelation.vue b/src/views/modules/plugins/union/customerrelation.vue
index 7ec832446..d009bb351 100644
--- a/src/views/modules/plugins/union/customerrelation.vue
+++ b/src/views/modules/plugins/union/customerrelation.vue
@@ -61,7 +61,7 @@
               row-key="areaCode"
               border
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-              :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+              
               :height="tableHeight">
         <el-table-column prop="areaName" label="区域名称"></el-table-column>
         <el-table-column prop="customerName" label="客户名称" header-align="center" align="center"></el-table-column>
diff --git a/src/views/modules/secretaryLog/difficulty/difficultyList.vue b/src/views/modules/secretaryLog/difficulty/difficultyList.vue
index a1ed847fc..246b4953a 100644
--- a/src/views/modules/secretaryLog/difficulty/difficultyList.vue
+++ b/src/views/modules/secretaryLog/difficulty/difficultyList.vue
@@ -69,7 +69,7 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                
                 style="width: 100%">
 
         <el-table-column label="序号"
diff --git a/src/views/modules/secretaryLog/humanisticCare/careList.vue b/src/views/modules/secretaryLog/humanisticCare/careList.vue
index 1b5b52ea1..68f06fab1 100644
--- a/src/views/modules/secretaryLog/humanisticCare/careList.vue
+++ b/src/views/modules/secretaryLog/humanisticCare/careList.vue
@@ -108,7 +108,7 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                
                 style="width: 100%">
 
         <el-table-column label="序号"
diff --git a/src/views/modules/secretaryLog/workLog/index.vue b/src/views/modules/secretaryLog/workLog/index.vue
index 530121aa0..19e65289f 100644
--- a/src/views/modules/secretaryLog/workLog/index.vue
+++ b/src/views/modules/secretaryLog/workLog/index.vue
@@ -65,7 +65,7 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                
                 style="width: 100%">
 
         <el-table-column label="序号"
diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue
index 1dc440b29..fad2df55c 100644
--- a/src/views/modules/shequzhili/csgltc/csgl.vue
+++ b/src/views/modules/shequzhili/csgltc/csgl.vue
@@ -79,7 +79,7 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                
                 style="width: 100%">
         <el-table-column label="序号"
                          header-align="center"
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
index 74b8e4e9b..db608ee3c 100644
--- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue
+++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue
@@ -77,7 +77,7 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                
                 style="width: 100%">
         <el-table-column label="序号"
                          header-align="center"
diff --git a/src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue b/src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue
index b77c708c6..405033281 100644
--- a/src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue
+++ b/src/views/modules/shequzhili/issue/cpts/evaluationDetail.vue
@@ -3,7 +3,7 @@
     <div class="dialog-h-content scroll-h">
       <el-table :data="commentList"
                 border
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                
                 class="table"
                 style="width: 100%"
                 :height="maxTableHeight">
diff --git a/src/views/modules/shequzhili/statics/cEvent.vue b/src/views/modules/shequzhili/statics/cEvent.vue
index 2df9cd292..e4d746795 100644
--- a/src/views/modules/shequzhili/statics/cEvent.vue
+++ b/src/views/modules/shequzhili/statics/cEvent.vue
@@ -38,9 +38,8 @@
           <el-form-item>
             <el-button type="primary"
                        size="small"
-                       class="diy-button--search"
                        @click="handleSearch">查询</el-button>
-            <el-button class="diy-button--reset"
+            <el-button 
                        size="small"
                        @click="resetForm('searchForm')">重置</el-button>
           </el-form-item>
@@ -52,7 +51,6 @@
                      class="diy-button--add"
                      size="small">总计</el-button>
           <el-button @click="exportHandle"
-                     class="diy-button--reset"
                      size="small"
                      :loading="exportLoading">导出</el-button>
         </div>
@@ -436,11 +434,11 @@ export default {
 @import "@/assets/scss/buttonstyle.scss";
 
 .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);
-  }
+  // ::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 {
diff --git a/src/views/modules/shequzhili/statics/gridEvent.vue b/src/views/modules/shequzhili/statics/gridEvent.vue
index 55cf91432..f3f8bc68d 100644
--- a/src/views/modules/shequzhili/statics/gridEvent.vue
+++ b/src/views/modules/shequzhili/statics/gridEvent.vue
@@ -30,9 +30,8 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" size="small" class="diy-button--search" @click="handleSearch">查询</el-button>
+          <el-button type="primary" size="small" class="diy-button--add" @click="handleSearch">查询</el-button>
           <el-button
-            class="diy-button--reset"
             size="small"
             @click="resetForm('searchForm')"
             >重置</el-button>
@@ -45,7 +44,7 @@
                     class="diy-button--add"
                     size="small">总计</el-button> -->
         <el-button @click="exportHandle"
-                    class="diy-button--reset"
+                    class="diy-button--add"
                     size="small" :loading="exportLoading">导出</el-button>
       </div>
       <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border style="width: 100%"
@@ -336,11 +335,11 @@ export default {
   @import "@/assets/scss/buttonstyle.scss";
 
   .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);
-    }
+    // ::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 {
diff --git a/src/views/modules/shequzhili/statics/index.vue b/src/views/modules/shequzhili/statics/index.vue
index 40a9e4008..cc49aa3d1 100644
--- a/src/views/modules/shequzhili/statics/index.vue
+++ b/src/views/modules/shequzhili/statics/index.vue
@@ -36,9 +36,8 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" size="small" class="diy-button--search" @click="handleSearch">查询</el-button>
+          <el-button type="primary" size="small" class="diy-button--add" @click="handleSearch">查询</el-button>
           <el-button
-            class="diy-button--reset"
             size="small"
             @click="resetForm('searchForm')"
             >重置</el-button>
@@ -51,7 +50,6 @@
                     class="diy-button--add"
                     size="small">总计</el-button>
         <el-button @click="exportHandle"
-                    class="diy-button--reset"
                     size="small" :loading="exportLoading">导出</el-button>
       </div>
       <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border  style="width: 100%"
@@ -406,11 +404,11 @@ export default {
   @import "@/assets/scss/buttonstyle.scss";
 
   .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);
-    }
+    // ::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 {
diff --git a/src/views/modules/systemManagement/serviceMatter/service.vue b/src/views/modules/systemManagement/serviceMatter/service.vue
index 2e6be2d09..c98444174 100644
--- a/src/views/modules/systemManagement/serviceMatter/service.vue
+++ b/src/views/modules/systemManagement/serviceMatter/service.vue
@@ -14,7 +14,7 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                
                 style="width: 100%">
 
         <el-table-column prop="categoryName"
diff --git a/src/views/modules/workPc/guidance/categoryList.vue b/src/views/modules/workPc/guidance/categoryList.vue
index 775ecd426..7967cb377 100644
--- a/src/views/modules/workPc/guidance/categoryList.vue
+++ b/src/views/modules/workPc/guidance/categoryList.vue
@@ -7,10 +7,10 @@
         <el-button style="margin-left:10px"
                    type="primary"
                    size="small"
-                   @click="handleSaveSort">保存顺序</el-button>
-        <el-button type="success"
+                   @click="handleSaveSort" class="diy-button--white">保存顺序</el-button>
+        <el-button type="primary"
                    size="small"
-                   @click="handleAdd">新增</el-button>
+                   @click="handleAdd" class="diy-button-add">新增</el-button>
       </div>
       <el-table ref="roleTable"
                 v-loading="loading1"
@@ -381,25 +381,25 @@ 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;
-  }
-  ::v-deep .btn-color-del {
-    margin-left: 10px;
-    color: rgba(213, 16, 16, 1);
-  }
-  ::v-deep .btn-color-edit {
-    color: rgba(0, 167, 169, 1);
-  }
-}
+// .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;
+//   }
+//   ::v-deep .btn-color-del {
+//     margin-left: 10px;
+//     color: rgba(213, 16, 16, 1);
+//   }
+//   ::v-deep .btn-color-edit {
+//     color: rgba(0, 167, 169, 1);
+//   }
+// }
 .role-container,
 .role-flex {
   display: flex;
@@ -430,22 +430,4 @@ export default {
   bottom: 30px;
   right: 15px;
 }
-.resi-row-btn {
-  display: flex;
-  align-items: center;
-  margin-bottom: 13px;
-  .el-button {
-    margin-left: 10px;
-    border: 0;
-  }
-  .el-button--success {
-    background: rgba(34, 193, 195, 1);
-  }
-  .el-button--warning {
-    background: rgba(254, 179, 73, 1);
-  }
-  .el-button--danger {
-    background: rgba(254, 98, 82, 1);
-  }
-}
 </style>
diff --git a/src/views/modules/workPc/guidance/guidanceList.vue b/src/views/modules/workPc/guidance/guidanceList.vue
index 0f73622c8..4a867f916 100644
--- a/src/views/modules/workPc/guidance/guidanceList.vue
+++ b/src/views/modules/workPc/guidance/guidanceList.vue
@@ -38,14 +38,14 @@
             </el-form-item>
 
             <el-form-item style="margin-left:10px">
-              <el-button size="small"
-                         @click="loadData()"
-                         class="diy-button--search"
-                         type="primary">查询</el-button>
               <el-button style="margin-left:10px"
-                         class="diy-button--reset"
+                         class="diy-button--white"
                          size="small"
                          @click="resetSearch">重置</el-button>
+              <el-button size="small"
+                         @click="loadData()"
+                         class="diy-button--add"
+                         type="primary">查询</el-button>
             </el-form-item>
             <!-- <el-form-item v-if="isStaff"
                             style="margin-left:10px">
@@ -370,23 +370,7 @@ 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;
diff --git a/src/views/modules/workSys/demandCate.vue b/src/views/modules/workSys/demandCate.vue
index c8f0dd7f2..9b0e52fdf 100644
--- a/src/views/modules/workSys/demandCate.vue
+++ b/src/views/modules/workSys/demandCate.vue
@@ -22,12 +22,12 @@
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button class="diy-button--search"
+            <el-button class="diy-button--add"
                        size="small"
                        @click="handleSearch">查询</el-button>
           </el-form-item>
           <el-form-item>
-            <el-button class="diy-button--reset" size="small" @click="resetForm('searchForm')">重置</el-button>
+            <el-button class="diy-button--white" size="small" @click="resetForm('searchForm')">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -464,10 +464,10 @@ export default {
 <style lang="scss" scoped>
 .resi-container .resi-card-table {
   ::v-deep .el-table {
-    th {
-      color: #fff;
-      background-color: rgba(33, 149, 254, 1);
-    }
+    // th {
+    //   color: #fff;
+    //   background-color: rgba(33, 149, 254, 1);
+    // }
 
     .cell {
       span:nth-of-type(3) {
@@ -479,16 +479,16 @@ export default {
   }
 }
 .resi-table {
-  ::v-deep .el-button--text {
-    text-decoration: underline;
-  }
-  ::v-deep .btn-color-del {
-    margin-left: 10px;
-    color: rgba(213, 16, 16, 1);
-  }
-  ::v-deep .btn-color-edit {
-    color: rgba(0, 167, 169, 1);
-  }
+  // ::v-deep .el-button--text {
+  //   text-decoration: underline;
+  // }
+  // ::v-deep .btn-color-del {
+  //   margin-left: 10px;
+  //   color: rgba(213, 16, 16, 1);
+  // }
+  // ::v-deep .btn-color-edit {
+  //   color: rgba(0, 167, 169, 1);
+  // }
 }
 </style>
 
diff --git a/src/views/modules/workSys/elegantCate.vue b/src/views/modules/workSys/elegantCate.vue
index bc3af0a07..6c81a0455 100644
--- a/src/views/modules/workSys/elegantCate.vue
+++ b/src/views/modules/workSys/elegantCate.vue
@@ -259,10 +259,10 @@ export default {
 
 .resi-container .resi-card-table {
   ::v-deep .el-table {
-    th  {
-      color: #fff;
-      background-color: rgba(33, 149, 254, 1);
-    }
+    // th  {
+    //   color: #fff;
+    //   background-color: rgba(33, 149, 254, 1);
+    // }
     
     .cell {
       
@@ -289,15 +289,15 @@ export default {
   }
 }
 .resi-table {
-  ::v-deep .el-button--text {
-    text-decoration: underline;
-  }
-  ::v-deep .btn-color-del {
-    margin-left: 10px;
-    color: rgba(213, 16, 16, 1);
-  }
-  ::v-deep .btn-color-edit {
-    color: rgba(0, 167, 169, 1);
-  }
+  // ::v-deep .el-button--text {
+  //   text-decoration: underline;
+  // }
+  // ::v-deep .btn-color-del {
+  //   margin-left: 10px;
+  //   color: rgba(213, 16, 16, 1);
+  // }
+  // ::v-deep .btn-color-edit {
+  //   color: rgba(0, 167, 169, 1);
+  // }
 }
 </style>
diff --git a/src/views/modules/workSys/operAuth.vue b/src/views/modules/workSys/operAuth.vue
index 22f81ca95..6dc4e246f 100644
--- a/src/views/modules/workSys/operAuth.vue
+++ b/src/views/modules/workSys/operAuth.vue
@@ -44,15 +44,15 @@
             </el-input>
 
           </el-form-item>
-
           <el-button style="margin-left:30px"
                      size="small"
-                     class="diy-button--search"
-                     @click="handleSearch">查询</el-button>
+                     class="diy-button--white"
+                     @click="resetSearch">重置</el-button>
           <el-button style="margin-left:10px"
                      size="small"
-                     class="diy-button--reset"
-                     @click="resetSearch">重置</el-button>
+                     class="diy-button--add"
+                     @click="handleSearch">查询</el-button>
+         
 
         </div>
       </el-form>
@@ -73,7 +73,7 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                
                 style="width: 100%">
         <el-table-column label="序号"
                          header-align="center"
diff --git a/src/views/modules/workSys/pointAditive/rule.vue b/src/views/modules/workSys/pointAditive/rule.vue
index 64b744cd0..cd3566d5c 100644
--- a/src/views/modules/workSys/pointAditive/rule.vue
+++ b/src/views/modules/workSys/pointAditive/rule.vue
@@ -435,10 +435,10 @@ export default {
 <style lang="scss" scoped>
 .resi-container .resi-card-table {
   ::v-deep .el-table {
-    th {
-      color: #fff;
-      background-color: rgba(33, 149, 254, 1);
-    }
+    // th {
+    //   color: #fff;
+    //   background-color: rgba(33, 149, 254, 1);
+    // }
 
     .cell {
       span:nth-of-type(3) {
@@ -450,24 +450,24 @@ export default {
   }
 }
 .resi-table {
-  ::v-deep .el-button--text {
-    text-decoration: underline;
-  }
-  ::v-deep .btn-color-del {
-    margin-left: 10px;
-    color: rgba(213, 16, 16, 1);
-  }
-  ::v-deep .btn-color-2j {
-    margin-left: 10px;
-    color: #fdaf30;
-  }
-  ::v-deep .btn-color-1j {
-    margin-left: 10px;
-    color: #3cb357;
-  }
-  ::v-deep .btn-color-edit {
-    color: rgba(0, 167, 169, 1);
-  }
+  // ::v-deep .el-button--text {
+  //   text-decoration: underline;
+  // }
+  // ::v-deep .btn-color-del {
+  //   margin-left: 10px;
+  //   color: rgba(213, 16, 16, 1);
+  // }
+  // ::v-deep .btn-color-2j {
+  //   margin-left: 10px;
+  //   color: #fdaf30;
+  // }
+  // ::v-deep .btn-color-1j {
+  //   margin-left: 10px;
+  //   color: #3cb357;
+  // }
+  // ::v-deep .btn-color-edit {
+  //   color: rgba(0, 167, 169, 1);
+  // }
 }
 </style>
 
diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue
index a0f578d52..012a8e45b 100644
--- a/src/views/modules/workSys/resiCate.vue
+++ b/src/views/modules/workSys/resiCate.vue
@@ -33,15 +33,16 @@
             </el-select>
           </el-form-item>
           <el-form-item>
-            <el-button class="diy-button--search"
+            <el-button class="diy-button--white"
                        size="small"
-                       @click="handleSearch">查询</el-button>
+                       @click="resetForm('searchForm')">重置</el-button>
           </el-form-item>
           <el-form-item>
-            <el-button class="diy-button--reset"
+            <el-button class="diy-button--add"
                        size="small"
-                       @click="resetForm('searchForm')">重置</el-button>
+                       @click="handleSearch">查询</el-button>
           </el-form-item>
+        
 
         </el-form>
       </div>
@@ -614,16 +615,16 @@ export default {
 
 <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);;
-  }
+  // ::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;
-  }
+  // ::v-deep .el-button--text {
+  //   text-decoration: underline;
+  // }
   ::v-deep .btn-color-del {
     margin-left: 10px;
     color: rgba(213, 16, 16, 1);
diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue
index e0465e034..e7d0973dd 100644
--- a/src/views/modules/workSys/role/role.vue
+++ b/src/views/modules/workSys/role/role.vue
@@ -29,16 +29,16 @@
           </el-date-picker>
 
         </el-form-item> -->
-
         <el-button style="margin-left:30px"
                    size="small"
-                   class="diy-button--search"
-                   @click="handleSearch">查询</el-button>
-        <el-button style="margin-left:10px"
-                   size="small"
-                   class="diy-button--reset"
+                   class="diy-button--white"
                    @click="resetSearch">重置</el-button>
 
+        <el-button style="margin-left:10px"
+                   size="small"
+                   class="diy-button--add"
+                   @click="handleSearch">查询</el-button>
+        
       </el-form>
     </div>
     <div class="m-table">
@@ -55,7 +55,7 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
+                
                 style="width: 100%">
         <el-table-column label="序号"
                          header-align="center"
diff --git a/src/views/modules/workSys/workLog/list.vue b/src/views/modules/workSys/workLog/list.vue
index f53cc086c..0298077c9 100644
--- a/src/views/modules/workSys/workLog/list.vue
+++ b/src/views/modules/workSys/workLog/list.vue
@@ -246,10 +246,10 @@ export default {
 
 .resi-container .resi-card-table {
   ::v-deep .el-table {
-    th  {
-      color: #fff;
-      background-color: rgba(33, 149, 254, 1);
-    }
+    // th  {
+    //   color: #fff;
+    //   background-color: rgba(33, 149, 254, 1);
+    // }
 
     .cell {
 
@@ -276,15 +276,15 @@ export default {
   }
 }
 .resi-table {
-  ::v-deep .el-button--text {
-    text-decoration: underline;
-  }
-  ::v-deep .btn-color-del {
-    margin-left: 10px;
-    color: rgba(213, 16, 16, 1);
-  }
-  ::v-deep .btn-color-edit {
-    color: rgba(0, 167, 169, 1);
-  }
+  // ::v-deep .el-button--text {
+  //   text-decoration: underline;
+  // }
+  // ::v-deep .btn-color-del {
+  //   margin-left: 10px;
+  //   color: rgba(213, 16, 16, 1);
+  // }
+  // ::v-deep .btn-color-edit {
+  //   color: rgba(0, 167, 169, 1);
+  // }
 }
 </style>
diff --git a/src/views/modules/worklog/icworklog.vue b/src/views/modules/worklog/icworklog.vue
index 2bde74cf0..aaf015dd7 100644
--- a/src/views/modules/worklog/icworklog.vue
+++ b/src/views/modules/worklog/icworklog.vue
@@ -75,16 +75,18 @@
             </el-date-picker>
           </el-form-item>
           <el-form-item>
+            <el-button 
+                       size="small"
+                       type="primary"
+                       class="diy-button--white"
+                       @click="resetSearch">重置</el-button>
             <el-button type="primary"
+                       style="margin-left:10px"
                        size="small"
-                       class="diy-button--search"
+                       class="diy-button--add"
                        @click="getDataList()">{{ $t('query') }}</el-button>
 
-            <el-button style="margin-left:10px"
-                       size="small"
-                       type="primary"
-                       class="diy-button--reset"
-                       @click="resetSearch">重置</el-button>
+           
           </el-form-item>
           <!-- <el-button style="margin-left:10px"
                    size="small"
@@ -105,13 +107,13 @@
                      size="small"
                      @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
           <el-button @click="exportHandle()"
-                     class="diy-button--reset"
+                     class="diy-button--white"
                      size="small">导出</el-button>
           <el-button size="small"
-                     type="danger"
+                     class="diy-button--add"
                      @click="deleteHandle()">批量删除</el-button>
         </div>
-        <el-table class="resi-table"
+        <el-table 
                   v-loading="dataListLoading"
                   :data="dataList"
                   border
@@ -339,25 +341,6 @@ export default {
 <style lang="scss" scoped>
 @import "@/assets/scss/buttonstyle.scss";
 
-.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;
-  }
-  ::v-deep .btn-color-del {
-    margin-left: 10px;
-    color: rgba(213, 16, 16, 1);
-  }
-  ::v-deep .btn-color-edit {
-    color: rgba(0, 167, 169, 1);
-  }
-}
 
 .resi-row-btn {
   margin-bottom: 13px;

From c709f1f0299c8f1c6f6132e02cb2c83800a513bd Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 11 May 2023 16:10:45 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=83=A8=E5=88=86=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=E4=B8=8E=E4=BA=A4=E4=BA=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/management/edit-main.scss    | 19 +++++++++++++++++++
 src/views/modules/base/resi.vue               |  6 +++---
 .../modules/shequzhili/statics/index.vue      |  7 +++++--
 src/views/modules/workSys/operAuth.vue        |  2 --
 4 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/assets/scss/modules/management/edit-main.scss b/src/assets/scss/modules/management/edit-main.scss
index dfaf49407..3a28cf392 100644
--- a/src/assets/scss/modules/management/edit-main.scss
+++ b/src/assets/scss/modules/management/edit-main.scss
@@ -46,5 +46,24 @@
   margin-right:16px;
   justify-content: flex-end;
   text-align: center;
+  &::v-deep .el-button--default {
+      font-size: 14px  !important;
+      font-family: PingFangSC-Regular, PingFang SC;
+      font-weight: 400;
+      color: #0056d6 !important;
+      // line-height: 22px  !important;
+      min-width: 60px !important;
+      height: 30px !important;
+      // padding:0 8px  !important;
+      background: #FFFFFF !important;
+      border-radius: 2px !important;
+      border: 1px solid #0056d6 !important;
+   
+  } 
+  &::v-deep  .el-button--default:hover{
+    border: 1px solid #0042a3 !important;
+    color: #0042a3 !important;
+  }
+ 
 }
 
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 013c39839..e98ceb542 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -451,7 +451,7 @@
 					class="diy-button--common"
 					>重置</el-button
 				>
-				<el-button size="small" @click="handlerCancle" plain
+				<el-button size="small" class="diy-button--white" @click="handlerCancle" plain
 					>取消</el-button
 				>
 				<el-button
@@ -498,7 +498,7 @@
 			</div>
 
 			<div class="resi-btns">
-				<el-button size="small" plain @click="dialogVisible2 = false"
+				<el-button size="small"  class="diy-button--white" plain @click="dialogVisible2 = false"
 					>关闭</el-button
 				>
 			</div>
@@ -1858,7 +1858,7 @@ export default {
 
 <style lang="scss" scoped>
 @import "@/assets/scss/modules/management/list-main.scss";
-
+@import "@/assets/scss/buttonstyle.scss";
 ::v-deep .el-tabs__nav-next {
 	box-shadow: 2px 0px 9px 0px;
 }
diff --git a/src/views/modules/shequzhili/statics/index.vue b/src/views/modules/shequzhili/statics/index.vue
index cc49aa3d1..da0e543d2 100644
--- a/src/views/modules/shequzhili/statics/index.vue
+++ b/src/views/modules/shequzhili/statics/index.vue
@@ -36,11 +36,12 @@
           />
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" size="small" class="diy-button--add" @click="handleSearch">查询</el-button>
           <el-button
+            class="diy-button--white"
             size="small"
             @click="resetForm('searchForm')"
             >重置</el-button>
+          <el-button type="primary" size="small" class="diy-button--add" @click="handleSearch">查询</el-button>
         </el-form-item>
       </el-form>
     </el-card>
@@ -50,7 +51,9 @@
                     class="diy-button--add"
                     size="small">总计</el-button>
         <el-button @click="exportHandle"
-                    size="small" :loading="exportLoading">导出</el-button>
+                    size="small"
+                    class="diy-button--white"
+                    :loading="exportLoading">导出</el-button>
       </div>
       <el-table class="resi-table" v-loading="dataListLoading" :data="dataList" border  style="width: 100%"
       :height="tableHeight">
diff --git a/src/views/modules/workSys/operAuth.vue b/src/views/modules/workSys/operAuth.vue
index 6dc4e246f..49b7206a2 100644
--- a/src/views/modules/workSys/operAuth.vue
+++ b/src/views/modules/workSys/operAuth.vue
@@ -53,7 +53,6 @@
                      class="diy-button--add"
                      @click="handleSearch">查询</el-button>
          
-
         </div>
       </el-form>
     </div>
@@ -73,7 +72,6 @@
                 border
                 :height="tableHeight"
                 v-loading="tableLoading"
-                
                 style="width: 100%">
         <el-table-column label="序号"
                          header-align="center"

From ccea313661538e96ef2358d5e0b34720017870c2 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 11 May 2023 16:32:33 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scss/modules/management/edit-main.scss    | 43 ++++++++-----------
 src/views/modules/base/resi.vue               |  2 +-
 2 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/src/assets/scss/modules/management/edit-main.scss b/src/assets/scss/modules/management/edit-main.scss
index 3a28cf392..57b5bc143 100644
--- a/src/assets/scss/modules/management/edit-main.scss
+++ b/src/assets/scss/modules/management/edit-main.scss
@@ -39,31 +39,22 @@
   
   }
 }
-
-.m-edit-btn {
-  display: flex;
-  margin-top: 20px;
-  margin-right:16px;
-  justify-content: flex-end;
-  text-align: center;
-  &::v-deep .el-button--default {
-      font-size: 14px  !important;
-      font-family: PingFangSC-Regular, PingFang SC;
-      font-weight: 400;
-      color: #0056d6 !important;
-      // line-height: 22px  !important;
-      min-width: 60px !important;
-      height: 30px !important;
-      // padding:0 8px  !important;
-      background: #FFFFFF !important;
-      border-radius: 2px !important;
-      border: 1px solid #0056d6 !important;
-   
-  } 
-  &::v-deep  .el-button--default:hover{
-    border: 1px solid #0042a3 !important;
-    color: #0042a3 !important;
-  }
- 
+//取消按钮
+::v-deep .el-button--default {
+  font-size: 14px  !important;
+  font-family: PingFangSC-Regular, PingFang SC;
+  font-weight: 400;
+  color: #0056d6 !important;
+  // line-height: 22px  !important;
+  min-width: 60px !important;
+  height: 30px !important;
+  // padding:0 8px  !important;
+  background: #FFFFFF !important;
+  border-radius: 2px !important;
+  border: 1px solid #0056d6 !important;
+} 
+::v-deep  .el-button--default:hover{
+border: 1px solid #0042a3 !important;
+color: #0042a3 !important;
 }
 
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index e98ceb542..388be0681 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -56,7 +56,7 @@
 			<div class="div_btn">
 				<div class="div_btn_left">
 					<el-button
-						style="height: 32px"
+						class="diy-button--add"
 						v-if="btnAuths.ic_resi_add"
 						size="small"
 						@click="handleAdd"