zhuchunyun/flinfo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
许允枞 2025-03-10 15:10:08 +08:00
parent a6a14e8ebb
commit d9fa16c70a
3 changed files with 768 additions and 675 deletions
dc-App/pages
Chat
newChat.vue
newChat
submit.vue
busNavigation
busNavigation.nvue

35
dc-App/pages/Chat/newChat.vue
View File

@ -370,7 +370,6 @@ export default {
msgInfo() {
if (this.msgSocket) {
this.msgSocket.onMessage(res => {
console.log('this.messagesList', this.messagesList[this.messagesList.length - 1])
if (this.info.conversation == 'Translator') {
if (this.messagesList[this.messagesList.length - 1].inputs.type != 'image') {
this.messagesList[this.messagesList.length - 1].answer = this.messagesList[this
@ -411,7 +410,6 @@ export default {
this.goBottom()
}
}
console.log('this.messagesList', this.messagesList)
})
@ -564,7 +562,6 @@ export default {
'type': '',
'filePath': inputData.filePath,
};
console.log(msgItem)
if (this.info.conversation == 'Translator') {
msgItem.response_mode = 'blocking'
msgItem.inputs.lang = this.lang
@ -597,22 +594,30 @@ export default {
'answer': '',
'socketId': this.socketId,
};
console.log(this.info.conversation, 259)
if (this.info.conversation == 'Translator') {
requestData.response_mode = 'blocking'
requestData.inputs.lang = this.lang
requestData.inputs.sayLang = this.sayLang
} else if (this.info.conversation == 'Trip') {
// requestData.query = "描述图片"
if (requestData.inputs.type == 'image') {
requestData.query = "描述图片"
// requestData.inputs = {}
// requestData.files = [
// {
// "type": "image",
// "transfer_method": "local_file",
// "url": '',
// "upload_file_id": inputData.message
// }
// ]
requestData.files = [
{
"type": "image",
// "type": "image/jpeg",
"transfer_method": "local_file",
"url": '',
"upload_file_id": inputData.message
}
]
}
setTimeout(() => {
sendMsg(that.msgSocket, JSON.stringify(requestData))
requestData.query = inputData.base64
}, 500)
return
}
setTimeout(() => {
sendMsg(that.msgSocket, JSON.stringify(requestData))
@ -665,8 +670,9 @@ page {
.po_i {
position: absolute;
//top: -60px;
left: 0px;
top: -55px;
box-sizing: border-box;
padding: 10px;
height: 50px;
@ -760,6 +766,7 @@ page {
padding: 18rpx 24rpx;
white-space: pre-wrap;
word-wrap: break-word;
position: relative;
}
.msg-img {

17
dc-App/pages/Chat/newChat/submit.vue
View File

@ -223,7 +223,22 @@ export default {
//将res.data转为json
let json = JSON.parse(res.data)
console.log(json.id,'上传图片返回结果')
that.send(json.id, 1, res.data)
upload({
filePath: tempFilePaths[0],
url: 'base64Api/upload',
name: 'file',
}).then(res1 => {
request({
url: 'base64Api/inputBase64',
method: 'post',
data: {
base64: res1.base64
}
}).then(res2 => {
that.send(json.id, 1, res1.base64)
})
})
// that.send(json.id, 1, res.data)
},
fail: (err) => {
console.log(err,'上传报错')

113
dc-App/pages/busNavigation/busNavigation.nvue
View File

@ -1,6 +1,7 @@
<template>
<view class="container">
<map id="map" :show-compass="true" :include-points="points" :polyline="polyline" lang="en" :longitude="center.longitude" :latitude="center.latitude"
<map id="map" :show-compass="true" :include-points="points" :polyline="polyline" lang="en"
:longitude="center.longitude" :latitude="center.latitude"
:markers="markers" bindmarkertap="handleMarkerTap" show-location
:style="'width:' + windowWidth + 'px;' + 'height:'+ '540rpx;' ">
@ -15,19 +16,25 @@
</view>
<view class="ds_">
<text class="text_2">walk distance</text>
<text class="text_1">{{allData.walkingDistance?Number.parseFloat(allData.walkingDistance/1000).toFixed(2):0}}km</text>
<text class="text_1">
{{ allData.walkingDistance ? Number.parseFloat(allData.walkingDistance / 1000).toFixed(2) : 0 }}km
</text>
</view>
</view>
<!-- -->
<view class="c_c_box">
<view class="ds_" style="flex-wrap: wrap;">
<image src="/static/imgs/icon2.png" style="height: 48rpx;width: 48rpx;"></image>
<view v-for="(item,index) in allData.segments">
<view class="c_c_title" :style="'background-color:' + colorList[index] " v-for="(it,idx) in item.bus" :key="idx" >
<view v-for="(item,index) in allData.segments" :key="index">
<view class="segment-item" :style="{ flexDirection: 'row', alignItems: 'center' }">
<image src="/static/imgs/icon2.png" style="height: 48rpx; width: 48rpx; flex-shrink: 0;"
v-if="item.walking"></image>
<view class="c_c_title" :style="'background-color:' + colorList[index] "
v-for="(it,idx) in item.bus" :key="idx">
<text class="text_line">{{ it.enName.split('(')[0] || '' }}</text>
</view>
</view>
</view>
</view>
</view>
@ -42,7 +49,8 @@
:refresher-enabled="true" style="height: 620rpx;" lower-threshold="50">
<view class="contenr_bottom">
<view class="c_b_title">
<image src="/static/imgs/icon3.png" style="height: 40rpx;width: 40rpx;margin-right: 20rpx;"></image>
<image src="/static/imgs/icon3.png"
style="height: 40rpx;width: 40rpx;margin-right: 20rpx;"></image>
<text class="text_1">My Location</text>
</view>
</view>
@ -51,7 +59,9 @@
<view class="c_b_box" v-if="item.walking">
<view class="ds_">
<view class="qiu_"></view>
<text class="text_4">Walk {{item.walking.distance}} meters ({{Number.parseInt(item.walking.duration/60)}} minutes)</text>
<text class="text_4">Walk {{ item.walking.distance }} meters
({{ Number.parseInt(item.walking.duration / 60) }} minutes)
</text>
</view>
<view class="b_walk">
<text class="text_3" @click="walkLine(item.walking)">Walk</text>
@ -67,15 +77,18 @@
<view class="l_t_i" :style="'background-color:' + colorList[index] "></view>
</view>
<view class="bz_right">
<text class="text_1" style="margin-bottom: 32rpx;">{{it.departureStop.enName}} station</text>
<text class="text_1" style="margin-bottom: 32rpx;">{{ it.departureStop.enName }} station
</text>
<view class="ds_">
<view class="bz_icon" :style="'background-color:' + colorList[index] ">
<view class="bz_icon bz_width" :style="'background-color:' + colorList[index] ">
<text class="text_3">{{ it.enName }}</text>
</view>
</view>
<view class="botton_size">
<text class="text_4">{{it.viaStops.length}} station ({{Number.parseInt(it.duration/60)}} min)</text>
<text class="text_4">{{ it.viaStops.length }} station
({{ Number.parseInt(it.duration / 60) }} min)
</text>
</view>
<text class="text_1" style="margin-top: 39rpx;">{{ it.arrivalStop.enName }} station</text>
@ -86,7 +99,8 @@
<view class="contenr_bottom">
<view class="c_b_title">
<image src="/static/imgs/end.png" style="height: 50rpx;width: 45rpx;margin-right: 20rpx;"></image>
<image src="/static/imgs/end.png"
style="height: 50rpx;width: 45rpx;margin-right: 20rpx;"></image>
<text class="text_1">destination</text>
</view>
</view>
@ -102,19 +116,25 @@
</view>
<view class="ds_">
<text class="text_2">步行距离</text>
<text class="text_1">{{allData.walkingDistance?Number.parseFloat(allData.walkingDistance/1000).toFixed(2):0}}km</text>
<text class="text_1">
{{ allData.walkingDistance ? Number.parseFloat(allData.walkingDistance / 1000).toFixed(2) : 0 }}km
</text>
</view>
</view>
<!-- -->
<view class="c_c_box">
<view class="ds_" style="flex-wrap: wrap;">
<image src="/static/imgs/icon2.png" style="height: 48rpx;width: 48rpx;"></image>
<view v-for="(item,index) in allData.segments">
<view class="c_c_title" :style="'background-color:' + colorList[index] " v-for="(it,idx) in item.bus" :key="idx" >
<view class="segment-item" :style="{ flexDirection: 'row', alignItems: 'center' }">
<image src="/static/imgs/icon2.png" style="height: 48rpx;width: 48rpx; flex-shrink: 0"
v-if="item.walking"></image>
<view class="c_c_title" :style="'background-color:' + colorList[index] "
v-for="(it,idx) in item.bus" :key="idx">
<text class="text_line">{{ it.name.split('(')[0] || '' }}</text>
</view>
</view>
</view>
</view>
</view>
@ -129,7 +149,8 @@
:refresher-enabled="true" style="height: 620rpx;" lower-threshold="50">
<view class="contenr_bottom">
<view class="c_b_title">
<image src="/static/imgs/icon3.png" style="height: 40rpx;width: 40rpx;margin-right: 20rpx;"></image>
<image src="/static/imgs/icon3.png"
style="height: 40rpx;width: 40rpx;margin-right: 20rpx;"></image>
<text class="text_1">我的位置</text>
</view>
</view>
@ -138,7 +159,9 @@
<view class="c_b_box" v-if="item.walking">
<view class="ds_">
<view class="qiu_"></view>
<text class="text_4">步行 {{item.walking.distance}} 米 ({{Number.parseInt(item.walking.duration/60)}} 分钟)</text>
<text class="text_4">步行 {{ item.walking.distance }} 米
({{ Number.parseInt(item.walking.duration / 60) }} 分钟)
</text>
</view>
<view class="b_walk">
<text class="text_3" @click="walkLine(item.walking)">导航</text>
@ -156,13 +179,15 @@
<view class="bz_right">
<text class="text_1" style="margin-bottom: 32rpx;">{{ it.departureStop.name }} 站点</text>
<view class="ds_">
<view class="bz_icon" :style="'background-color:' + colorList[index] ">
<view class="bz_icon bz_width" :style="'background-color:' + colorList[index]">
<text class="text_3">{{ it.name }}</text>
</view>
</view>
<view class="botton_size">
<text class="text_4">{{it.viaStops.length}} 站 ({{Number.parseInt(it.duration/60)}} 分钟)</text>
<text class="text_4">{{ it.viaStops.length }} 站
({{ Number.parseInt(it.duration / 60) }} 分钟)
</text>
</view>
<text class="text_1" style="margin-top: 39rpx;">{{ it.arrivalStop.name }} 站点</text>
@ -173,7 +198,8 @@
<view class="contenr_bottom">
<view class="c_b_title">
<image src="/static/imgs/end.png" style="height: 50rpx;width: 45rpx;margin-right: 20rpx;"></image>
<image src="/static/imgs/end.png"
style="height: 50rpx;width: 45rpx;margin-right: 20rpx;"></image>
<text class="text_1">终点</text>
</view>
</view>
@ -186,6 +212,7 @@
<script>
import request from '../../utils/request'
import config from '@/config'
export default {
data() {
return {
@ -506,6 +533,7 @@
align-items: center;
}
.bottom_pr {
min-height: 160rpx;
position: fixed;
@ -521,6 +549,7 @@
align-items: center;
justify-content: space-between;
}
.draggable {
width: 100px;
height: 100px;
@ -531,6 +560,7 @@
align-items: center;
z-index: 99999;
}
.bz_icon {
box-sizing: border-box;
padding: 18rpx 18rpx;
@ -542,6 +572,7 @@
align-items: center;
margin-right: 20rpx;
}
.b_walk {
width: 80rpx;
height: 40rpx;
@ -552,6 +583,7 @@
align-items: center;
}
.button_ {
width: 686rpx;
height: 96rpx;
@ -564,6 +596,7 @@
}
.qiu_ {
width: 16rpx;
height: 16rpx;
@ -571,21 +604,25 @@
background: #e8e8e8;
margin-right: 32rpx;
}
.c_b_box {
margin: 10rpx 0rpx;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.c_b_title {
flex-direction: row;
align-items: center;
}
.button_text {
color: #FFFFFF;
font-size: 38rpx;
}
.contenr_ {
min-height: 160rpx;
position: fixed;
@ -594,6 +631,7 @@
background: #fff;
}
.contenr_top {
width: 686rpx;
@ -604,6 +642,7 @@
box-sizing: border-box;
padding: 32rpx;
}
.c_t_box {
box-sizing: border-box;
padding-bottom: 16rpx;
@ -613,47 +652,64 @@
justify-content: space-between;
margin-bottom: 16rpx;
}
.c_c_box {
margin-bottom: 16rpx;
}
.c_box {
box-sizing: border-box;
padding: 0px 32rpx;
}
.text_1 {
font-size: 32rpx;
color: #333333;
font-weight: 600;
lines: 2;
}
.text_2 {
font-size: 32rpx;
color: #999999;
margin-right: 5px;
}
.text_3 {
font-weight: 500;
font-size: 28rpx;
color: #FFFFFF;
white-space: normal;
word-wrap: break-word;
/* 如果需要强制换行可以添加 */
word-break: break-all;
/* 如果父容器需要限制宽度 */
display: block;
max-width: 100%;
}
.text_line {
font-weight: 500;
font-size: 23rpx;
color: #FFFFFF;
}
.text_4 {
font-weight: 400;
font-size: 24rpx;
color: #999999;
margin-right: 10rpx;
}
.text_5 {
font-size: 24rpx;
color: #333333;
margin-right: 10rpx;
}
.c_c_title {
width: 260rpx;
@ -663,8 +719,9 @@
flex-direction: row;
align-items: center;
justify-content: center;
margin: 0px 5rpx;
margin: 5px 5rpx;
}
.contenr_bottom {
// margin-top: 40rpx;
box-sizing: border-box;
@ -672,6 +729,7 @@
padding-bottom: 0px;
}
.contenr_bottom_d {
box-sizing: border-box;
padding: 11rpx;
@ -679,13 +737,16 @@
flex-direction: row;
}
.bz_left {
position: relative;
margin-right: 20rpx;
}
.bz_right {
}
.l_t_i {
width: 40rpx;
height: 40rpx;
@ -697,6 +758,7 @@
border: 1rpx solid #fff;
}
.l_t_z {
width: 24rpx;
height: 240rpx;
@ -707,13 +769,16 @@
}
.po_box {
height: 360rpx;
overflow: auto;
}
.botton_size {
margin-top: 100rpx;
}
.fy_icon {
position: fixed;
right: 15px;
@ -721,19 +786,25 @@
width: 80rpx;
height: 80rpx;
}
::v-deep .amap-logo {
opacity: 0 !important;
}
::v-deep .amap-copyright {
opacity: 0 !important;
}
::v-deep .BMap_cpyCtrl {
display: none !important;
}
::v-deep .anchorBL {
display: none !important;
}
.bz_width {
width: 60%;
}
</style>