Browse Source

roll back some code

allen 2 years ago
parent
commit
27f6bbd185
3 changed files with 7 additions and 127 deletions
  1. 0 116
      package-lock.json
  2. 0 1
      package.json
  3. 7 10
      src/views/extract/info/classCreateV2.vue

+ 0 - 116
package-lock.json

@@ -46,7 +46,6 @@
         "vue": "2.6.12",
         "vue-count-to": "1.0.13",
         "vue-cropper": "0.5.5",
-        "vue-doc-preview": "^0.3.2",
         "vue-meta": "2.4.0",
         "vue-pdf": "^4.3.0",
         "vue-router": "3.4.9",
@@ -11640,17 +11639,6 @@
         "node": ">=0.12"
       }
     },
-    "node_modules/marked": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmmirror.com/marked/-/marked-0.4.0.tgz",
-      "integrity": "sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw==",
-      "bin": {
-        "marked": "bin/marked"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/material-colors": {
       "version": "1.2.6",
       "resolved": "https://registry.npmmirror.com/material-colors/-/material-colors-1.2.6.tgz",
@@ -18433,58 +18421,6 @@
       "resolved": "https://registry.npmmirror.com/vue-cropper/-/vue-cropper-0.5.5.tgz",
       "integrity": "sha512-5mGaBlS1EwLxUFwHHX2Q8zOZSiVfBUjOfolR+ZNKwu7Rh3u+GhwHYOyFkgZHhhoQBBNdyVB28O6W+MpMimhCbA=="
     },
-    "node_modules/vue-doc-preview": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmmirror.com/vue-doc-preview/-/vue-doc-preview-0.3.2.tgz",
-      "integrity": "sha512-1zRW/LOLpgtt+bdb4jRzsKfOngkJYzFJsKT0uH4/KqdUMVo7W8jhYUuVcllnw5mHVL/l4v3JESsqX+i8v3uhRw==",
-      "dependencies": {
-        "axios": "^0.18.0",
-        "highlight.js": "^9.12.0",
-        "marked": "^0.4.0"
-      }
-    },
-    "node_modules/vue-doc-preview/node_modules/axios": {
-      "version": "0.18.1",
-      "resolved": "https://registry.npmmirror.com/axios/-/axios-0.18.1.tgz",
-      "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==",
-      "deprecated": "Critical security vulnerability fixed in v0.21.1. For more information, see https://github.com/axios/axios/pull/3410",
-      "dependencies": {
-        "follow-redirects": "1.5.10",
-        "is-buffer": "^2.0.2"
-      }
-    },
-    "node_modules/vue-doc-preview/node_modules/debug": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmmirror.com/debug/-/debug-3.1.0.tgz",
-      "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/vue-doc-preview/node_modules/follow-redirects": {
-      "version": "1.5.10",
-      "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.5.10.tgz",
-      "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
-      "dependencies": {
-        "debug": "=3.1.0"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/vue-doc-preview/node_modules/is-buffer": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmmirror.com/is-buffer/-/is-buffer-2.0.5.tgz",
-      "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/vue-doc-preview/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
     "node_modules/vue-eslint-parser": {
       "version": "7.11.0",
       "resolved": "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz",
@@ -29420,11 +29356,6 @@
         }
       }
     },
-    "marked": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmmirror.com/marked/-/marked-0.4.0.tgz",
-      "integrity": "sha512-tMsdNBgOsrUophCAFQl0XPe6Zqk/uy9gnue+jIIKhykO51hxyu6uNx7zBPy0+y/WKYVZZMspV9YeXLNdKk+iYw=="
-    },
     "material-colors": {
       "version": "1.2.6",
       "resolved": "https://registry.npmmirror.com/material-colors/-/material-colors-1.2.6.tgz",
@@ -35132,53 +35063,6 @@
       "resolved": "https://registry.npmmirror.com/vue-cropper/-/vue-cropper-0.5.5.tgz",
       "integrity": "sha512-5mGaBlS1EwLxUFwHHX2Q8zOZSiVfBUjOfolR+ZNKwu7Rh3u+GhwHYOyFkgZHhhoQBBNdyVB28O6W+MpMimhCbA=="
     },
