Merge branch 'master' of http://192.168.1.222:3000/jiayi/zl-zhyl-web

web/src/views/basedata_manage/parklist.vue

@@ -40,6 +40,7 @@
           <span>{{ scope.row.fType == 3 ? '专类公园' : '' }}</span>
           <span>{{ scope.row.fType == 4 ? '历史名园' : '' }}</span>
           <span>{{ scope.row.fType == 5 ? '游园' : '' }}</span>
+          <span>{{ scope.row.fType == 6 ? '单位绿地' : '' }}</span>
         </template>
       </el-table-column>
       <el-table-column prop="fArea" label="总面积"></el-table-column>
@@ -145,6 +146,7 @@
                   <el-option label="专类公园" :value="3"></el-option>
                   <el-option label="历史名园" :value="4"></el-option>
                   <el-option label="游园" :value="5"></el-option>
+                  <el-option label="单位绿地" :value="5"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>

web/src/views/intelalarml_manage/parkscenery.vue

@@ -76,7 +76,8 @@
           { label: '社区公园', value: 1 },
           { label: '综合公园', value: 2 },
           { label: '专类公园', value: 3 },
-          { label: '游园', value: 5 }
+          { label: '游园', value: 5 },
+          { label: '单位绿地', value: 6 },
         ],
         searchname:'',
         selectparameter:{