Browse Source

Merge branch 'develop'

master
wzl 1 month ago
parent
commit
afab8c9f9a
2 changed files with 13 additions and 2 deletions
  1. +1
    -1
      src/config/models.js
  2. +12
    -1
      src/views/psychological-scale/list.vue

+ 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.132F'; //版本号
export const VERSION_MODEL = '1.0.133F'; //版本号
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/',


+ 12
- 1
src/views/psychological-scale/list.vue View File

@@ -24,7 +24,7 @@
<div class="name">{{ item.ScaleName }}</div> <div class="name">{{ item.ScaleName }}</div>
<div class="result"> <div class="result">
<span>评测结果:</span> <span>评测结果:</span>
<span>{{ item.Summary }}</span>
<span :style="{ color: levels[`${item.SummaryLevel}`].color }">{{ item.Summary }}</span>
</div> </div>
<div class="time"> <div class="time">
{{ formateDate('yyyy年mm月dd日 HH:MM', item.Time) }} {{ formateDate('yyyy年mm月dd日 HH:MM', item.Time) }}
@@ -53,6 +53,17 @@ export default {
showLeftArrow: false, showLeftArrow: false,
fromSsjl: this.$store.getters.fromSsjl, fromSsjl: this.$store.getters.fromSsjl,
result: [], result: [],
levels: [
{
color: '#60B977',
},
{
color: '#FFB600',
},
{
color: '#CC0003',
},
],
} }
}, },
computed: { computed: {


Loading…
Cancel
Save