Merge branch 'liubiao-main'

src/api/FenceManager/fence.ts

@@ -64,6 +64,34 @@ function DelFence(ids) {
     })
 }
 
+//添加终端
+function addTerminal(data){
+  return request({
+        url: '/api/equipment/geoFence/addTerminal',
+        method: 'post',
+        data: data
+    })
+}
+
+//删除终端
+function delTerminal(data){
+ return request({
+        url: '/api/equipment/geoFence/delTerminal',
+        method: 'post',
+        data:data
+    })
+}
+
+//查询终端
+function pageTerminal(data){
+    return request({
+        url:'api/device/pageTerminal',
+        method:'get',
+        params:data
+    });
+}
+
+
 export default{
     updateFence:updateFence,
     AddFence:AddFence,
@@ -71,7 +99,10 @@ export default{
     check:check,
     geoFenceById:geoFenceById,
     getList:getList,
-    DelFence:DelFence
+    DelFence:DelFence,
+    addTerminal:addTerminal,
+    delTerminal:delTerminal,
+    pageTerminal:pageTerminal
 }
 
 

src/api/FenceManager/mapOpt.ts

@@ -1,7 +1,7 @@
 var map = null;
 var circle = null;
 var polygon = null;
-
+import mapLocation from '@/assets/images/mapLocation.png';
 
 function initMap() {
     // let key = '90bc158992feb8ccd0145e168cab1307';
@@ -9,12 +9,18 @@ function initMap() {
         map = new AMap.Map("map", {
             viewMode: '2D', //默认使用 2D 模式
             zoom: 11, //地图级别
+              dragEnable: true, // 强制开启拖拽
+    zoomEnable: true, // 开启滚轮缩放（辅助验证）
             center: [114.420739, 30.487514], //地图中心点
         });
 
-        map.on('click',function(evt){
-          alert('您点击的位置:'+evt.lnglat.lng+' , '+ evt.lnglat.lat);
-        });
+        
+setTimeout(() => {
+    map.resize();
+}, 1000);
+        // map.on('click',function(evt){
+        //   alert('您点击的位置:'+evt.lnglat.lng+' , '+ evt.lnglat.lat);
+        // });
     }
     return new Promise((resolve, reject) => {
         if(map){
@@ -39,7 +45,7 @@ function AddPoint(point, index, dragEnd, click) {
             let center = point ? new AMap.LngLat(point.lng, point.lat) : map.getCenter();
 
             let marker = new AMap.Text({
-                icon: "http://wdxm.ztzhtech.com:8111/Script/Home/img/welComeImg/mapLocation.png",
+                icon: mapLocation,
                 position: center,
                 offset: new AMap.Pixel(-15, -24),
                 draggable: true,

src/api/system/service/api.ts

@@ -0,0 +1,118 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { ServiceVO, ServiceForm, ServiceQuery } from '@/api/system/service/types';
+
+/**
+ * 查询轨迹服务列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listService = (query?: ServiceQuery): AxiosPromise<ServiceVO[]> => {
+  return request({
+    url: '/api/trackService/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询轨迹服务详细
+ * @param id
+ */
+export const getService = (id: string | number): AxiosPromise<ServiceVO> => {
+  return request({
+    url: '/api/trackService/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增轨迹服务
+ * @param data
+ */
+export const addService = (data: ServiceForm) => {
+  return request({
+    url: '/api/trackService/add',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改轨迹服务
+ * @param data
+ */
+export const updateService = (data: ServiceForm) => {
+    return Promise.reject({code:500,msg:'不允许此操作'});
+//   return request({
+//     url: '/api/trackService/update',
+//     method: 'put',
+//     data: data
+//   });
+};
+
+/**
+ * 删除轨迹服务
+ * @param id
+ */
+export const delService = (id: string | number | Array<string | number>) => {
+//   return request({
+//     url: '/api/trackService/' + id,
+//     method: 'delete'
+//   });
+
+return Promise.reject({code:500,msg:'不允许此操作'});
+};
+
+
+//获取设备
+export const getDevice = (data) => {
+  return request({
+    url: '/api/device',
+    method: 'get',
+    params:data
+  });
+};
+
+//获取设备
+export const getDeviceList = (data) => {
+  return request({
+    url: '/api/device/list',
+    method: 'get',
+    params:data
+  });
+};
+//保存
+export const terminalDevice=(data)=>{
+   return request({
+    url: '/api/trackService/terminal',
+    method: 'post',
+    data:data
+  });
+}
+//删除
+export const delTerminalDevice=(id)=>{
+   return request({
+    url: '/api/trackService/delTerminal/'+id,
+    method: 'delete'    
+  });
+}
+
+//获取地图的终端，列表查询
+export const getMapDevice = (data) => {
+  return request({
+    url: '/api/trackService/listTerminal',
+    method: 'get',
+    params:data
+  });
+};
+
+//获取地图的终端，模糊查询
+export const getMapDeviceByFilter = (data) => {
+  return request({
+    url: '/api/trackService/searchTerminal',
+    method: 'get',
+    params:data
+  });
+};

src/api/system/service/types.ts

@@ -0,0 +1,56 @@
+export interface ServiceVO {
+  /**
+   * 
+   */
+  id: string | number;
+
+  /**
+   * 猎鹰服务ID
+   */
+  sid: string | number;
+
+  /**
+   * 服务名称
+   */
+  sname: string;
+
+}
+
+export interface ServiceForm extends BaseEntity {
+  /**
+   * 
+   */
+  id?: string | number;
+
+  /**
+   * 猎鹰服务ID
+   */
+  sid?: string | number;
+
+  /**
+   * 服务名称
+   */
+  sname?: string;
+
+}
+
+export interface ServiceQuery extends PageQuery {
+
+  /**
+   * 猎鹰服务ID
+   */
+  sid?: string | number;
+
+  /**
+   * 服务名称
+   */
+  sname?: string;
+
+    /**
+     * 日期范围参数
+     */
+    params?: any;
+}
+
+
+