From aa65cf2832315b9dfe7032a07122aa587d698f04 Mon Sep 17 00:00:00 2001 From: shanao Date: Tue, 15 Oct 2024 18:15:00 +0800 Subject: [PATCH] 11111 --- .../evaluate/publicity/components/list.vue | 1 + .../firefighting/points/components/list.vue | 496 ++---------------- src/views/index/index.vue | 5 +- .../outsourced/components/edit.vue | 20 +- .../inspection/components/list.vue | 22 +- 5 files changed, 86 insertions(+), 458 deletions(-) diff --git a/src/views/evaluate/publicity/components/list.vue b/src/views/evaluate/publicity/components/list.vue index b755a65..25b334f 100644 --- a/src/views/evaluate/publicity/components/list.vue +++ b/src/views/evaluate/publicity/components/list.vue @@ -93,6 +93,7 @@ export default { } }, created() { + console.log('------------------ 初始化 ------------------') this.getParam() this.getList() }, diff --git a/src/views/firefighting/points/components/list.vue b/src/views/firefighting/points/components/list.vue index 966cb81..decdf53 100644 --- a/src/views/firefighting/points/components/list.vue +++ b/src/views/firefighting/points/components/list.vue @@ -29,11 +29,7 @@ - + @@ -71,22 +67,16 @@ - + - - - @@ -124,7 +98,6 @@
新增 批量删除 - 批量修改负责人
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
消防点位维护信息告知牌
-
-
-
-
消防点位
-
{{ qrInfo.FIRE_POINT_NAME }}
-
-
-
点位编号
-
{{ qrInfo.FIRE_POINT_CODE }}
-
-
-
-
-
检查码
-
- -
-
查询码
-
- -
-
-
+ +
+
+

消防点位信息

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

检查记录二维码

-
-
- -
-
-
- 关 闭 - 打 印 -
- - - - - - - - - - - - -
- 取 消 - 确 定 -
-
@@ -278,7 +148,9 @@ import waves from '@/directive/waves' // waves directive import SelectTree from '@/components/SelectTree' export default { + components: { Pagination, SelectTree, vueQr }, + directives: { waves }, data() { return { @@ -286,11 +158,7 @@ export default { addBtnType: true, listLoading: true, dialogFormShow: false, - dialogRecordFormShow: false, - qrcodeStr_jianchama: '', - qrcodeStr_chaxunma: '', - tabsActive: 'horizontal', - recordQrcodeStr: '', + qrcodeStr: '', qrInfo: {}, add: false, del: false, @@ -305,9 +173,6 @@ export default { KEYWORDS: '', FIRE_POINT_NAME: '', FIRE_POINT_CODE: '', - selectForm: { - DEPARTMENT_ID: '' - }, // 树形菜单 filterText: '', varList: [], @@ -316,28 +181,7 @@ 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: { @@ -349,44 +193,36 @@ export default { created() { this.getList() this.hasButton() - this.getTreeData() }, methods: { - handleShowNotificationCard(ROW) { + handleShowQr(ROW) { this.dialogFormShow = true this.qrInfo = ROW - // 检查码 - 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 - }) + this.qrcodeStr = this.config.weburlWaiwang + 'static/qrcode/views/bsbw/point_list.html?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 true + return row.DEVICE_COUNT == 0 }, 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 = [] @@ -395,9 +231,7 @@ 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, - DEPARTMENT_ID: this.selectForm.DEPARTMENT_ID, - IS_PUNCTUATION: this.IS_PUNCTUATION + FIRE_POINT_CODE: this.FIRE_POINT_CODE } ).then((data) => { this.listLoading = false @@ -407,14 +241,9 @@ 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() { @@ -454,88 +283,6 @@ 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) { @@ -549,19 +296,6 @@ 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) }) @@ -613,17 +347,15 @@ export default { } - - - diff --git a/src/views/index/index.vue b/src/views/index/index.vue index e9711ba..96db313 100644 --- a/src/views/index/index.vue +++ b/src/views/index/index.vue @@ -118,9 +118,10 @@ 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/keyprojects/outsourced/components/edit.vue b/src/views/keyprojects/outsourced/components/edit.vue index 7d1fbc6..f3c2177 100644 --- a/src/views/keyprojects/outsourced/components/edit.vue +++ b/src/views/keyprojects/outsourced/components/edit.vue @@ -46,14 +46,26 @@ - + + + + + + + + + + + style="width: 100%;" + /> diff --git a/src/views/safetyenvironmental/inspection/components/list.vue b/src/views/safetyenvironmental/inspection/components/list.vue index 7d38400..6cd6438 100644 --- a/src/views/safetyenvironmental/inspection/components/list.vue +++ b/src/views/safetyenvironmental/inspection/components/list.vue @@ -24,6 +24,16 @@ placeholder="请选择检查部门"/> + + + + + + + + + + @@ -42,6 +52,8 @@ children-name="nodes" /> + + - - @@ -75,6 +85,11 @@ + + + + + @@ -259,6 +274,9 @@ export default { INSPECTION_ORIGINATOR_NAME: '', // 检查发起人 INSPECTION_TYPE: '', // 检查类型 INSPECTION_TIME: ['', ''], // 检查时间 + INSPECTION_USER_NAME: '', // 检查人员 + INSPECTION_USER_PHONE: '', // 检查人员手机 + INSPECTION_CASE: '', // 检查情况 INSPECTION_STATUS: '', // 检查状态 INSPECTION_SUBJECT: '' // 检查题目 },