Merge branch 'dev-chaxun' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-chaxun

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">

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;

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;

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;

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;

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;