Merge branch 'hn2.0' into wp1.0

src/views/components/carouselChart.vue

@@ -155,7 +155,12 @@
     </div>
 
     <!-- 点击出现大图 -->
-    <div v-if="showBigpic" class="showPic" v-loading="canvasloading">
+    <div
+      v-if="showBigpic"
+      class="showPic"
+      v-loading="canvasloading"
+      @click="closePic($event)"
+    >
       <div
         class="picboxI"
         @mousewheel.prevent="rollImg"
@@ -173,7 +178,7 @@
         />
         <!-- <canvas id="bigCanvas" class="myCanvas" ref="myCanvasbig"></canvas> -->
       </div>
-      <div class="viewClose" @click="closePic">
+      <div class="viewClose" @click="closePic($event)">
         <i class="el-icon-close"></i>
       </div>
     </div>
@@ -351,10 +356,19 @@ export default {
       this.showBigpic = true;
       this.bigImgPath = val.substring(0, val.length - 9);
     },
-    closePic(data) {
+    closePic(e) {
-      console.log(data);
+      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;

src/views/management/userEquipment/towerInformation/components/addDialog.vue

@@ -61,9 +61,9 @@ export default {
         lineId: [
           { required: true, message: "请选择线路编号", trigger: "blur" },
         ],
-        address: [
+        // address: [
-          { required: true, message: "请输入杆塔地址", trigger: "blur" },
+        //   { required: true, message: "请输入杆塔地址", trigger: "blur" },
-        ],
+        // ],
         order: [{ required: true, message: "请输入排序号", trigger: "blur" }],
       },
     };