From 7562fb8fee91a2832efc525d7ba0728d4804728d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com> Date: Mon, 27 Mar 2023 18:39:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AE=E8=83=8E=E7=94=9F?= =?UTF-8?q?=E5=91=BD=E5=91=A8=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alarmSendingSettings.js | 40 +- .../api/realTimeMonitoring/alarmStatistics.js | 38 +- .../alarmSendingSettings/index.vue | 25 +- .../alarmStatistics/index.vue | 445 ++---------------- .../views/tireManagement/lifecycle/index.vue | 5 - ruoyi-ui/vite.config.js | 4 +- 6 files changed, 51 insertions(+), 506 deletions(-) diff --git a/ruoyi-ui/src/api/realTimeMonitoring/alarmSendingSettings.js b/ruoyi-ui/src/api/realTimeMonitoring/alarmSendingSettings.js index 9ea6c8b..d7930c7 100644 --- a/ruoyi-ui/src/api/realTimeMonitoring/alarmSendingSettings.js +++ b/ruoyi-ui/src/api/realTimeMonitoring/alarmSendingSettings.js @@ -2,44 +2,10 @@ import request from '@/utils/request' // 查询轮胎基础信息列表 -export function listTest(query) { +export function listBaseCar(query) { return request({ - url: '/test/test/list', + url: '/basecar/car/list', method: 'get', params: query }) -} - -// 查询轮胎基础信息详细 -export function getTest(id) { - return request({ - url: '/test/test/' + id, - method: 'get' - }) -} - -// 新增轮胎基础信息 -export function addTest(data) { - return request({ - url: '/test/test', - method: 'post', - data: data - }) -} - -// 修改轮胎基础信息 -export function updateTest(data) { - return request({ - url: '/test/test', - method: 'put', - data: data - }) -} - -// 删除轮胎基础信息 -export function delTest(id) { - return request({ - url: '/test/test/' + id, - method: 'delete' - }) -} +} \ No newline at end of file diff --git a/ruoyi-ui/src/api/realTimeMonitoring/alarmStatistics.js b/ruoyi-ui/src/api/realTimeMonitoring/alarmStatistics.js index 9ea6c8b..537f324 100644 --- a/ruoyi-ui/src/api/realTimeMonitoring/alarmStatistics.js +++ b/ruoyi-ui/src/api/realTimeMonitoring/alarmStatistics.js @@ -2,44 +2,10 @@ import request from '@/utils/request' // 查询轮胎基础信息列表 -export function listTest(query) { +export function alarmList(query) { return request({ - url: '/test/test/list', + url: '/basetyre/CollectMachineGps/alarmrecord', method: 'get', params: query }) } - -// 查询轮胎基础信息详细 -export function getTest(id) { - return request({ - url: '/test/test/' + id, - method: 'get' - }) -} - -// 新增轮胎基础信息 -export function addTest(data) { - return request({ - url: '/test/test', - method: 'post', - data: data - }) -} - -// 修改轮胎基础信息 -export function updateTest(data) { - return request({ - url: '/test/test', - method: 'put', - data: data - }) -} - -// 删除轮胎基础信息 -export function delTest(id) { - return request({ - url: '/test/test/' + id, - method: 'delete' - }) -} diff --git a/ruoyi-ui/src/views/realTimeMonitoring/alarmSendingSettings/index.vue b/ruoyi-ui/src/views/realTimeMonitoring/alarmSendingSettings/index.vue index cc3d22d..7daf15e 100644 --- a/ruoyi-ui/src/views/realTimeMonitoring/alarmSendingSettings/index.vue +++ b/ruoyi-ui/src/views/realTimeMonitoring/alarmSendingSettings/index.vue @@ -36,7 +36,7 @@ :remote-method="remoteMethod" v-model="form.internationalization8" class="m-2" - placeholder="Select" > + placeholder="请选择车辆" > - {{ t('option.search') }} + 立即创建 {{ t('option.reset') }} @@ -56,10 +56,11 @@ \ No newline at end of file diff --git a/ruoyi-ui/src/views/realTimeMonitoring/alarmStatistics/index.vue b/ruoyi-ui/src/views/realTimeMonitoring/alarmStatistics/index.vue index a3be6dd..6746d49 100644 --- a/ruoyi-ui/src/views/realTimeMonitoring/alarmStatistics/index.vue +++ b/ruoyi-ui/src/views/realTimeMonitoring/alarmStatistics/index.vue @@ -3,9 +3,9 @@ - + + v-model="dateRange" + value-format="YYYY-MM-DD" + type="daterange" + range-separator="-" + start-placeholder="开始日期" + end-placeholder="结束日期" + > {{ t('option.search') }} @@ -29,38 +30,6 @@ - - {{ t('option.add') }} - - - - {{ t('option.edit') }} - - - - {{ t('option.remove') }} - - - - - - - - - - - + + + + + @@ -123,180 +75,11 @@ @pagination="getList" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -