From 11c8cd5f619e6f1bf51db1e7599860ccdb57c855 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Thu, 25 Apr 2024 09:23:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=9B=BE=E7=89=87=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ah-jjzhgd-web/src/views/basic/project/index.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ah-jjzhgd-web/src/views/basic/project/index.vue b/ah-jjzhgd-web/src/views/basic/project/index.vue index 544cf08..6a1c4ae 100644 --- a/ah-jjzhgd-web/src/views/basic/project/index.vue +++ b/ah-jjzhgd-web/src/views/basic/project/index.vue @@ -217,6 +217,7 @@ :file-list="imageList" :on-change="handleImageChange" :accept="'image/jpeg, image/png, image/jpg'" + :on-exceed="handleExceed" >
@@ -247,6 +248,7 @@ :limit="imageUploadLimit2" :on-change="handleImageChange2" :accept="'image/jpeg, image/png, image/jpg'" + :on-exceed="handleExceed2" >
@@ -481,6 +483,12 @@ export default { this.getList() }, methods: { + handleExceed(files, fileList) { + this.$message.error(`最多只能上传 1 张图片`); + }, + handleExceed2(files, fileList) { + this.$message.error(`最多只能上传 5 张图片`); + }, // 图片上传验证 validateImageNum(rule, value, callback) { if (this.imageList2.length) { From 024ba888587b3671c2cfedd4b06972805dcf1eb0 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Fri, 26 Apr 2024 11:10:59 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ah-jjzhgd-web/src/views/man-car/car/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/ah-jjzhgd-web/src/views/man-car/car/index.vue b/ah-jjzhgd-web/src/views/man-car/car/index.vue index 2e004de..79f9a65 100644 --- a/ah-jjzhgd-web/src/views/man-car/car/index.vue +++ b/ah-jjzhgd-web/src/views/man-car/car/index.vue @@ -42,6 +42,7 @@ {{ (listQuery.pageNum - 1) * 10 + scope.$index + 1 }} + From 0d7388f639ba1afd9fafcc5a0f8092b2717d2eb1 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Sun, 28 Apr 2024 14:50:22 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=BA=94=E6=80=A5=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/risk/emergency/components/EmergencyProcess.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ah-jjzhgd-web/src/views/risk/emergency/components/EmergencyProcess.vue b/ah-jjzhgd-web/src/views/risk/emergency/components/EmergencyProcess.vue index 9d3869c..f596c91 100644 --- a/ah-jjzhgd-web/src/views/risk/emergency/components/EmergencyProcess.vue +++ b/ah-jjzhgd-web/src/views/risk/emergency/components/EmergencyProcess.vue @@ -70,7 +70,7 @@ label-width="120px" > - + Date: Tue, 11 Jun 2024 11:17:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ah-jjzhgd-web/src/api/devData/devData.js | 48 +++ ah-jjzhgd-web/src/views/basic/model/index.vue | 4 +- .../src/views/basic/project/index.vue | 6 +- .../src/views/device/devData/index.vue | 289 ++++++++++++++++++ .../components/SidebandDetailTable.vue | 30 +- ah-jjzhgd-web/src/views/system/user/index.vue | 8 +- ah-jjzhgd-web/vue.config.js | 10 +- 7 files changed, 377 insertions(+), 18 deletions(-) create mode 100644 ah-jjzhgd-web/src/api/devData/devData.js create mode 100644 ah-jjzhgd-web/src/views/device/devData/index.vue diff --git a/ah-jjzhgd-web/src/api/devData/devData.js b/ah-jjzhgd-web/src/api/devData/devData.js new file mode 100644 index 0000000..9f1d4b2 --- /dev/null +++ b/ah-jjzhgd-web/src/api/devData/devData.js @@ -0,0 +1,48 @@ +import request from '@/utils/request' + +/* 设备管理 */ +// 查询设备列表 +export function getDavDataList(data) { + return request({ + url: '/background/back/device/getDavDataList', + method: 'get', + params: data + }) +} + +// 新增设备 +export function addDevData(data) { + return request({ + url: '/background/back/device/addDevData', + method: 'post', + data + }) +} + +// 编辑设备 +export function updateDevData(data) { + return request({ + url: '/background/back/device/updateDevData', + method: 'post', + data + }) +} + +// 删除设备 +export function deleteDevData(data) { + return request({ + url: '/background/back/device/deleteDevData', + method: 'post', + data + }) +} + + +// 新增设备 +export function getDevDataById(data) { + return request({ + url: '/background/back/device/getDevDataById', + method: 'post', + data + }) +} diff --git a/ah-jjzhgd-web/src/views/basic/model/index.vue b/ah-jjzhgd-web/src/views/basic/model/index.vue index 520c613..6867a4c 100644 --- a/ah-jjzhgd-web/src/views/basic/model/index.vue +++ b/ah-jjzhgd-web/src/views/basic/model/index.vue @@ -69,7 +69,7 @@ label-width="120px" > - + @@ -176,7 +176,7 @@ export default { this.list = response.rows this.total = response.total }).finally(() => { - + }) setTimeout(()=>{ this.listLoading = false diff --git a/ah-jjzhgd-web/src/views/basic/project/index.vue b/ah-jjzhgd-web/src/views/basic/project/index.vue index 544cf08..291df41 100644 --- a/ah-jjzhgd-web/src/views/basic/project/index.vue +++ b/ah-jjzhgd-web/src/views/basic/project/index.vue @@ -268,7 +268,7 @@ - + @@ -709,7 +709,7 @@ export default { } else { this.imageList = fileList this.handleValidateField('dataForm', 'imageList') - } + } }, handleImageChange2(file, fileList) { const isLt2M = file.size / 1024 / 1024 < 10; @@ -723,7 +723,7 @@ export default { this.imageList2 = fileList this.handleValidateField('dataForm', 'imageList2') } - + }, handleRemoveImageItem(file) { if (!file?.hasOwnProperty('raw')) { diff --git a/ah-jjzhgd-web/src/views/device/devData/index.vue b/ah-jjzhgd-web/src/views/device/devData/index.vue new file mode 100644 index 0000000..ef8ff38 --- /dev/null +++ b/ah-jjzhgd-web/src/views/device/devData/index.vue @@ -0,0 +1,289 @@ + + + diff --git a/ah-jjzhgd-web/src/views/device/sidebandDevice/components/SidebandDetailTable.vue b/ah-jjzhgd-web/src/views/device/sidebandDevice/components/SidebandDetailTable.vue index 14d3739..5c2dcfd 100644 --- a/ah-jjzhgd-web/src/views/device/sidebandDevice/components/SidebandDetailTable.vue +++ b/ah-jjzhgd-web/src/views/device/sidebandDevice/components/SidebandDetailTable.vue @@ -44,6 +44,10 @@ + + + + @@ -76,6 +80,22 @@ + + + + + + + + + + + + + + + @@ -116,6 +136,10 @@ import { const defaultTmp = { modeName: '', + updateTime: '', + changeVal: '', + val: '', + isWarn: '', maxValueData: '', minValueData: '', dataType: '', @@ -193,7 +217,7 @@ export default { this.list = response.rows this.total = response.total }).finally(() => { - + }) setTimeout(()=>{ this.listLoading = false @@ -223,7 +247,7 @@ export default { this.dialogFormVisible = false this.getList() }).finally(() => { - + }) } }) @@ -250,7 +274,7 @@ export default { this.dialogFormVisible = false this.getList() }).finally(() => { - + }) } }) diff --git a/ah-jjzhgd-web/src/views/system/user/index.vue b/ah-jjzhgd-web/src/views/system/user/index.vue index c088899..8321d6d 100644 --- a/ah-jjzhgd-web/src/views/system/user/index.vue +++ b/ah-jjzhgd-web/src/views/system/user/index.vue @@ -114,7 +114,7 @@ - +