-    "vue-doc-preview": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmmirror.com/vue-doc-preview/-/vue-doc-preview-0.3.2.tgz",
-      "integrity": "sha512-1zRW/LOLpgtt+bdb4jRzsKfOngkJYzFJsKT0uH4/KqdUMVo7W8jhYUuVcllnw5mHVL/l4v3JESsqX+i8v3uhRw==",
-      "requires": {
-        "axios": "^0.18.0",
-        "highlight.js": "^9.12.0",
-        "marked": "^0.4.0"
-      },
-      "dependencies": {
-        "axios": {
-          "version": "0.18.1",
-          "resolved": "https://registry.npmmirror.com/axios/-/axios-0.18.1.tgz",
-          "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==",
-          "requires": {
-            "follow-redirects": "1.5.10",
-            "is-buffer": "^2.0.2"
-          }
-        },
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmmirror.com/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "follow-redirects": {
-          "version": "1.5.10",
-          "resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.5.10.tgz",
-          "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
-          "requires": {
-            "debug": "=3.1.0"
-          }
-        },
-        "is-buffer": {
-          "version": "2.0.5",
-          "resolved": "https://registry.npmmirror.com/is-buffer/-/is-buffer-2.0.5.tgz",
-          "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="
-        },
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmmirror.com/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-        }
-      }
-    },
     "vue-eslint-parser": {
       "version": "7.11.0",
       "resolved": "https://registry.npmmirror.com/vue-eslint-parser/-/vue-eslint-parser-7.11.0.tgz",

+ 0 - 1
package.json

@@ -73,7 +73,6 @@
     "vue": "2.6.12",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
-    "vue-doc-preview": "^0.3.2",
     "vue-meta": "2.4.0",
     "vue-pdf": "^4.3.0",
     "vue-router": "3.4.9",

+ 7 - 10
src/views/extract/info/classCreateV2.vue

@@ -22,8 +22,7 @@
     <el-row>
       <el-col :span="12">
         <div style="margin: 10px; max-height: calc(100vh - 220px);overflow: auto;">
-          <!-- <ViewPdf :src="showPdfPath" :show-toolbar="false" :show-navigation="false"/> -->
-          <vue-doc-preview :url="showPdfPath" :showDownloadButton="false" type="office"/>
+          <ViewPdf :src="showPdfPath"/>
         </div>
       </el-col>
       <el-col :span="12">
@@ -47,17 +46,16 @@
     </el-row>
   </div>
 </template>
-  
+
 <script>
 import { getExtractByHandBySubtaskId, submitBySubTask } from "@/api/suport/hand";
 import { getEntityClassOption } from '@/api/neo4j/class'
 import { getDocPathBySunTaskId } from '@/api/extract/subTask'
 import ViewPdf from '@/views/search/pdf/view'
-import VueDocPreview from 'vue-doc-preview';
 
 export default {
   name: "ClassCreateResult",
-  components: { ViewPdf, VueDocPreview },
+  components: { ViewPdf },
   props:{
     subTask: {
       type: Object,
@@ -99,7 +97,7 @@ export default {
     getResult(){
       this.loading = true
       getExtractByHandBySubtaskId(this.subTask.id).then(resp =>{
-          
+
           if(resp.data){
             this.extractByHands = resp.data
             for(let extractByHand of this.extractByHands) {
@@ -110,7 +108,7 @@ export default {
           } else {
             this.extractByHands[this.pageNum].details = this.getNewDetails();
           }
-          
+
           this.loading = false
         }
       )
@@ -143,8 +141,7 @@ export default {
     },
     getPdfPath(){
       getDocPathBySunTaskId(this.subTask.id).then(resp => {
-        this.showPdfPath = 'http://localhost'+ process.env.VUE_APP_BASE_API + resp.data
-        // this.showPdfPath = 'C:/Users/allen/Desktop/test/nginx.docx'
+        this.showPdfPath = process.env.VUE_APP_BASE_API + resp.data
       })
     },
     handleApprove(isApprove) {
@@ -218,4 +215,4 @@ export default {
   justify-content: center;
   align-items: center;
 }
-</style>
+</style>