Merge remote-tracking branch 'origin/develop' into develop

src/views/project/index.vue

@@ -7,7 +7,7 @@
           <img :class="`${prefixCls}__top-img`" src="../../assets/images/group.png" />
           <span
             ><p>{{ countData.counttotal }}</p
-            >人</span
+            >个</span
           >
         </div>
       </Col>
@@ -15,35 +15,35 @@
         <div class="title">自建</div>
         <span
           ><p>{{ countData.countbuildbyoneself }}</p
-          >人</span
+          >个</span
         >
       </Col>
       <Col :span="4" :class="`${prefixCls}__top-col`">
         <div class="title">委托建设</div>
         <span
           ><p>{{ countData.countbuildbyentrust }}</p
-          >人</span
+          >个</span
         >
       </Col>
       <Col :span="4" :class="`${prefixCls}__top-col`">
         <div class="title">代建</div>
         <span
           ><p>{{ countData.countbuildbyreplace }}</p
-          >人</span
+          >个</span
         >
       </Col>
       <Col :span="4" :class="`${prefixCls}__top-col`">
         <div class="title">承建</div>
         <span
           ><p>{{ countData.countbuildbyhold }}</p
-          >人</span
+          >个</span
         >
       </Col>
       <Col :span="4" :class="`${prefixCls}__top-col`">
         <div class="title">储备</div>
         <span
           ><p>{{ countData.countreserve }}</p
-          >人</span
+          >个</span
         >
       </Col>
     </Row>

src/views/project/project.data.ts

@@ -244,8 +244,8 @@ export const searchFormSchema: FormSchema[] = [
           value: '委托建设',
         },
         {
-          label: '代理',
-          value: '代理',
+          label: '代建',
+          value: '代建',
         },
         {
           label: '承建',