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

liuyg

2021-09-10 0f9d3776541622e3069386f4fb02141f00217d8f

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

 src/api/Jurs/jurs.js

@@ -71,7 +71,7 @@

export const getDeptLazyTree = (parentId) => {
  return request({
    url: '/api/jurisdiction/lazy-tree',
    url: '/api/jurisdiction/lazy-trees',
    method: 'get',
    params: {
      parentId

 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/api/system/dept.js

@@ -88,3 +88,13 @@
        }
    })
}

export const getDeptLazyTreeUsers = (type) => {
    return request({
        url: '/api/blade-system/dept/lazy-tree-users',
        method: 'get',
        params: {
            type
        }
    })
}

 src/router/views/index.js

@@ -217,34 +217,36 @@
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/resource/uploadNotice')
        }]
    }, {
        path: '/workreport',
        component: Layout,
        redirect: '/workreport/workreport',
        children: [{
            path: 'workreport',
            name: '发起的汇报',
            meta: {
                i18n: 'dict'
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/workreport/workreport')
        }]
    },
    // {
    //     path: '/workreport',
    //     component: Layout,
    //     redirect: '/workreport/workreport',
    //     children: [{
    //         path: 'workreport',
    //         name: '发起的汇报',
    //         meta: {
    //             i18n: 'dict'
    //         },
    //         component: () =>
    //             import( /* webpackChunkName: "views" */ '@/views/workreport/workreport')
    //     }]
    // },
    // {
    //     path: '/workreport',
    //     component: Layout,
    //     redirect: '/workreport/workreply',
    //     children: [{
    //         path: 'workreply',
    //         name: '接收的汇报',
    //         meta: {
    //             i18n: 'dict'
    //         },
    //         component: () =>
    //             import( /* webpackChunkName: "views" */ '@/views/workreport/workreply')
    //     }]
    // },
    {
        path: '/workreport',
        component: Layout,
        redirect: '/workreport/workreply',
        children: [{
            path: 'workreply',
            name: '接收的汇报',
            meta: {
                i18n: 'dict'
            },
            component: () =>
                import( /* webpackChunkName: "views" */ '@/views/workreport/workreply')
        }]
    }, {
        path: '/management',
        redirect: '/management/index',
        component: Layout,

 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();

 src/views/qualificationExamination/paymentInquiry.vue

@@ -196,8 +196,8 @@
                    {
                        label: "缴费人",
                        prop: "deptName",
                        searchSpan: 4,
                        search: true,
                        // searchSpan: 4,
                        // search: true,
                        // slot: true,
                        // display: false,
                    },

 src/views/qualificationExamination/scoreInquiry.vue

@@ -62,9 +62,7 @@
        addBtn: false,
        selection: true,
        menu: false,

        searchShowBtn: false,

        align: "center",
        height: "auto",
        calcHeight: 30,
@@ -79,12 +77,14 @@
          {
            label: "姓名",
            prop: "securityName",
            // slot: true,
            // display: false,
            searchSpan: 4,
            search: true,
          },
          {
            label: "考试名称",
            prop: "examName",
            search:true,
            searchSpan:6,
            // slot: true,
            // display: false,
          },
@@ -96,8 +96,7 @@
            format: "yyyy-MM-dd",
            valueFormat: "yyyy-MM-dd",
            labelWidth: 120,
            searchSpan: 4,
            search: true,
            
            overHidden: true,
            rules: [
              {
@@ -160,8 +159,25 @@
            // display: false,
          },
          {
            label: "是否通过",
            label: "是否合格",
            prop: "qualified",
            searchSpan: 4,
            search: true,
            type:"select",
            dicData:[
              {
                label:"合格",
                value: 0
              },
              {
                label:"不合格",
                value: 1
              },
              {
                label:"实操成绩暂未录入",
                value: 3
              },
            ]
            // slot: true,
            // display: false,
          },
@@ -292,20 +308,20 @@
      ).then((res) => {
        const data = res.data.data;
        this.page.total = data.total;
        var d = data.records;

        for (var k in d) {
          if (d[k].qualified == 0) {
            d[k].qualified = "通过";
          } else if (d[k].qualified == 1) {
            d[k].qualified = "不通过";
          } else if (d[k].qualified == 2) {
            d[k].qualified = "暂未录入实操成绩";
          }
        }
        this.data = d;
        console.log(this.data);
        this.data = data.records;
        this.loading = false;
        // for (var k in d) {
        //   if (d[k].qualified == 0) {
        //     d[k].qualified = "通过";
        //   } else if (d[k].qualified == 1) {
        //     d[k].qualified = "不通过";
        //   } else if (d[k].qualified == 2) {
        //     d[k].qualified = "暂未录入实操成绩";
        //   }
        // }
        // this.data = d;
        // console.log(this.data);
        
        // this.selectionClear();
      });
    },

 src/views/securityCompany/dispatch.vue

@@ -88,6 +88,8 @@
            prop: "linkman",
            display: false,
            width: 120,
            search: true,
            searchSpan: 4,
          },

          {
@@ -106,8 +108,6 @@
              type: "datetime",
              format: "yyyy-MM-dd",
            },
            search: true,
            searchSpan: 4,
            display: false,
            width: 180,
          },

 src/views/securityGuardManagement/dispatchChildoperable.vue

