askbot-dragon 1.5.46-beta → 1.5.48-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.5.46-beta",
+  "version": "1.5.48-beta",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -13,6 +13,7 @@
     "audio-loader": "^1.0.3",
     "ckeditor": "^4.12.1",
     "core-js": "^3.6.5",
+    "esdk-obs-browserjs": "^3.23.5",
     "install": "^0.13.0",
     "jquery": "^3.5.1",
     "lodash": "^4.17.21",

package/src/assets/js/hammer.js

@@ -3,15 +3,6 @@ export function zoomElement (el) {
 	let store = {
 		scale: 1
 	};
-	if (!el){
-		return
-	}
-	let scale = 1;
-	if (el.style.transform){
-		let transForm = el.style.transform;
-		var values = transForm.split('(')[1].split(')')[0].split(',');
-		scale = values[0] ? values[0] : 1
-	}
 	// 缩放事件的处理
 	el.addEventListener('touchstart', function (event) {
 		let touches = event.touches;
@@ -76,15 +67,13 @@ export function zoomElement (el) {
 				newScale = 3;
 			}
 			// 最小缩放比例限制
-			if(newScale < scale) {
-				newScale = scale;
+			if(newScale < 1) {
+				newScale = 1;
 			}
 			// 记住使用的缩放值
 			store.scale = newScale;
 			// 图像应用缩放效果
 			el.style.transform = 'scale(' + newScale + ')';
-			el.style.transformOrigin = 'top left'
-
 		}
 	});
 	document.addEventListener('touchend', function () {

package/src/assets/js/obsBrowser.js

@@ -0,0 +1,32 @@
+// 创建ObsClient实例
+import ObsClient from 'esdk-obs-browserjs';
+const obsClient = new ObsClient({
+    access_key_id: "EE4MAFWH4YLQSQF7NNIP",
+    secret_access_key: "Dq9giqqwZoX77dqSIzhA1Yhhe9tarA3LRBGBF4eO",
+    server : 'https://obs.cn-east-3.myhuaweicloud.com',
+    timeout : 1000
+});
+async function putObject(file,callback){
+    let fileUrl = ''
+    let objName = (process.env.VUE_APP_ENV === 'development' ? 'dev_' : 'pro_') + file.name
+    await obsClient.putObject({
+        Bucket: 'askbot-uat',
+        Key : objName,
+        SourceFile : file,
+        ACL : obsClient.enums.AclPublicRead,
+        ProgressCallback: callback
+    }).then(function(result) {
+        if(result.CommonMsg.Status < 300){
+            console.log('Create object:' + JSON.stringify(result) + ' successfully!\n');
+            fileUrl = {
+                url:'https://askbot-uat.obs.cn-east-3.myhuaweicloud.com/' + objName,
+                name:file.name
+            }
+        }
+    });
+    return fileUrl
+}
+
+export {
+    putObject
+}

package/src/assets/less/converSationContainer/common.less

@@ -35,13 +35,6 @@
     border-radius: 6px;
     background-color: #bfceec !important;
 }
-@media screen and (max-width: 767px){
-    ::-webkit-scrollbar {
-        width: 0;
-        height: 0;
-        background-color:@system_bordercolor_4;
-    }
-}
 
 // 弹窗body
 .el-dialog__body{

package/src/components/AnswerDocknowledge.vue

@@ -234,8 +234,7 @@ export default {
               if(res.data.code == '0') {
                 this.previewHref = res.data.data;
                 this.sourceFileType = url.substring(url.lastIndexOf('.'))
-                let isOhmPc = sessionStorage.getItem('isOhmPc')
-                if (isMobile() || isOhmPc == 'true'){
+                if (isMobile()){
                   this.$refs.previewPdf.drawer = true;
                   this.$refs.previewPdf.previewShowPopup = true;
                 } else {
@@ -244,18 +243,7 @@ export default {
                 }
                 this.$refs.previewPdf.fileType = type
                 this.$refs.previewPdf.tagIds = item.tagIds
-                this.$refs.previewPdf.isMessageRecord = this.isMessageRecord ? true : false ;
-                let index = url.indexOf("?");
-                let newFileInOssPath = url;
-                if (index !== -1){
-                  newFileInOssPath =  url.substring(0, url.indexOf("?"))
-                }
-                let fileName = newFileInOssPath.substring(newFileInOssPath.lastIndexOf('.'))
-                if (fileName === '.doc' || fileName === '.docx' || fileName === '.txt'){
-                  this.$refs.previewPdf.fileName = fileName;
-                } else {
-                  this.$refs.previewPdf.fileName = '';
-                }
+                this.$refs.previewPdf.isMessageRecord = this.isMessageRecord ? true : false 
                 if(item.tagIds && item.tagIds.length != 0) {
                   this.$refs.previewPdf.loading = false
                   return

package/src/components/ConversationContainer.vue

@@ -34,7 +34,7 @@
     </div> -->
 
     <text-message :text="text" @submitClick="submitClick"></text-message>
-     <answer-docknowledge :isAskLightning="2" :msg="answerDocknowledge"></answer-docknowledge>
+    <!-- <answer-docknowledge :isAskLightning="2" :msg="answerDocknowledge"></answer-docknowledge> -->
     <!--    <voice-component @closeVoice="closeVoice">
       <div slot="voiceTip">
         松开发送
@@ -105,7 +105,7 @@ import AnswerVoice from "@/components/AnswerVoice";
 // import ChatContent from "./chatContent";
 // import FeedBack from '@/components/feedBack'
 // 知识类型
-import AnswerDocknowledge from "./AnswerDocknowledge.vue";
+// import AnswerDocknowledge from "./AnswerDocknowledge.vue";
 export default {
   name: 'ConversationContainer',
   components: {
@@ -131,7 +131,7 @@ export default {
     // FormTemplate,
     // FileType,
     // ChatContent,
-    AnswerDocknowledge,
+    // AnswerDocknowledge,
   },
   props: {
     messages: Array
@@ -188,48 +188,17 @@ export default {
       answerDocknowledge:
       // {"content":{"knowledgeId":"64915d6e098ec248701da267","actionType":"answer_doc_knowledge","text":"跳舞不仅要有实力，还要有好的穿搭，本文针对街舞爱好者提供了穿搭指南，给你带来灵感和帮助！","list":[{"tagIds":[],"format":"html","updateTime":"2023-06-20 16:03:58","source":"WECHAT","url":"https://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/137993c6d830416696bbd771fc61d423/1937/2023/06/20/16/03/微信同步/52720/501775e41a724d7da06e66b3b4686407.html","knowledgeId":"64915d6e098ec248701da267","from":"跳舞要有范儿，穿搭占一半！快来get你的街舞穿搭指南~"}],"renderType":0,"type":0,"isKnowledgeSummary":true},"type":"answer_doc_knowledge","sessionId":1687251699065,"keyId":"1a079f48-ace3-4064-89b4-8a292c6a8a93_________","isKnowledgeSummary":true},
 
-          {
-            "conditionList": null,
-            "apiKey": null,
-            "effectiveTime": null,
-            "intentId": null,
-            "msgId": null,
-            "actionCategory": null,
-            "id": null,
-            "type": "answer_doc_knowledge",
-            "nodeId": null,
-            "content": {
-              "knowledgeId": null,
-              "actionType": "answer_doc_knowledge",
-              "images": null,
-              "knowledgePartId": null,
-              "srcContentId": null,
-              "text": "新能源车是指采用新型能源的轿车、客车、货车等机动车辆，包括纯电动汽车、插电式混合动力汽车和燃料电池汽车。根据数据显示，2020年我国新能源汽车销售量达到139万辆，同比增长10.9%。预计2021年新能源车市场将继续保持高速增长，销售量有望超过200万辆。政府对新能源汽车实行补贴政策，同时逐步放松对新能源车的限购和限行政策。此外，中国汽车企业在新能源车领域的技术研发能力也不断提升，各大品牌纷纷推出新能源车型，采用更优秀的动力电池和电控系统，提高了车辆的续航里程。因此，新能源车市场发展前景广阔。",
-              "list": [
-                {
-                  "owner": null,
-                  "tagId": "6525183560177f6223d52a14",
-                  "enterprise": null,
-                  "tagIds": [
-                    "6525183560177f6223d52a14"
-                  ],
-                  "format": "docx",
-                  "srcContentId": "99cada54a02161f979acc28c5b8b913e",
-                  "updateTime": "2023-10-10 17:24:05",
-                  "source": "CORP_LOCAL_FILE",
-                  "srcContent": "新能源车指的是采用新型能源的轿车、客车、货车等机动车辆。目前主要的新能源车包括纯电动汽车、插电式混合动力汽车、燃料电池汽车等。以下是对新能源车的分析报告：市场发展趋势：随着环保和能源安全意识的增强，新能源车市场呈现快速发展态势。数据显示，2020年我国新能源汽车销售量达到139万辆，同比增长10.9%。预计2021年新能源车市场仍将保持高速增长，销售量有望达到200万辆以上。政策扶持力度加大：我国政府对新能源汽车实行补贴政策，以鼓励消费者选择绿色出行方式。此外，对新能源车限购、限行等政策也逐步放松。政策扶持的加大将进一步促进新能",
-                  "url": "http://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/43aadcaac45f4be19b63fd18ca68f2e6/2023/10/10/17/23/a27c5c1dd534d180c5512c907d5c9888/新能源车分析报告 (1).docx?uploadId=0921CB01AB5847E8BEF44730EE5DACF7",
-                  "knowledgeId": "6525182f002ff5198983a90c",
-                  "knowledgePartId": "YfHmGIsBvcIPGxbfkvwK",
-                  "from": "新能源车分析报告 (1)",
-                  "introduction": "新能源车指的是采用新型能源的轿车、客车、货车等机动车辆。目前主要的新能源车包括纯电动汽车、插电式混合动力汽车、燃料电池汽车等。以下是对新能源车的分析报告：市场发展趋势：随着环保和能源安全意识的增强，新能源车市场呈现快速发展态势。数据显示，2020年我国新能源汽车销售量达到139万辆，同比增长10.9%。预计2021年新能源车市场仍将保持高速增长，销售量有望达到200万辆以上。政策扶持力度加大：我国政府对新能源汽车实行补贴政策，以鼓励消费者选择绿色出行方式。此外，对新能源车限购、限行等政策也逐步放松。政策扶持的加大将进一步促进新能"
-                }
-              ],
-              "renderType": 0,
-              "type": 0,
-              "srcContent": null
-            }
-          },
+      {
+        "content": {
+          "images": [{ url: 'https://static.guoranbot.com/images/knowledge/e0f6898c6b0d47fa98e8f71ceab1bde8/安全标志--禁止标志.png' }],
+          "actionType": "answer_doc_knowledge",
+          "text": "中国的省份名称有湖北省、广西壮族自治区等。",
+          "list": [{ "tagIds": [], "format": "yqhtml", "srcContentId": "8ee0fa9bb5a89ea01f588843589bf931", "updateTime": "2023-04-14 20:15:50", "source": "YUQUE", "srcContent": "功能概述分院科室的建立。分院科室医生关联。分院科室建立时，科室编码需要与集团提供的科室编码保持一致。科室维护进入扁鹊基础配置模块，如图进入科室维护界面进行科室新增输入科室信息进行科室增加。", "url": "https://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/yuque/7faaefde11374c7992c377731ea4dddc/dinga77cc098b0b5e113ee0f45d8e4f7c288/2023/4/14/19/54/31/acc2421dcfd04db39eba0c37e7d3b580.html", "knowledgeId": "643940bb6cbe816b83ebbaaf", "knowledgePartId": "lPexf4cBYkmDoUE2eSUt", "from": "2.3 科室", "introduction": "功能概述分院科室的建立。分院科室医生关联。分院科室建立时，科室编码需要与集团提供的科室编码保持一致。科室维护进入扁鹊基础配置模块，如图进入科室维护界面进行科室新增输入科室信息进行科室增加。" }, { "tagIds": [], "format": "feishuhtml", "srcContentId": "8ee0fa9bb5a89ea01f588843589bf931", "updateTime": "2023-04-13 23:19:48", "source": "YUQUE", "srcContent": "功能概述分院科室的建立。分院科室医生关联。分院科室建立时，科室编码需要与集团提供的科室编码保持一致。科室维护进入扁鹊基础配置模块，如图进入科室维护界面进行科室新增输入科室信息进行科室增加。", "url": "https://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/yuque/7faaefde11374c7992c377731ea4dddc/dinga77cc098b0b5e113ee0f45d8e4f7c288/2023/4/13/22/20/40/0e48cc7b15b34d2f84fe49fd1a89d606.html", "knowledgeId": "643817509ab4545bef50db64", "knowledgePartId": "NeYze4cBh77-s6lwjWOl", "from": "2.12 重要异常科室对照", "introduction": "功能概述分院科室的建立。分院科室医生关联。分院科室建立时，科室编码需要与集团提供的科室编码保持一致。科室维护进入扁鹊基础配置模块，如图进入科室维护界面进行科室新增输入科室信息进行科室增加。" }, { "tagIds": ['12312313123'], "format": "yqhtml", "srcContentId": "8ee0fa9bb5a89ea01f588843589bf931", "updateTime": "2023-04-13 23:19:02", "source": "YUQUE", "srcContent": "功能概述分院科室的建立。分院科室医生关联。分院科室建立时，科室编码需要与集团提供的科室编码保持一致。科室维护进入扁鹊基础配置模块，如图进入科室维护界面进行科室新增输入科室信息进行科室增加。", "url": "https://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/yuque/7faaefde11374c7992c377731ea4dddc/dinga77cc098b0b5e113ee0f45d8e4f7c288/2023/4/13/22/20/18/5cdf1295ec1649f6ab73948aa82ea810.html", "knowledgeId": "643817509ab4545bef50db58", "knowledgePartId": "Hvcye4cBYkmDoUE21h6V", "from": "2.3 科室", "introduction": "功能概述分院科室的建立。分院科室医生关联。分院科室建立时，科室编码需要与集团提供的科室编码保持一致。科室维护进入扁鹊基础配置模块，如图进入科室维护界面进行科室新增输入科室信息进行科室增加。" }, { "tagId": "6475eab868110215ab821a7c", "tagIds": ["6475eab868110215ab821a7c"], "format": "xlsx", "srcContentId": "0bf639060655ff3ec217484a2fc7827d", "updateTime": "2023-05-30 20:28:21", "source": "CORP_LOCAL_FILE", "srcContent": "产品:外观,解释:VX50有两种套餐可下单： 套餐一：只购买VX50终端设备，不包含摄像头、麦克风 套餐二：除购买VX50终端设备外，可选购SC701云台摄像头及MC30/MC31麦克风", "url": "https://guoranwisdom.oss-cn-zhangjiakou.aliyuncs.com/5ecf2fcd704541149201ab9c1c31162d/2023/05/30/20/11/85b7b2a5f61e2b060387656e88c02d50/VX30与VX50对比表.xlsx", "knowledgeId": "6475e7eac724c54c46cbfa2d", "knowledgePartId": "T_uhbIgB3v-0X8BLeDAh", "from": "VX30与VX50对比表", "introduction": "产品:外观,解释:VX50有两种套餐可下单： 套餐一：只购买VX50终端设备，不包含摄像头、麦克风 套餐二：除购买VX50终端设备外，可选购SC701云台摄像头及MC30/MC31麦克风" },],
+          "renderType": 0,
+          "type": 0
+        },
+        "type": "answer_doc_knowledge"
+      },
       ActionAiGuideObj: {
         // 智能引导
         type: "answer_intellect_guide",

package/src/components/askVideo.vue

@@ -25,7 +25,7 @@
     </div>
 </template>
 <script>
-    import {ossConfig,uploadImageByBase64} from "../assets/js/AliyunlssUtil";
+    import { putObject } from "../assets/js/obsBrowser";
 
     export default {
         name: "ask_video",
@@ -85,7 +85,10 @@
             console.debug('img.src',output)
             let base64 = canvas.toDataURL("image/png")
             let blob = that.dataURLtoFile(base64,'name')
-            let promise = uploadImageByBase64(ossConfig,blob);
+            // let promise = uploadImageByBase64(ossConfig,blob);
+            const file = new File([blob], 'name', { type: 'text/plain', lastModified: Date.now() });
+            console.debug('file',file)
+            let promise = putObject(file);
             promise.then((res)=>{
               console.debug("upload base64 reslut",res);
               if (res&&res.url){

package/src/components/associationIntention.vue

@@ -233,7 +233,7 @@
         this.$emit("onRadioClick", id, name, apikey);
       },
       onImageClick(url){
-        this.$emit('onImageClick', encodeURI(url))
+        this.$emit('onImageClick',url)
       },
       msgContent(content){
         console.debug('215',content)

package/src/components/formTemplate.vue

@@ -833,6 +833,7 @@ import Tree from '../components/tree'
 import selectPopup from '../components/popup'
 import fileListView from './fielListView.vue'
 import { uniqueData } from './utils/math_utils'
+import { putObject } from "../assets/js/obsBrowser";
 export default {
   name: "formTemplate",
   data() {
@@ -1598,21 +1599,24 @@ export default {
         status:'',
         url:''
       }
-      let res = multipartUpload(
-              this.ossConfig,
-              file,
-              null,
-              imageInfo
-      );
-      res.then((res) => {
+      // let res = multipartUpload(
+      //         this.ossConfig,
+      //         file,
+      //         null,
+      //         imageInfo
+      // );
+      let resp = putObject(file);
+      resp.then((res) => {
         console.log("upload result:", res);
         // let filePath = res.name;
-        imageData.urls.push({
+        let obj = {
           name:file.name,
-          url:ossFileUrl(this.ossConfig, res.name),
+          url:res.url,
           status:'success'
-        })
-        imageInfo.url = ossFileUrl(this.ossConfig, res.name)
+        }
+        imageData.urls.push(obj)
+        // imageInfo.url = ossFileUrl(this.ossConfig, res.name)
+        imageInfo.url = res.url;
         imageInfo.status='success'
         imageInfo.name=file.name
         for (let j=0;j<this.extInfoFieldValue[this.filedId].length;j++){
@@ -2498,13 +2502,14 @@ export default {
            progress: 0,
          },
        };*/
-      let res = multipartUpload(
-              this.ossConfig,
-              file,
-              null,
-              imgInfo
-      );
-      res.then((res) => {
+      // let res = multipartUpload(
+      //         this.ossConfig,
+      //         file,
+      //         null,
+      //         imgInfo
+      // );
+      let ress = putObject(file)
+      ress.then((res) => {
         console.debug("upload result:", res);
         // let filePath = res.name;
         /* imageData.content.progress = 1;
@@ -2512,7 +2517,7 @@ export default {
                  ossFileUrl(this.ossConfig, res.name)
          );
          console.log('imageData',imageData)*/
-        imgInfo.url = ossFileUrl(this.ossConfig, res.name)
+        imgInfo.url = res.url
         imgInfo.status='success'
         if (data.file){
           imgInfo.name = data.file.name

package/src/components/pdfPosition.vue

@@ -1,5 +1,5 @@
 <template>
-    <div id="pdf_view" class="pdf_view" :style="{
+    <div class="pdf_view" ref="pdfView" @scroll="pdfScroll" :style="{
         marginTop: isPC ? '50px' : '',
         marginBottom: tagIds.length > 1 ? '60px' : '0px',
         height: setHeight
@@ -17,7 +17,6 @@
                 </el-option>
             </el-select>
         </div>
-        <div class="pdf_container_view" id="pdf_container_view" @scroll="pdfScroll"  ref="pdfView"></div>
         <div class="btn_footer" v-if="tagIds.length > 1 && !isPC">
             <div class="prev" @click="prev">上一段</div>
             <div class="next" @click="next">下一段</div>
@@ -45,11 +44,10 @@ if (pdfjsLib) {
     // 'pdfjs-dist/build/pdf.worker';
 }
 const { TextLayerBuilder } = window['pdfjs-dist/web/pdf_viewer']
-const CSS_UNITS = 96.0 / 72.0
 // import { zoomElement } from '../assets/js/hammer'
 export default {
     name: 'pdfView',
-    props: ['tagIds', 'isMessageRecord','fileName'],
+    props: ['tagIds', 'isMessageRecord'],
     data () {
         return {
             url: '',
@@ -96,7 +94,6 @@ export default {
             },
             isTouchMoved: false,
             transformSalce: null,
-            defaultTransform:0.8,
             isPC: false,
             handScale: 'auto',
             scaleList: [
@@ -284,41 +281,36 @@ export default {
             const { pdfPage, pageNo, dom } = page;
             // dom 元素已存在，无须重新渲染，直接返回
             if ((dom && dom.children.length != 0) || page.loading) {
-              return;
+                return;
             }
             page.loading = true
             const viewport = pdfPage.getViewport({
-              scale: this.scale,
-              rotation: this.rotation,
+                scale: this.scale,
+                rotation: this.rotation,
             });
             // 创建新的canvas
             const canvas = document.createElement('canvas');
             const context = canvas.getContext('2d');
             // canvas.getContext('2d');
-            canvas.height = this.pageSize.height * (this.fileName ? CSS_UNITS : 1);
-            canvas.width = this.pageSize.width * (this.fileName ? CSS_UNITS : 1);
+            canvas.height = this.pageSize.height;
+            canvas.width = this.pageSize.width;
             canvas.style.position = 'relative'
             canvas.style.top = -3 + 'px'
             // 创建渲染的dom
             const pageDom = document.createElement('div');
             pageDom.style.position = 'absolute';
-            pageDom.style.top = `${((pageNo - 1) * (this.pageSize.height + this.PAGE_INTVERVAL) * (this.fileName ? CSS_UNITS : 1)) + this.PAGE_INTVERVAL}px`;
-            pageDom.style.width = `${this.pageSize.width * (this.fileName ? CSS_UNITS : 1)}px`;
-            pageDom.style.height = `${this.pageSize.height * (this.fileName ? CSS_UNITS : 1)}px`;
+            pageDom.style.top = `${((pageNo - 1) * (this.pageSize.height + this.PAGE_INTVERVAL)) + this.PAGE_INTVERVAL}px`;
+            pageDom.style.width = `${this.pageSize.width}px`;
+            pageDom.style.height = `${this.pageSize.height}px`;
             pageDom.setAttribute('data-id', 'page' + pageNo)
-            // pageDom.appendChild(canvas);
+            pageDom.appendChild(canvas);
             // 渲染内容
             let renderContext = {
                 canvasContext: context,
                 viewport: viewport,
-                transform: this.fileName ? [CSS_UNITS, 0, 0, CSS_UNITS, 0, 0] : '',
             }
             await pdfPage.render(renderContext).promise.then(() => {
-              const html = canvas.toDataURL();
-              let image = document.createElement('img');
-              image.setAttribute('src',html)
-              pageDom.appendChild(image);
-              return pdfPage.getTextContent()
+                return pdfPage.getTextContent()
             }).then(async (textContent) => {
                 const textLayerDiv = document.createElement('div');
                 textLayerDiv.setAttribute('class', 'textLayer');
@@ -348,35 +340,36 @@ export default {
                                     let postionArr = lines[index].location
                                     let div = document.createElement('div')
                                     div.style.position = 'absolute';
-                                    div.style.left = postionArr[0] * this.scale * (this.fileName ? CSS_UNITS : 1) + 'px',
+                                    div.style.left = postionArr[0] * this.scale + 'px',
                                     // 后端返回的坐标有基线对齐的问题，top 值是后端算好（基线top - 文字高度），在此加上文字高度的 1/9 （大致比例）为实际展示出文字的top值
-                                    div.style.top = postionArr[1] * this.scale * (this.fileName ? CSS_UNITS : 1) + 'px'
-                                    div.style.height = postionArr[3] * this.scale * (this.fileName ? CSS_UNITS : 1) + 'px';
-                                    div.style.width = postionArr[2] * this.scale * (this.fileName ? CSS_UNITS : 1) + 'px'
+                                    div.style.top = postionArr[1] * this.scale + 'px'
+                                    div.style.height = postionArr[3] * this.scale + 'px';
+                                    div.style.width = postionArr[2] * this.scale + 'px'
                                     div.style.backgroundColor = 'rgba(54, 106, 255, 0.3)'
                                     div.classList.add('lineHeight')
                                     rectdom.appendChild(div)
                                     if (index == 0 && j == 0) {
                                         if (this.transformSalce !== null) {
-                                            rectdomTop = postionArr[1]* this.scale * (this.fileName ? CSS_UNITS : 1) * this.transformSalce
-                          } else {
-                            rectdomTop = postionArr[1] * this.scale * (this.fileName ? CSS_UNITS : 1) * this.defaultTransform
-                          }
-                          // if(this.isPC) {
-                          //     rectdomTop = rectdomTop - 50 < 0 ? 0 : rectdomTop - 50
-                          // }
+                                            rectdomTop = postionArr[1] * this.scale * this.transformSalce
+                                        } else {
+                                            rectdomTop = postionArr[1] * this.scale
+                                        }
+                                        // if(this.isPC) {
+                                        //     rectdomTop = rectdomTop - 50 < 0 ? 0 : rectdomTop - 50
+                                        // }
+                                    }
+                                }
+                            }
+                            if (rectdom.children.length > 0) {
+                                pageDom.appendChild(rectdom)
+                            }
                         }
-                      }
-                    }
-                    if (rectdom.children.length > 0) {
-                      pageDom.appendChild(rectdom)
                     }
-                  }
                 }
-              }
-              textLayer.setTextContent(textContent);
-              textLayer.render()
-              pageDom.appendChild(textLayerDiv);
+                textLayer.setTextContent(textContent);
+                textLayer.render()
+                pageDom.appendChild(textLayerDiv);
+
                 let backgroundDom = document.getElementById('backgroundLoad' + pageNo)
                 if (backgroundDom) {
                     this.contentView.removeChild(backgroundDom);
@@ -384,27 +377,8 @@ export default {
                 page.dom = await pageDom;
                 page.loading = false
                 this.contentView.appendChild(pageDom);
-                let pdf_view = document.getElementsByClassName('pdf_view');
-                if (pdf_view && pdf_view[0]){
-                  pdf_view[0].style.backgroundImage = 'none'
-                }
-                let postionArr = []
-              if (findPage){
-                let AllLines = findPage.allLines
-                if (AllLines.length){
-                  postionArr = AllLines[0].lines[0].location
-                }
-              }
-              if(this.transformSalce !== null && this.fileName) {
-                this.contentView.style.transform = `scale(${this.transformSalce}, ${this.transformSalce})`
-                if (postionArr.length){
-                  this.contentView.style.left = (postionArr[0] * this.scale  * CSS_UNITS * (this.transformSalce) * -1) + 10 + 'px';
-                }
-              } else {
-                this.contentView.style.transform = `scale(${this.defaultTransform})`;
-                if (postionArr.length){
-                  this.contentView.style.left = (postionArr[0] * this.scale  * CSS_UNITS * (this.defaultTransform) * -1) / 2 + 'px';
-                }
+                if (this.transformSalce !== null) {
+                    this.contentView.style.transform = `scale(${this.transformSalce}, ${this.transformSalce})`
                 }
                 if (this.changetoolbar) {
                     setTimeout(() => {
@@ -416,21 +390,22 @@ export default {
                     setTimeout(() => {
                         let pageoffsetHeight = 0
                         if (this.transformSalce !== null) {
-                            pageoffsetHeight = (this.pageSize.height + this.PAGE_INTVERVAL) * this.transformSalce * (this.fileName ? CSS_UNITS : 1)
+                            pageoffsetHeight = (this.pageSize.height + this.PAGE_INTVERVAL) * this.transformSalce
                         } else {
-                            pageoffsetHeight = (this.pageSize.height + this.PAGE_INTVERVAL) * this.defaultTransform *(this.fileName ? CSS_UNITS : 1)
+                            pageoffsetHeight = (this.pageSize.height + this.PAGE_INTVERVAL)
                         }
                         if (this.$refs.pdfView.clientHeight - pageoffsetHeight > 0 && pageIndex == 1) {
                             const height = this.$refs.pdfView.clientHeight;
                             let startNum = 0
                             let endNum = 0
                             if (this.transformSalce !== null) {
-                                startNum = Math.ceil(this.$refs.pdfView.scrollTop / ((this.pageSize.height + this.PAGE_INTVERVAL) * this.transformSalce* (this.fileName ? CSS_UNITS : 1)))
-                                endNum = startNum + Math.ceil(height / ((this.pageSize.height + this.PAGE_INTVERVAL) * this.transformSalce* (this.fileName ? CSS_UNITS : 1)))
-                    } else {
-                      startNum = Math.ceil(this.$refs.pdfView.scrollTop / ((this.pageSize.height + this.PAGE_INTVERVAL) * (this.fileName ? CSS_UNITS : 1) * this.defaultTransform))
-                                endNum = startNum + Math.ceil(height / ((this.pageSize.height + this.PAGE_INTVERVAL) * (this.fileName ? CSS_UNITS : 1) * this.defaultTransform))}
-                    console.log(this.$refs.pdfView.scrollTop, startNum, endNum, 'endNumendNum');
+                                startNum = Math.ceil(this.$refs.pdfView.scrollTop / ((this.pageSize.height + this.PAGE_INTVERVAL) * this.transformSalce))
+                                endNum = startNum + Math.ceil(height / ((this.pageSize.height + this.PAGE_INTVERVAL) * this.transformSalce))
+                            } else {
+                                startNum = Math.ceil(this.$refs.pdfView.scrollTop / (this.pageSize.height + this.PAGE_INTVERVAL))
+                                endNum = startNum + Math.ceil(height / (this.pageSize.height + this.PAGE_INTVERVAL))
+
+                            }
                             for (let pageIndex = startNum; pageIndex <= endNum; pageIndex++) {
                                 if (pageIndex > 0 && pageIndex <= this.pages.length) {
                                     this.loadPdfData(pageIndex)
@@ -462,14 +437,14 @@ export default {
             let startNum = 0
             let endNum = 0
             if (this.transformSalce !== null) {
-                startNum = Math.ceil(scrollTop / ((that.pageSize.height + that.PAGE_INTVERVAL) * this.transformSalce * (this.fileName ? CSS_UNITS : 1)))
-                endNum = startNum + Math.ceil(height / ((that.pageSize.height + that.PAGE_INTVERVAL) * this.transformSalce * (this.fileName ? CSS_UNITS : 1)))
+                startNum = Math.ceil(scrollTop / ((that.pageSize.height + that.PAGE_INTVERVAL) * this.transformSalce))
+                endNum = startNum + Math.ceil(height / ((that.pageSize.height + that.PAGE_INTVERVAL) * this.transformSalce))
             } else {
-                startNum = Math.ceil(scrollTop / ((that.pageSize.height + that.PAGE_INTVERVAL) * (this.fileName ? CSS_UNITS : 1) * this.defaultTransform))
-                endNum = startNum + Math.ceil(height / ((that.pageSize.height + that.PAGE_INTVERVAL) * (this.fileName ? CSS_UNITS : 1) * this.defaultTransform))
+                startNum = Math.ceil(scrollTop / (that.pageSize.height + that.PAGE_INTVERVAL))
+                endNum = startNum + Math.ceil(height / (that.pageSize.height + that.PAGE_INTVERVAL))
             }
             for (let pageIndex = startNum; pageIndex < endNum; pageIndex++) {
-                if (pageIndex > 0 && pageIndex <= that.pages.length) {
+                if (pageIndex > 0 && pageIndex < that.pages.length) {
                     that.loadPdfData(pageIndex)
                 }
             }
@@ -554,10 +529,10 @@ export default {
                 return
             }
             const pageDom = document.createElement('div');
-            pageDom.style.width = `${this.pageSize.width * (this.fileName ? CSS_UNITS : 1)}px`;
-            pageDom.style.height = `${this.pageSize.height * (this.fileName ? CSS_UNITS : 1)}px`;
+            pageDom.style.width = `${this.pageSize.width}px`;
+            pageDom.style.height = `${this.pageSize.height}px`;
             pageDom.style.position = 'absolute';
-            pageDom.style.top = `${((pageNo - 1) * (this.pageSize.height + this.PAGE_INTVERVAL) * (this.fileName ? CSS_UNITS : 1)) + this.PAGE_INTVERVAL
+            pageDom.style.top = `${((pageNo - 1) * (this.pageSize.height + this.PAGE_INTVERVAL)) + this.PAGE_INTVERVAL
                 }px`;
             pageDom.style.backgroundImage = `url('https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/cdn-common/images/loading.gif')`
             pageDom.style.backgroundPosition = 'center'
@@ -634,7 +609,7 @@ export default {
             if (this.transformSalce !== null) {
                 this.$refs.pdfView.scrollTop = `${((pdfResloute.page - 1) * (this.pageSize.height + this.PAGE_INTVERVAL) * this.transformSalce) + (this.identifyTextPostion.top * this.scale * this.transformSalce)}`
             } else {
-                this.$refs.pdfView.scrollTop = `${((pdfResloute.page - 1) * (this.pageSize.height + this.PAGE_INTVERVAL)) + (this.identifyTextPostion.top * this.scale * this.defaultTransform)}`
+                this.$refs.pdfView.scrollTop = `${((pdfResloute.page - 1) * (this.pageSize.height + this.PAGE_INTVERVAL)) + (this.identifyTextPostion.top * this.scale * this.transformSalce)}`
             }
         },
         scrollToExcalTop (currentPage) {
@@ -888,7 +863,6 @@ export default {
                 if (value && value.length) {
                     // 在 pdf_view 下创建 所有canvs的容器
                     this.contentView = document.createElement('div')
-                    this.contentView.setAttribute('id','contentView')
                     this.contentView.style.transformOrigin = '0px 0px 0px'
                     this.$http.get('/knowledge-api/knowledge/knowledge-part-location-info/list?ids=' + value.join(',')).then(res => {
                         // res.data = {"data":[{"id":"64591b7d8bb8ab1b91c65f24","knowledgeId":"64591a9c8da27649473f3b4b","mainId":"fb348d095c0b4fd7bbd37826563dac7d","page":3,"total":18,"pageHeight":540.0,"pageWidth":960.00946,"publicPageFileUrl":"https://askbot-pdf-all.oss-cn-zhangjiakou.aliyuncs.com/fb348d095c0b4fd7bbd37826563dac7d/2023/05/08/11/55/18/64591b638bb8ab1b91c65eed/3.pdf","extractInfo":{"location":[280.488,161.32,398.71573,61.99298],"content":"黄花城水长城旅游区位于北京市怀柔区九渡河镇境内，距北京市区65公里，是以奇而著称，融山川、碧水、古长城为一体的旅游休闲胜地。而这里的“三绝景”更是引人入","lines":[{"content":"黄花城水长城旅游区位于北京市怀柔区九渡河镇境内，距","location":[280.488,161.32,398.71573,15.9869995]},{"content":"北京市区65公里，是以奇而著称，融山川、碧水、古长","location":[283.691,184.30899,392.3055,15.9869995]},{"content":"城为一体的旅游休闲胜地。而这里的“三绝景”更是引人入","location":[282.699,207.32599,394.3033,15.9869995]}],"tagId":null}}],"code":"0","msg":null,"traceId":null}
@@ -1079,16 +1053,11 @@ export default {
                                         xhr.onload = ({ currentTarget }) => {
                                             // 请求完成
                                             if (currentTarget.status === 200) {   // 返回200
-                                                let pdf_view = document.getElementsByClassName('pdf_view');
-                                                if (pdf_view && pdf_view[0]){
-                                                  pdf_view[0].style.backgroundImage = 'none'
-                                                }
                                                 this.contentView.innerHTML = currentTarget.response
                                                 this.contentView.style.padding = '10px'
                                                 // this.contentView.style.position = 'relative'
                                                 this.$refs.pdfView.style.backgroundColor = '#FFFFFF'
                                                 this.$refs.pdfView.appendChild(this.contentView)
-
                                                 let allTr = Array.from(this.$refs.pdfView.getElementsByTagName('tr'))
                                                 this.allTr = []
                                                 for (let index = 0; index < allTr.length; index++) {
@@ -1131,14 +1100,10 @@ export default {
     width: 100%;
     height: calc(100% - 110px);
     overflow: auto;
-    //overflow-y: scroll;
     background-color: #f5f7fb;
     // margin-bottom: 60px;
     box-sizing: border-box;
-    background-image: url('https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/cdn-common/images/loading.gif');
-    background-position: center;
-    background-size: 50px;
-    background-repeat: no-repeat;
+
     // position: relative;
     // > div {
     //     width: 100%;
@@ -1327,12 +1292,6 @@ export default {
             background: rgba(221, 222, 223, 1);
         }
     }
-  .pdf_container_view{
-    height: 100%;
-    width: 100%;
-    position: relative;
-    overflow: auto;
-  }
 }
 </style>
 <style lang="less">
@@ -1345,6 +1304,7 @@ export default {
     0% {
         background: rgba(255, 136, 0, 0.3);
     }
+
     25% {
         background: rgba(255, 136, 0, 0.6);
     }