Merge remote-tracking branch 'origin/master'

src/components/agency/form/residential.vue

@@ -88,17 +88,17 @@
                 trigger: "blur"
               }]
             },
-            {
-              label: '坐标',
-              prop: 'map',
-              type: 'map',
-              //高德初始化参数
-              params: {
-                zoom: 10,
-                // zoomEnable: false,
-                // dragEnable: false,
-              }
-            },
+            // {
+            //   label: '坐标',
+            //   prop: 'map',
+            //   type: 'map',
+            //   //高德初始化参数
+            //   params: {
+            //     zoom: 10,
+            //     // zoomEnable: false,
+            //     // dragEnable: false,
+            //   }
+            // },
             {
               label: "经度",
               prop: "longitude",

src/views/businessmng/agencymng/agency.vue

@@ -4,16 +4,16 @@
     <!--卡片数据展示-->
     <!--    <el-card style="margin-bottom: 20px">-->
     <el-tabs type="border-card" style="margin-bottom: 20px">
-      <el-tab-pane label="社区数据统计" v-if="tenantType == 0">
+      <el-tab-pane label="社区数据统计">
         <div>
           <avue-data-box :option="communityStatistics"></avue-data-box>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="园区数据统计" v-else>
+      <!--<el-tab-pane label="社区数据统计" v-else>
         <div>
           <avue-data-box :option="parkStatistics"></avue-data-box>
         </div>
-      </el-tab-pane>
+      </el-tab-pane>-->
     </el-tabs>
     <!--    </el-card>-->
 
@@ -127,7 +127,7 @@
         parkStatistics: {
           span: 6,
           data: [{
-              title: '园区数量',
+              title: '社区数量',
               count: 0,
               icon: 'el-icon-office-building',
               color: 'rgb(49, 180, 141)',

src/views/dashboard/smartoperationcenter/comps/air_quality.vue

@@ -68,7 +68,7 @@
             }
           },
           legend: {
-            data: ['全市AQI', '园区AQI']
+            data: ['全市AQI', '社区AQI']
           },
           grid: {
             left: '4%',
@@ -95,7 +95,7 @@
               data: [120, 132, 101, 134, 90, 230, 210,156,145,168]
             },
             {
-              name: '园区AQI',
+              name: '社区AQI',
               type: 'line',
               stack: 'Total',
               areaStyle: {},

src/views/person/option/houseuseroption.js

@@ -21,7 +21,8 @@ export default () => {
     gutter: 30,
     dialogClickModal: false,
     addTitle: "居民录入",
-    column: [{
+    column: [
+      {
         label: "人脸照片",
         prop: "faceUrl",
         type: "upload",