|
@@ -223,12 +223,28 @@
|
|
|
次
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="interfere_echarts">
|
|
|
- <mpvue-echarts
|
|
|
- :echarts="echarts"
|
|
|
- :onInit="interfere_charts"
|
|
|
- canvasId="demo-canvas-4"
|
|
|
- />
|
|
|
+ <!-- 表图 -->
|
|
|
+ <view class="interfere_echarts_wrap">
|
|
|
+ <view class="interfere_echarts">
|
|
|
+ <mpvue-echarts
|
|
|
+ :echarts="echarts"
|
|
|
+ :onInit="interfere_charts"
|
|
|
+ canvasId="demo-canvas-4"
|
|
|
+ />
|
|
|
+ </view>
|
|
|
+ <view class="interfere_echarts_bottom">
|
|
|
+ <text>0</text>
|
|
|
+ <text>2</text>
|
|
|
+ <text>4</text>
|
|
|
+ <text>6</text>
|
|
|
+ <text>8</text>
|
|
|
+ <text>10</text>
|
|
|
+ <text>12</text>
|
|
|
+ <text>14</text>
|
|
|
+ <text>16</text>
|
|
|
+ <text>18</text>
|
|
|
+ <text>20</text>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<view class="interfere_footer">
|
|
|
<title class="interfere_footer_logo"></title>专注力干扰
|
|
@@ -245,12 +261,28 @@
|
|
|
>
|
|
|
<text>调整能力分析</text>
|
|
|
</view>
|
|
|
- <view class="adjustment_echarts">
|
|
|
- <mpvue-echarts
|
|
|
- :echarts="echarts"
|
|
|
- :onInit="adjustment_charts"
|
|
|
- canvasId="demo-canvas-5"
|
|
|
- />
|
|
|
+ <!-- 表图 -->
|
|
|
+ <view class="adjustment_echarts_wrap">
|
|
|
+ <view class="adjustment_echarts">
|
|
|
+ <mpvue-echarts
|
|
|
+ :echarts="echarts"
|
|
|
+ :onInit="adjustment_charts"
|
|
|
+ canvasId="demo-canvas-5"
|
|
|
+ />
|
|
|
+ </view>
|
|
|
+ <view class="adjustment_echarts_bottom">
|
|
|
+ <text>0</text>
|
|
|
+ <text>2</text>
|
|
|
+ <text>4</text>
|
|
|
+ <text>6</text>
|
|
|
+ <text>8</text>
|
|
|
+ <text>10</text>
|
|
|
+ <text>12</text>
|
|
|
+ <text>14</text>
|
|
|
+ <text>16</text>
|
|
|
+ <text>18</text>
|
|
|
+ <text>20</text>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
<view class="adjustment_footer">
|
|
|
<view class="adjustment_footer_logo"></view>专注力上升
|
|
@@ -440,8 +472,8 @@ export default {
|
|
|
let $res = res.data;
|
|
|
$this.record = $res.data;
|
|
|
|
|
|
- console.log("成绩记录数据", $res.data.interfereArr);
|
|
|
- console.log("数据长度:", $res.data.line);
|
|
|
+ // console.log("成绩记录数据", $res.data.interfereArr);
|
|
|
+ // console.log("数据长度:", $res.data.line);
|
|
|
|
|
|
$this.record.play_time = formatSeconds($this.record.play_time);
|
|
|
$this.record.start_time = timestampToTimeS($this.record.start_time);
|
|
@@ -904,15 +936,31 @@ image.boy {
|
|
|
font-weight: 900;
|
|
|
}
|
|
|
/* 干扰 echarts */
|
|
|
-.interfere_echarts {
|
|
|
- /* margin: 0 auto; */
|
|
|
+.interfere_echarts_wrap {
|
|
|
width: 360px;
|
|
|
height: 193px;
|
|
|
background: #f3f3f3;
|
|
|
opacity: 0.6;
|
|
|
-
|
|
|
box-shadow: 0px 6px 11px #dadada;
|
|
|
}
|
|
|
+.interfere_echarts {
|
|
|
+ /* margin: 0 auto; */
|
|
|
+ width: 100%;
|
|
|
+ height: 173px;
|
|
|
+ /* background: #f3f3f3;
|
|
|
+ opacity: 0.6;
|
|
|
+ box-shadow: 0px 6px 11px #dadada; */
|
|
|
+}
|
|
|
+.interfere_echarts_bottom {
|
|
|
+ margin: 0 auto;
|
|
|
+ width: 90%;
|
|
|
+ height: 20px;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: space-around;
|
|
|
+ font-size: 15px;
|
|
|
+ color: #828282;
|
|
|
+}
|
|
|
/* 干扰 bottom */
|
|
|
.interfere_footer {
|
|
|
width: 100%;
|
|
@@ -951,14 +999,30 @@ image.boy {
|
|
|
height: 19px;
|
|
|
margin-right: 7px;
|
|
|
}
|
|
|
-.adjustment_echarts {
|
|
|
+/* 调整能力表图 */
|
|
|
+.adjustment_echarts_wrap {
|
|
|
margin: 0 auto;
|
|
|
width: 360px;
|
|
|
height: 193px;
|
|
|
+
|
|
|
background: #f3f3f3;
|
|
|
opacity: 0.6;
|
|
|
box-shadow: 0px 6px 11px #dadada;
|
|
|
}
|
|
|
+.adjustment_echarts {
|
|
|
+ width: 100%;
|
|
|
+ height: 173px;
|
|
|
+}
|
|
|
+.adjustment_echarts_bottom {
|
|
|
+ margin: 0 auto;
|
|
|
+ width: 90%;
|
|
|
+ height: 20px;
|
|
|
+ display: flex;
|
|
|
+ align-items: center;
|
|
|
+ justify-content: space-around;
|
|
|
+ font-size: 15px;
|
|
|
+ color: #828282;
|
|
|
+}
|
|
|
.adjustment_footer {
|
|
|
width: 100%;
|
|
|
height: 26px;
|
|
@@ -993,4 +1057,7 @@ image.boy {
|
|
|
font-size: 21px;
|
|
|
font-weight: 600;
|
|
|
}
|
|
|
+.test {
|
|
|
+ color: rgb(163, 7, 7);
|
|
|
+}
|
|
|
</style>
|