Merge remote-tracking branch 'origin/master'

src/views/basic/corpMaintain/corpMaintain.vue

@@ -654,19 +654,21 @@ export default {
       });
     },
     showImgViewer(row) {
-      this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
+      let newWindow = window.open();
-      this.imgList = [];
+      newWindow.document.write(row.filePath)
-      previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
+      // this.certFileUrl = this.BASE_URL + "/udiwms/image/register/file/getImage?type=image2&name=";
-        if (response.code === 20000) {
+      // this.imgList = [];
-          this.imgList=response.data;
+      // previewImage({imageUrl: row.filePath, certFileUrl: this.certFileUrl}).then(response => {
-        }
+      //   if (response.code === 20000) {
-      });
+      //     this.imgList=response.data;
-      this.imgViewerVisible = true;
+      //   }
-      const m = (e) => {
+      // });
-        e.preventDefault()
+      // this.imgViewerVisible = true;
-      };
+      // const m = (e) => {
-      document.body.style.overflow = 'hidden';
+      //   e.preventDefault()
-      document.addEventListener("touchmove", m, false); // 禁止页面滑动
+      // };
+      // document.body.style.overflow = 'hidden';
+      // document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
     // 隐藏表单
     hideForm() {

src/views/improveInfo.vue

@@ -947,25 +947,27 @@ export default {
     },
 
     showImgViewer(row) {
-      this.certFileUrl =
+      let newWindow = window.open();
-        this.BASE_URL +
+      newWindow.document.write(row.filePath)
-        "/udiwms/image/register/file/getImage?type=image2&name=";
+      // this.certFileUrl =
-      this.imgList = [];
+      //   this.BASE_URL +
-      previewImage({
+      //   "/udiwms/image/register/file/getImage?type=image2&name=";
-        imageUrl: row.filePath,
+      // this.imgList = [];
-        certFileUrl: this.certFileUrl,
+      // previewImage({
-      }).then((response) => {
+      //   imageUrl: row.filePath,
-        if (response.code === 20000) {
+      //   certFileUrl: this.certFileUrl,
-          this.imgList = response.data;
+      // }).then((response) => {
-        }
+      //   if (response.code === 20000) {
-        console.log(this.imgList);
+      //     this.imgList = response.data;
-        this.imgViewerVisible = true;
+      //   }
-      });
+      //   console.log(this.imgList);
-      const m = (e) => {
+      //   this.imgViewerVisible = true;
-        e.preventDefault();
+      // });
-      };
+      // const m = (e) => {
-      document.body.style.overflow = "hidden";
+      //   e.preventDefault();
-      document.addEventListener("touchmove", m, false); // 禁止页面滑动
+      // };
+      // document.body.style.overflow = "hidden";
+      // document.addEventListener("touchmove", m, false); // 禁止页面滑动
     },
     closeImgViewer() {
       this.imgViewerVisible = false;