电签签名

src/api/certificate/list.js

@@ -133,10 +133,10 @@ export const picPresave = (form) => {
   })
 }
 
-export const prePicture = (id) => {
+export const prePicture = (form) => {
   return request({
     url: '/api/blade-manager/signPfxFile/prePicture',
     method: 'post',
-    data: {id}
+    data: form
   })
 }

src/config/index.json

@@ -1,7 +1,7 @@
 {
-  "target": "http://39.108.216.210:8090",
+  "target1": "http://39.108.216.210:8090",
   "target2": "http://127.0.0.1:8090",
-  "target3": "http://192.168.0.196:8090",
+  "target": "http://192.168.0.196:8090",
   "dev": {
     "port": 1888
   },

src/views/certificate/lists/addList.vue

@@ -165,10 +165,7 @@
               <el-input v-model="form.wide" style="width:60px; margin-left: 24px;" placeholder="宽度" size="small" :disabled="form.signatureFileUrl.length<=0"></el-input>
               <div style="display: inline-block; margin-left: 8px;">x</div>
               <el-input v-model="form.high" style="width:60px; margin-left: 8px;" placeholder="高度" size="small" :disabled="form.signatureFileUrl.length<=0"></el-input>
-              <span style="margin-left: 8px; font-size: 22px;cursor: pointer" @click.stop="signatureSave">
-                <i class="el-icon-success" :style="form.signatureFileUrl.length<=0?'color: #1A1A1A;':'color: #1e9fff;'"></i>
-              </span>
-              <el-button size="small" type="warning" style="margin-left: 12px" :disabled="form.signatureFileUrl.length<=0 || !signatureId" @click.stop="signaturePreview">预览</el-button>
+              <el-button size="small" type="warning" style="margin-left: 12px" :disabled="form.signatureFileUrl.length <= 0 " @click.stop="signaturePreview">预览</el-button>
             </div>
           </div>
           <div
@@ -394,6 +391,11 @@ export default {
           }
 
           if (this.form.signatureFileUrl[0]&&this.form.signatureFileUrl[0].name && this.form.signatureFileUrl[0].status === "ready") {
+            const url = await this.prePictureApi()
+            if (url) {
+              fromData.wide = this.form.wide
+              fromData.high = this.form.high
+            }
             let fileData = await this.compressAndUploadApi(this.form.signatureFileUrl[0].raw, fromData.wide, fromData.high);
             fromData.signatureFileUrl = fileData.link;
             fromData.signatureFileName = fileData.originalName;
@@ -638,8 +640,13 @@ export default {
         this.updateDependentFieldValidation()
       }
     },
-    //保存
-    async signatureSave() {
+    //预览
+    async signaturePreview() {
+      const url = await this.prePictureApi()
+      if (!url) return
+      window.open(url, '_blank')
+    },
+    async prePictureApi() {
       const form = this.form
       const isImg = form.signatureFileUrl.length <= 0
       if (isImg) {
@@ -647,35 +654,26 @@ export default {
           message: '请先上传签名图片',
           type: 'error'
         })
-        return
+        return false
       }
-      if (!form.wide || !form.high) {
+      const file = form.signatureFileUrl[0].raw
+      if (!file) {
         this.$message({
-          message: '请先填写宽度和高度的尺寸',
+          message: '请重新上传签名文件',
           type: 'error'
         })
-        return
+        return false
       }
-      const file = form.signatureFileUrl[0].raw
       let fromData = new FormData();
       fromData.append('file', file);
       fromData.append('wide', form.wide);
       fromData.append('high', form.high);
-      const { data: res } = await picPresave(fromData)
-      this.signatureId = res.data.id;
-    },
-    //预览
-    async signaturePreview() {
-     const cid = this.signatureId
-      if (!cid) {
-        this.$message({
-          message: '请先上传和保存尺寸',
-          type: 'error'
-        })
-        return
-      }
-      const { data: res } = await prePicture(cid)
-      window.open(res.data, '_blank')
+      const { data: res } = await prePicture(fromData)
+      const data = res.data;
+      if (!data.preUrl) return false
+      this.form.wide = data.wide //宽度
+      this.form.high = data.high //高度
+      return data.preUrl
     },
     stopClick() {},
   },