增加面积单位公顷

data-ui/src/views/data/digitalforest/resources/index.vue

@@ -85,7 +85,7 @@
         </template>
       </el-table-column>
       <el-table-column label="公顷株数" align="center" prop="hectareTrees"/>
-      <el-table-column label="面积" align="center" prop="forestryArea"/>
+      <el-table-column label="面积（公顷）" align="center" prop="forestryArea"/>
       <el-table-column label="森林类别" align="center" prop="forestCategory">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.forest_category" :value="scope.row.forestCategory"/>
@@ -143,7 +143,7 @@
 
     <!-- 添加或修改林业资源对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" class="form-style">
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="地类" prop="groundClass">
@@ -191,8 +191,8 @@
                   :aria-readonly="!disabled"/>
               </el-select>
             </el-form-item>
-            <el-form-item label="面积" prop="forestryArea">
-              <el-input v-model="form.forestryArea" placeholder="请输入面积" maxlength="15"/>
+            <el-form-item label="面积（公顷）" prop="forestryArea">
+              <el-input v-model="form.forestryArea" placeholder="请输入面积（公顷）" maxlength="15"/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -279,7 +279,7 @@
             {validator: checkNonnegativeInteger, trigger: 'blur'}
           ],
           forestryArea: [
-            {required: true, message: '面积不能为空', trigger: 'blur'},
+            {required: true, message: '面积（公顷）不能为空', trigger: 'blur'},
             {validator: checkPositiveDecimal, trigger: 'blur'}
           ],
           dominantTreeSpecies: [

src/main/resources/mapper/digitalforest/ForestBigDataMapper.xml

@@ -216,7 +216,7 @@
 
 
     <select id="focusOnFire" resultType="map">
-        SELECT SUM(plots_area) as '面积' ,COUNT(DISTINCT forest_species)as '防火林种',dept_name as '归属部门' FROM `centerdata_t_forest_keyfireproofplots` GROUP BY dept_name
+        SELECT SUM(plots_area) as area ,COUNT(DISTINCT forest_species)as species,dept_name as deptName FROM `centerdata_t_forest_keyfireproofplots` GROUP BY dept_name
     </select>
 
     <select id="selectResourcesAreaCount" resultType="java.util.Map">