Browse Source

提交

yun
douzhuo 2 years ago
parent
commit
47fdb6bfb2
6 changed files with 885 additions and 713 deletions
  1. +2
    -2
      components/uniapp-zaudio/dist/zaudio.js
  2. +631
    -634
      pages.json
  3. +12
    -11
      pages/mine/details2.vue
  4. +238
    -64
      pages/mine/equipmentLog.vue
  5. BIN
      static/images/back.png
  6. +2
    -2
      utils/domain.js

+ 2
- 2
components/uniapp-zaudio/dist/zaudio.js View File

@@ -450,8 +450,8 @@ class ZAudio extends util_1.EventBus {
this.audioCtx.singer = renderSinger;
this.audioCtx.coverImgUrl = renderCoverImgUrl || this.defaultCover;
this.audioCtx.startTime = 0;
this.audioCtx.seek(0);
this.audioCtx.play();
// this.audioCtx.seek(0);
// this.audioCtx.play();
this.commit("setPause", false);
this.commit("setPlayinfo", {
src: renderSrc,


+ 631
- 634
pages.json
File diff suppressed because it is too large
View File


+ 12
- 11
pages/mine/details2.vue View File

@@ -43,7 +43,15 @@
</view>
<view class="contentInfo">
<view class="info">
<text class="AudioUserName">{{ item.speaker | toCapital }}</text>
<text class="AudioUserName">
<template v-if="item.username">
{{ item.username }}
</template>
<template v-else>
{{ item.speaker | toCapital }}
</template>
</text>
<text>{{conversionTiame(item.bg/1000)}}</text>
</view>
<view class="contentMain">
@@ -92,24 +100,16 @@
</view>
<view class="fill"></view>
<!-- audioinfo2 -->
<view class="tmmchen" v-if="Menulistisshow==true">
<view class="tmmchen">
<image @click="Receivedetailsabouttab('Receivedetailsabout')" src="../../static/images/allimg.png"
mode=""></image>
<view @click="Receivedetailsabouttab('Receivedetailsabout')">更多</view>
<view class="allimg" v-if="Thetapeidisshow">
<view v-if="eqLog!=-1" @click="eqLogClick()" style="line-height: 70rpx;margin-top: 10rpx;">设备日志</view>
<view @click="Receivetap()" style="line-height: 70rpx;margin-top: 10rpx;">接待信息</view>
<view @click="alllogo()" style="line-height:70rpx;">{{userlistobj.validInvalidName}}</view>
<view v-if="Menulistisshow==true" @click="alllogo()" style="line-height:70rpx;">{{userlistobj.validInvalidName}}</view>
</view>
</view>

<view class="tmmchen" @click="Receivetap()" v-if="Menulistisshow==false">
<image @click="Receivedetailsabouttab('Receivedetailsabout')"
src="../../static/images/audioinfo2.png" mode=""></image>
<view @click="Receivedetailsabouttab('Receivedetailsabout')">接待信息</view>
</view>


</view>
</view>

@@ -1974,6 +1974,7 @@
.allimg {
position: absolute;
width: 168rpx;
min-height: 210rpx;
top: -240rpx;
border: 1px solid #E0E0E0;
background: #FFFFFF;


+ 238
- 64
pages/mine/equipmentLog.vue View File

@@ -1,10 +1,24 @@
<template>
<view class="eqLog">
<view class="bg"></view>
<view class="tophead" :style="{height: `${CustomBar}px`}">
<view class="topheads" :style="{height: `${CustomBar}px`,paddingTop: `${StatusBar}px`}">
<view class="eqno">
<image @click="back" class="backs" src="@/static/images/back.png" mode=""></image>
<view class="middle">
设备日志
</view>
</view>
<!-- 背景色 -->
<view class="eqNo-bg"></view>
</view>
</view>
<view class="eqNo">
<view class="noInfo">
<view class="left">
<text>设备编号:{{info.imei}}</text>
<text>录音说明:{{info.recordExplain}}</text>
<text style="font-weight: 500;">设备编号:{{ info.imei || '' }}</text>
<text>录音说明:{{ info.recordExplain || '' }}</text>
</view>
<view class="right">
<text>{{state(info.recording)}}</text>
@@ -13,43 +27,67 @@
</view>
<view class="eqMain">
<view class="recordingStart">
<view>录音开启用时:<text :style="{color: info.recording==1?'red':'#333'}">{{info.startActionTime || ''}}</text>min
<view class="items">
<text>录音开启用时</text>
<text class="font"
:style="{color: info.recording==1?'red':'#333'}">{{info.startActionTime || ''}}min</text>
</view>
<view class="line"></view>
<view class="items">
<text>待上传文件</text>
<text class="font" :style="{color: info.fileCount==0?'#333':'red'}">{{info.fileCount}}个</text>
</view>
<view>待上传文件:<text :style="{color: info.fileCount==0?'#333':'red'}">{{info.fileCount}}</text>个</view>
</view>
<view class="recording">
<view class="recordingBox">
<text style="font-size:36rpx">录音开启</text>
<text>指派人:</text>
<text>{{info.owenrName}}</text>
<text>指派时间:</text>
<text>{{info.assignTime}}</text>
<text>录音开始时间:</text>
<text style="font-weight: bold;font-size: 28rpx;">
<text :style="{color: info.recording==1?'red':'#333'}">
{{info.recordStartTime}}
</text>
</text>
<view class="left-box">
<view class="cycle"></view>
<view class="point"></view>
<view class="cycle"></view>
</view>
<view class="recordingBox">
<text style="font-size:36rpx">录音关闭</text>
<text>结束人:</text>
<text>{{info.userName}}</text>
<text>结束时间:</text>
<text>{{info.assignEndTime}}</text>
<text>录音结束时间:</text>
<text style="font-weight: bold;font-size: 28rpx;">
<text :style="{color: info.recording==1?'red':'#333'}">
{{info.recordEndTime}}
</text>
</text>
<text class="recordingBoxItem-title" >录音开启</text>
<view class="recordingBoxItem">
<text class="left">指派人:</text>
<text class="right">{{info.owenrName}}</text>
</view>
<view class="recordingBoxItem">
<text class="left">指派时间:</text>
<text class="right">{{info.assignTime}}</text>
</view>
<view class="recordingBoxItem">
<text class="left">录音开始时间:</text>
<view class="right" style="font-weight: bold;font-size: 28rpx;">
<text :style="{color: info.recording==1?'red':'#333'}">
{{info.recordStartTime}}
</text>
</view>
</view>
</view>
<view class="recordingBox" style="margin-top: 40rpx;">
<text class="recordingBoxItem-title">录音关闭</text>
<view class="recordingBoxItem">
<text class="left">结束人:</text>
<text class="right">{{info.userName}}</text>
</view>
<view class="recordingBoxItem">
<text class="left">结束时间:</text>
<text class="right">{{info.assignEndTime}}</text>
</view>
<view class="recordingBoxItem">
<text class="left">录音结束时间:</text>
<view class="right" style="font-weight: bold;font-size: 28rpx;">
<text :style="{color: info.recording==1?'red':'#333'}">
{{info.recordEndTime}}
</text>
</view>
</view>
</view>
</view>
<view class="offlineRec">
<text style="font-size:36rpx">离线记录</text>
<view class="recMain">
<block v-for="(item,index) in info.offLineList" :key="index">
<text>{{index+1}}. {{item}}</text>
<text>{{index+1}} {{item}}</text>
</block>
</view>
</view>
@@ -61,7 +99,7 @@
export default {
data() {
return {
info: {}
info: {},
}
},
computed: {
@@ -76,9 +114,11 @@
return "完整录音";
}
})
}
},
},
onLoad(options) {
console.log(this.cusTHeight)
console.log(options.id)
this.$u.get("/equipment/equipmentLog", {
id: options.id
@@ -88,27 +128,92 @@
})
},
methods: {
back() {
uni.navigateBack()
}
}
}
</script>
<style lang="scss">
.eqLog {
width: 100%;
height: 100%;
position: fixed;
background: #F5F5F5;
position: relative;
width: 100vw;
min-height: 100vh;
background: #F8F8F8;
.bg {
position: absolute;
top: 0;
left: 0;
right: 0;
z-index: 0;
width: 100%;
height: 420rpx;
background: linear-gradient(180deg, #2671E2 0%, #3B9CF4 54%, #93C8F7 100%);
}
.tophead {
position: sticky;
top: 0;
z-index: 999;
width: 100%;
.topheads {
position: relative;
z-index: 1;
overflow: hidden;
.eqno {
position: relative;
z-index: 1;
width: 100%;
height: 100%;
display: flex;
align-items: center;
.backs {
margin-left: 24rpx;
width: 32rpx;
height: 32rpx;
}
.middle {
position: absolute;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
font-size: 32rpx;
color: #fff;
}
}
.eqNo-bg {
position: absolute;
top: 0;
left: 0;
right: 0;
z-index: 0;
width: 100%;
height: 420rpx;
background: linear-gradient(180deg, #2671E2 0%, #3B9CF4 54%, #93C8F7 100%);
}
}
}
.eqNo {
background: #2671E2;
padding: 20rpx;
position: relative;
z-index: 1;
width: 100%;
.noInfo {
height: 110rpx;
margin: 24rpx auto 0;
padding: 24rpx;
width: 690rpx;
height: 152rpx;
background: #FFFFFF;
border-radius: 10rpx;
padding: 10rpx;
border-radius: 8rpx;
display: flex;
justify-content: space-between;
@@ -116,62 +221,131 @@
display: flex;
flex-direction: column;
justify-content: space-between;
font-size: 32rpx;
font-weight: 400;
}
.right {
font-size: 32rpx;
font-weight: 400;
}
}
}
.eqMain {
position: relative;
z-index: 1;
padding: 0 20rpx;
.recordingStart {
background: #FFFFFF;
display: flex;
width: 100%;
border: 1rpx solid #000000;
padding: 20rpx 12rpx;
margin-top: 20rpx;
border-radius: 8rpx;
width: 100%;
height: 164rpx;
display: flex;
align-items: center;
border-radius: 8rpx;
background: #FFFFFF;
view {
width: 50%;
.items {
flex-grow: 1;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
color: #1C1010;
font-size: 30rpx;
.font {
margin-top: 20rpx;
font-weight: 500;
}
}
.line {
width: 1rpx;
height: 88rpx;
background: #E0E0E0;
}
}
.recording {
margin-top: 30rpx;
position: relative;
z-index: 1;
margin-top: 20rpx;
padding: 30rpx 30rpx 30rpx 68rpx;
display: flex;
justify-content: space-between;
flex-direction: column;
background: #FFFFFF;
border-radius: 8rpx;
.left-box {
position: absolute;
left: 30rpx;
top: 40rpx;
width: 24rpx;
height: 300rpx;
display: flex;
flex-direction: column;
align-items: center;
.cycle {
width: 24rpx;
height: 24rpx;
flex-shrink: 0;
border-radius: 50%;
border: 4rpx solid #2671E2;
}
.point {
flex-grow: 1;
border-left: 1rpx dotted #2671E2;
}
}
.recordingBox {
background: #FFFFFF;
width: 100%;
display: flex;
flex-direction: column;
width: 48%;
border: 1rpx solid #000000;
padding: 0 10rpx;
border-radius: 8rpx;
text {
margin: 10rpx 0;
.recordingBoxItem-title {
font-size: 32rpx;
font-weight: 500;
}
.recordingBoxItem {
margin-top: 24rpx;
display: flex;
.left {
width: 210rpx;
color: #505050;
font-size: 30rpx;
}
.right {
flex-grow: 1;
font-size: 30rpx !important;
}
}
}
}
.offlineRec {
background: #FFFFFF;
padding: 20rpx;
border: 1rpx solid #000000;
margin-top: 20rpx;
padding: 28rpx 24rpx;
border-radius: 8rpx;
margin-top: 30rpx;
background: #FFFFFF;
.recMain {
display: flex;
flex-direction: column;
text {
margin: 14rpx 0;
margin: 24rpx 0;
font-size: 30rpx;
}
}
}


BIN
static/images/back.png View File

Before After
Width: 128  |  Height: 128  |  Size: 3.0 KiB

+ 2
- 2
utils/domain.js View File

@@ -3,8 +3,8 @@
// const baseUrl = 'http://192.168.31.148:8080/api';// 泽明
// const baseUrl = 'http://127.0.0.1:8080/autoSR/api'; // 本地
// const baseUrl = 'http://192.168.31.161:8080/autoSR/api'; // 长龙
// const baseUrl = 'http://192.168.31.86:9090/api'; // 盛浩
const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式
const baseUrl = 'http://192.168.31.90:8080/api'; // 盛浩
// const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式
// const baseUrl = 'https://hfju.com/api'; // 数智正式
// const baseUrl = 'https://xitong.pachira.cn/api'; // AI营销辅助 普强使用



Loading…
Cancel
Save