From 4bfda5d7fc2383b749a043e48866bab26cdccc77 Mon Sep 17 00:00:00 2001 From: huangyuxuan Date: Tue, 29 Oct 2024 18:42:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[BUG=E4=BF=AE=E5=A4=8D](pet)=20=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E9=9A=90=E6=82=A3=E7=B1=BB=E5=9E=8B=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=EF=BC=8C=E6=95=B4=E6=94=B9=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/index/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/index/index.vue b/src/views/index/index.vue index 96db313..9e88e33 100644 --- a/src/views/index/index.vue +++ b/src/views/index/index.vue @@ -118,9 +118,9 @@ export default { this.jinduData[1] = nowYear + '-12-31' this.getJindu() this.getQingdan() - // this.getWorkNumber() + this.getWorkNumber() this.getRiskNumber() - // this.getHiddenTypeCount() + this.getHiddenTypeCount() /* this.getNoticeList() this.getNoticeCorpList()*/ From 504fdc7746a798025399c1dd8e9ede5b033dcfca Mon Sep 17 00:00:00 2001 From: huangyuxuan Date: Thu, 31 Oct 2024 15:21:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[BUG=E4=BF=AE=E5=A4=8D](hyx=5F2024-10-30=5F?= =?UTF-8?q?new)=20=E6=96=B0=E6=A1=86=E6=9E=B6bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accesscontrol/accesscontroldata/components/list.vue | 2 +- .../corpInfo/information/qualifications/components/list.vue | 6 +++--- src/views/firefighting/device/components/info.vue | 2 +- src/views/firefighting/points/components/list.vue | 3 +++ src/views/hiddenApi/publicMethod/list.vue | 2 +- src/views/index/index.vue | 4 ++-- src/views/risk/identificationparts/components/list.vue | 4 ++-- src/views/risk/riskpoint/components/list.vue | 6 +++--- src/views/risk/riskunit/components/list.vue | 2 +- 9 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/views/accesscontrol/accesscontroldata/components/list.vue b/src/views/accesscontrol/accesscontroldata/components/list.vue index 1e50ad8..99588e8 100644 --- a/src/views/accesscontrol/accesscontroldata/components/list.vue +++ b/src/views/accesscontrol/accesscontroldata/components/list.vue @@ -368,7 +368,7 @@ export default { type: 'warning' }).then(() => { this.listLoading = false - window.location.href = config.httpurl + 'riskunit/excelModel' + window.location.href = config.httpurl + '/riskunit/excelModel' }).catch(() => { this.listLoading = false }) diff --git a/src/views/corpInfo/information/qualifications/components/list.vue b/src/views/corpInfo/information/qualifications/components/list.vue index 90be215..6406a35 100644 --- a/src/views/corpInfo/information/qualifications/components/list.vue +++ b/src/views/corpInfo/information/qualifications/components/list.vue @@ -76,14 +76,14 @@
- 新增 + 新增
diff --git a/src/views/firefighting/device/components/info.vue b/src/views/firefighting/device/components/info.vue index 21285ce..bf34ef9 100644 --- a/src/views/firefighting/device/components/info.vue +++ b/src/views/firefighting/device/components/info.vue @@ -163,7 +163,7 @@ export default { type: 'warning' }).then(() => { this.listLoading = false - window.location.href = config.httpurl + 'riskpoint/excelModel' + window.location.href = config.httpurl + '/riskpoint/excelModel' }).catch(() => { this.listLoading = false }) diff --git a/src/views/firefighting/points/components/list.vue b/src/views/firefighting/points/components/list.vue index decdf53..caeffe8 100644 --- a/src/views/firefighting/points/components/list.vue +++ b/src/views/firefighting/points/components/list.vue @@ -173,6 +173,9 @@ export default { KEYWORDS: '', FIRE_POINT_NAME: '', FIRE_POINT_CODE: '', + selectForm: { + DEPARTMENT_ID: '' + }, // 树形菜单 filterText: '', varList: [], diff --git a/src/views/hiddenApi/publicMethod/list.vue b/src/views/hiddenApi/publicMethod/list.vue index 22e2de2..3252e46 100644 --- a/src/views/hiddenApi/publicMethod/list.vue +++ b/src/views/hiddenApi/publicMethod/list.vue @@ -644,7 +644,7 @@ export default { data += '&ENDTIME=' + _this.condform.creatTime[1] data += '&sessionID=' + ssionID data += '&tm=' + new Date().getTime() - window.location.href = config.httpurl + 'hiddenExcel/excel2' + data + window.location.href = config.httpurl + '/hiddenExcel/excel2' + data var timingTask = setInterval(function() { requestFN( diff --git a/src/views/index/index.vue b/src/views/index/index.vue index 96db313..9e88e33 100644 --- a/src/views/index/index.vue +++ b/src/views/index/index.vue @@ -118,9 +118,9 @@ export default { this.jinduData[1] = nowYear + '-12-31' this.getJindu() this.getQingdan() - // this.getWorkNumber() + this.getWorkNumber() this.getRiskNumber() - // this.getHiddenTypeCount() + this.getHiddenTypeCount() /* this.getNoticeList() this.getNoticeCorpList()*/ diff --git a/src/views/risk/identificationparts/components/list.vue b/src/views/risk/identificationparts/components/list.vue index b54e1c1..b946999 100644 --- a/src/views/risk/identificationparts/components/list.vue +++ b/src/views/risk/identificationparts/components/list.vue @@ -468,7 +468,7 @@ export default { type: 'warning' }).then(() => { this.listLoading = false - window.location.href = config.httpurl + 'identificationparts/excel' + window.location.href = config.httpurl + '/identificationparts/excel' }).catch(() => { this.listLoading = false }) @@ -505,7 +505,7 @@ export default { type: 'warning' }).then(() => { this.listLoading = false - window.location.href = config.httpurl + 'identificationparts/excelModel' + window.location.href = config.httpurl + '/identificationparts/excelModel' }).catch(() => { this.listLoading = false }) diff --git a/src/views/risk/riskpoint/components/list.vue b/src/views/risk/riskpoint/components/list.vue index 48cc85a..37d1eca 100644 --- a/src/views/risk/riskpoint/components/list.vue +++ b/src/views/risk/riskpoint/components/list.vue @@ -493,7 +493,7 @@ export default { type: 'warning' }).then(() => { this.listLoading = false - window.location.href = config.httpurl + 'riskpoint/excel' + window.location.href = config.httpurl + '/riskpoint/excel' }).catch(() => { this.listLoading = false }) @@ -517,7 +517,7 @@ export default { type: 'warning' }).then(() => { this.listLoading = false - window.open(this.config.httpurl + 'riskpoint/excelAll?ids=' + ids) + window.open(this.config.httpurl + '/riskpoint/excelAll?ids=' + ids) }).catch(() => { this.listLoading = false }) @@ -530,7 +530,7 @@ export default { type: 'warning' }).then(() => { this.listLoading = false - window.location.href = config.httpurl + 'riskpoint/excelModel' + window.location.href = config.httpurl + '/riskpoint/excelModel' }).catch(() => { this.listLoading = false }) diff --git a/src/views/risk/riskunit/components/list.vue b/src/views/risk/riskunit/components/list.vue index c104dcb..a026b56 100644 --- a/src/views/risk/riskunit/components/list.vue +++ b/src/views/risk/riskunit/components/list.vue @@ -379,7 +379,7 @@ export default { type: 'warning' }).then(() => { this.listLoading = false - window.location.href = config.httpurl + 'riskunit/excelModel' + window.location.href = config.httpurl + '/riskunit/excelModel' }).catch(() => { this.listLoading = false }) From 4cbef9b2fbb2a50c312e4cebc38f56bd07af9cda Mon Sep 17 00:00:00 2001 From: guoyuepeng <770272267@qq.com> Date: Thu, 31 Oct 2024 16:08:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?1.=E6=B6=88=E9=98=B2=E7=82=B9=E4=BD=8D?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../firefighting/points/components/list.vue | 496 ++++++++++++++++-- 1 file changed, 450 insertions(+), 46 deletions(-) diff --git a/src/views/firefighting/points/components/list.vue b/src/views/firefighting/points/components/list.vue index decdf53..966cb81 100644 --- a/src/views/firefighting/points/components/list.vue +++ b/src/views/firefighting/points/components/list.vue @@ -29,7 +29,11 @@ - + @@ -67,16 +71,22 @@ - + + + + @@ -98,6 +124,7 @@
新增 批量删除 + 批量修改负责人
- -
-
-

消防点位信息

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
消防点位维护信息告知牌
+
+
+
+
消防点位
+
{{ qrInfo.FIRE_POINT_NAME }}
+
+
+
点位编号
+
{{ qrInfo.FIRE_POINT_CODE }}
+
+
+
+
+
检查码
+
+ +
+
查询码
+
+ +
+
+
- - - - - - - - - - - - - -
消防区域{{ qrInfo.FIRE_REGION_NAME }}消防点位{{ qrInfo.FIRE_POINT_NAME }}
负责部门{{ qrInfo.DEPARTMENT_NAME }}负责人{{ qrInfo.USERNAME }}
-
- +
+
+
+
消防点位
+
{{ qrInfo.FIRE_POINT_NAME }}
+
+
+
点位编号
+
{{ qrInfo.FIRE_POINT_CODE }}
+
+
+
+
+
检查码
+
+ +
+
+
+
查询码
+
+ +
+
+
@@ -136,6 +227,45 @@ 打 印
+ + +
+
+

检查记录二维码

+
+
+ +
+
+
+ 关 闭 + 打 印 +
+ + + + + + + + + + + + +
+ 取 消 + 确 定 +
+
@@ -148,9 +278,7 @@ import waves from '@/directive/waves' // waves directive import SelectTree from '@/components/SelectTree' export default { - components: { Pagination, SelectTree, vueQr }, - directives: { waves }, data() { return { @@ -158,7 +286,11 @@ export default { addBtnType: true, listLoading: true, dialogFormShow: false, - qrcodeStr: '', + dialogRecordFormShow: false, + qrcodeStr_jianchama: '', + qrcodeStr_chaxunma: '', + tabsActive: 'horizontal', + recordQrcodeStr: '', qrInfo: {}, add: false, del: false, @@ -173,6 +305,9 @@ export default { KEYWORDS: '', FIRE_POINT_NAME: '', FIRE_POINT_CODE: '', + selectForm: { + DEPARTMENT_ID: '' + }, // 树形菜单 filterText: '', varList: [], @@ -181,7 +316,28 @@ export default { value: 'id', children: 'nodes', label: 'name' - } + }, + editDataIds: [], + dialogEditUser: false, + dialogEditUserForm: { + USER_ID: '' + }, + dialogEditUserRules: { + USER_ID: [{ required: true, message: '请选择负责人', trigger: 'change' }] + }, + deptTreeData: [], + userList: [], + punctuationStatusList: [ + { + value: 0, + label: '是' + }, + { + value: 1, + label: '否' + } + ], + IS_PUNCTUATION: '' } }, watch: { @@ -193,36 +349,44 @@ export default { created() { this.getList() this.hasButton() + this.getTreeData() }, methods: { - handleShowQr(ROW) { + handleShowNotificationCard(ROW) { this.dialogFormShow = true this.qrInfo = ROW - this.qrcodeStr = this.config.weburlWaiwang + 'static/qrcode/views/bsbw/point_list.html?id=' + ROW.FIRE_POINT_ID + // 检查码 + this.qrcodeStr_chaxunma = JSON.stringify({ + MANAGER_TYPE: 'checkRecordManager', + USER_ID: ROW.USER_ID, + DEPARTMENT_ID: ROW.DEPARTMENT_ID, + FIRE_POINT_ID: ROW.FIRE_POINT_ID + }) + // 查询码 + this.qrcodeStr_jianchama = JSON.stringify({ + MANAGER_TYPE: 'fireListManager', + FIRE_POINT_ID: ROW.FIRE_POINT_ID + }) }, handleEdit(FIRE_POINT_ID) { this.$parent.FIRE_POINT_ID = FIRE_POINT_ID this.$parent.activeName = 'Edit' }, selectable(row, index) { - return row.DEVICE_COUNT == 0 + return true }, getRowKey(row) { return row.FIRE_POINT_ID }, - // 添加 handleAdd() { this.$parent.activeName = 'Edit' this.$parent.FIRE_POINT_ID = '' this.$parent.FIRE_POINT_CODE = '' this.$parent.FIRE_POINT_NAME = '' }, - // 搜索 getQuery() { - // this.$refs.multipleTable.clearSelection() this.getList() }, - // 获取列表 getList(pid) { this.listLoading = true this.varList = [] @@ -231,7 +395,9 @@ export default { '/firePoint/list?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page, { FIRE_POINT_NAME: this.FIRE_POINT_NAME, - FIRE_POINT_CODE: this.FIRE_POINT_CODE + FIRE_POINT_CODE: this.FIRE_POINT_CODE, + DEPARTMENT_ID: this.selectForm.DEPARTMENT_ID, + IS_PUNCTUATION: this.IS_PUNCTUATION } ).then((data) => { this.listLoading = false @@ -241,9 +407,14 @@ export default { }).catch((e) => { this.listLoading = false }) - }, goKeyReset() { + }, + goKeyReset() { this.FIRE_POINT_NAME = '' this.FIRE_POINT_CODE = '' + this.IS_PUNCTUATION = '' + this.selectForm = { + DEPARTMENT_ID: '' + } this.getList() }, getDict() { @@ -283,6 +454,88 @@ export default { this.listLoading = false }) }, + getTreeData() { + requestFN( + '/department/listTreeV2', + {} + ).then((data) => { + this.deptTreeData = JSON.parse(data.zTreeNodes) + }).catch((e) => { + }) + }, + handleEditUser(row) { + this.editDataIds = [] + if (row.FIRE_POINT_ID) { + this.editDataIds.push(row.FIRE_POINT_ID) + } else { + const selection = this.$refs.multipleTable.selection + if (!selection.length > 0) { + this.$message({ + type: 'warning', + message: '请选择要修改的数据' + }) + return + } + selection.forEach(item => { + this.editDataIds.push(item.FIRE_POINT_ID) + }) + } + const selection = this.$refs.multipleTable.selection + const DEPARTMENT_ID = selection[0].DEPARTMENT_ID + if (selection.length > 1) { + let flag = false + selection.forEach(item => { + if (DEPARTMENT_ID !== item.DEPARTMENT_ID) { + this.$message({ + type: 'warning', + message: '只能选择同一部门下的数据' + }) + flag = true + } + }) + if (flag) { + return + } + } + this.getUserList(DEPARTMENT_ID) + this.dialogEditUserForm = { + USER_ID: '' + } + this.dialogEditUser = true + }, + getUserList(DEPARTMENT_ID) { + requestFN( + '/user/listAll', + { + DEPARTMENT_ID: DEPARTMENT_ID + } + ).then((data) => { + this.userList = data.userList + }).catch((e) => { + }) + }, + dialogEditUserConfirm() { + this.$refs.firefightingBatchEditDept.validate((valid) => { + if (valid) { + this.listLoading = true + requestFN( + '/firePoint/batchEditFirePointUser', + { + DATA_IDS: this.editDataIds.join(','), + USER_ID: this.dialogEditUserForm.USER_ID + } + ).then(() => { + this.$message({ + message: '修改成功', + type: 'success' + }) + this.dialogEditUser = false + this.getList() + }).catch(() => { + }) + } + }) + }, handleDelete(row) { const DATA_IDS = [] if (row.FIRE_POINT_ID) { @@ -296,6 +549,19 @@ export default { }) return } + var flag = true + selection.forEach(item => { + if (item.DEVICE_COUNT > 0) { + flag = false + } + }) + if (!flag) { + this.$message({ + type: 'warning', + message: '选择的点位中有子数据，不能删除' + }) + return + } selection.forEach(item => { DATA_IDS.push(item.FIRE_POINT_ID) }) @@ -347,15 +613,17 @@ export default { } - + +