Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory

shuishen

2021-11-26 2f8e65fa3cdc33bbb029bbc72308efde58d10e27

Merge branch 'master' of http://192.168.0.105:10010/r/zhba_regulatory

 src/views/home/index.vue

@@ -1168,30 +1168,30 @@
            //   name: type,
            //   value: [Number(m.longitude), Number(m.latitude)],
            // };
            if (m.type === 1) {
              middleData[m.type]["geoData"].push([
                Number(this.peopleGps.LGTD),
                Number(this.peopleGps.LTTD)
              ]);
              middleData[m.type]["table"].push(obj);
            } else if (m.type === 2) {
              middleData[m.type]["geoData"].push([
                Number(this.carGps.LGTD),
                Number(this.carGps.LTTD)
              ]);
              middleData[m.type]["table"].push(obj);
            } else {
              middleData[m.type]["geoData"].push([
                Number(m.longitude),
                Number(m.latitude)
              ]);
              middleData[m.type]["table"].push(obj);
            }
            // middleData[m.type]["geoData"].push([
            //   Number(m.longitude),
            //   Number(m.latitude)
            // ]);
            // middleData[m.type]["table"].push(obj);
            // if (m.type === 1) {
            //   middleData[m.type]["geoData"].push([
            //     Number(this.peopleGps.LGTD),
            //     Number(this.peopleGps.LTTD)
            //   ]);
            //   middleData[m.type]["table"].push(obj);
            // } else if (m.type === 2) {
            //   middleData[m.type]["geoData"].push([
            //     Number(this.carGps.LGTD),
            //     Number(this.carGps.LTTD)
            //   ]);
            //   middleData[m.type]["table"].push(obj);
            // } else {
            //   middleData[m.type]["geoData"].push([
            //     Number(m.longitude),
            //     Number(m.latitude)
            //   ]);
            //   middleData[m.type]["table"].push(obj);
            // }
            middleData[m.type]["geoData"].push([
              Number(m.longitude),
              Number(m.latitude)
            ]);
            middleData[m.type]["table"].push(obj);
          });
          this.carNum = middleData[2]["table"].length;
          this.peoNum = middleData[1]["table"].length;
@@ -1488,14 +1488,14 @@
    }
  },
  mounted() {
    this.getPeoplePosition();
    this.getCarPosition();
    // this.getPeoplePosition();
    // this.getCarPosition();
    this.initEchart();
    this.getHolderNum(0);
    // this.getPoorPerformance(3);
    // this.getTableData("car");
    // this.initMap();
    // this.getTableData(0);
    this.getTableData(0);
    // this.initMapEchart();
    this.getOfficeData();
  }