Merge branch 'master' of http://git.2weisou.com/Acher/newEdition

App.vue

@@ -277,7 +277,7 @@
 
 		.swiper-box {
 			width: 97%;
-			margin: 0 auto 38rpx;
+			margin: 0 auto 26rpx;
 		}
 
 		.hejibox {

pages/center/Piabodata/StaffAnalysis.vue

@@ -50,7 +50,7 @@
 			</view>
 			<view class="danwei">来访(人)</view>
 			<view class="uchaserbox">
-				<qiun-data-charts v-if="isShow" type="line" :opts="lineOpts1" :chartData="lineOptsect" background="none" :ontouch="true"
+				<qiun-data-charts v-if="isShow" type="line"  :chartData="lineOptsect" background="none" :ontouch="true"
 					canvasId="wangxiaohuaerlingeryilingwuyibbb" :canvas2d="true" />
 			</view>
 		</view>
@@ -80,7 +80,7 @@
 			</view>
 			<view class="danwei">录音时长</view>
 			<view class="uchaserbox">
-				<qiun-data-charts v-if="isShow" type="line"  :opts="lineOpts1" :chartData="lineOptsect1" background="none" :ontouch="true"
+				<qiun-data-charts v-if="isShow" type="line"  :chartData="lineOptsect1" background="none" :ontouch="true"
 					canvasId="wangxiaouaerlingeryilingwuyibhh" :canvas2d="true" />
 			</view>
 		</view>
@@ -110,7 +110,7 @@
 			</view>
 			<view class="uchaserbox">
 				<qiun-data-charts v-if="isShow" type="line" :chartData="lineOptsect2" background="none" :ontouch="true"
-					canvasId="wangxiaohuaerlingryilingwuyibhh" :canvas2d="true" :opts="lineOpts1" />
+					canvasId="wangxiaohuaerlingryilingwuyibhh" :canvas2d="true" :opts="lineOpts" />
 			</view>
 		</view>
 
@@ -215,31 +215,14 @@
 						}
 					}
 				},
-				
 				lineOpts: {
-					// enableScroll: true,
-					// xAxis: {
-					// 	disableGrid: true,
-					// 	scrollShow: true,
-					// 	itemCount: 8
-					// },
 					yAxis: {
-						data: [
-							{
-								max: 100,
-								min: 0,
-							}
-						]
+						data: [{
+							max: 100,
+							min: 0,
+						}]
 					}
 				},
-				lineOpts1: {
-					// enableScroll: true,
-					// xAxis: {
-					// 	disableGrid: true,
-					// 	scrollShow: true,
-					// 	itemCount: 8
-					// }
-				},
 				isShow: true, // 默认都展示
 			};
 		},

pages/center/Piabodata/Theteamcompared.vue

@@ -54,7 +54,7 @@
 				</view>
 			</view>
 			<view class="" v-if="eharTab.active1 == 1 ">
-				<view class="danwei">接待量</view>
+				<view class="danwei">接待量(次)</view>
 				<view class="uchaserbox">
 					<template v-if="lineOptsect1">
 						<qiun-data-charts type="line" :opts="lineOpts1" :chartData="lineOptsect1" background="none" :ontouch="true"
@@ -101,7 +101,7 @@
 				</view>
 			</view>
 			<view v-if="eharTab.active2 == 1 ">
-				<view class="danwei">录音时长</view>
+				<view class="danwei">录音时长(min)</view>
 				<view class="uchaserbox">
 					<template v-if="lineOptsect2">
 						<qiun-data-charts type="line" :opts="lineOpts1" :chartData="lineOptsect2" background="none" :ontouch="true"
@@ -135,7 +135,7 @@
 				</view>
 			</view>
 			<view v-if="eharTab.active3 == 1 ">
-				<view class="danwei">执行率</view>
+				<view class="danwei">执行率(%)</view>
 				<view class="uchaserbox">
 					<template v-if="lineOptsect3">
 						<qiun-data-charts type="line" :chartData="lineOptsect3" background="none" :ontouch="true"