@@ -143,7 +143,7 @@
            },
            search: true,
            overHidden: true,
            type: "select",
            type: "tree",
            rules: [
              {
                required: true,
@@ -183,7 +183,7 @@
          },
          {
            label: "保安人名称",
            prop: "name",
            prop: "securityName",
            search: true,
            searchSpan: 4,
            labelWidth: 120,
@@ -199,7 +199,7 @@
          },
          {
            label: "身份证",
            prop: "cardid",
            prop: "idCardNo",
            labelWidth: 120,
            overHidden: true,
            rules: [

 src/views/securityGuardManagement/register.vue

@@ -370,16 +370,64 @@
        lazy: true,
        treeLoad: function (node, resolve) {
          const parentId = node.level === 0 ? 0 : node.data.id;



          if (parentId == 0) {
          getDeptLazyTree(parentId).then((res) => {

            resolve(

              res.data.data.map((item) => {

                return {
                  ...item,
                  leaf: !item.hasChildren,
                };

              })

            );

          });
          } else if (parentId == '1372091709474910209') {

            getDeptLazyTree(parentId).then((res) => {

              resolve(

                res.data.data[0].children.map((item) => {

                  return {
                    ...item,
                    leaf: !item.hasChildren,
                  };

                })

              );

            });
          } else {
            getDeptLazyTree(parentId).then((res) => {
              res.data.data = [];
              resolve(

                res.data.data.map((item) => {

                  return {
                    ...item,
                    leaf: !item.hasChildren,
                  };

                })

              );

            });
          }


        },
        addBtn: false,
        menu: false,

 src/views/workreport/data.js

@@ -1,131 +1,4 @@
//已发送列表信息
export var workreportColumn = [{
    label: "汇报时间",
    prop: "reportTime",
    type: "datetime",
    format: "yyyy-MM-dd HH:mm:ss",
    valueFormat: "yyyy-MM-dd HH:mm:ss",
    searchRange: true,
    searchSpan: 6,
    hide: false,
    addDisplay: false,
    editDisplay: false,
    // viewDisplay: false,
    search: false,
    rules: [{
        required: true,
        message: "请输入时间",
        trigger: "blur"
    }]
},
//  {
//     label: "汇报类别",
//     prop: "category",
//     type: "select",
//     dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportCategory",
//     props: {
//         label: "dictValue",
//         value: "dictKey"
//     },
//     dataType: "number",
//     // searchSpan: 4,
//     // search: true,
//     hide: true,
//     addDisplay: false,
//     editDisplay: false,
//     viewDisplay: false,
//     rules: [{
//         required: true,
//         message: "请选择汇报类别",
//         trigger: "blur"
//     }]
// }, 
{
    label: "汇报类型",
    prop: "type",
    type: "select",
    dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportType",
    props: {
        label: "dictValue",
        value: "dictKey"
    },
    dataType: "number",
    searchSpan: 4,
    search: true,
    rules: [{
        required: true,
        message: "请选择汇报类型",
        trigger: "blur"
    }]
},
{
    label: "接收人",
    prop: "receivedIds",
    // span: 12,
    type: "tree",
    dicUrl: "/api/blade-system/dept/lazy-tree-users?type=3&deptId=" + this.deptId,
    hide: true,
    leafOnly: true,
    props: {
        label: "title",
        value: "id",
    },
    multiple: true,
    // dataType: "number",
    rules: [{
        required: true,
        message: "请选择接收人",
        trigger: "blur"
    }]
},
{
    label: "汇报人身份证号",
    prop: "idCardNo",
    hide: true,
    addDisplay: false,
    editDisplay: false,
    viewDisplay: false,
},
{
    label: "汇报内容",
    prop: "content",
    type: "textarea",
    span: 24,
    rules: [{
        required: true,
        message: "请输入汇报内容",
        trigger: "blur"
    }]
},

{
    label: "接收人",
    prop: "replyRealName",
    addDisplay: false,
    editDisplay: false,
    viewDisplay: false,
},
{
    label: "接收人单位",
    prop: "replyDeptName",
    addDisplay: false,
    editDisplay: false,
    // viewDisplay: false,
},
{
    label: "回复内容",
    prop: "replyContent",
    type: "textarea",
    span: 24,
    addDisplay: false,
    editDisplay: false,
    rules: [{
        required: true,
        message: "请输入回复内容",
        trigger: "blur"
    }]
}
]


//接收人列信息

 src/views/workreport/workreply.vue

@@ -77,7 +77,7 @@
        dialogWidth: 1000,
        tip: false,
        searchShow: true,
        searchBtn: false,
        searchBtn: true,
        searchMenuSpan: 6,
        editBtnText: "回复",
        searchShowBtn: false,

 src/views/workreport/workreport.vue

@@ -52,7 +52,6 @@
import { getDept } from "@/api/system/dept";
import { mapGetters } from "vuex";
import { mapState } from "vuex";
import { workreportColumn } from "./data";

export default {
  data() {
@@ -78,7 +77,7 @@
        calcHeight: 30,
        dialogWidth: 1000,
        tip: false,
        searchBtn: false,
        searchBtn: true,
        searchShow: true,
        searchShowBtn: false,
        searchMenuSpan: 6,
@@ -91,7 +90,133 @@
        excelBtn: false,
        menuWidth: 320,
        dialogClickModal: false,
        column:workreportColumn,
        column:[{
                  label: "汇报时间",
                  prop: "reportTime",
                  type: "datetime",
                  format: "yyyy-MM-dd HH:mm:ss",
                  valueFormat: "yyyy-MM-dd HH:mm:ss",
                  searchRange: true,
                  searchSpan: 6,
                  hide: false,
                  addDisplay: false,
                  editDisplay: false,
                  // viewDisplay: false,
                  search: false,
                  rules: [{
                      required: true,
                      message: "请输入时间",
                      trigger: "blur"
                  }]
              },
              //  {
              //     label: "汇报类别",
              //     prop: "category",
              //     type: "select",
              //     dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportCategory",
              //     props: {
              //         label: "dictValue",
              //         value: "dictKey"
              //     },
              //     dataType: "number",
              //     // searchSpan: 4,
              //     // search: true,
              //     hide: true,
              //     addDisplay: false,
              //     editDisplay: false,
              //     viewDisplay: false,
              //     rules: [{
              //         required: true,
              //         message: "请选择汇报类别",
              //         trigger: "blur"
              //     }]
              // }, 
              {
                  label: "汇报类型",
                  prop: "type",
                  type: "select",
                  dicUrl: "/api/blade-system/dict-biz/dictionary?code=workReportType",
                  props: {
                      label: "dictValue",
                      value: "dictKey"
                  },
                  dataType: "number",
                  searchSpan: 4,
                  search: true,
                  rules: [{
                      required: true,
                      message: "请选择汇报类型",
                      trigger: "blur"
                  }]
              },
              {
                  label: "接收人",
                  prop: "receivedIds",
                  // span: 12,
                  type: "tree",
                  dicUrl: "/api/blade-system/dept/lazy-tree-users?type=3",
                  hide: true,
                  leafOnly: true,
                  props: {
                      label: "title",
                      value: "id",
                  },
                  multiple: true,
                  // dataType: "number",
                  rules: [{
                      required: true,
                      message: "请选择接收人",
                      trigger: "blur"
                  }]
              },
              {
                  label: "汇报人身份证号",
                  prop: "idCardNo",
                  hide: true,
                  addDisplay: false,
                  editDisplay: false,
                  viewDisplay: false,
              },
              {
                  label: "汇报内容",
                  prop: "content",
                  type: "textarea",
                  span: 24,
                  rules: [{
                      required: true,
                      message: "请输入汇报内容",
                      trigger: "blur"
                  }]
              },

              {
                  label: "接收人",
                  prop: "replyRealName",
                  addDisplay: false,
                  editDisplay: false,
                  viewDisplay: false,
              },
              {
                  label: "接收人单位",
                  prop: "replyDeptName",
                  addDisplay: false,
                  editDisplay: false,
                  // viewDisplay: false,
              },
              {
                  label: "回复内容",
                  prop: "replyContent",
                  type: "textarea",
                  span: 24,
                  addDisplay: false,
                  editDisplay: false,
                  rules: [{
                      required: true,
                      message: "请输入回复内容",
                      trigger: "blur"
                  }]
              }
          ],
      },
      data: [],
    };
@@ -245,8 +370,6 @@

      var that = this;
      getDept(this.deptId).then(() => {
        const columnReceivedIds = that.findObject(that.option.column, "receivedIds");
        columnReceivedIds.dicUrl = "/api/blade-system/dept/lazy-tree-users?type=3&deptId="+that.deptId;
        params["deptId"] = that.deptId;
        params["userId"] = that.userId;


 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': '/'