askbot-dragon 1.5.80-beta → 1.5.82-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "askbot-dragon",
-  "version": "1.5.80-beta",
+  "version": "1.5.82-beta",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",

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/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

@@ -67,7 +67,7 @@
                 </div>
             </div>
         </div>
-        <previewPdf ref="previewPdf" :url="previewHref" :watermark="watermark" :sourceFileType="sourceFileType" officePreviewType="pdf"></previewPdf>
+        <previewPdf ref="previewPdf" :url="previewHref" :sourceFileType="sourceFileType" officePreviewType="pdf"></previewPdf>
     </div>
 </template>
   
@@ -151,11 +151,6 @@ export default {
               MP3: "audio",
               yqhtml: "yqhtml",
               feishuhtml:"feishuhtml"
-            },
-            watermark: {
-              textWatermarkValue:'',
-              visitorWatermarkValue:'',
-              source:""
             }
         }
     },
@@ -203,9 +198,6 @@ export default {
     methods: {
         //预览图片
         lookAttach(url, item, event) {
-          // console.log(item.knowledgeId);
-          // this.$http.get("/knowledge-api/internal/knowledgeBaseStructure/" + "642ffbccde420e2772f7787b")
-          // debugger
           event.preventDefault();
           if (this.isAskLightning == 1 && !this.isApp){
             window.parent.postMessage({
@@ -238,10 +230,8 @@ export default {
             }
             this.$http.post(httpUrl, {
               "fileInOssPath":url
-            }).then(async res =>{
+            }).then(res =>{
               if(res.data.code == '0') {
-                this.watermark = await this.getknowledgeBaseStructure(item.knowledgeId);
-                this.watermark.source = item.source;
                 this.previewHref = res.data.data;
                 this.sourceFileType = url.substring(url.lastIndexOf('.'))
                 let isOhmPc = sessionStorage.getItem('isOhmPc')
@@ -254,18 +244,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'|| fileName === '.html'){
-                  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
@@ -316,24 +295,6 @@ export default {
               // return res.data
             })
           // return imgurl
-        },
-        async getknowledgeBaseStructure(knowledgeId) {
-          let watermark = {
-            textWatermarkValue:'',
-            visitorWatermarkValue:''
-          }
-          await this.$http.get("/knowledge-api/internal/knowledgeBaseStructure/" + knowledgeId).then( async res =>{
-            if(res.data) {
-              watermark.textWatermarkValue = await res.data.textWatermarkValue
-              if(res.data.visitorWatermark) {
-                let userInfo = sessionStorage.getItem('userInfo') || localStorage.getItem('userInfo')
-                if(userInfo && userInfo !== 'null') {
-                  watermark.visitorWatermarkValue = JSON.parse(userInfo).realName
-                }
-              }
-            }
-          })
-          return watermark
         }
     }
 }

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">
         松开发送
@@ -108,7 +108,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: {
@@ -134,7 +134,7 @@ export default {
     FormTemplate,
     // FileType,
     // ChatContent,
-    AnswerDocknowledge,
+    // AnswerDocknowledge,
   },
   props: {
     messages: Array
@@ -191,48 +191,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",
@@ -4665,7 +4634,6 @@ export default {
             url:
               'https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/2021/08/24/07/35/41221223-c180-4f3f-bdc8-94875b693965/WeChat_20210719215122.mp4',
             videoFlag: false,
-            nodownload: false,
             videoUploadPercent: 0,
             isShowUploadVideo: true,
             recommend: {

package/src/components/askVideo.vue

@@ -15,16 +15,13 @@
                 :controlslist="nodownload&&'nodownload'"
                 :raw-controls="true"
                 x5-video-player-type="h5-page"
-                style="object-fit: contain;width: calc(100vw - 169px);height: 160px;background-color: black;border-radius: 25px;max-width: 200px;padding-left: 10px"
+                style="object-fit: contain;width: calc(100vw - 139px);height: 160px;background-color: black;border-radius: 25px;max-width: 230px;padding-left: 10px"
                 preload
                 :poster="videoSrc+'?spm=qipa250&x-oss-process=video/snapshot,t_1000,f_jpg,w_0,h_0,m_fast'"
                 class="video-player vjs-custom-skin"
                 :id="msg.id+'key'">
           <source :src="videoSrc"/>
         </video>
-        <div v-show="!nodownload" class="dragon-video-download">
-          <a :href="msg.content.url" download><span class="el-icon-download"></span></a>
-        </div>
       <div id="output"></div>
     </div>
 </template>
@@ -126,8 +123,6 @@
 video::-webkit-media-controls-mute-button { display: none !important;}
 #dragon-video{
   position: relative;
-  width: calc(100vw - 109px);
-  max-width: 260px;
   #outputVideo{
     position: absolute;
     top: 0px;
@@ -139,24 +134,6 @@ video::-webkit-media-controls-mute-button { display: none !important;}
     }
 
   }
-  .dragon-video-download{
-    position: absolute;
-    width: 40px;
-    height: 26px;
-    background-color: rgba(54, 106, 255, 0.5);
-    border-radius: 13px;
-    text-align: center;
-    bottom: 2px;
-    right: 6px;
-    a {
-      span {
-        height: 26px;
-        line-height: 26px;
-        display: block;
-        color: white;
-      }
-    }
-  }
 }
 
 </style>

package/src/components/associationIntention.vue

@@ -233,7 +233,7 @@
         this.$emit("onRadioClick", id, name, apikey,optionApiKey);
       },
       onImageClick(url){
-        this.$emit('onImageClick', encodeURI(url))
+        this.$emit('onImageClick',url)
       },
       msgContent(content){
         console.debug('215',content)
@@ -343,6 +343,9 @@
       display: block;
     }
   }
+  img {
+    max-width: 300px;
+  }
 }
 /deep/.el-drawer__body{
   height: 100%;

package/src/components/formTemplate.vue

@@ -1870,7 +1870,12 @@ export default {
         if (type === 'TIME_PICKER') {
           if(this.formList.form.formFieldRelation[i].value!==''&& this.formList.form.formFieldRelation[i].value!==null)
           {
-            const dateTime = new Date(this.formList.form.formFieldRelation[i].value)
+            // 判断是否是时间戳 时间戳为字符串转换为Number
+            var regex = /^\d{13}$/;
+            if (regex.test(this.formList.form.formFieldRelation[i].value)){
+              this.formList.form.formFieldRelation[i].value = Number(this.formList.form.formFieldRelation[i].value)
+            }
+            const dateTime = new Date(this.formList.form.formFieldRelation[i].value);
             if (!this.formList.form.formFieldRelation[i].formField.extInfo.mold ||
                 this.formList.form.formFieldRelation[i].formField.extInfo.mold == 'TIME' ||
                 this.getMoldTime(this.formList.form.formFieldRelation[i].formField.formField) == 'TIME'){
@@ -1883,10 +1888,18 @@ export default {
                   this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = this.formList.form.formFieldRelation[i].value;
                   this.formList.form.formFieldRelation[i].value = new Date().getFullYear() + "-" + (new Date().getMonth() + 1) + "-" + new Date().getDate() + " " + this.formList.form.formFieldRelation[i].value;
                 } else {
-                  this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = this.formList.form.formFieldRelation[i].value
+                  if (regex.test(this.formList.form.formFieldRelation[i].value)){
+                    this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = dateTime
+                  } else {
+                    this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = this.formList.form.formFieldRelation[i].value
+                  }
                 }
               } else {
-                this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = this.formList.form.formFieldRelation[i].value
+                if (regex.test(this.formList.form.formFieldRelation[i].value)){
+                  this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = dateTime.Format('hh:mm')
+                } else {
+                  this.extInfoFieldValue[this.formList.form.formFieldRelation[i].fieldId] = this.formList.form.formFieldRelation[i].value
+                }
               }
             }
             else if (this.formList.form.formFieldRelation[i].formField.extInfo.mold == 'DATA_TIME' ||
@@ -2240,7 +2253,8 @@ export default {
       }
       let extInfo = {
         extInfoFieldValue:this.extInfoFieldValue,
-        attachmentList:this.attachmentList
+        attachmentList:this.attachmentList,
+        attachments: this.attachmentList.map(item =>{ return item.url})
       }
       this.$set(this.formShow,'extInfo',extInfo)
       let newForm = JSON.parse(JSON.stringify(this.formShow));