@@ -809,7 +809,7 @@
 								})
 							}
 						} else {
-							// console.log(3)
+							console.log(311111)
 							// 当两个都选择的时候
 							res.first.map((item, index) => {
 								let obj = {

pages/center/Piabodata/TrendAnalysis.vue

@@ -158,7 +158,7 @@
 			</view>
 
 			<view class="single">
-				<!-- <view class="danwei" style="margin-top: 10rpx;">销讲词执行率</view> -->
+				<view class="danwei" style="margin: 20rpx 0" v-if="newactiveTotal==0||newactiveTotal==4">单位(%)</view>
 				<view class="uchaserbox" v-if="lineOptsect.series.length!=0">
 					<qiun-data-charts :style="!showCanvas?'display:none':''" :type="linetype" :opts="opts"
 						:chartData="lineOptsect" background="none" :ontouch="true"
@@ -338,6 +338,12 @@
 						scrollShow: true,
 						itemCount: 8
 					},
+					yAxis: {
+						data: [{
+							max: 100,
+							min: 0,
+						}]
+					},
 					fontSize: 10,
 					extra: {
 						radar: {

pages/center/Piabodata/index.vue

@@ -23,7 +23,8 @@
 						<view class="circle"></view>
 						{{item.name}}</view>
 					<view class="num u-flex" v-if="item.name==='平均执行率'">
-						{{item.num}} <image style="margin-left: 2rpx;width: 28rpx;height: 14rpx" src="../../../static/images/excute.png" mode="" />
+						{{item.num}} 
+						<!-- <image style="margin-left: 2rpx;width: 28rpx;height: 14rpx" src="../../../static/images/excute.png" mode="" /> -->
 					</view>
 					<view class="num" v-else-if="item.name==='有效接待'">{{item.num||'--'}}</view>
 					<view class="num" v-else>{{item.num||0}}</view>
@@ -53,7 +54,7 @@
 						:ontouch="true" canvasId="wangxiaohuaerlingilingwuyiba1" :canvas2d="true" />
 				</template>
 				<template v-else>
-					<qiun-data-charts type="line" :opts="lineOpts" :chartData="lineOptsect" background="none" :ontouch="true"
+					<qiun-data-charts type="line" :opts="lineOpts1" :chartData="lineOptsect" background="none" :ontouch="true"
 						canvasId="wangxiaohuaerlingilingwuyiba1" :canvas2d="true" />
 				</template>
 			</view>
@@ -315,6 +316,13 @@
 							min: 0,
 						}]
 					}
+				},
+				lineOpts1: {
+					xAxis: {
+						disableGrid: true,
+						scrollShow: true,
+						itemCount: 8
+					}
 				}
 			};
 		},

pages/center/records/index.vue

