diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 3ef1396..8f4e844 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -309,7 +309,6 @@ export default { } }, setShowModel(model) { - console.log("test===========================") this.$store.dispatch('permission/setShowModel', model) }, toggleSideBar() { diff --git a/src/views/corpInfo/user/components/edit.vue b/src/views/corpInfo/user/components/edit.vue index b25093d..60dc0bc 100644 --- a/src/views/corpInfo/user/components/edit.vue +++ b/src/views/corpInfo/user/components/edit.vue @@ -732,27 +732,27 @@ export default { callback() }) } - var hasEmail = (rule, value, callback) => { - if (value) { - requestFN( - '/user/hasEmail', - { - EMAIL: value, - USERNAME: this.form.USERNAME - } - ).then((data) => { - if (data.result == 'success') { - callback() - } else { - callback(new Error('邮箱重复')) - } - }).catch((e) => { - - }) - } else { - callback() - } - } + // var hasEmail = (rule, value, callback) => { + // if (value) { + // requestFN( + // '/user/hasEmail', + // { + // EMAIL: value, + // USERNAME: this.form.USERNAME + // } + // ).then((data) => { + // if (data.result == 'success') { + // callback() + // } else { + // callback(new Error('邮箱重复')) + // } + // }).catch((e) => { + // + // }) + // } else { + // callback() + // } + // } return { ISCHECK: false, dayTime: [], diff --git a/src/views/corpInfo/user/components/list.vue b/src/views/corpInfo/user/components/list.vue index de867a0..7e19783 100644 --- a/src/views/corpInfo/user/components/list.vue +++ b/src/views/corpInfo/user/components/list.vue @@ -96,7 +96,7 @@ 编辑 删除 - 推送 + @@ -797,8 +797,7 @@ export default { SHIFTDUTYONE: this.SHIFTDUTYONE, SHIFTDUTYTWO: this.SHIFTDUTYTWO, IS_HAZARDCONFIRMER: this.IS_HAZARDCONFIRMER, - USER_ID: this.USER_ID, - ISPUSH: '1' + USER_ID: this.USER_ID } ).then((data) => { this.listLoading = false diff --git a/src/views/corpInfo/userCenter/components/list.vue b/src/views/corpInfo/userCenter/components/list.vue index 73b9a36..7a22021 100644 --- a/src/views/corpInfo/userCenter/components/list.vue +++ b/src/views/corpInfo/userCenter/components/list.vue @@ -95,7 +95,8 @@ 编辑 删除 - 推送 + + diff --git a/src/views/firefighting/points/components/list.vue b/src/views/firefighting/points/components/list.vue index d28bce7..b8c08de 100644 --- a/src/views/firefighting/points/components/list.vue +++ b/src/views/firefighting/points/components/list.vue @@ -73,7 +73,7 @@ 否 - + @@ -143,6 +151,22 @@ 打 印 + + +
+
+

检查记录二维码

