图表统计修改、附近水源修改

public/config/app.json

@@ -35,7 +35,7 @@
             "center":[],
             "zoom":null
         },
-        "waterUrl":"http://223.99.16.253:9007/geoserver/ksp/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=ksp%3Ashp_1686208018&maxFeatures=50000&outputFormat=application%2Fjson",
+        "waterUrl":"http://60.217.22.180:9007/geoserver/ksp/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=ksp%3Aqushuidian&maxFeatures=50000&outputFormat=application%2Fjson",
         "goodsUrl":"",
         "tools":{
             "routebox":true,
@@ -58,7 +58,7 @@
             "center":[],
             "zoom":null
         },
-        "waterUrl":"http://223.99.16.253:9007/geoserver/ksp/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=ksp%3Ashp_1686208018&maxFeatures=50000&outputFormat=application%2Fjson",
+        "waterUrl":"http://60.217.22.180:9007/geoserver/ksp/ows?service=WFS&version=1.0.0&request=GetFeature&typeName=ksp%3Aqushuidian&maxFeatures=50000&outputFormat=application%2Fjson",
         "goodsUrl":"",
         "tools":{
             "routebox":true,

src/views/home/widget/rightechartsdata.vue

@@ -15,6 +15,27 @@
       data(){
           return {
               list:[],
+              query:[
+                {
+                    severName:"现有水源地-一级水源",
+                    tableRef:"yijishuiyuan"
+                },{
+                    severName:"现有水源地-二级水源",
+                    tableRef:"erjishuiyuan"
+                },{
+                    severName:"防火卡口",
+                    tableRef:"fanghuokakou"
+                },{
+                    severName:"森林消防专业队伍",
+                    tableRef:"xiaofangzhuanyeduiwu"
+                },{
+                    severName:"规划水源地",
+                    tableRef:"guihuashuiyuandi"
+                },{
+                    severName:"森林防火物资",
+                    tableRef:"senlinfanghuowuzi"
+                }
+              ],
               listParams:{
                   areaname:localStorage.getItem("areaName"),
               },
@@ -28,15 +49,20 @@
       },
       methods:{
           getList(){
+              let params= [];
+
+              this.query.forEach((item,index)=>{
+                  params.push(item.tableRef);
+              })
+
               axios({
-                  method:"get",
+                  method:"post",
-                  url:BASE_URL+"/FirePrevention/GetTableListCount",
+                  url:BASE_URL+"/FirePrevention/GetTableListCountByTableName",
-                  params:this.listParams,
+                  data:params,
                   headers:{
                       'X-Token':localStorage.getItem("X-Token")
                   }
               }).then(res=>{
-                //   console.log('1111',res)
                   let rel = res.data.data
                   this.handleEcharts(rel)
               })
@@ -45,7 +71,10 @@
             let xData = []
             let yData = []
             data.forEach(item =>{
-                xData.push(item.name)
+                let obj = this.query.find((it,idx)=>{
+                    return it.tableRef == item.name;
+                })
+                xData.push(obj.severName)
                 yData.push(item.value)
             })
             let option = {

src/views/home/widget/waterbox.vue

@@ -12,8 +12,8 @@
             <el-radio :label="1" class="mr-1">1km内</el-radio>
             <el-radio :label="2" class="mr-1">5km内</el-radio>
             <el-radio :label="3" class="mr-1">10km内</el-radio>
-            <el-radio :label="4" class="mr-1">20km内</el-radio>
+            <!-- <el-radio :label="4" class="mr-1">20km内</el-radio> -->
-            <el-radio :label="5">全部</el-radio>
+            <!-- <el-radio :label="5">全部</el-radio> -->
           </el-radio-group>
         </div>
       </div>