diff --git a/package-lock.json b/package-lock.json index f6143577..ade57088 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "3.6.3", "license": "MIT", "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@riophae/vue-treeselect": "0.4.0", "axios": "0.24.0", "clipboard": "2.0.8", @@ -27,6 +28,7 @@ "skywalking-client-js": "^0.11.0", "sortablejs": "1.10.2", "vue": "2.6.12", + "vue-amap": "^0.5.10", "vue-count-to": "1.0.13", "vue-cropper": "0.5.5", "vue-meta": "2.4.0", @@ -72,6 +74,11 @@ "node": "8 || 10 || 12 || 14 || 16 || 17" } }, + "node_modules/@amap/amap-jsapi-loader": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz", + "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==" + }, "node_modules/@ampproject/remapping": { "version": "2.3.0", "resolved": "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.3.0.tgz", @@ -4558,6 +4565,14 @@ "tslib": "^2.0.3" } }, + "node_modules/camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==", + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/caniuse-api": { "version": "3.0.0", "resolved": "https://registry.npmmirror.com/caniuse-api/-/caniuse-api-3.0.0.tgz", @@ -16950,6 +16965,14 @@ "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==", "dev": true }, + "node_modules/uppercamelcase": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/uppercamelcase/-/uppercamelcase-1.1.0.tgz", + "integrity": "sha512-C7YEMvhgrvTEKEEVqA7LXNID/1TvvIwYZqNIKLquS6y/MGSkRQAav9LnTTILlC1RqUM8eTVBOe1U/fnB652PRA==", + "dependencies": { + "camelcase": "^1.2.1" + } + }, "node_modules/uri-js": { "version": "4.4.1", "resolved": "https://registry.npmmirror.com/uri-js/-/uri-js-4.4.1.tgz", @@ -17194,6 +17217,19 @@ "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==", "deprecated": "Vue 2 has reached EOL and is no longer actively maintained. See https://v2.vuejs.org/eol/ for more details." }, + "node_modules/vue-amap": { + "version": "0.5.10", + "resolved": "https://registry.npmmirror.com/vue-amap/-/vue-amap-0.5.10.tgz", + "integrity": "sha512-9ViNCev1vx32+zZ5RvF/TmUZNbwL9QrdA2/OnD2GlXMfQBkJy7D08Vb7379t6guqnopDPtWJ8K6gg72h9+4GUg==", + "dependencies": { + "uppercamelcase": "^1.1.0" + }, + "engines": { + "core-js": "^2.5.0", + "node": ">= 4.0.0", + "npm": ">= 3.0.0" + } + }, "node_modules/vue-count-to": { "version": "1.0.13", "resolved": "https://registry.npmmirror.com/vue-count-to/-/vue-count-to-1.0.13.tgz", @@ -18817,6 +18853,11 @@ "js-message": "1.0.7" } }, + "@amap/amap-jsapi-loader": { + "version": "1.0.1", + "resolved": "https://registry.npmmirror.com/@amap/amap-jsapi-loader/-/amap-jsapi-loader-1.0.1.tgz", + "integrity": "sha512-nPyLKt7Ow/ThHLkSvn2etQlUzqxmTVgK7bIgwdBRTg2HK5668oN7xVxkaiRe3YZEzGzfV2XgH5Jmu2T73ljejw==" + }, "@ampproject/remapping": { "version": "2.3.0", "resolved": "https://registry.npmmirror.com/@ampproject/remapping/-/remapping-2.3.0.tgz", @@ -22240,6 +22281,11 @@ "tslib": "^2.0.3" } }, + "camelcase": { + "version": "1.2.1", + "resolved": "https://registry.npmmirror.com/camelcase/-/camelcase-1.2.1.tgz", + "integrity": "sha512-wzLkDa4K/mzI1OSITC+DUyjgIl/ETNHE9QvYgy6J6Jvqyyz4C0Xfd+lQhb19sX2jMpZV4IssUn0VDVmglV+s4g==" + }, "caniuse-api": { "version": "3.0.0", "resolved": "https://registry.npmmirror.com/caniuse-api/-/caniuse-api-3.0.0.tgz", @@ -32087,6 +32133,14 @@ "integrity": "sha512-WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==", "dev": true }, + "uppercamelcase": { + "version": "1.1.0", + "resolved": "https://registry.npmmirror.com/uppercamelcase/-/uppercamelcase-1.1.0.tgz", + "integrity": "sha512-C7YEMvhgrvTEKEEVqA7LXNID/1TvvIwYZqNIKLquS6y/MGSkRQAav9LnTTILlC1RqUM8eTVBOe1U/fnB652PRA==", + "requires": { + "camelcase": "^1.2.1" + } + }, "uri-js": { "version": "4.4.1", "resolved": "https://registry.npmmirror.com/uri-js/-/uri-js-4.4.1.tgz", @@ -32288,6 +32342,14 @@ "resolved": "https://registry.npmmirror.com/vue/-/vue-2.6.12.tgz", "integrity": "sha512-uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg==" }, + "vue-amap": { + "version": "0.5.10", + "resolved": "https://registry.npmmirror.com/vue-amap/-/vue-amap-0.5.10.tgz", + "integrity": "sha512-9ViNCev1vx32+zZ5RvF/TmUZNbwL9QrdA2/OnD2GlXMfQBkJy7D08Vb7379t6guqnopDPtWJ8K6gg72h9+4GUg==", + "requires": { + "uppercamelcase": "^1.1.0" + } + }, "vue-count-to": { "version": "1.0.13", "resolved": "https://registry.npmmirror.com/vue-count-to/-/vue-count-to-1.0.13.tgz", diff --git a/package.json b/package.json index 567e3a18..64f22ac8 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "url": "https://gitee.com/y_project/MuYu-Cloud.git" }, "dependencies": { + "@amap/amap-jsapi-loader": "^1.0.1", "@riophae/vue-treeselect": "0.4.0", "axios": "0.24.0", "clipboard": "2.0.8", @@ -54,6 +55,7 @@ "skywalking-client-js": "^0.11.0", "sortablejs": "1.10.2", "vue": "2.6.12", + "vue-amap": "^0.5.10", "vue-count-to": "1.0.13", "vue-cropper": "0.5.5", "vue-meta": "2.4.0", diff --git a/src/api/carRail/corpuscle.js b/src/api/carRail/corpuscle.js new file mode 100644 index 00000000..7403cf28 --- /dev/null +++ b/src/api/carRail/corpuscle.js @@ -0,0 +1,43 @@ +import request from '@/utils/request' + +// 查询电子围栏列表 +export function listCorpuscle() { + return request({ + url: '/car/carRail/list', + method: 'get' + }) +} + +// // 查询电子围栏详细 +// export function getCorpuscle(id) { +// return request({ +// url: '/carRail/corpuscle/' + id, +// method: 'get' +// }) +// } + +// 新增电子围栏 +export function addCorpuscle(data) { + return request({ + url: '/car/carRail', + method: 'post', + data: data + }) +} + +// 修改电子围栏 +export function updateCorpuscle(data) { + return request({ + url: '/car/carRail', + method: 'put', + data: data + }) +} + +// 删除电子围栏 +export function delCorpuscle(id) { + return request({ + url: '/car/carRail/' + id, + method: 'delete' + }) +} diff --git a/src/api/fence/fence.js b/src/api/fence/fence.js new file mode 100644 index 00000000..a798f136 --- /dev/null +++ b/src/api/fence/fence.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询围栏组列表 +export function listFence() { + return request({ + url: '/car/fence/list', + method: 'get', + + }) +} + +// 查询围栏组详细 +export function getFence(id) { + return request({ + url: '/car/fence/' + id, + method: 'get' + }) +} + +// 新增围栏组 +export function addFence(data) { + return request({ + url: '/car/fence', + method: 'post', + data: data + }) +} + +// 修改围栏组 +export function updateFence(data) { + return request({ + url: '/car/fence', + method: 'put', + data: data + }) +} + +// 删除围栏组 +export function delFence(id) { + return request({ + url: '/car/fence/' + id, + method: 'delete' + }) +} diff --git a/src/api/supervisorycontrolmap/map/mapapi.js b/src/api/supervisorycontrolmap/map/mapapi.js new file mode 100644 index 00000000..592e0863 --- /dev/null +++ b/src/api/supervisorycontrolmap/map/mapapi.js @@ -0,0 +1,12 @@ +import request from '@/utils/request' + +// 查询围栏组 +export function listFence() { + return request({ + url: '/car/fence/list', + method: 'get', + + }) + + +} diff --git a/src/api/system/user.js b/src/api/system/user.js index 8bd36992..c26e5185 100644 --- a/src/api/system/user.js +++ b/src/api/system/user.js @@ -21,7 +21,7 @@ export function getUser(userId) { // 新增用户 export function addUser(data) { return request({ - url: '/saas/user', + url: '/car/user', method: 'post', data: data }) diff --git a/src/views/car/car/index.vue b/src/views/car/car/index.vue index 7177ec61..ac029350 100644 --- a/src/views/car/car/index.vue +++ b/src/views/car/car/index.vue @@ -145,6 +145,14 @@ export default { { value: '/car/breakdown', label: '车辆故障' + }, + { + value: '/firm/strategy', + label: '预警策略' + }, + { + value: '/firm/logs', + label: '预警日志' } ], activeTab: '', diff --git a/src/views/carRail/corpuscle/index.vue b/src/views/carRail/corpuscle/index.vue new file mode 100644 index 00000000..da815382 --- /dev/null +++ b/src/views/carRail/corpuscle/index.vue @@ -0,0 +1,294 @@ + + + diff --git a/src/views/fence/fence/index.vue b/src/views/fence/fence/index.vue new file mode 100644 index 00000000..d7194b11 --- /dev/null +++ b/src/views/fence/fence/index.vue @@ -0,0 +1,289 @@ + + + diff --git a/src/views/monitoring/map/index.vue b/src/views/monitoring/map/index.vue new file mode 100644 index 00000000..0057ef93 --- /dev/null +++ b/src/views/monitoring/map/index.vue @@ -0,0 +1,155 @@ + + + + + diff --git a/src/views/warning/logs/index.vue b/src/views/warning/logs/index.vue index 0921cbe8..2637d5ac 100644 --- a/src/views/warning/logs/index.vue +++ b/src/views/warning/logs/index.vue @@ -262,6 +262,11 @@ export default { created() { this.getList(); }, + mounted() { + this.$store.dispatch('app/toggleSideBarHide',true); + document.querySelector('.navbar').style.display = 'none'; + document.querySelector('.tags-view-container').style.display = 'none'; + }, methods: { /** 查询预警日志列表 */ getList() { diff --git a/src/views/warning/rule/index.vue b/src/views/warning/rule/index.vue index 81025b40..7a670e33 100644 --- a/src/views/warning/rule/index.vue +++ b/src/views/warning/rule/index.vue @@ -228,7 +228,11 @@ export default { rule: {} }; }, - + mounted() { + this.$store.dispatch('app/toggleSideBarHide',true); + document.querySelector('.navbar').style.display = 'none'; + document.querySelector('.tags-view-container').style.display = 'none'; + }, created() { this.queryParams.strategyId = this.$route.query.id this.getList(); diff --git a/src/views/warning/strategy/index.vue b/src/views/warning/strategy/index.vue index d1bdb026..b80c0e98 100644 --- a/src/views/warning/strategy/index.vue +++ b/src/views/warning/strategy/index.vue @@ -188,6 +188,11 @@ export default { created() { this.getList(); }, + mounted() { + this.$store.dispatch('app/toggleSideBarHide',true); + document.querySelector('.navbar').style.display = 'none'; + document.querySelector('.tags-view-container').style.display = 'none'; + }, methods: { /** 查询预警策略列表 */ getList() {