现实表现修改

Administrator

2021-09-10 ae425fbcb4a275e0a4185ee799e8e1e6acd61678

现实表现修改

 src/api/map/people.js

@@ -1,26 +1,41 @@
import request from '@/router/axios';

export const getPeopleList = (param) => {
  return request({
    url: '/api/blade-user/page-security',
    method: 'get',
    params: param
  })
    return request({
        url: '/api/blade-user/page-security',
        method: 'get',
        params: param
    })
}

export const getPosition = (param) => {
  return request({
    url: '/api/liveLocation/detail',
    method: 'get',
    params: param
  })
    return request({
        url: '/api/liveLocation/detail',
        method: 'get',
        params: param
    })
}


export const getDirectiveLiveLocationVoList = (param) => {
    return request({
        url: '/api/liveLocation/getDirectiveLiveLocationVoList',
        method: 'get',
        params: param
    })
}

export const getTrack = (param) => {
  return request({
    url: '/api/liveLocation/getLocusInfoList',
    method: 'get',
    params: param
  })
    return request({
        url: '/api/liveLocation/getLocusInfoList',
        method: 'get',
        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,20 +377,23 @@

            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) != "{}") {
                    this.$refs.locationForm.addEntitys(
                        {
                            LGTD: res.longitude,
                            LTTD: res.latitude,
                            name: "人员位置",
                        },
                        peoplePng,
                        0.5,
                        "peoplelayer",
                        "peopleAddlayer"
                    );
                if (JSON.stringify(res) != "[]") {
                    res.forEach((data)=>{
                        this.$refs.locationForm.addEntitys(
                            {
                                LGTD: data.longitude,
                                LTTD: data.latitude,
                                name: "人员位置",
                            },
                            peoplePng,
                            0.5,
                            "peoplelayer",
                            "peopleAddlayer"
                        );
                    })
                    
                }
            });
        },
@@ -438,21 +441,25 @@
                ":" +
                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) {
                    let arr = [];

                if (JSON.stringify(res) != "[]") {
                    result.forEach((item) => {
                        arr.push([Number(item.longitude), Number(item.latitude)]);
                    });
                        if (item.length > 1) {
                            let arr = [];

                    this.$refs.tarckForm.addLines(arr);
                            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

@@ -1,46 +1,46 @@
module.exports = {
  //路径前缀
  publicPath: "/",
  lintOnSave: true,
  productionSourceMap: false,
  chainWebpack: (config) => {
    //忽略的打包文件
    config.externals({
      'vue': 'Vue',
      'vue-router': 'VueRouter',
      'vuex': 'Vuex',
      'axios': 'axios',
      'element-ui': 'ELEMENT',
    });
    const entry = config.entry('app');
    entry.add('babel-polyfill').end();
    entry.add('classlist-polyfill').end();
    entry.add('@/mock').end();
  },
  css: {
    extract: { ignoreOrder: true }
  },
  //开发模式反向代理配置，生产模式请使用Nginx部署并配置反向代理
  devServer: {
    port: 1888,
    disableHostCheck: true,
    proxy: {
      '/api': {
        //本地服务接口地址
        // target: 'http://192.168.0.109:1',
        //远程演示服务地址,可用于直接启动项目
        // target: 'http://2h3f861221.wicp.vip:58646',
        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',
        ws: true,
        pathRewrite: {
          '^/api': '/'
    //路径前缀
    publicPath: "/",
    lintOnSave: true,
    productionSourceMap: false,
    chainWebpack: (config) => {
        //忽略的打包文件
        config.externals({
            'vue': 'Vue',
            'vue-router': 'VueRouter',
            'vuex': 'Vuex',
            'axios': 'axios',
            'element-ui': 'ELEMENT',
        });
        const entry = config.entry('app');
        entry.add('babel-polyfill').end();
        entry.add('classlist-polyfill').end();
        entry.add('@/mock').end();
    },
    css: {
        extract: { ignoreOrder: true }
    },
    //开发模式反向代理配置，生产模式请使用Nginx部署并配置反向代理
    devServer: {
        port: 1888,
        disableHostCheck: true,
        proxy: {
            '/api': {
                //本地服务接口地址
                // target: 'http://192.168.0.109:1',
                //远程演示服务地址,可用于直接启动项目
                // target: 'http://2h3f861221.wicp.vip:58646',
                // 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',
                ws: true,
                pathRewrite: {
                    '^/api': '/'
                }
            }
        }
      }
    }
  }
};
};