From 06a7b89d8e35d1ecf728d991c11c80aaff8a8042 Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Thu, 8 Jun 2023 17:47:16 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/globalTools/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/system/globalTools/index.vue b/src/views/system/globalTools/index.vue index 358a34f..72b1af9 100644 --- a/src/views/system/globalTools/index.vue +++ b/src/views/system/globalTools/index.vue @@ -29,7 +29,7 @@ placeholder="请输入可信度值" > - 设置 From d1051bf8c53c0da13ffc389bab18df4978bb598e Mon Sep 17 00:00:00 2001 From: fanluyan <754122931@qq.com> Date: Fri, 9 Jun 2023 16:09:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=85=A8=E5=B1=80=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E5=8F=AF=E4=BF=A1=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/css/element.less | 3 + src/views/alarmHandling/index.vue | 95 ++++++++++++------- .../photographicDevice/index.vue | 2 +- .../towerInformation/components/addDialog.vue | 18 +++- .../userEquipment/towerInformation/index.vue | 6 +- src/views/realTimeSearch/index.vue | 26 +++-- src/views/system/globalTools/index.vue | 20 +++- 7 files changed, 115 insertions(+), 55 deletions(-) diff --git a/src/assets/css/element.less b/src/assets/css/element.less index 3ad2c1c..ba702b3 100644 --- a/src/assets/css/element.less +++ b/src/assets/css/element.less @@ -69,3 +69,6 @@ .el-dropdown-menu--small .el-dropdown-menu__item { font-size: 12px; } +.el-popper[x-placement^="bottom"] { + margin-top: 6px !important; +} diff --git a/src/views/alarmHandling/index.vue b/src/views/alarmHandling/index.vue index 9b79c51..766796a 100644 --- a/src/views/alarmHandling/index.vue +++ b/src/views/alarmHandling/index.vue @@ -14,7 +14,11 @@ - + - + @@ -161,12 +165,24 @@
- + +
- 主动拍照 - 历史图片 + 主动拍照 + 历史图片
@@ -192,11 +208,11 @@ import { getReturnedPhotoJoggle, readAlarm, } from "@/utils/api/index"; -import historyimg from './components/historyimg.vue' +import historyimg from "./components/historyimg.vue"; import moment from "moment"; export default { components: { - historyimg + historyimg, }, data() { return { @@ -233,18 +249,19 @@ export default { new Date(new Date().toLocaleDateString()).getTime(), new Date().getTime(), ]); - this.getTableList(); + // this.getTableList(); this.getSearchdy(); - this.getSearchgj(); }, methods: { handleBigPicbox(val) { - console.log(val); - this.bigPhotoPic = val.path; - this.showBigpic = true; - this.$nextTick(() => { - this.drawline(val); - }); + if (val.path !== "" && tableData.length !== 0) { + console.log(val); + this.bigPhotoPic = val.path; + this.showBigpic = true; + this.$nextTick(() => { + this.drawline(val); + }); + } }, closePic() { this.showBigpic = false; @@ -277,6 +294,7 @@ export default { this.gtOptions = [{ id: 0, name: "全部" }]; this.gtOptions = this.gtOptions.concat(res.data.list); this.formdata.towerId = this.gtOptions[0].id; + this.getSearchgj(); }) .catch((err) => {}); }, @@ -289,12 +307,17 @@ export default { console.log(this.gjOptions); this.formdata.label = this.gjOptions[0].label; console.log(this.formdata.label); + this.getTableList(); }) .catch((err) => {}); }, //获取数据 getTableList() { this.loading = true; + // this.$set(this.formdata, "dyId", this.page); + // this.$set(this.formdata, "label", this.page); + // this.$set(this.formdata, "lineId", this.page); + // this.$set(this.formdata, "towerId", this.page); this.$set(this.formdata, "pageindex", this.page); this.$set(this.formdata, "pagesize", this.pageSize); this.$set(this.formdata, "starttime", this.formdata.timeVal[0]); @@ -375,17 +398,19 @@ export default { this.selectRow = row; //未读变已读 if (row.isread == 0) { - readAlarm({ - id: row.id, - }) - .then((res) => { - console.log(res); - row.isread = 1; - console.log(row.isread); + setTimeout(function () { + readAlarm({ + id: row.id, }) - .catch((err) => { - console.log(err); - }); + .then((res) => { + console.log(res); + row.isread = 1; + console.log(row.isread); + }) + .catch((err) => { + console.log(err); + }); + }, 300); } this.drawline(row); }, @@ -421,10 +446,10 @@ export default { this.i = 0; this.btnpicloading = false; this.$notify({ - title: '通知信息', - message: '已返回最新图片', - type: 'success', - position: 'bottom-right' + title: "通知信息", + message: "已返回最新图片", + type: "success", + position: "bottom-right", }); } else if (res.data == false && this.i > 10) { clearInterval(this.timer); @@ -432,16 +457,16 @@ export default { this.i = 0; this.btnpicloading = false; this.$notify({ - title: '通知信息', - message: '装置暂无响应，请稍后再试！', - type: 'warning', - position: 'bottom-right' + title: "通知信息", + message: "装置暂无响应，请稍后再试！", + type: "warning", + position: "bottom-right", }); } }); }, //历史图片 - handleHistory(){ + handleHistory() { this.$refs.historyimg_ref.display(); this.$refs.historyimg_ref.getdataform(this.selectRow); }, diff --git a/src/views/management/monitoringEquipment/photographicDevice/index.vue b/src/views/management/monitoringEquipment/photographicDevice/index.vue index ba48076..9b1ac39 100644 --- a/src/views/management/monitoringEquipment/photographicDevice/index.vue +++ b/src/views/management/monitoringEquipment/photographicDevice/index.vue @@ -37,7 +37,7 @@ prop="towerName" label="杆塔名称" show-overflow-tooltip - min-width="120" + min-width="150" > + + +
取 消 @@ -51,6 +58,7 @@ export default { lineId: [ { required: true, message: "请选择线路编号", trigger: "blur" }, ], + order: [{ required: true, message: "请输入排序号", trigger: "blur" }], }, }; }, @@ -68,7 +76,9 @@ export default { //判断 getdataform(val) { if (val == null) { - return (this.formdata = {}); + return (this.formdata = { + order: 0, + }); } this.formdata = val; }, @@ -142,5 +152,11 @@ export default { .el-select { width: 100%; } + .el-input-number { + width: 100%; + } + .el-input-number .el-input__inner { + text-align: left; + } } diff --git a/src/views/management/userEquipment/towerInformation/index.vue b/src/views/management/userEquipment/towerInformation/index.vue index 5deb0e4..c5ae35d 100644 --- a/src/views/management/userEquipment/towerInformation/index.vue +++ b/src/views/management/userEquipment/towerInformation/index.vue @@ -41,11 +41,7 @@ show-overflow-tooltip > - +