askbot-dragon 1.6.52-beta → 1.6.54-beta

package/package.json

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

package/src/components/ConversationContainer.vue

@@ -2,7 +2,9 @@
 <template>
   <div id="conversation">
     <!-- <answer-radio :msg="answerRadiosPri"></answer-radio> -->
-    <!-- <asser-deatils></asser-deatils> -->
+    <asser-deatils :data="{
+      assets:assetDetail
+    }"></asser-deatils>
     <!-- <msg-loading v-if="inLoading"></msg-loading>
     <div style="position: relative" class="img_div">
       <img
@@ -101,7 +103,7 @@ import AssociationIntention from './associationIntention'
 // import AnswerDissatisfaction from './answerDissatisfaction'
 // import ActionSendToBot from './actionSendToBot'
 // import VoiceCompontent from './voiceComponent'
-// import AsserDeatils from './assetDetails.vue'
+import AsserDeatils from './assetDetails.vue'
 /* import TicketMessage from "@/components/message/TicketMessage";
 import TextMessage from "@/components/message/TextMessage";
 import FeedBack from "@/components/feedBack";*/
@@ -134,7 +136,7 @@ export default {
     AssociationIntention,
     /* VoiceComponent,*/
     TicketMessage,
-    // AsserDeatils,
+    AsserDeatils,
     AnswerRadio,
     // FormTemplate,
     TextMessage,
@@ -5054,7 +5056,191 @@ export default {
           "sessionId": 1709707284287,
           "keyId": "a2da2307-3de3-41ef-b0f0-fd5f9d40adba_________"
         }
-      ]
+      ],
+      assetDetail:{
+        "id": "642ab03615ecdd7566b6221c",
+        "mainId": null,
+        "name": "电脑名称",
+        "description": '',
+        "productId": "642aafec15ecdd7566b6221b",
+        "snNo": "GR0001",
+        "attachmentPath": "https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/front-oss/ab0f90737c8b4f2d85ba2157e4473110/2023/04/03/18/53/4272832c8c55c3450a131728b6e9f335/%E6%9C%BA%E5%99%A8%E4%BA%BA%26%E5%B7%A5%E5%8D%95%E7%B3%BB%E7%BB%9F%E9%85%8D%E7%BD%AE%E5%9C%BA%E6%99%AF.txt",
+        "attachmentName": "front-oss/ab0f90737c8b4f2d85ba2157e4473110/2023/04/03/18/53/4272832c8c55c3450a131728b6e9f335/机器人&工单系统配置场景.txt",
+        "product": {
+          "id": "642aafec15ecdd7566b6221b",
+          "name": "电脑产品名称",
+          "type": {
+            "id": "61f0b2aee698d414a7857d8f",
+            "name": "电脑"
+          },
+          "productImgPathes": [
+            "https://guoranopen-zjk.oss-cn-zhangjiakou.aliyuncs.com/front-oss/ab0f90737c8b4f2d85ba2157e4473110/2023/04/03/18/52/04272832c8c55c3450a131728b6e9f33/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20210617100443.jpg"
+          ],
+          "supplier": "电脑产品供应商名称"
+        },
+        "productName": "电脑产品名称",
+        "typeName": "电脑",
+        "users": [
+          {
+            "corpId": "dingd63bac705bb13c74bc961a6cb783455b",
+            "type": 3,
+            "bindType": 0,
+            "memberId": 147804,
+            "name": "刁瑶杭",
+            "userid": null,
+            "source": null,
+            "internalUserId": null,
+            "departments": null,
+            "defaultExpandedKeys": [
+              "2027",
+              "2028",
+              "147804"
+            ]
+          }
+        ],
+        "userDepts": [],
+        "hasUser": true,
+        "userNames": [
+          "刁瑶杭"
+        ],
+        "managers": [
+          {
+            "corpId": "dingd63bac705bb13c74bc961a6cb783455b",
+            "type": 3,
+            "bindType": 0,
+            "memberId": 71303,
+            "name": "张强",
+            "userid": null,
+            "source": null,
+            "internalUserId": null,
+            "departments": null,
+            "defaultExpandedKeys": [
+              "2027",
+              "2029",
+              "71303"
+            ]
+          }
+        ],
+        "managerNames": [
+          "张强"
+        ],
+        "depts": [
+          {
+            "id": 2028,
+            "mainId": "ab0f90737c8b4f2d85ba2157e4473110",
+            "corpId": "dingd63bac705bb13c74bc961a6cb783455b",
+            "name": "研发组",
+            "nameEn": null,
+            "parentId": 2027,
+            "orderNum": 609267418,
+            "apiKey": "bdd1148dae574fc0aecc5addd2ea18dc",
+            "refInfo": {
+              "id": 609267418,
+              "name": "研发组",
+              "name_en": null,
+              "order": 609267418,
+              "parentid": 1,
+              "storeCode": null,
+              "shopNo": null,
+              "businessType": null,
+              "unitNo": null,
+              "zoneNo": null,
+              "zoneName": null,
+              "open_department_id": null,
+              "parent_department_id": null,
+              "parentName": null,
+              "sortCode": null,
+              "fcreateTime": null,
+              "status": null,
+              "fullName": null,
+              "businessUnit": null,
+              "feffectDate": null,
+              "flastUpdateTime": null
+            },
+            "creator": -1,
+            "source": 2,
+            "deleted": false,
+            "createTime": "2023-03-03T06:56:33.000+00:00",
+            "updateTime": "2023-03-22T07:13:35.000+00:00",
+            "refInfoId": 609267418,
+            "refInfoParentId": 1,
+            "wechatBotDTO": {
+              "id": 453,
+              "bindCode": "5bdc04b276b74eeea48321563b835231",
+              "botId": 1431,
+              "apiKey": "fb5a8ab59b344a1180f562a15315fa92",
+              "appInfoId": 79,
+              "corpName": "深藏blue",
+              "corpId": "dingd63bac705bb13c74bc961a6cb783455b",
+              "agentId": "1451608359",
+              "agentName": "AskBot助手",
+              "agentLogoUrl": "https://static-legacy.dingtalk.com/media/lALPDe7s16uKNlfNASzNASw_300_300.png",
+              "appKey": null,
+              "secret": "",
+              "wechatType": 3,
+              "enable": true,
+              "allowPushMsg": false,
+              "authUrl": "https://test.auth.wx.guoranbot.com/?corpId=$CORPID$&type=3",
+              "scanUrl": null,
+              "bindType": 0,
+              "thirdId": "suitedpsq6c9bqzcdwfcj",
+              "sceneId": null,
+              "mainId": "ab0f90737c8b4f2d85ba2157e4473110"
+            },
+            "defaultExpandedKeys": [
+              "2027",
+              "2028"
+            ]
+          }
+        ],
+        "deptNames": [
+          "研发组"
+        ],
+        "relationScope": {
+          "appType": null,
+          "type": "BOT",
+          "scope": "45df125ce3924286baec4541a9e65452",
+          "weChatBotApiKey": "45df125ce3924286baec4541a9e65452",
+          "intentsGuide": "",
+          "relationIntents": [
+            {
+              "intentId": "152722",
+              "intentName": "提交工单",
+              "bid": null,
+              "recommendedText": "提交工单",
+              "extInfo": null
+            },
+            {
+              "intentId": "152716",
+              "intentName": "咨询者问题机器人不识别",
+              "bid": null,
+              "recommendedText": "不识别",
+              "extInfo": null
+            }
+          ],
+          "extInfo": null
+        },
+        "officeAreaId": "624ffb2b5cf1b3280f35bb6c",
+        "officeArea": {
+          "id": "624ffb2b5cf1b3280f35bb6c",
+          "name": "果然智汇办公区"
+        },
+        "officeAreaName": "果然智汇办公区",
+        "qrUrl": "https://test.auth.wx.askbot.cn/api/assets-qr/transit/642ab03615ecdd7566b6221c?askbotStr=0b3b0b8d1d8154e41b15bd70851b1b72",
+        "createTime": "2023-04-03 18:53:42",
+        "updateTime": "2023-04-03 18:53:42",
+        "switches": {
+          "enabledAssociateRobot": true,
+          "enabledAssociateIntent": true
+        },
+        "deleted": false,
+        "extInfo": {},
+        "thirdAssetsCode": null,
+        "assetsInfoEntity": null,
+        "isScrap": null,
+        "isReceive": null,
+        "receivesDesc": null
+      }
     }
   },
   methods: {

package/src/components/assetDetails.vue

@@ -3,7 +3,7 @@
     <div class="asset-details">
       <section class="details-title">
         <p>您正在咨询</p>
-        <span v-if="!isThirdParty" @click="rotateClick" :class="rotateFlag ? 'rotate' : ''">
+        <span @click="rotateClick" class="rotate">
           <i class="arsenal_icon arsenalangle-up-solid"></i>
         </span>
       </section>
@@ -68,12 +68,12 @@
                 </p>
                 <p class="text-SN">
                   <i class="iconfont guoran-tongyichicun-mingcheng"></i>
-                  <span>{{ dataDetails.thirdAssetsCode ? dataDetails.thirdAssetsCode : "--" }}</span>
+                  <span>{{ dataDetails.thirdAssetsCode ? dataDetails.thirdAssetsCode : "--12312" }}</span>
                 </p>
               </section>
           </div>
       </div>
-      <div class="details-content-hide" v-if="rotateFlag && !isThirdParty">
+      <div class="details-content-hide" v-if="false && !isThirdParty">
         <p>
           <i class="iconfont guoran-miaoshu"></i>
           <section class="description">
@@ -155,6 +155,7 @@
 </template>
 
 <script>
+/*eslint-disable*/
 export default {
   props: {
     data: {
@@ -213,7 +214,8 @@ export default {
   },
   methods: {
     rotateClick() {
-      this.rotateFlag = !this.rotateFlag;
+      // this.rotateFlag = !this.rotateFlag;
+      this.$emit('assetClick', this.data.assets)
     },
   },
 };
@@ -258,7 +260,7 @@ export default {
       }
     }
     .rotate {
-      transform: rotate(180deg);
+      transform: rotate(90deg);
     }
   }
   .details-content {
@@ -296,6 +298,7 @@ export default {
         color: #000000;
         font-size: 15px;
         text-overflow: hidden;
+        margin-bottom: 5px;
         // overflow-wrap: each();
       }
       .text-label {
@@ -314,6 +317,8 @@ export default {
           background: #e1faf9;
           box-sizing: border-box;
           padding: 3px 5px;
+          margin-bottom: 5px;
+          border-radius: 5px;
           i {
             color: #00c2bb;
           }
@@ -325,11 +330,14 @@ export default {
           background: #edf2ff;
           box-sizing: border-box;
           padding: 3px 5px;
+          margin-bottom: 5px;
+          border-radius: 5px;
           i {
             color: #366aff;
           }
           span {
             color: #366aff;
+            margin-bottom: 0 !important;
           }
         }
       }

package/src/components/welcomeSuggest.vue

@@ -2,7 +2,7 @@
     <div class="welcome_suggest">
         <div class="title">
             <div class="title_desc">{{ msg.content.problemRecommendationDesc }}</div>
-            <div class="title_change_batch" v-if="msg.content.problemRecommendationValue.length > msg.content.pageCount" @click="changeBatch">
+            <div class="title_change_batch" v-if="msg.content.page && msg.content.problemRecommendationValue.length > msg.content.pageCount" @click="changeBatch">
                 <i class="iconfont guoran-tongyichicun-huanyipi"></i>
                 <span>换一批</span>
             </div>
@@ -28,11 +28,14 @@ export default {
         }
     },
     mounted () {
-        this.changeBatch()
+        if(this.msg.content.page) {
+            this.changeBatch()
+        } else {
+            this.suggestList = this.msg.content.problemRecommendationValue
+        }
     },
     methods: {
         changeBatch () {
-            console.log(this.pageCount, 'pageCount');
             let msgSuggestList = JSON.parse(JSON.stringify(this.msg.content.problemRecommendationValue))
             this.suggestList = msgSuggestList.splice((this.pageCount - 1) * this.msg.content.pageCount, this.msg.content.pageCount)
             if (this.pageCount == Math.ceil(this.msg.content.problemRecommendationValue.length / this.msg.content.pageCount)) {