From 4865eedde45647e3d76a787c7277218dd6dcc066 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 26 Jan 2022 09:11:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/communityParty/elegant/index.vue    | 4 +++-
 src/views/modules/visual/communityParty/community.vue | 2 +-
 src/views/modules/visual/communityParty/party.vue     | 2 +-
 src/views/modules/visual/measure/service.vue          | 2 +-
 src/views/modules/visual/measure/volunteer.vue        | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
index 9c7b5a18..422df400 100644
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@@ -28,7 +28,7 @@
           </el-form-item>
           <el-form-item>
             <el-button type="primary" @click="handleSearch">查询</el-button>
-            <el-button @click="resetForm('searchForm')">重置</el-button>
+            <el-button type="yellow" @click="resetForm('searchForm')">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -585,6 +585,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+@import "@/assets/scss/buttonstyle.scss";
+
 .resi-container .resi-card-table {
   ::v-deep .el-table th {
     color: #fff;
diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue
index 01da97c1..4c708061 100644
--- a/src/views/modules/visual/communityParty/community.vue
+++ b/src/views/modules/visual/communityParty/community.vue
@@ -648,7 +648,7 @@ export default {
       margin-left: 10px;
       .el-input__inner {
         font-size: 18px;
-        font-weight: 800;
+        // font-weight: 800;
         color: #fff;
         background: #06186d;
         border: 1px solid #1a64cc;
diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
index 2aad8ed5..8d4ab043 100644
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -843,7 +843,7 @@ export default {
       width: 180px;
       .el-input__inner {
         font-size: 18px;
-        font-weight: 800;
+        // font-weight: 800;
         color: #fff;
         background: #06186d;
         border: 1px solid #1a64cc;
diff --git a/src/views/modules/visual/measure/service.vue b/src/views/modules/visual/measure/service.vue
index 4f01209d..294a8ce7 100644
--- a/src/views/modules/visual/measure/service.vue
+++ b/src/views/modules/visual/measure/service.vue
@@ -634,7 +634,7 @@ export default {
       width: 180px;
       .el-input__inner {
         font-size: 18px;
-        font-weight: 800;
+        // font-weight: 800;
         color: #fff;
         background: #06186d;
         border: 1px solid #1a64cc;
diff --git a/src/views/modules/visual/measure/volunteer.vue b/src/views/modules/visual/measure/volunteer.vue
index 1f4030cc..02e93ecd 100644
--- a/src/views/modules/visual/measure/volunteer.vue
+++ b/src/views/modules/visual/measure/volunteer.vue
@@ -649,7 +649,7 @@ export default {
       width: 180px;
       .el-input__inner {
         font-size: 18px;
-        font-weight: 800;
+        // font-weight: 800;
         color: #fff;
         background: #06186d;
         border: 1px solid #1a64cc;

From cbf8dacff9971e4cbc61a425840dde07ba4bca88 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Wed, 26 Jan 2022 10:08:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/editResi.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/components/editResi.vue b/src/views/components/editResi.vue
index 8d431863..ed807fd9 100644
--- a/src/views/components/editResi.vue
+++ b/src/views/components/editResi.vue
@@ -14,7 +14,7 @@
         <el-row v-if="fixed" class="resi-row">
           <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
           <el-col :span="6">
-              <el-form-item prop="GRID_ID" label="所属网格" required>
+              <el-form-item prop="GRID_ID" label="所属网格">
               <!-- <div class="resi-cell"> -->
                 <!-- <div class="resi-cell-label">{{n.label}}</div> -->
                 <div class="resi-cell-value">