+
+
+ +
+
+
+ 关 闭 + 打 印 +
+ + @@ -157,7 +181,6 @@ 取 消 确 定 - @@ -171,9 +194,7 @@ import waves from '@/directive/waves' // waves directive import SelectTree from '@/components/SelectTree' export default { - components: { Pagination, SelectTree, vueQr }, - directives: { waves }, data() { return { @@ -181,7 +202,9 @@ export default { addBtnType: true, listLoading: true, dialogFormShow: false, + dialogRecordFormShow: false, qrcodeStr: '', + recordQrcodeStr: '', qrInfo: {}, add: false, del: false, @@ -246,39 +269,36 @@ export default { handleShowQr(ROW) { this.dialogFormShow = true this.qrInfo = ROW - // 2024-07-22 齐金城确认后，将代码还原，如果不还原则无法显示H5页面和。created by liu jun this.qrcodeStr = this.config.weburlWaiwang + 'static/qrcode/views/bsbw/point_list.html?id=' + ROW.FIRE_POINT_ID - // const json = { - // MANAGER_TYPE: 'fireListManager', - // FIRE_POINT_ID: ROW.FIRE_POINT_ID - // } - // const jsonStr = JSON.stringify(json) - // this.qrcodeStr = jsonStr + }, + handleShowRecordQr(ROW) { + this.dialogRecordFormShow = true + const json = { + MANAGER_TYPE: 'fireListManager', + USER_ID: ROW.USER_ID, + DEPARTMENT_ID: ROW.DEPARTMENT_ID + } + this.recordQrcodeStr = JSON.stringify(json) }, 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 = [] @@ -299,7 +319,8 @@ export default { }).catch((e) => { this.listLoading = false }) - }, goKeyReset() { + }, + goKeyReset() { this.FIRE_POINT_NAME = '' this.FIRE_POINT_CODE = '' this.IS_PUNCTUATION = '' @@ -345,7 +366,6 @@ export default { this.listLoading = false }) }, - // 部门列表树 getTreeData() { requestFN( '/department/listTreeV2', @@ -355,7 +375,6 @@ export default { }).catch((e) => { }) }, - // 批量修改负责人 handleEditUser(row) { this.editDataIds = [] if (row.FIRE_POINT_ID) { @@ -505,15 +524,15 @@ export default { } - diff --git a/src/views/map/js/ry_dragentity.js b/src/views/map/js/ry_dragentity.js index 4472aad..82c02e8 100644 --- a/src/views/map/js/ry_dragentity.js +++ b/src/views/map/js/ry_dragentity.js @@ -30,6 +30,16 @@ export default class DragEntity { heightReference: Cesium.HeightReference.CLAMP_TO_GROUND, disableDepthTestDistance: Number.POSITIVE_INFINITY }, + label: { + text: point.name ? point.name : point.id, + font: '13px sans-serif', + pixelOffset: new Cesium.Cartesian2(0, -55), + showBackground: true, + // eslint-disable-next-line new-cap + backgroundColor: new Cesium.Color.fromCssColorString('rgba(20, 58, 142, 1)'), + backgroundPadding: new Cesium.Cartesian2(7, 5), + disableDepthTestDistance: Number.POSITIVE_INFINITY + }, orientation: new Cesium.VelocityOrientationProperty(point.property), monitoItems: { @@ -43,7 +53,9 @@ export default class DragEntity { this.viewer.clock.clockRange = Cesium.ClockRange.CLAMPED this.viewer.clock.shouldAnimate = false } - + delEntity(point) { + this.viewer.entities.remove(point) + } getPosition(point) { if (this.viewer.clock.shouldAnimate === false) { this.viewer.clock.shouldAnimate = true diff --git a/src/views/safetyenvironmental/archive/components/accept.vue b/src/views/safetyenvironmental/archive/components/accept.vue index ee6fcf1..a2ec907 100644 --- a/src/views/safetyenvironmental/archive/components/accept.vue +++ b/src/views/safetyenvironmental/archive/components/accept.vue @@ -595,7 +595,7 @@ export default { this.$refs.form.validate(valid => { if (valid) { requestFN( - '/hidden/finalcheck', + '/safetyenvironmental/V2/finalcheck', { HIDDEN_ID: this.HIDDEN_ID, FINAL_CHECKDESCR: this.form.FINAL_CHECKDESCR, diff --git a/src/views/safetyenvironmental/inspected/components/list.vue b/src/views/safetyenvironmental/inspected/components/list.vue index 2427552..a2dfef5 100644 --- a/src/views/safetyenvironmental/inspected/components/list.vue +++ b/src/views/safetyenvironmental/inspected/components/list.vue @@ -330,7 +330,7 @@ export default { hiddenCount(INSPECTION_ID) { this.listLoading = true requestFN( - '/safetyenvironmentalexplain/hiddencount', + '/safetyenvironmental/V2/hiddencount', { INSPECTION_ID: INSPECTION_ID } diff --git a/src/views/safetyenvironmental/inspection/components/add.vue b/src/views/safetyenvironmental/inspection/components/add.vue index 37b6a8e..eccae03 100644 --- a/src/views/safetyenvironmental/inspection/components/add.vue +++ b/src/views/safetyenvironmental/inspection/components/add.vue @@ -13,6 +13,16 @@ + + + + + 是 + 否 + + + + @@ -86,7 +96,7 @@ - + @@ -421,7 +431,8 @@ export default { CONFIRM_MESSAGE_SIGN: '', CONFIRM_MESSAGE_TIME: '', situationList: [{ INSPECTION_SITUATION_ID: '', SITUATION: '' }], // 检查情况 - hiddenList: [{ ...this.hiddenForm }] // 隐患信息集合 + hiddenList: [{ ...this.hiddenForm }], // 隐患信息集合 + IS_XGF: '' // 是否相关方 }, hiddenCurIndex: -1, hdFile: [], // 隐患附件 @@ -519,7 +530,7 @@ export default { this.INSPECTED_SITEUSER_List = [] } if (newVal != null && newVal != '') { - this.getUserList(newVal) + this.getXgfUserList(newVal) } }, immediate: false @@ -587,8 +598,9 @@ export default { this.INSPECTOR_List.push([]) }, updateInspecteDept(DEPARTMENT_ID, i) { - this.form.inspectorList[i].INSPECTION_USER_ID = '' - this.getInspectorList(DEPARTMENT_ID, i) + // this.form.inspectorList[i].INSPECTION_USER_ID = '' + // this.getInspectorList(DEPARTMENT_ID, i) + this.getXgfUserList(DEPARTMENT_ID) }, // 获取人员列表 getInspectorList(DEPARTMENT_ID, i) { @@ -1039,6 +1051,50 @@ export default { }) }) }, + // 获取相关方被检查单位数据 + getXgfTreeData(value) { + console.info(value) + if (value == '1') { + requestFN( + '/department/getXgfListTree', + {} + ).then((data) => { + this.treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes') + this.treeDataInspectDept = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes') + }).catch((e) => { + }) + } else { + requestFN( + '/department/listTree', + {} + ).then((data) => { + this.treeData = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes') + this.treeDataInspectDept = this.listTransTree(JSON.parse(data.zTreeNodes), 'id', 'pId', 'nodes') + }).catch((e) => { + }) + } + }, + // 获取相关方被检查单位现场负责人 + getXgfUserList(DEPARTMENT_ID) { + console.info(this.form.IS_XGF) + if (this.form.IS_XGF == '1') { + requestFN( + '/user/xgfListAll', + { DEPARTMENT_ID: DEPARTMENT_ID } + ).then((data) => { + this.INSPECTED_SITEUSER_List = data.userList + }).catch((e) => { + }) + } else { + requestFN( + '/user/listAll', + { DEPARTMENT_ID: DEPARTMENT_ID } + ).then((data) => { + this.INSPECTED_SITEUSER_List = data.userList + }).catch((e) => { + }) + } + }, // 获取隐患部位 下拉树 getHiddenReginTreeList() { return new Promise((resolve) => {