Commit 6bf3658d authored by gengchunlei's avatar gengchunlei

Merge branch 'chronic-dev' of http://gitlab.yiboshi.com/nightkis1995/frontend-h5 into chronic-dev

 Conflicts:
	src/doctor/Doctor.vue
parents b6636cd3 67a098fc
......@@ -66,7 +66,7 @@ export default {
if (!token) {
token = sessionStorage.getItem('token')
if (process.env.NODE_ENV !== 'production') {
token = '12d2fd58-ee1f-45b5-b455-cce7126fe19a'
token = '1b8515e3-66a8-458b-b4d9-0cef6f73b8c1'
}
}
if (token) {
......
......@@ -100,6 +100,7 @@
v-if="check.inspectFileList?.length"/>
</div>
</div>
<span class="py-1" v-if="!checkInfo.length">-</span>
</div>
</van-collapse-item>
</van-collapse>
......
......@@ -33,10 +33,7 @@ export default {
}
},
// 疾病类型
diseaseType: {
type: [String, Number],
required: true
},
diseaseType: [String, Number],
teleport: [String, Element]
},
emits: ['update:show', 'update:value', 'change'],
......
......@@ -78,12 +78,20 @@ export default {
// 工作台查询范围 1:本科室 2:本人
configRange: 1,
configValue: { range: 1 },
configOption: null
configOption: null,
// tab滚动记录
scrollRecord: 0
}
},
created() {
this.init()
},
activated() {
if (this.scrollRecord) {
const dom = this.$refs['tab-inner']
dom.scrollTo({ left: this.scrollRecord > 0 ? this.scrollRecord : 0 })
}
},
methods: {
init() {
this.tabActive = this.configTab[0]
......@@ -127,6 +135,7 @@ export default {
// dom.children[index].scrollIntoView({ behavior: 'smooth', inline: 'start' })
const scrollNum = dom.children[index].offsetLeft - (dom.clientWidth - dom.children[index].clientWidth) / 2
dom.scrollTo({ left: scrollNum > 0 ? scrollNum : 0, behavior: 'smooth' })
this.scrollRecord = scrollNum
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment