diff --git a/package.json b/package.json index f24ad11..63ee4d2 100644 --- a/package.json +++ b/package.json @@ -38,6 +38,7 @@ "dependencies": { "@amap/amap-jsapi-loader": "^1.0.1", "@riophae/vue-treeselect": "0.4.0", + "@types/echarts": "^4.9.22", "axios": "0.24.0", "clipboard": "2.0.8", "core-js": "3.25.3", diff --git a/src/api/system/fence.js b/src/api/system/fence.js new file mode 100644 index 0000000..ed3d22b --- /dev/null +++ b/src/api/system/fence.js @@ -0,0 +1,77 @@ +import request from "@/utils/request"; +import fence from "@/views/system/fence/index.vue"; + +/** + * 围栏列表 + * @param data + * @returns {*} + */ +export function fenceList(data) { + return request({ + url: '/corpor/fenceList', + method: 'post', + data + }) +} + +/** + * 新增围栏 + * @param data + * @returns {*} + */ +export function fenceAdd(data) { + return request({ + url: '/corpor/fenceAdd', + method: 'post', + data + }) +} + +/** + * 删除围栏 + * @param fenceId + * @returns {*} + */ +export function fenceDelete(fenceId) { + return request({ + url: '/corpor/fenceDelete/'+fenceId, + method: 'post' + }) +} + + +/** + * 修改围栏 + * @param data + * @returns {*} + */ +export function fenceUpdate(data) { + return request({ + url: '/corpor/fenceUpdate', + method: 'post', + data + }) +} + + +/** + * 保存围栏 + */ +export function saveFence(data) { + return request({ + url: '/corpor/saveFence', + method: 'post', + data + }) +} + + +/** + * 标识列表 + */ +export function identificationList() { + return request({ + url: '/corpor/identificationList', + method: 'post' + }) +} diff --git a/src/api/system/record.js b/src/api/system/record.js new file mode 100644 index 0000000..7fe692d --- /dev/null +++ b/src/api/system/record.js @@ -0,0 +1,9 @@ +import request from "@/utils/request"; + +export function recordList(data) { + return request({ + url: '/corpor/recordList', + method: 'post', + data + }) +} diff --git a/src/main.js b/src/main.js index a2bb892..b0d4db7 100644 --- a/src/main.js +++ b/src/main.js @@ -88,10 +88,11 @@ new Vue({ render: h => h(App) }) + AMapLoader.load({ - 'key':'bf67e6b110fda0875d19dcd528f2ee10', - 'version': '2.0',// - 'plugins':['AMap.Scale','AMap.GeoJSON'], -}).then((AMap)=>{ + 'key': 'fcd296bbfa904e3bf49d7316882a11bf', + 'version': '2.0', // 指定要加载的 JSAPI 的版本，缺少时默认为 1.4.15 + 'plugins': ['AMap.Scale','AMap.GeoJSON'] // 需要使用的的插件列表，如比例尺'AMap.Scale'等，更多插件请看官方文档 +}).then((AMap) => { Vue.use(AMap) }) diff --git a/src/router/index.js b/src/router/index.js index 94a8711..2afac71 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -3,9 +3,6 @@ import Router from 'vue-router' /* Layout */ import Layout from '@/layout' - - - Vue.use(Router) /** @@ -30,9 +27,6 @@ Vue.use(Router) } */ - - - // 公共路由 export const constantRoutes = [ { @@ -79,34 +73,6 @@ export const constantRoutes = [ } ] }, - // { - // path: '/car', - // component: Layout, - // redirect: 'index', - // children: [ - // { - // path: 'index', - // component: () => import('@/views/system/car/index'), - // name: 'Index', - // meta: {title: '车辆管理', icon: 'dashboard', affix: true} - // } - // ] - // }, - - // { - // path: '/car', - // component: Layout, - // redirect: 'index', - // children: [ - // { - // path: 'map', - // component: () => import('@/views/system/car/map'), - // name: 'Index', - // meta: {title: '地图页面！', icon: 'dashboard', affix: true} - // } - // ] - // }, - { path: '/user', component: Layout, @@ -197,9 +163,6 @@ export const dynamicRoutes = [ } ] - - - // 防止连续点击多次路由报错 let routerPush = Router.prototype.push; let routerReplace = Router.prototype.replace; @@ -212,12 +175,8 @@ Router.prototype.replace = function push(location) { return routerReplace.call(this, location).catch(err => err) } - - - export default new Router({ mode: 'history', // 去掉url中的# scrollBehavior: () => ({y: 0}), - routes: constantRoutes, - + routes: constantRoutes }) diff --git a/src/views/system/fence/index.vue b/src/views/system/fence/index.vue new file mode 100644 index 0000000..be0a6fc --- /dev/null +++ b/src/views/system/fence/index.vue @@ -0,0 +1,518 @@ + + + + diff --git a/src/views/system/record/index.vue b/src/views/system/record/index.vue new file mode 100644 index 0000000..0ec2125 --- /dev/null +++ b/src/views/system/record/index.vue @@ -0,0 +1,222 @@ + + +