diff --git a/App.vue b/App.vue index ac4bfb4..428d50d 100644 --- a/App.vue +++ b/App.vue @@ -83,7 +83,7 @@ // ASCII码转换 大写字母A是65 演讲人是从1开始所以num+64 toCapital(num) { let str = '' - str = String.fromCharCode(Number(num) + 65) + str = String.fromCharCode(Number(num) + 64) return str }, } diff --git a/pages/center/Piabodata/TrendAnalysis.vue b/pages/center/Piabodata/TrendAnalysis.vue index 1144dd3..22e45dd 100644 --- a/pages/center/Piabodata/TrendAnalysis.vue +++ b/pages/center/Piabodata/TrendAnalysis.vue @@ -613,7 +613,7 @@ // this.pamect.marketingId = ''; // this.pamect.deptId = "" // this.activeTotal = 0; - this.timepickpickisshow = false; + // this.timepickpickisshow = false; this.init() if (index == 1) { diff --git a/pages/index/personal.vue b/pages/index/personal.vue index 8658a46..966d545 100644 --- a/pages/index/personal.vue +++ b/pages/index/personal.vue @@ -310,4 +310,4 @@ } } } - + \ No newline at end of file diff --git a/pages/mine/details.vue b/pages/mine/details.vue index 92c9bb2..3c0e8fc 100644 --- a/pages/mine/details.vue +++ b/pages/mine/details.vue @@ -51,9 +51,7 @@ v-for="(item,index) in dialog.message" :key="index" :data-speaker="item.speaker"> - - - {{ item.speaker | toCapital }} + {{ item.speaker | toCapital }} diff --git a/pages/mine/details2.vue b/pages/mine/details2.vue index 1d90fa6..1347172 100644 --- a/pages/mine/details2.vue +++ b/pages/mine/details2.vue @@ -971,7 +971,7 @@ // 添加角色 addRole() { this.tablist.push({ - name: String.fromCharCode(this.tablist.length + 65) + name: String.fromCharCode(this.tablist.length + 64) }) }, diff --git a/pages/mine/equipmentLog.vue b/pages/mine/equipmentLog.vue index 2e5ea1b..1b0c5fd 100644 --- a/pages/mine/equipmentLog.vue +++ b/pages/mine/equipmentLog.vue @@ -35,7 +35,7 @@ 待上传文件 - {{info.fileCount}}个 + {{info.fileCount || 0}}个 @@ -84,7 +84,7 @@ - 离线记录 + 离线记录 {{index+1}}、 {{item}} @@ -118,8 +118,6 @@ }, onLoad(options) { - console.log(this.cusTHeight) - console.log(options.id) this.$u.get("/equipment/equipmentLog", { id: options.id }).then(res => { @@ -174,8 +172,8 @@ .backs { margin-left: 24rpx; - width: 32rpx; - height: 32rpx; + width: 48rpx; + height: 48rpx; } .middle { @@ -211,7 +209,7 @@ margin: 24rpx auto 0; padding: 24rpx; width: 690rpx; - height: 152rpx; + min-height: 152rpx; background: #FFFFFF; border-radius: 8rpx; display: flex; @@ -226,6 +224,7 @@ } .right { + flex-shrink: 0; font-size: 32rpx; font-weight: 400; } @@ -235,7 +234,7 @@ .eqMain { position: relative; z-index: 1; - padding: 0 20rpx; + padding: 0 30rpx; .recordingStart { margin-top: 20rpx; @@ -257,7 +256,7 @@ .font { margin-top: 20rpx; - font-weight: 500; + font-weight: 700; } } @@ -299,7 +298,7 @@ .point { flex-grow: 1; - border-left: 1rpx dotted #2671E2; + border-left: 5rpx dotted #2671E2; } @@ -312,7 +311,7 @@ .recordingBoxItem-title { font-size: 32rpx; - font-weight: 500; + font-weight: 700; } .recordingBoxItem { @@ -320,6 +319,7 @@ display: flex; .left { + flex-shrink: 0; width: 210rpx; color: #505050; font-size: 30rpx; @@ -328,6 +328,9 @@ .right { flex-grow: 1; font-size: 30rpx !important; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } } } @@ -351,4 +354,4 @@ } } } - + diff --git a/utils/domain.js b/utils/domain.js index 1603e0c..7072a4e 100644 --- a/utils/domain.js +++ b/utils/domain.js @@ -1,10 +1,10 @@ // http.js使用域名 -// const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 +const baseUrl = 'http://81.70.55.170:9090/autoSR/api';// 最新测试 // 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.90:8080/api'; // 盛浩 -const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 +// const baseUrl = 'https://zkgj.quhouse.com/api'; // 质控正式 // const baseUrl = 'https://hfju.com/api'; // 数智正式 // const baseUrl = 'https://xitong.pachira.cn/api'; // AI营销辅助 普强使用