diff --git a/public/img/bg.jpg b/public/img/bg.jpg index 497f986..dccadee 100644 Binary files a/public/img/bg.jpg and b/public/img/bg.jpg differ diff --git a/public/js/chunk-common.js b/public/js/chunk-common.js index d96ce24..c869b58 100644 --- a/public/js/chunk-common.js +++ b/public/js/chunk-common.js @@ -648,7 +648,7 @@ staticStyle: { color: "#fff", position: "absolute", - top: "calc(50% - 13px)", + top: "calc(75% - 13px)", "text-align": "center", width: "100%", }, @@ -34480,7 +34480,7 @@ staticStyle: { color: "#fff", position: "absolute", - top: "calc(50% - 13px)", + top: "calc(75% - 13px)", "text-align": "center", width: "100%", }, diff --git a/src/views/base/bracelet/index.vue b/src/views/base/bracelet/index.vue index 815b4d3..7c5cf03 100644 --- a/src/views/base/bracelet/index.vue +++ b/src/views/base/bracelet/index.vue @@ -740,6 +740,7 @@
手环箱编号：{{ rowObj.shboxCode }}
+
手环箱名称：{{ rowObj.shboxName }}
+
设备编号：{{ rowObj.deviceCode }}
+
设备名称：{{ rowObj.deviceName }}
0){ + const msg = this.$modal.loading('批量生成中，请稍候...') + let that = this + try { + let captureId = document.getElementsByClassName('captureId') + for (let i = 0; i < this.checkboxModel.length; i++) { + const element = this.checkboxModel[i] + captureId[i].innerHTML = '' + let shareContent = that.$refs['QrcodePage'][i], + width = shareContent.offsetWidth, + height = shareContent.offsetHeight + const maCodeText = document.createElement('div') + maCodeText.innerHTML = '编码:' + element + maCodeText.style = + 'font-size=18px; width:100%;text-align:center;margin:10px;' + shareContent.appendChild(maCodeText) + console.log(element) + new QRCode(captureId[i], { + width: width, + height: height, + text: element+'', + colorDark: '#000', + colorLight: '#fff', + }) + let canvas = document.createElement('canvas'), + scale = 0.9 + canvas.width = width * scale + canvas.height = height * scale + canvas.style.width = + (shareContent.clientWidth * scale) / 100 + 'px' + canvas.style.height = + (shareContent.clientHeight * scale) / 100 + 'px' + canvas.getContext('2d').scale(scale, scale) + let opts = { + scale: scale, + canvas: canvas, + logging: false, + width: width, + height: height, + useCORS: true, + } + await html2canvas(shareContent, opts) + .then(function (canvas) { + const qrContentImage = canvas.toDataURL( + 'image/jpeg', + 1.0, + ) + if (i <= that.checkboxModel.length - 1) { + that.qrcodeArr.push({ + url: qrContentImage, + name: element, + }) + } + }) + .catch(function (reason) { + console.log(reason) + this.$emit('clearCheck') + that.$modal.closeLoading() + }) } - await html2canvas(shareContent, opts) - .then(function (canvas) { - const qrContentImage = canvas.toDataURL( - 'image/jpeg', - 1.0, - ) - if (i <= that.checkboxModel.length - 1) { - that.qrcodeArr.push({ - url: qrContentImage, - name: element, - }) - } - }) - .catch(function (reason) { - console.log(reason) - this.$emit('clearCheck') - that.$modal.closeLoading() - }) + await new Promise((resolve) => setTimeout(resolve, 2000)) + that.packageImages() + setTimeout(msg, 1000) + that.$modal.closeLoading() + } catch (error) { + setTimeout(msg, 1000) + // that.getList() + this.$emit('clearCheck') + that.$modal.closeLoading() } - await new Promise((resolve) => setTimeout(resolve, 1000)) - that.packageImages() - setTimeout(msg, 1000) - that.$modal.closeLoading() - } catch (error) { - setTimeout(msg, 1000) - // that.getList() - this.$emit('clearCheck') - that.$modal.closeLoading() + }else{ + this.$modal.msgError("请先选择导出设备"); } + }, //打包压缩 packageImages() { diff --git a/src/views/construction/deviceReceive/index.vue b/src/views/construction/deviceReceive/index.vue index c9c7ded..2e7754d 100644 --- a/src/views/construction/deviceReceive/index.vue +++ b/src/views/construction/deviceReceive/index.vue @@ -212,7 +212,7 @@ diff --git a/src/views/construction/manage/hoistManage/hoistManage.vue b/src/views/construction/manage/hoistManage/hoistManage.vue index 3b1e304..007f2ee 100644 --- a/src/views/construction/manage/hoistManage/hoistManage.vue +++ b/src/views/construction/manage/hoistManage/hoistManage.vue @@ -46,21 +46,29 @@ 电量 {{ item.electricQuantity }}%
-
配置
+
配置 +
- - - - - - - - +
+ 预警信息 +
+
+ +
+
-

配置{{ index + 1 }}

- +

配置

+ + + - - + + - + -
+
确定 - 添加配置 + 取消
@@ -133,13 +144,15 @@ export default { isShow: false, // 近电感应设备无数据时处理 isShow2: false, + // 近电感应设备预警信息无数据时处理 + isShow3: true, // 线路属性配置 configTypeArr: [], // 交流属性的电压等级 jlArr: [], // 直流属性的电压等级 zlArr: [], - loading: false, + // loading: false, //电量图标 battery1: require('../../../../assets/images/battery1.png'), battery2: require('../../../../assets/images/battery2.png'), @@ -152,6 +165,7 @@ export default { //保存近电感应设置信息 form: { devId: null, + devCode: null, configItems: [], }, // 表单校验 @@ -160,16 +174,26 @@ export default { nocheckStyle: ['dev-info-box', 'layout', 'nocheck'], checkStyle: ['dev-info-box', 'layout', 'check'], warnStyle: ['dev-info-box', 'layout', 'warn'], + //预警是否加载 + loading: false, + //预警滚动是否有数据 + isHasData: true, + busy: true, + // 查询参数 + queryParams: { + pageNum: 0, + pageSize: 10 + }, }; }, created() { this.laodDzWarnList(); this.loadJdList(); - this.loadJdWarnList(); }, mounted() { this.$nextTick(() => { this.$refs.iframePage.src = this.htmlContent; + this.busy = false; }) }, methods: { @@ -222,13 +246,40 @@ export default { }).catch(() => { }) }, /* 加载近电感应设备预警信息 */ - loadJdWarnList() { + // 预警信息动态加载 + loadWarnInfoData() { + if (!this.isHasData) { + return; + } + this.queryParams.pageNum = this.queryParams.pageNum + 1; + this.loading = true; + this.busy = true; + getJdWarnList(this.queryParams).then(res => { + const data = res.data; + if (data && data.length > 0) { + data.forEach(item => { + this.tableData.push(item); + }) + } else { + this.isHasData = false; + if(this.queryParams.pageNum === 1){ + this.isShow3 = false; + } + } + this.loading = false; + this.busy = false; + }).catch(res => { + this.loading = false; + this.busy = false; + }); + }, + /* loadJdWarnList() { let params = {}; getJdWarnList(params).then((res) => { const data = res.data this.tableData = data; }).catch(() => { }) - }, + }, */ /* 加载线路属性 */ async loadLineStats() { let loading = this.$loading({ @@ -292,8 +343,9 @@ export default { this.laodDzWarnList(); }, /* 近电感应设备点击事件 */ - clickJdDev(id) { + clickJdDev(id, devCode) { this.form.devId = id; + this.form.devCode = devCode; this.loadLineStats(); }, // 添加配置 @@ -328,6 +380,7 @@ export default { closeConfigItem() { this.form.configItems.splice(0); this.form.devId = null; + this.form.devCode = null; this.dialogVisible = false; }, // 线路属性切换 @@ -352,6 +405,7 @@ export default { } const obj = { 'devId': this.form.devId, + 'devCode': this.form.devCode, 'configItems': this.form.configItems } configJdDevice(obj).then((res) => { @@ -549,7 +603,7 @@ export default { .dev-config { width: 100%; - max-height: 300px; + height: 200px; overflow-y: auto; border: 1px solid #cccccc; border-radius: 6px; @@ -586,9 +640,30 @@ export default { .warn-info { width: 100%; margin-top: 10px; - min-height: calc(100% - 300px); - max-height: calc(100% - 150px); - overflow-y: auto; + height: calc(100% - 220px); +} + +.warn-li { + width: 100%; + height: 60px; + border-bottom: 1px solid #cccccc; +} + +.warn-li span { + width: 33.33%; + height: 100%; + letter-spacing: 1px; +} + +ul { + padding-inline-start: 0; + margin-block-start: 0; + margin-block-end: 0; +} + +.infinite-list-wrapper { + height: 96%; + overflow: auto; } .form-box { diff --git a/src/views/construction/manage/personManage/personManage.vue b/src/views/construction/manage/personManage/personManage.vue index c6f18c7..f07a572 100644 --- a/src/views/construction/manage/personManage/personManage.vue +++ b/src/views/construction/manage/personManage/personManage.vue @@ -6,7 +6,7 @@
+ ref="tree" :filter-node-method="filterNode" :highlight-current="true" :expand-on-click-node="false" />
@@ -306,12 +306,8 @@ export default { keyword2: "", //保存抽检树形数据 teamTreeData: [], - //间隔时间 - intervalTime: 1, - - //验证对话框单选按钮 - provingTypeRadioValue: "1", - provingTimeValue: [''], + // 查看班组施工定位前，是否选中了班组 + checkTeamId: null }; }, created() { @@ -343,7 +339,11 @@ export default { this.treeData = treeData // 设置默认展示杆塔层级 treeData.forEach(item => { - this.idArr.push(item.id); + const children = item.children; + children.forEach(child => { + // 设置默认展示杆塔层级 + this.idArr.push(child.id); + }) }) } }).catch(res => { @@ -353,7 +353,7 @@ export default { /* 人员树过滤 */ filterNode(value, data, node) { if (!value) { - if (node.level == 1) { + if (node.level == 1 || node.level == 2) { node.expanded = true } else { node.expanded = false @@ -411,7 +411,7 @@ export default { const teamTreeData = res.data; if (teamTreeData && teamTreeData.length > 0) { this.teamTreeData = teamTreeData - // 设置默认展示杆塔层级 + // 设置默认展示班组层级 teamTreeData.forEach(item => { this.idArr2.push(item.id); }) @@ -495,7 +495,7 @@ export default { this.dialogVisible2 = false }, // 获取班组下的人员定位及杆塔坐标 - loadPersonsInfo(params) { + loadPersonsInfo(params, personData) { getPersonsInfo(params).then((res) => { const data = res.data; if (data) { @@ -524,6 +524,9 @@ export default { this.addPersonMarker(item); } } + if (personData) { + this.clickMarker(personData); + } } } }).catch((res) => { }) @@ -610,13 +613,26 @@ export default { 'id': towerId, 'teamId': teamId } - this.loadPersonsInfo(obj); + this.checkTeamId = teamId; + this.loadPersonsInfo(obj, null); } else if (node.level === 4) { this.isTower = false; this.isTeam = false; this.isPerson = true; - // 选中班组人员 触发事件 - this.clickMarker(data); + const teamId = parseInt(data.parentId.replace('team-', '')); + const towerId = data.gtId; + if (!this.checkTeamId || this.checkTeamId !== teamId) { + this.removeOverlay(); + const obj = { + 'id': towerId, + 'teamId': teamId + } + this.checkTeamId = teamId; + this.loadPersonsInfo(obj, data); + } else { + // 选中班组人员 触发事件 + this.clickMarker(data); + } } else { this.isTower = false; this.isTeam = false; @@ -711,7 +727,7 @@ export default { 'id': this.id, 'teamId': this.teamId } - this.loadPersonsInfo(obj); + this.loadPersonsInfo(obj, null); }, // 获取人员运动轨迹 loadGj() { @@ -900,7 +916,7 @@ export default { .personManage .left { - width: 20%; + width: 22%; height: 100%; padding: 0 0.5%; box-sizing: border-box; @@ -913,7 +929,7 @@ export default { } .personManage .center { - width: 58%; + width: 54%; height: 100%; } @@ -931,7 +947,7 @@ export default { } .personManage .right { - width: 20%; + width: 22%; height: 100%; } diff --git a/src/views/construction/manage/realTimeManage/realTimeManage.vue b/src/views/construction/manage/realTimeManage/realTimeManage.vue index e67511f..1d37a32 100644 --- a/src/views/construction/manage/realTimeManage/realTimeManage.vue +++ b/src/views/construction/manage/realTimeManage/realTimeManage.vue @@ -106,7 +106,7 @@

预警信息

-
+
  • @@ -118,6 +118,7 @@

    加载中...

+
@@ -159,6 +160,7 @@ export default { //预警滚动是否有数据 isHasData: true, busy: true, + isShow3:true, // 窗口数量 boxNum: 1,//1窗口或4窗口 boxIndex:1,//视频下标 @@ -238,6 +240,9 @@ export default { }) } else { this.isHasData = false; + if(this.queryParams.pageNum === 1){ + this.isShow3 = false; + } } this.loading = false; this.busy = false; @@ -735,6 +740,8 @@ export default { ul { padding-inline-start: 0; + margin-block-start: 0; + margin-block-end: 0; } .infinite-list-wrapper {