Administrator
2021-09-10 ae425fbcb4a275e0a4185ee799e8e1e6acd61678
现实表现修改
5 files modified
57 ■■■■ changed files
src/api/map/people.js 17 ●●●●● patch | view | raw | blame | history
src/api/register/honor.js 4 ●●●● patch | view | raw | blame | history
src/views/commandQuery/taskDistribution.vue 27 ●●●●● patch | view | raw | blame | history
src/views/management/computents/performance.vue 5 ●●●●● patch | view | raw | blame | history
vue.config.js 4 ●●●● patch | view | raw | blame | history
src/api/map/people.js
@@ -16,6 +16,15 @@
  })
}
export const getDirectiveLiveLocationVoList = (param) => {
    return request({
        url: '/api/liveLocation/getDirectiveLiveLocationVoList',
        method: 'get',
        params: param
    })
}
export const getTrack = (param) => {
  return request({
    url: '/api/liveLocation/getLocusInfoList',
@@ -23,4 +32,10 @@
    params: param
  })
}
export const getDirectiveLocusInfoList = (param) => {
    return request({
        url: '/api/liveLocation/getDirectiveLocusInfoList',
        method: 'get',
        params: param
    })
}
src/api/register/honor.js
@@ -22,7 +22,7 @@
}
export const getLisperformance = (current, size, params, cardid) => {
export const getLisperformance = (current, size, params, securityid) => {
    return request({
        url: '/api/performance/page',
        method: 'get',
@@ -30,7 +30,7 @@
            ...params,
            current,
            size,
            cardid
            securityid
        }
    })
}
src/views/commandQuery/taskDistribution.vue
@@ -84,7 +84,7 @@
// import { datasing } from "./dataqualificationExamination";
// import { getList } from "@/api/qualificationExamination/qualificationExamination";
import { getLisperetaskDistribution } from "@/api/commandQuery/commandQuery";
import { getPosition, getTrack } from "@/api/map/people";
import { getDirectiveLiveLocationVoList, getDirectiveLocusInfoList } from "@/api/map/people";
import peoplePng from "@/assets/img/people.png";
export default {
@@ -377,13 +377,14 @@
            this.seeLocationFlag = true
            getPosition({ type: 1, workerId: row.receiveDirectiveIds }).then((result) => {
            getDirectiveLiveLocationVoList({ type: 1, userIds: row.receiveDirectiveIds }).then((result) => {
                var res = result.data.data;
                if (JSON.stringify(res) != "{}") {
                if (JSON.stringify(res) != "[]") {
                    res.forEach((data)=>{
                    this.$refs.locationForm.addEntitys(
                        {
                            LGTD: res.longitude,
                            LTTD: res.latitude,
                                LGTD: data.longitude,
                                LTTD: data.latitude,
                            name: "人员位置",
                        },
                        peoplePng,
@@ -391,6 +392,8 @@
                        "peoplelayer",
                        "peopleAddlayer"
                    );
                    })
                }
            });
        },
@@ -438,22 +441,26 @@
                ":" +
                this.disposeTime(endTime.getSeconds());
            getTrack({
                workerId: this.rowData.receiveDirectiveIds,
            getDirectiveLocusInfoList({
                userIds: this.rowData.receiveDirectiveIds,
                type: 1,
                startTime: start,
                endTime: end,
            }).then((res) => {
                var result = res.data.data;
                if (result.length > 1) {
                if (JSON.stringify(res) != "[]") {
                    result.forEach((item) => {
                        if (item.length > 1) {
                    let arr = [];
                    result.forEach((item) => {
                        arr.push([Number(item.longitude), Number(item.latitude)]);
                            item.forEach((data) => {
                                arr.push([Number(data.longitude), Number(data.latitude)]);
                    });
                    this.$refs.tarckForm.addLines(arr);
                }
                    })
                }
            });
        },
src/views/management/computents/performance.vue
@@ -277,12 +277,13 @@
  },
  methods: {
    staffOnLoad(page, params = {}) {
      console.log(this.form,111);
      this.staffLoading = true;
      getLisperformance(
        page.currentPage,
        page.pageSize,
        Object.assign(params, this.staffQuery),
        this.form.cardid
        this.form.id
      ).then((res) => {
        const data = res.data.data;
@@ -291,7 +292,7 @@
        for (var k in this.staffData) {
          this.staffData[k]["name"] = this.form.realName;
        }
        console.log(this.staffData);
        console.log(this.staffData,'staffData');
        this.staffLoading = false;
        this.$refs.staffCrud.refreshTable();
        this.$refs.staffCrud.doLayout();
vue.config.js
@@ -30,12 +30,12 @@
        // target: 'http://192.168.0.109:1',
        //远程演示服务地址,可用于直接启动项目
        // target: 'http://2h3f861221.wicp.vip:58646',
        target: 'http://s16s652780.51mypc.cn/api',
                // target: 'http://s16s652780.51mypc.cn/api',
        // target: 'http://192.168.0.114:82',
        // target: 'http://192.168.0.108:82',
        // target: 'http://s16s652780.51mypc.cn/api',
        // 服务器使用
        // target: 'http://localhost:82',
                target: 'http://localhost:82',
        ws: true,
        pathRewrite: {
          '^/api': '/'