验收部分修改

shuishen

2021-12-04 a36ba93c2e392d370f380124b441b7ee3a91a883

验收部分修改

 src/components/map/main.vue

@@ -7,7 +7,8 @@
 * @LastEditTime: 2021-04-24 11:59:43
-->
<template>
  <div id="track_map" style="height: 100%"></div>
    <div id="track_map"
         style="height: 100%"></div>
</template>
<script>
import "ol/ol.css";
@@ -50,7 +51,7 @@
import Feature from "ol/Feature.js";
import Point from "ol/geom/Point.js";
import LineString from "ol/geom/LineString.js";
import { Icon, Style, Fill, Stroke } from "ol/style.js";
import { Icon, Style, Fill, Stroke, Text } from "ol/style.js";

import { getWidth, getTopLeft } from "ol/extent";

@@ -239,6 +240,58 @@
      this.flyTo(Number(item.LGTD), Number(item.LTTD), 18);
    },

        addTextEntitys (item, icon, scale, name, type) {

            this[type].getSource().clear();

            const iconFeature = new Feature({
                geometry: new Point([Number(item.LGTD), Number(item.LTTD)]),
                name: name,
                attributes: item,
            });

            const iconStyle = new Style({
                // text: new Text({ // 字体, 未成功, 浪费许多时间
                //   font: 'Normal ' + 12 + 'px ' + 'iconfont',
                //   text: "\e645",
                //   fill: new Fill({ color: "green" }),
                // }),

                text: new Text({
                    textAlign: 'top',
                    text: item.phone + '\r\n' + item.rname + '\r\n' + item.deptname,
                    font: 'bold 20px SimHei',
                    fill: new Fill({ color: '#000' }),
                    offsetX: 20,
                    offsetY: -16
                }),

                image: new Icon({
                    scale: scale,
                    opacity: 1,
                    src: icon,
                    // src: require('../../assets/Mark.png')
                }),

                // new CircleStyle({ // 普通样式
                //   radius: 6,
                //   fill: new Fill({
                //     color: 'rgba(200, 155, 155, 0.8)'
                //   }),
                //   stroke: new Stroke({
                //     color: 'black',
                //     width: 0.3,
                //   })
                // }),
            });

            iconFeature.setStyle(iconStyle);

            this[type].getSource().addFeature(iconFeature);

            this.flyTo(Number(item.LGTD), Number(item.LTTD), 18);
        },

    addLines(arr) {
      this.addEntity(arr[0][0], arr[0][1]);
      this.peopleLineAddlayer.getSource().clear();

 src/views/commandQuery/taskDistribution.vue

@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-07-07 17:30:05
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-11-25 15:47:19
 * @Last Modified time: 2021-12-04 15:54:03
 * menu-name 监管信息
 */
<template>
@@ -86,7 +86,7 @@
// import { datasing } from "./dataqualificationExamination";
// import { getList } from "@/api/qualificationExamination/qualificationExamination";
import { getLisperetaskDistribution } from "@/api/commandQuery/commandQuery";
import { getDirectiveLiveLocationVoList, getDirectiveLocusInfoList, getNewPeople } from "@/api/map/people";
import { getDirectiveLiveLocationVoList, getDirectiveLocusInfoList } from "@/api/map/people";

import peoplePng from "@/assets/img/people.png";

@@ -407,43 +407,25 @@
            this.seeLocationFlag = true

            getDirectiveLiveLocationVoList({ type: 1, userIds: row.receiveDirectiveIds }).then((result) => {
                getNewPeople().then(res => {

                    if (JSON.stringify(res.data) != "{}") {
                        var arr = res.data.sort(function (a, b) {
                            return a['date'] < b['date'] ? 1 : -1
                        })

                        this.$refs.locationForm.addEntitys(
                var res = result.data.data;
                if (JSON.stringify(res) != "[]") {
                    res.forEach((data)=>{
                        this.$refs.locationForm.addTextEntitys(
                            {
                                LGTD: arr[0].gis_jd,
                                LTTD: arr[0].gis_wd,
                                LGTD: data.longitude,
                                LTTD: data.latitude,
                                name: "人员位置",
                                deptname: data.deptname,
                                rname: data.rname,
                                phone: data.phone
                            },
                            peoplePng,
                            0.5,
                            "peoplelayer",
                            "peopleAddlayer"
                        );
                    }
                })

                // var res = result.data.data;
                // if (JSON.stringify(res) != "[]") {
                //     res.forEach((data)=>{
                //         this.$refs.locationForm.addEntitys(
                //             {
                //                 LGTD: data.longitude,
                //                 LTTD: data.latitude,
                //                 name: "人员位置",
                //             },
                //             peoplePng,
                //             0.5,
                //             "peoplelayer",
                //             "peopleAddlayer"
                //         );
                //     })
                // }
                }
            });
        },


 src/views/desk/notice.vue

@@ -209,7 +209,7 @@
            ],
          },
          {
            label: "通知日期",
            label: "下发时间",
            prop: "releaseTime",
            type: "date",
            format: "yyyy-MM-dd hh:mm:ss",
@@ -217,7 +217,7 @@
            rules: [
              {
                required: true,
                message: "请输入通知日期",
                message: "请选择下发时间",
                trigger: "click",
              },
            ],

 src/views/map/carGps.vue

@@ -2,7 +2,7 @@
 * @Author: Morpheus
 * @Date: 2021-07-05 16:31:54
 * @Last Modified by: Morpheus
 * @Last Modified time: 2021-12-02 18:37:19
 * @Last Modified time: 2021-12-04 15:28:17
 * menu-name 押运人员定位
 */
<template>

 src/views/workreport/workreport.vue

@@ -99,8 +99,6 @@
                  searchRange: true,
                  searchSpan: 6,
                  hide: false,
                  addDisplay: false,
                  editDisplay: false,
                  // viewDisplay: false,
                  search: false,
                  rules: [{