From 16c0def6eb12844de196254421612bc16925022d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com> Date: Mon, 17 Jan 2022 16:23:37 +0800 Subject: [PATCH 1/3] init --- src/api/vehicleMent/add.js | 38 ++++ src/api/vehicleMent/journal.js | 22 ++ src/api/vehicleMent/map.js | 17 ++ src/api/vehicleMent/reader.js | 38 ++++ src/assets/icons/svg/reader.svg | 1 + src/views/vehicleMent/add.vue | 327 ++++++++++++++++++++++++++++ src/views/vehicleMent/icon.png | Bin 0 -> 2825 bytes src/views/vehicleMent/journal.vue | 336 +++++++++++++++++++++++++++++ src/views/vehicleMent/map.vue | 93 ++++++++ src/views/vehicleMent/overview.vue | 182 ++++++++++++++++ src/views/vehicleMent/reader.vue | 325 ++++++++++++++++++++++++++++ vue.config.js | 4 +- 12 files changed, 1381 insertions(+), 2 deletions(-) create mode 100644 src/api/vehicleMent/add.js create mode 100644 src/api/vehicleMent/journal.js create mode 100644 src/api/vehicleMent/map.js create mode 100644 src/api/vehicleMent/reader.js create mode 100644 src/assets/icons/svg/reader.svg create mode 100644 src/views/vehicleMent/add.vue create mode 100644 src/views/vehicleMent/icon.png create mode 100644 src/views/vehicleMent/journal.vue create mode 100644 src/views/vehicleMent/map.vue create mode 100644 src/views/vehicleMent/overview.vue create mode 100644 src/views/vehicleMent/reader.vue diff --git a/src/api/vehicleMent/add.js b/src/api/vehicleMent/add.js new file mode 100644 index 0000000..0a94dd4 --- /dev/null +++ b/src/api/vehicleMent/add.js @@ -0,0 +1,38 @@ +import request from '@/utils/request' + +// 车辆列表 +export function vehicleList(params) { + return request({ + url: '/business/hxCarLocation/list', + params, + }) +} +// 车辆 添加 +export function vehicleAdd(data) { + return request({ + url: '/business/hxCarLocation', + method: 'post', + data, + }) +} +// 车辆 获取详情 +export function vehicleDetail(id) { + return request({ + url: '/business/hxCarLocation/' + id, + }) +} +// 车辆 修改 +export function vehicleEdit(data) { + return request({ + url: '/business/hxCarLocation', + method: 'put', + data, + }) +} +// 车辆 批量删除 +export function vehicleDelete(id) { + return request({ + url: '/business/hxCarLocation/' + id, + method: 'delete', + }) +} diff --git a/src/api/vehicleMent/journal.js b/src/api/vehicleMent/journal.js new file mode 100644 index 0000000..c6c1b31 --- /dev/null +++ b/src/api/vehicleMent/journal.js @@ -0,0 +1,22 @@ +import request from '@/utils/request' + +// 获取大图数据 +export function bigPicList() { + return request({ + url: '/business/hxCarLocationLog/bigPic', + }) +} +// 日志列表 +export function journalList(params) { + return request({ + url: '/business/hxCarLocationLog/list', + params, + }) +} +// 日志 批量删除 +export function journalDelete(ids) { + return request({ + url: '/business/hxCarLocationLog/' + ids, + method: 'delete', + }) +} diff --git a/src/api/vehicleMent/map.js b/src/api/vehicleMent/map.js new file mode 100644 index 0000000..2d0033e --- /dev/null +++ b/src/api/vehicleMent/map.js @@ -0,0 +1,17 @@ +import request from '@/utils/request' + +// 大图列表 +export function mapList(params) { + return request({ + url: '/business/hxCarLocationMap/list', + params, + }) +} +// 修改大图 +export function mapEdit(data) { + return request({ + url: '/business/hxCarLocationMap', + method: 'put', + data, + }) +} diff --git a/src/api/vehicleMent/reader.js b/src/api/vehicleMent/reader.js new file mode 100644 index 0000000..adc7799 --- /dev/null +++ b/src/api/vehicleMent/reader.js @@ -0,0 +1,38 @@ +import request from '@/utils/request' + +// 读卡器列表 +export function readerCardList(params) { + return request({ + url: '/business/hxReaderInfo/list', + params, + }) +} +// 读卡器 添加 +export function readerCardAdd(data) { + return request({ + url: '/business/hxReaderInfo', + method: 'post', + data, + }) +} +// 读卡器 获取详情 +export function readerCardDetail(id) { + return request({ + url: '/business/hxReaderInfo/' + id, + }) +} +// 读卡器 修改 +export function readerCardEdit(data) { + return request({ + url: '/business/hxReaderInfo', + method: 'put', + data, + }) +} +// 读卡器 批量删除 +export function readerCardDelete(id) { + return request({ + url: '/business/hxReaderInfo/' + id, + method: 'delete', + }) +} diff --git a/src/assets/icons/svg/reader.svg b/src/assets/icons/svg/reader.svg new file mode 100644 index 0000000..19ad62f --- /dev/null +++ b/src/assets/icons/svg/reader.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/views/vehicleMent/add.vue b/src/views/vehicleMent/add.vue new file mode 100644 index 0000000..9a98ef7 --- /dev/null +++ b/src/views/vehicleMent/add.vue @@ -0,0 +1,327 @@ + + + diff --git a/src/views/vehicleMent/icon.png b/src/views/vehicleMent/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..c7e13132be288c5629abe3c24bedc10e4edeff6b GIT binary patch literal 2825 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 X$?XRUY5C(DKc@tHGX9#KU($a7K$E@Q literal 0 HcmV?d00001 diff --git a/src/views/vehicleMent/journal.vue b/src/views/vehicleMent/journal.vue new file mode 100644 index 0000000..47c7592 --- /dev/null +++ b/src/views/vehicleMent/journal.vue @@ -0,0 +1,336 @@ + + + diff --git a/src/views/vehicleMent/map.vue b/src/views/vehicleMent/map.vue new file mode 100644 index 0000000..6f70785 --- /dev/null +++ b/src/views/vehicleMent/map.vue @@ -0,0 +1,93 @@ + + + diff --git a/src/views/vehicleMent/overview.vue b/src/views/vehicleMent/overview.vue new file mode 100644 index 0000000..f2f8290 --- /dev/null +++ b/src/views/vehicleMent/overview.vue @@ -0,0 +1,182 @@ + + + \ No newline at end of file diff --git a/src/views/vehicleMent/reader.vue b/src/views/vehicleMent/reader.vue new file mode 100644 index 0000000..c348a08 --- /dev/null +++ b/src/views/vehicleMent/reader.vue @@ -0,0 +1,325 @@ + + + diff --git a/vue.config.js b/vue.config.js index 6ec0d53..b4b08b5 100644 --- a/vue.config.js +++ b/vue.config.js @@ -34,8 +34,8 @@ module.exports = { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { // target: `http://localhost:1818`, - target: `http://120.26.107.74:1818`, - // target: `http://192.168.0.115:1818`, + // target: `http://120.26.107.74:1818`, + target: `http://192.168.0.115:1818`, // target: `http://124.70.138.50:1818`, changeOrigin: true, pathRewrite: { From 4c5e0679e369707968b9816a0503650d5c3d7a6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com> Date: Tue, 18 Jan 2022 10:32:04 +0800 Subject: [PATCH 2/3] up --- src/views/vehicleMent/map.vue | 7 ++++--- src/views/vehicleMent/overview.vue | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/views/vehicleMent/map.vue b/src/views/vehicleMent/map.vue index 6f70785..9a0f965 100644 --- a/src/views/vehicleMent/map.vue +++ b/src/views/vehicleMent/map.vue @@ -6,15 +6,16 @@ :model="dataInfo" :rules="rules" ref="form" - label-width="80px" + label-width="100px" > + px/m - + - + diff --git a/src/views/vehicleMent/overview.vue b/src/views/vehicleMent/overview.vue index f2f8290..4a82792 100644 --- a/src/views/vehicleMent/overview.vue +++ b/src/views/vehicleMent/overview.vue @@ -11,7 +11,7 @@ class="bg_box" :style="{ top: 100 - item.carOrdinate + '%', - left: item.carAbscissa - 1 + '%', + left: item.carAbscissa + '%', }" v-for="item in vehicleList" :key="item.id" @@ -22,7 +22,7 @@ class="bg_box2" :style="{ top: 100 - item.ordinate + '%', - left: item.abscissa - 1 + '%', + left: item.abscissa + '%', }" v-for="item in cardList" :key="item.id" @@ -92,6 +92,7 @@ export default { getMessage(msg) { const data = JSON.parse(msg.data); if (data.isLocationUpdate) { + console.log(data.isLocationUpdate); this.changeAdjustState(data.isLocationUpdate); } }, From 735d5bba5e9d0d8c6ac9ad5e1e62a431b4a79c9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=86=8A=E4=B8=BD=E5=90=9B?= <664953382@qq.com> Date: Thu, 20 Jan 2022 13:16:58 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/vehicleMent/journal.vue | 20 ++++++++++---------- src/views/vehicleMent/reader.vue | 10 +++++++--- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/src/views/vehicleMent/journal.vue b/src/views/vehicleMent/journal.vue index 47c7592..479b844 100644 --- a/src/views/vehicleMent/journal.vue +++ b/src/views/vehicleMent/journal.vue @@ -83,21 +83,21 @@ - - - - - - + + - + @@ -131,7 +131,11 @@ - + @@ -310,7 +314,7 @@ export default { handleDelete(row) { const rowId = row.id || this.ids; this.$modal - .confirm('是否确认删除数据编号为"' + rowId + '"的数据项？') + .confirm('是否确认删除设备地址为"' + rowId + '"的数据项？') .then(function () { return readerCardDelete(rowId); })