la 2 роки тому
батько
коміт
b18e01961e
4 змінених файлів з 4260 додано та 2272 видалено
  1. 21 0
      package-lock.json
  2. 1 0
      package.json
  3. 18 13
      src/views/gwglxt/dbfw/sh/index.vue
  4. 4220 2259
      yarn.lock

+ 21 - 0
package-lock.json

@@ -32,6 +32,7 @@
         "require": "^2.4.20",
         "tinymce": "^6.3.1",
         "vue": "^2.6.14",
+        "vue-drag-resize": "^1.5.4",
         "vue-pdf": "^4.3.0",
         "vue-router": "^3.5.3",
         "xlsx": "^0.18.5"
@@ -7224,6 +7225,18 @@
         }
       }
     },
+    "node_modules/vue-drag-resize": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/vue-drag-resize/-/vue-drag-resize-1.5.4.tgz",
+      "integrity": "sha512-SR3U7n6TAZEBgP7zw7bR9mjtAlYBjqIoaWTDPz5HXN/nYhOxKSA31aD7p71fmq1jtyt9reAnCx62valNL9ZAcg==",
+      "dependencies": {
+        "vue-drag-resize": "^1.5.0-rc3"
+      },
+      "engines": {
+        "node": ">= 4.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
     "node_modules/vue-pdf": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/vue-pdf/-/vue-pdf-4.3.0.tgz",
@@ -13760,6 +13773,14 @@
       "integrity": "sha512-QL3ny+wX8c6Xm1/EZylbgzdoDolye+VpCXRhI2hug9dJTP3OUJ3lmiKN3CsVV3mOJKwFi0nsstbgob0vG7aoIw==",
       "requires": {}
     },
+    "vue-drag-resize": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/vue-drag-resize/-/vue-drag-resize-1.5.4.tgz",
+      "integrity": "sha512-SR3U7n6TAZEBgP7zw7bR9mjtAlYBjqIoaWTDPz5HXN/nYhOxKSA31aD7p71fmq1jtyt9reAnCx62valNL9ZAcg==",
+      "requires": {
+        "vue-drag-resize": "^1.5.0-rc3"
+      }
+    },
     "vue-pdf": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/vue-pdf/-/vue-pdf-4.3.0.tgz",

+ 1 - 0
package.json

@@ -43,6 +43,7 @@
     "require": "^2.4.20",
     "tinymce": "^6.3.1",
     "vue": "^2.6.14",
+    "vue-drag-resize": "^1.5.4",
     "vue-pdf": "^4.3.0",
     "vue-router": "^3.5.3",
     "xlsx": "^0.18.5"

+ 18 - 13
src/views/gwglxt/dbfw/sh/index.vue

@@ -155,7 +155,9 @@
           <div ref="finalimageDom" id="finalimageDomId" style="min-height:100px;">
             <img :src="item" v-for="(item, index) in uploadPdfImg" :key="index" alt="">
           </div>
-          <div class="lastZhang" ref="lastZhang" draggable="true" @dragstart="dragstart($event)" @dragend="dragend($event)" :style="`right:${elLeft}px;bottom:${elTop}px`">
+          <VueDragResize>
+            <!-- draggable="true" @dragstart="dragstart($event)" @dragend="dragend($event)" :style="`right:${elLeft}px;bottom:${elTop}px`" -->
+            <div class="lastZhang" ref="lastZhang" :w="currentImgW" :h="currentImgH" :z="2"  :isResizable="false" :parent-limitation="true" >
             <img src="../../../../assets/images/zhang1.png" alt="" v-if="singleData.lb_id == 1"
               crossorigin="“anonymous”" />
             <img src="../../../../assets/images/zhang2.png" alt="" v-else-if="singleData.lb_id == 2"
@@ -168,6 +170,8 @@
               crossorigin="“anonymous”" />
             <img src="../../../../assets/images/zhang6.png" alt="" v-else />
           </div>
+          </VueDragResize>
+          
         </div>
       </div>
       <div slot="footer">
@@ -189,6 +193,7 @@ import html2canvas from "html2canvas";
 import * as PDFJS from "pdfjs-dist";
 import * as pdfjsLib from "pdfjs-dist";
 import pdfjsWorker from "pdfjs-dist/build/pdf.worker.entry";
+import VueDragResize from 'vue-drag-resize'
 import {
   common_edit,
   common_detail,
@@ -202,6 +207,9 @@ import { useUserStore } from "@/stores/user";
 const { real_name, user_id, dept_ids, token } = useUserStore();
 export default {
   name: "sh",
+  components: {
+    VueDragResize
+  },
   data() {
     const validateLogo = (rule, value, callback) => {
       if (!this.dialogForm_lxmb.fj) {
@@ -276,6 +284,9 @@ export default {
       elLeft: 163,//元素的左偏移量
       elTop: 260,//元素的右偏移量
 
+      currentImgW:120,
+      currentImgH:120,
+
     };
   },
   mounted() {
@@ -991,17 +1002,9 @@ export default {
 
       let currentImgW = this.$refs.lastZhang.offsetWidth;
       let currentImgH = this.$refs.lastZhang.offsetHeight;
-
-      this.$nextTick(() => {
-        let currentImgW = this.$refs.lastZhang.offsetWidth;
-        let currentImgH = this.$refs.lastZhang.offsetHeight;
-        
-      })
       let halfCurrentImgW = currentImgW / 2;
       let halfCurrentImgH = currentImgH / 2;
-      
-      console.log(halfCurrentImgW,"989")
-     
+           
       /**
        * x:正值为往左拖动,负值为往右拖动
        * y:正值往上拖动,负值为向下拖动
@@ -1027,7 +1030,9 @@ export default {
 
 <style lang="scss" scoped>
 @import url("../../../../styles/documentOnlineRev.scss");
-
+.vdr.active:before {
+  display:none;
+}
 .topBut {
   display: flex;
   flex-direction: row;
@@ -1082,8 +1087,8 @@ export default {
 
 .lastZhang {
   position: absolute;
-  // right: 13%;
-  // bottom: 10%;
+  right: 13%;
+  bottom: 10%;
   z-index: 14;
   user-select: none;
 }

Різницю між файлами не показано, бо вона завелика
+ 4220 - 2259
yarn.lock