diff --git a/src/views/components/carouselChart.vue b/src/views/components/carouselChart.vue index 41a9973..803411e 100644 --- a/src/views/components/carouselChart.vue +++ b/src/views/components/carouselChart.vue @@ -155,7 +155,12 @@ -
+
-
+
@@ -351,10 +356,19 @@ export default { this.showBigpic = true; this.bigImgPath = val.substring(0, val.length - 9); }, - closePic(data) { - console.log(data); - this.zoomD = 1; - this.showBigpic = false; + closePic(e) { + console.log(e); + var btn = this.$refs.bigimgref; + console.log(btn); + if (btn) { + if (!btn.contains(event.target)) { + //按钮.app-download以外的区域 + this.zoomD = 1; + this.showBigpic = false; + } + } + // + // this.showBigpic = false; }, openline() { this.flagline = true; diff --git a/src/views/management/userEquipment/towerInformation/components/addDialog.vue b/src/views/management/userEquipment/towerInformation/components/addDialog.vue index bea43b0..cc85d8f 100644 --- a/src/views/management/userEquipment/towerInformation/components/addDialog.vue +++ b/src/views/management/userEquipment/towerInformation/components/addDialog.vue @@ -61,9 +61,9 @@ export default { lineId: [ { required: true, message: "请选择线路编号", trigger: "blur" }, ], - address: [ - { required: true, message: "请输入杆塔地址", trigger: "blur" }, - ], + // address: [ + // { required: true, message: "请输入杆塔地址", trigger: "blur" }, + // ], order: [{ required: true, message: "请输入排序号", trigger: "blur" }], }, };