Browse Source

Merge branch 'feat' into test

test
chenJinxu 6 months ago
parent
commit
c6cb7340c8
3 changed files with 13 additions and 5 deletions
  1. +7
    -0
      README.md
  2. +1
    -1
      src/config/models.js
  3. +5
    -4
      src/views/health/psychological/report/index.vue

+ 7
- 0
README.md View File

@@ -1152,3 +1152,10 @@ update
update update


- ‘7天’,‘30天’文字 改成 ‘前7天’,‘前30天’, - ‘7天’,‘30天’文字 改成 ‘前7天’,‘前30天’,

## v1.0.125

`2024.5.27`
update

- 增加 周报详情不显示对比条件

+ 1
- 1
src/config/models.js View File

@@ -8,7 +8,7 @@
import store from "@/store"; import store from "@/store";
// 情绪模型 // 情绪模型
const appTypeList = ['1']; const appTypeList = ['1'];
export const VERSION_MODEL = '1.0.124F'; //版本号
export const VERSION_MODEL = '1.0.125F'; //版本号
export const IMAGE_URL = { export const IMAGE_URL = {
production: 'http://zfb.ssjlai.com/web/', production: 'http://zfb.ssjlai.com/web/',
test: 'http://zfb.ssjlai.com/web/', test: 'http://zfb.ssjlai.com/web/',


+ 5
- 4
src/views/health/psychological/report/index.vue View File

@@ -63,7 +63,7 @@
}}</label> }}</label>
</div> </div>


<div class="status">
<div class="status" v-if="isShowCompare">
<img :src="calcImg(item.percentage, item.lastPercentage)" alt="" /> <img :src="calcImg(item.percentage, item.lastPercentage)" alt="" />
<span :style="{ <span :style="{
color: color:
@@ -126,8 +126,8 @@
item.days item.days
}}</span> }}</span>
<span class="day-text">天</span> <span class="day-text">天</span>
<img :src="calcWeekImg(item.days, item.lastDay)" alt="" />
<span class="day-text status">{{
<img :src="calcWeekImg(item.days, item.lastDay)" alt="" v-if="isShowCompare" />
<span class="day-text status" v-if="isShowCompare">{{
calcWeekImg(item.days, item.lastDay, true) calcWeekImg(item.days, item.lastDay, true)
}}</span> }}</span>
</p> </p>
@@ -250,7 +250,7 @@ export default {
weekResult: {}, weekResult: {},
upImg: require("@/assets/img/psychological/up.png"), upImg: require("@/assets/img/psychological/up.png"),
downImg: require("@/assets/img/psychological/down.png"), downImg: require("@/assets/img/psychological/down.png"),
isShowCompare: null, //是否显示周对比
}; };
}, },
created() { created() {
@@ -695,6 +695,7 @@ export default {
this.weekResult.Summary = this.$replaceAll(data.Summary, '抑郁', '忧郁') this.weekResult.Summary = this.$replaceAll(data.Summary, '抑郁', '忧郁')
this.weekResult.Advice = this.$replaceAll(data.Advice, '抑郁', '忧郁') this.weekResult.Advice = this.$replaceAll(data.Advice, '抑郁', '忧郁')
this.emoName = this.calcTitle(data.Type); this.emoName = this.calcTitle(data.Type);
this.isShowCompare = data.LastweekData;
} }
let None = { let None = {
count: data.None, count: data.None,


Loading…
Cancel
Save