Merge branch 'dev-shuju' into test

src/views/modules/communityService/measure/index.vue

@@ -33,6 +33,19 @@
             <el-form-item label="需求人" prop="demandUserName">
               <el-input v-model="searchForm.demandUserName" placeholder="请输入内容" clearable=""></el-input>
             </el-form-item>
+            
+          </div>
+          <div>
+            <el-form-item label="状态" prop="status">
+              <el-select v-model="searchForm.status" filterable placeholder="请选择" clearable>
+                <el-option
+                  v-for="item in statusOptions"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
             <el-form-item label="上报时间" prop="reportStartTime">
               <el-date-picker
                 v-model="reportTime"
@@ -45,18 +58,10 @@
                 clearable="">
               </el-date-picker>
             </el-form-item>
+            
           </div>
           <div>
-            <el-form-item label="状态" prop="status">
-              <el-select v-model="searchForm.status" filterable placeholder="请选择" clearable>
-                <el-option
-                  v-for="item in statusOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
+            
             <el-form-item label="服务类型" prop="serviceType">
               <el-select v-model="searchForm.serviceType" filterable placeholder="请选择" clearable @change="handleServiceChange('query', $event)">
                 <el-option
@@ -94,7 +99,7 @@
               <el-button type="primary" @click="handleSearch">查询</el-button>
             </el-form-item>
             <el-form-item>
-            <el-button @click="resetForm('searchForm')">重置</el-button>
+            <el-button type="yellow" @click="resetForm('searchForm')">重置</el-button>
           </el-form-item>
           </div>
           
@@ -1119,6 +1124,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/measure/volunteer.vue

@@ -16,11 +16,11 @@
         </div>
       </div>
       <div class="box-wr">
-        <cpt-card class="card-wr">
+        <div class="card-wr">
           <div class="card-title">
-            <img class="title-icon"
-                 src="../../../../assets/img/shuju/title-tip.png" />
-            <div class="title-label">
+            <!-- <img class="title-icon"
+                 src="../../../../assets/img/shuju/title-tip.png" /> -->
+            <div class="card-left-title">
               志愿者服务情况
             </div>
           </div>
@@ -77,12 +77,12 @@
 
           </div>
 
-        </cpt-card>
-        <cpt-card class="card-wr card-wr-map">
+        </div>
+        <div class="card-wr card-wr-map">
           <div class="card-title">
-            <img class="title-icon"
-                 src="../../../../assets/img/shuju/title-tip.png" />
-            <div class="title-label">
+            <!-- <img class="title-icon"
+                 src="../../../../assets/img/shuju/title-tip.png" /> -->
+            <div class="card-left-title">
               多元化治理平面图
             </div>
           </div>
@@ -108,7 +108,7 @@
 
           </div>
 
-        </cpt-card>
+        </div>
       </div>
     </cpt-card>
   </div>
@@ -619,6 +619,7 @@ export default {
   // display: flex;
   .box-wr {
     display: flex;
+    margin-top: 40px;
   }
   .card-wr {
     flex: 1;
@@ -785,15 +786,35 @@ export default {
   text-align: center;
 
   .card-map {
-    margin-top: 10px;
+    margin-top: 30px;
     width: 100%;
     // height: calc(100vh - 285px);
-    height: calc(100vh - 315px);
-
+    height: calc(100vh - 335px);
+    padding-left: 20px;
     .map {
       width: 100%;
       height: 100%;
     }
   }
 }
+
+.card-left-title {
+  position: relative;
+  padding-left: 40px;
+  font-size: 16px;
+  font-weight: 500;
+  color: #fff;
+}
+.card-left-title::after {
+  content: '';
+  position: absolute;
+  top: 50%;
+  left: 20px;
+  width: 12px;
+  height: 12px;
+  box-sizing: border-box;
+  margin-top: -6px;
+  background: #2865FA;
+  border-radius: 50%;
+}
 </style>