@@ -783,12 +783,10 @@
 
 				.left {
 					flex-shrink: 0;
-					min-width: 50%;
+					min-width: 40%;
 					display: flex;
 					align-items: center;
 					overflow: hidden;
-
-
 					.adviser {
 						margin-right: 10rpx;
 						padding: 5rpx 11rpx;
@@ -826,9 +824,10 @@
 				}
 
 				.right {
-					max-width: 50%;
+					flex: 1;
 					display: flex;
 					font-size: 30rpx;
+					justify-content: flex-end;
 
 					view,
 					text {

pages/index/index.vue

@@ -113,7 +113,7 @@
 			<view class="real-timebox">
 				<view class="timebox">
 					<view class="real" @click="tapjumpreception('1')">
-						<view class="realnum u-flex"  style="justify-content: center">{{realtimeobj.fraction || 0}}% 
+						<view class="realnum u-flex"  style="justify-content: center">{{realtimeobj.fraction || 0}}<text style="font-weight: 400;font-family: SimHei;font-size: 30rpx;">%</text>
 							<!-- <image class="qushi-icon" src="/static/images/excute.png"  mode="" /> -->
 						</view>
 						<view class="realtext">平均执行率</view>
@@ -133,7 +133,7 @@
 				</view>
 				<view class="timebox" style="margin-bottom:0;">
 					<view class="real" @click="tapjumpreception('1')">
-						<view class="realnum">{{realtimeobj.avgDuration|| 0}}min</view>
+						<view class="realnum">{{realtimeobj.avgDuration|| 0}}<text style="font-size: 30rpx;font-weight: 400;font-family: SimHei">min</text></view>
 						<view class="realtext">平均接待时长</view>
 					</view>
 					<view class="real" @click="tapjumpreception('4')">
@@ -166,7 +166,7 @@
 			<view class="real-timebox" >
 				<view class="timebox">
 					<view class="real" @click="tapjumpreception('3')">
-						<view class="realnum u-flex" style="justify-content: center">{{Thisweekobj.fraction || 0}}%
+						<view class="realnum u-flex" style="justify-content: center">{{Thisweekobj.fraction || 0}}<text style="font-weight: 400;font-family: SimHei;font-size: 30rpx;">%</text>
 							<!-- <image class="qushi-icon" src="/static/images/qushi-up.png" mode="" /> -->
 						</view>
 						<view class="realtext">平均执行率</view>
@@ -182,7 +182,7 @@
 				</view>
 				<view class="timebox" style="margin-bottom:0;">
 					<view class="real" @click="tapjumpreception('3')">
-						<view class="realnum">{{Thisweekobj.avgDuration || 0}}min</view>
+						<view class="realnum">{{Thisweekobj.avgDuration || 0}}<text style="font-size: 30rpx;font-weight: 400;font-family: SimHei">min</text></view>
 						<view class="realtext">平均接待时长</view>
 					</view>
 					<view class="real" @click="prohibitedtap(2)" v-if="methodsisshow">
@@ -1099,8 +1099,8 @@
 				width: 100%;
 				text-align: center;
 				height: 50rpx;
-				font-size: 44rpx;
-				font-family: DINAlternate-Bold, DINAlternate;
+				font-size: 36rpx;
+				font-family: SourceHanSansCN-Medium, SourceHanSansCN;
 				font-weight: bold;
 				color: #333333;
 				line-height: 50rpx;
@@ -1134,8 +1134,8 @@
 					width: 100%;
 					text-align: center;
 					height: 50rpx;
-					font-size: 44rpx;
-					font-family: DINAlternate-Bold, DINAlternate;
+					font-size: 36rpx;
+					font-family: SourceHanSansCN-Medium, SourceHanSansCN;
 					font-weight: bold;
 					color: #333333;
 					line-height: 50rpx;

pages/mine/details2.vue

@@ -35,8 +35,9 @@
 						</view>
 						<view class="contentInfo">
 							<view class="info">
-								<text class="AudioUserName">{{ item.speaker | toCapital }}</text>
-								<text>{{conversionTiame(item.bg/1000)}}</text>
+								{{ item.speaker | toCapital }} {{conversionTiame(item.bg/1000)}}
+								<!-- <text class="AudioUserName">{{ item.speaker | toCapital }}</text>
+								<text>{{conversionTiame(item.bg/1000)}}</text> -->
 							</view>
 							<view class="contentMain">
 								<view class="content">

utils/domain.js

@@ -1,9 +1,9 @@
-// const base = 'http://81.70.55.170:9999'; // 测试站
+const base = 'http://81.70.55.170:9999'; // 测试站
 // const base = 'http://127.0.0.1:9999'; // 本地
 // const base = 'http://192.168.31.148:9999' ;// 泽明
 // const base = 'http://192.168.31.86:9999' ;// 胜浩
 // const base = 'http://192.168.31.161:9999' // 长龙
-const base = 'https://zanyong.hfju.com';// 正式 AI销管
+// const base = 'https://zanyong.hfju.com';// 正式 AI销管
 // const base = 'https://hxz.quhouse.com';// 正式 AI销讲助手
 
 // http.js使用