Skip to content

A
agcs2.0-web
Commit fc8b1546 authored by miaojiale's avatar miaojiale
Browse files
Options

1.修改首页内容 

2.动态设置视频高度
3.修改bug
parent 7054eace
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 53 deletions
src/components/layout/index.vue
View file @ fc8b1546
......@@ -104,10 +104,10 @@ export default {
route: "/allianceintroduction",
name: "联盟介绍",
},
{
route: "/healthpopularization",
name: "健康科普",
},
// {
// route: "/healthpopularization",
// name: "健康科普",
// },
{
route: "/scientificresearch",
name: "科学研究",
......
src/layouts/components/NavBar/index.vue
View file @ fc8b1546
......@@ -7,7 +7,7 @@
<div class="userInfo">
<error-log></error-log>
<!-- <avatar></avatar> -->
<div v-if="$route.path != '/auditqualitycontrol'" class="fontSelect">
<div v-if="showFontList.includes($route.path)" class="fontSelect">
<div
v-for="(item, index) in fontList"
:key="index"
......@@ -122,6 +122,25 @@ export default {
return {
pulse: false,
isDot: true,
showFontList: [
"/dataoverview",
"/screening/index",
"/screening/draft",
"/followupquery",
"/followupresearch",
"/auditqualitycontrol",
"/field-mapping",
"/systems/form-config",
"/database",
"/systems/colla-group",
"/systems/org",
"/systems/dict",
"/systems/user",
"/systems/role",
"/systems/menu",
"/systems/medicalunion",
"/operation",
],
screeningList: [
{
title: "社区筛查",
......
src/views/Home/ScientificResearch/index.vue
View file @ fc8b1546
<template>
<div class="commonList">
<ul class="left_bar">
<!-- <ul class="left_bar">
<li
v-for="(item, index) in leftBar"
:key="index"
......@@ -9,11 +9,11 @@
>
{{ item.name }}
</li>
</ul>
</ul> -->
<div v-loading="listLoading" class="right_list">
<div class="list_title">
<!-- <div class="list_title">
{{ leftBar[activeBar].name }}
</div>
</div> -->
<ul v-if="tableData.length > 0" class="list">
<li
v-for="(item, index) in tableData"
......@@ -104,7 +104,7 @@ export default {
current: this.pageIndex,
moduleType: "5",
status: "1",
articleType: this.activeBar - 0 + 1,
// articleType: this.activeBar - 0 + 1,
}
articleList(params)
.then((res) => {
......@@ -160,7 +160,8 @@ export default {
}
}
.right_list {
width: calc(100% - 208px);
width: 100%;
// width: calc(100% - 208px);
height: 760px;
background: #ffffff;
border-radius: 4px;
......
src/views/Home/index.vue
View file @ fc8b1546
......@@ -2,7 +2,7 @@
<div id="con">
<Notice v-show="isNotice"></Notice>
<div v-show="!isNotice">
<div class="top flex">
<div class="flex">
<div class="left box">
<video :src="videoSrc" controls class="video" />
</div>
......@@ -15,7 +15,10 @@
:label="e.title"
:name="index + 1 + ''"
>
<ul class="tabslist">
<ul
class="tabslist videoTabList"
:style="{ height: videoHeight }"
>
<li
v-for="(item, index) in noticeList"
:key="index"
......@@ -131,7 +134,7 @@
</div>
<!-- 健康科普 -->
<div class="healthPopularization">
<!-- <div class="healthPopularization">
<div class="title_box">
<div class="title">健康科普</div>
<div class="empty"></div>
......@@ -151,7 +154,7 @@
{{ item.name }}
</li>
</ul>
</div>
</div> -->
<!-- 科学研究 -->
<div class="scientificresearch">
......@@ -178,9 +181,9 @@
<div v-show="showFixed" class="fixed_box">
<ul class="f_list">
<el-popover
popper-class="poperbackground"
v-for="(item, index) in rigBarList"
:key="index"
popper-class="poperbackground"
placement="left-start"
title=""
width="200"
......@@ -228,9 +231,10 @@ export default {
isNotice: false,
curPdf: {},
pdfSrc: "",
videoHeight: "0px",
fixIndex: -1,
// videoSrc: require("../../../public/aaa.mp4"),
videoSrc: "",
videoSrc: require("../../../public/video.mp4"),
// videoSrc: "",
exTab: "浙江省典型案例",
example: [
{
......@@ -248,6 +252,9 @@ export default {
{
title: "学术动态",
},
{
title: "健康知识",
},
],
noticeList: [],
curTab: "1",
......@@ -317,7 +324,24 @@ export default {
this.showFixed = false
}
})
var video = document.querySelector("video")
video.addEventListener("canplay", (e) => {
console.log(e.target.clientHeight)
this.videoHeight = e.target.clientHeight - 66 + "px"
})
})
window.onresize = () =>
(() => {
this.$nextTick(() => {
this.videoHeight =
document.querySelector("video").clientHeight - 66 + "px"
})
})()
},
beforeDestroy() {
window.onresize = () => {}
},
methods: {
setPdf(item) {
......@@ -334,7 +358,10 @@ export default {
item.filePath[0].uuidName
},
handleClick() {
// if (this.curTab == "4") {
// } else {
this.getArticleList(this.curTab)
// }
},
// 获取新闻会议tab的数据
getArticleList(moduleType) {
......@@ -348,7 +375,7 @@ export default {
articleList(params)
.then((res) => {
if (res.code == 1) {
if (["1", "2", "3"].includes(moduleType)) {
if (["1", "2", "3", "4"].includes(moduleType)) {
this.noticeList = [...res.data.records]
}
if (["6"].includes(moduleType)) {
......@@ -393,7 +420,7 @@ export default {
.video {
width: 100%;
border-radius: 5px;
height: 420px;
// height: 420px;
object-fit: fill;
}
}
......@@ -402,7 +429,6 @@ export default {
border-radius: 8px;
overflow: hidden;
.tabslist {
height: 352px;
padding-right: 8px;
overflow: hidden;
display: flex;
......@@ -436,7 +462,7 @@ export default {
}
}
.videoboxs {
height: 100%;
// height: 100%;
}
}
.dataAnalysis {
......
src/views/followupentry/index.vue
View file @ fc8b1546
......@@ -15,6 +15,7 @@
:patient-id="patientId"
:screenList="screenList"
@refreshData="refreshData"
@changeShow="changeShow"
></ConfigForms>
</div>
</template>
......@@ -78,6 +79,9 @@ export default {
})
},
methods: {
changeShow() {
this.$emit("changeShow")
},
refreshData(data) {
// this.refreshFlag = false
// this.$nextTick(() => {
......
src/views/followupquery/index.vue
View file @ fc8b1546
<template>
<!-- 随访查询 -->
<div class="screeningSearch">
<div v-show="!isDetail">
<div v-show="!isDetail && !show">
<div class="top">
<form-components
ref="form"
......@@ -31,6 +31,7 @@
v-if="isDetail"
@back="back"
></FollowUpDetail>
<followupentry v-if="show" @changeShow="changeShow"></followupentry>
</div>
</template>
<script>
......@@ -40,15 +41,18 @@ import searchMixin from "../searchMixin"
import { getCurrentFormByType } from "@/api/coop-group.js"
import { getFollowSearch } from "@/api/followup"
import FollowUpDetail from "./FollowUpDetail.vue"
import followupentry from "../followupentry"
export default {
components: {
FormComponents,
FollowUpDetail,
followupentry,
},
mixins: [paginationMixin, searchMixin],
data() {
return {
isDetail: false,
show: false,
followId: "",
listLoading: false,
keyword: "",
......@@ -292,6 +296,10 @@ export default {
this.getCurrentFormByType(2)
},
methods: {
changeShow() {
this.$router.push({ query: {} })
this.show = false
},
back() {
this.isDetail = false
const followId = this.$route.query.followId
......@@ -311,8 +319,9 @@ export default {
console.log(v)
},
handleEdit(data, i, index) {
this.show = true
this.$router.push({
path: "/followupentry",
// path: "/followupentry",
query: {
patientId: data.patientId,
followId: data.id,
......
src/views/followupresearch/index.vue
View file @ fc8b1546
<template>
<!-- 随访调查 -->
<div class="screeningSearch">
<div class="top">
<form-components
:forms="formList"
:formEdit="formEdit"
@handleSearch="onSearch"
></form-components>
</div>
<div class="bot">
<el-table-self
ref="table"
:table-data="tableData"
:columns="columns"
:header-class="'newHeader'"
:list-loading="listLoading"
:current-page="pageIndex"
:total-count="total"
:page-sizes="pageSizes"
:page-size="pageSize"
@pageSizeChange="handleSizeChange"
@currentPageChange="handleCurrentChange"
/>
</div>
<template v-if="!show">
<div class="top">
<form-components
:forms="formList"
:formEdit="formEdit"
@handleSearch="onSearch"
></form-components>
</div>
<div class="bot">
<el-table-self
ref="table"
:table-data="tableData"
:columns="columns"
:header-class="'newHeader'"
:list-loading="listLoading"
:current-page="pageIndex"
:total-count="total"
:page-sizes="pageSizes"
:page-size="pageSize"
@pageSizeChange="handleSizeChange"
@currentPageChange="handleCurrentChange"
/>
</div>
</template>
<followupentry v-if="show" @changeShow="changeShow"></followupentry>
</div>
</template>
<script>
import FormComponents from "@/components/FormComponents"
import followupentry from "../followupentry"
import paginationMixin from "@/components/TabComponents/mixin"
import searchMixin from "../searchMixin"
import { getCurrentFormByType } from "@/api/coop-group.js"
......@@ -35,12 +39,14 @@ import { mapGetters } from "vuex"
export default {
components: {
FormComponents,
followupentry,
},
mixins: [paginationMixin, searchMixin],
data() {
return {
formId: "", //随访表单类型
listLoading: false,
show: false,
keyword: "",
modifiedFlag: false,
columns: [
......@@ -271,6 +277,10 @@ export default {
this.handleSearch() //调试注释
},
methods: {
changeShow() {
this.$router.push({ query: {} })
this.show = false
},
changeModified() {
this.modifiedFlag = !this.modifiedFlag
},
......@@ -287,7 +297,7 @@ export default {
rowOpration(data, i) {
sessionStorage.setItem("formEdit", JSON.stringify(data))
this.$router.push({
path: `/followupentry`,
// path: `/followupentry`,
query: {
patientId: data.patientId,
getData: 0,
......@@ -295,6 +305,7 @@ export default {
model: "add",
},
})
this.show = true
},
async handleSearch() {
this.listLoading = true
......
src/views/screening/components/ConfigForms.vue
View file @ fc8b1546
......@@ -18,7 +18,7 @@
v-if="formType == 1 ? (!disabled ? true : false) : true"
class="draftButton"
:loading="loading"
:disabled="!infoCompelete"
:disabled="formType == 1 ? !infoCompelete : false"
@click="onSubmit(formType)"
>{{ formType == 1 ? "临时保存" : "返回" }}</el-button
>
......@@ -353,17 +353,21 @@ export default {
this.loading = false
} else {
// 返回
this.$router.back()
// this.$router.back()
this.$emit("changeShow")
}
},
continueSubmit() {
sessionStorage.removeItem("index1Data")
this.activeName = "index0"
// 清空表单
for (let i = 0; i < this.$refs.formTabs.length; i++) {
this.$refs.formTabs[i].resetForm()
this.$refs.formTabs[i].initForm()
}
// for (let i = 0; i < this.$refs.formTabs.length; i++) {
// this.$refs.formTabs[i].resetForm()
// this.$refs.formTabs[i].initForm()
// }
this.formTabsList = []
this.formTabs = []
this.getCurrentFormByType(this.formType)
// 清空红字：不符合筛查条件
this.$refs.showDialog.dialogVisible = false
if (this.$route.path != "/screening/add") {
......
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