|
|
@@ -1,6 +1,6 @@
|
|
|
<template>
|
|
|
<div class="page">
|
|
|
- <Head :activeTab='activeTab' :allMoudles='allMoudles' :progress='progress'/>
|
|
|
+ <Head :activeTab='activeTab' :allMoudles='allMoudles' :progressNum="progressNum" :progress='progress'/>
|
|
|
<!-- <div class="progress-bar">
|
|
|
<div class="title">
|
|
|
<span :class="{'active':activeTab==i.type}" :style="{width:(100/allMoudles.length)+'%'}" v-for="i in allMoudles">{{i.name}}</span>
|
|
|
@@ -49,7 +49,7 @@
|
|
|
<div v-for="(item,idx) in addContentQasList" :key="'3'+idx+item.id">
|
|
|
<Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="activeNum" :extNum ="[symptomQasList.length,diagnoseQasList.length,othersQasList.length]" :cancelNum="cancelNum"/>
|
|
|
</div>
|
|
|
-
|
|
|
+
|
|
|
<!-- <div v-for="(item,idx) in diagnoseQasList" :key="'1'+idx+item.id" v-if="activeTab==moduleKeys[1]||activeTab==moduleKeys[2]||activeTab==moduleKeys[3]">
|
|
|
<Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="activeNum" :extNum ="[symptomQasList.length]" :cancelNum="cancelNum"/>
|
|
|
</div>
|
|
|
@@ -59,7 +59,7 @@
|
|
|
<div v-for="(item,idx) in addContentQasList" :key="'3'+idx+item.id" v-if="activeTab==moduleKeys[3]">
|
|
|
<Dialog :idx="idx" v-if="item.show" :item="item" @cancel="cancelSelected" :num="activeNum" :extNum ="[symptomQasList.length,diagnoseQasList.length,othersQasList.length]" :cancelNum="cancelNum"/>
|
|
|
</div> -->
|
|
|
-
|
|
|
+
|
|
|
</div>
|
|
|
</div>
|
|
|
<MultSelect @updataResult="updataResultSingle" :num="num" :symptomResult="symptomResult" v-if="type==3"></MultSelect>
|
|
|
@@ -160,6 +160,8 @@ export default {
|
|
|
wrong:false, //是否显示错误toast
|
|
|
showConfirm: false,
|
|
|
time:1000,
|
|
|
+ progressNum:'',
|
|
|
+
|
|
|
}
|
|
|
},
|
|
|
created() {
|
|
|
@@ -207,6 +209,9 @@ export default {
|
|
|
return '0.1px';
|
|
|
}
|
|
|
const moduleName = this.moduleMap[this.activeTab]+'QasList';
|
|
|
+ const pnum = this[moduleName].length;
|
|
|
+ const snum = (this.num+1)>pnum?pnum:(this.num+1);
|
|
|
+ this.progressNum=snum+"/"+(pnum===0?1:pnum);
|
|
|
const precent = (this.num+1)/this[moduleName].length;
|
|
|
return precent*100+"%";
|
|
|
}
|
|
|
@@ -353,7 +358,7 @@ export default {
|
|
|
//上传的图片及是否有可上传***答案不显示在预览所以不记录到state.diagnose.text中
|
|
|
if(this.symptomResult.id!==999999&&this.symptomResult.controlType!=4){
|
|
|
// console.log('当前问题单选',this.num-1,this.canceledQa,contentResult.val,contentResult.valp)
|
|
|
- this.$store.commit('setText', {
|
|
|
+ this.$store.commit('setText', {
|
|
|
type: this.activeTab,
|
|
|
text: contentResult.val,
|
|
|
textP: contentResult.valp,
|
|
|
@@ -497,7 +502,7 @@ export default {
|
|
|
position: fixed;
|
|
|
box-sizing: border-box;
|
|
|
overflow: hidden;
|
|
|
- top: 0.86rem;
|
|
|
+ top: 1.4rem;
|
|
|
}
|
|
|
.scrollPart {
|
|
|
// padding-bottom: 5rem;
|
zhouna