数据中心

src/api/datacenter.js

@@ -10,7 +10,7 @@ export function getResource() {
 
 //点击左侧菜单列表查询落点
 export function getResourcePoint(resourceTable, name) {
-  alert(resourceTable, name)
+  // alert(resourceTable, name)
   return request({
     url: '/center-fire/VisuForestDataCenterController/getResourcePoint',
     method: 'post',

src/views/datacenter.vue

@@ -29,11 +29,13 @@
 
                 <div class="icon-con" :class="{on:iconCurrentIndex==item.resourceTable}"
                      v-for="(item,index) in resourcesList"
-                     v-on:click="indentleftSetMarkers(item.resourceTable, searchName)">
+                     v-on:click="indentleftSetMarkers(item.type, searchName)">
                   <div class="iconfont icon icon-normal" :class="item.icon"></div>
                   <div class="icon-text">
-                    <h6>{{ item.count }}</h6>
-                    <h5>{{ item.resourceName }}</h5>
+                    <h6>{{ item.num }}</h6>
+                    <!--<h6>{{ item.count }}</h6>-->
+                    <h5>{{ item.name }}</h5>
+                    <!--<h5>{{ item.resourceName }}</h5>-->
                   </div>
                 </div>
               </div>
@@ -361,13 +363,15 @@ export default {
       let that = this
       //获取左侧菜单列表
       getResource().then(res => {
+        console.log("res.data=", res.data)
         that.resourcesList = res.data
         //截取data.resourceTable字段中“_”分隔符最后一个作为关键字,重新拼接成前端需要的图标:class,格式sj-icon-xxxx,将其set回原数组
         res.data.forEach(function(data, index) {
           // that.$set(that.resourcesList[index], 'icon', 'sj' + '-' + 'icon' + '-' + data.resourceTable.split('_').slice(-1))
 
+          let icon ='sj' + '-' + 'icon' + '-' + data.type.split('_').slice(-1);
           // let icon ='sj' + '-' + 'icon' + '-' + data.type.replaceAll("_", "-").replaceAll("@", "-");
-          let icon ='sj' + '-' + 'icon' + '-' + data.resourceTable.split('_').slice(-1);
+          // let icon ='sj' + '-' + 'icon' + '-' + data.resourceTable.split('_').slice(-1);
           console.log("icon_" + (index + 1) + "=", icon);
           that.$set(that.resourcesList[index], 'icon', icon);
 
@@ -398,7 +402,7 @@ export default {
       that.source = []
       //点击左侧地图落点
       getResourcePoint(resourceTable, name).then(res => {
-        console.log("res.data.resourceList=", res.data.resourceList)
+        console.log("res.data.resourceList resourceTable="+resourceTable+"and name="+name, res.data.resourceList)
         that.deptGroupList = res.data.deptGroupList
         if (res.data.deptGroupList != null && res.data.deptGroupList.length > 0) {
           for (let i = 0; i < res.data.deptGroupList.length; i++) {
@@ -469,7 +473,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>地址：' + item.weatherstationAddress +
+          '                  <h4>地址：' + (item.weatherstation_address?item.weatherstation_address:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -477,7 +481,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>联系人：' + item.weatherstationPerson +
+          '                  <h4>联系人：' + (item.contacts?item.contacts:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -485,7 +489,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>电话：' + item.weatherstationTel +
+          '                  <h4>电话：' + (item.phone?item.phone:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -505,21 +509,21 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>林场名称：' + item.name + '</h4>' +
+          '                  <h4>林场名称：' + (item.name?item.name:"") + '</h4>' +
           '                </div>' +
           '                </div>' +
           '                </span>' +
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>联系人：' + item.person + '</h4>' +
+          '                  <h4>联系人：' + (item.contacts?item.contacts:"") + '</h4>' +
           '                </div>' +
           '                </div>' +
           '                </span>' +
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>电话：' + item.tel + '</h4>' +
+          '                  <h4>电话：' + (item.phone?item.phone:"") + '</h4>' +
           '                </div>' +
           '                </div>' +
           '                </span></div>'
@@ -538,7 +542,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>起降点名称：' + item.landingName +
+          '                  <h4>起降点名称：' + (item.name?item.name:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -546,7 +550,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>联系人：' + item.landingPerson +
+          '                  <h4>联系人：' + (item.contacts?item.contacts:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -554,7 +558,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>电话：' + item.landingTel + '</h4>' +
+          '                  <h4>电话：' + (item.phone?item.phone:"") + '</h4>' +
           '                </div>' +
           '                </div>' +
           '                </span></div>'
@@ -573,7 +577,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>渠道名称：' + item.channelName +
+          '                  <h4>渠道名称：' + (item.name?item.name:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -581,7 +585,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>联系人：' + item.channelPerson +
+          '                  <h4>联系人：' + (item.contacts?item.contacts:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -589,7 +593,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>电话：' + item.channelTel + '</h4>' +
+          '                  <h4>电话：' + (item.phone?item.phone:"") + '</h4>' +
           '                </div>' +
           '                </div>' +
           '                </span></div>'
@@ -608,7 +612,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>检查站名称：' + item.checkpointName +
+          '                  <h4>防火站名称：' + (item.name?item.name:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -616,7 +620,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>地址：' + item.checkpointAddress +
+          '                  <h4>地址：' + (item.checkpoint_address?item.checkpoint_address:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -624,7 +628,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>联系人：' + item.checkpointPerson +
+          '                  <h4>联系人：' + (item.contacts?item.contacts:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -632,7 +636,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>电话：' + item.checkpointTel +
+          '                  <h4>电话：' + (item.phone?item.phone:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -652,7 +656,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>取水口名称：' + item.waterintakeName +
+          '                  <h4>取水口名称：' + (item.name?item.name:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -660,7 +664,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>联系人：' + item.waterintakePerson +
+          '                  <h4>联系人：' + (item.contacts?item.contacts:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -668,7 +672,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>电话：' + item.waterintakeTel +
+          '                  <h4>电话：' + (item.phone?item.phone:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -688,7 +692,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>水鹤名称：' + item.watercraneName +
+          '                  <h4>水鹤名称：' + (item.name?item.name:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -696,7 +700,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>联系人：' + item.watercranePerson +
+          '                  <h4>联系人：' + (item.contacts?item.contacts:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -704,7 +708,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>电话：' + item.watercraneTel +
+          '                  <h4>电话：' + (item.phone?item.phone:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -724,7 +728,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>消火栓名称：' + item.firehydrantName +
+          '                  <h4>消火栓名称：' + (item.name?item.name:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -732,7 +736,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>地址：' + item.firehydrantAddress +
+          '                  <h4>地址：' + (item.firehydrant_address?item.firehydrant_address:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -740,7 +744,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>联系人：' + item.firehydrantPerson +
+          '                  <h4>联系人：' + (item.contacts?item.contacts:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -748,7 +752,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>电话：' + item.firehydrantTel +
+          '                  <h4>电话：' + (item.phone?item.phone:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -768,7 +772,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>森林防火队名称：' + item.fireteamName +
+          '                  <h4>森林防火队名称：' + (item.name?item.name:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -776,7 +780,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>联系人：' + item.fireteamPerson +
+          '                  <h4>联系人：' + (item.contacts?item.contacts:"") +
           '</h4>' +
           '                </div>' +
           '                </div>' +
@@ -784,7 +788,7 @@ export default {
           '<span>' +
           '                  <div class="d-l-con">' +
           '                  <div class="d-l-l-text">' +
-          '                  <h4>电话：' + item.fireteamTel + '</h4>' +
+          '                  <h4>电话：' + (item.phone?item.phone:"") + '</h4>' +
           '                </div>' +
           '                </div>' +
           '                </span></div>'