Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main
continuous-integration/drone/push Build is passing Details

uat_us
caiyiling 2024-08-20 11:05:53 +08:00
commit 64a5a7f89c
6 changed files with 185 additions and 108 deletions

View File

@ -1,12 +1,14 @@
<template> <template>
<!--FEEDBACK--> <!--FEEDBACK-->
<div v-if="visible" @click.stop="() => false"> <div v-if="visible" @click.stop="() => false" class="feedBack-box">
<div class="feedBack-box-modal"></div>
<el-dialog <el-dialog
:visible.sync="visible" :visible.sync="visible"
v-dialogDrag v-dialogDrag
width="800px" width="800px"
:close-on-click-modal="false" :close-on-click-modal="false"
@close="cancel" @close="cancel"
:modal="false"
> >
<div slot="title"> <div slot="title">
{{ title }} {{ title }}
@ -58,7 +60,11 @@
prop="QuestionType" prop="QuestionType"
v-if="type === 'feedback' && trialId" v-if="type === 'feedback' && trialId"
> >
<el-select v-model="form.QuestionType" style="width: 100%"> <el-select
v-model="form.QuestionType"
style="width: 100%"
popper-class="feedBack-select-box"
>
<el-option <el-option
v-for="item in QuestionTypeOptions" v-for="item in QuestionTypeOptions"
:key="item.id" :key="item.id"

View File

@ -1,5 +1,5 @@
<template> <template>
<div v-if="visible" @click.stop="() => false"> <div v-if="visible" @click.stop="() => false" class="feedBack-box">
<el-dialog <el-dialog
:visible.sync="visible" :visible.sync="visible"
v-dialogDrag v-dialogDrag
@ -58,4 +58,5 @@ export default {
// padding-bottom: 0; // padding-bottom: 0;
// height: 500px; // height: 500px;
// } // }
// </style> //
</style>

View File

@ -9,7 +9,7 @@ body {
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
text-rendering: optimizeLegibility; text-rendering: optimizeLegibility;
font-family: "Helvetica Neue",Helvetica,"PingFang SC","Hiragino Sans GB","Microsoft YaHei","微软雅黑",Arial,sans-serif; font-family: "Helvetica Neue", Helvetica, "PingFang SC", "Hiragino Sans GB", "Microsoft YaHei", "微软雅黑", Arial, sans-serif;
// font-family:"Helvetica Neue", Helvetica, Arial, sans-serif; // font-family:"Helvetica Neue", Helvetica, Arial, sans-serif;
// font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC", // font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC",
// "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial, // "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial,
@ -52,6 +52,7 @@ a:hover {
div:focus { div:focus {
outline: none; outline: none;
} }
body .el-table th.gutter { body .el-table th.gutter {
display: table-cell !important; display: table-cell !important;
} }
@ -66,6 +67,7 @@ body .el-table th.gutter {
height: 0; height: 0;
} }
} }
.el-loading-mask { .el-loading-mask {
background-color: rgba(255, 255, 255, 0.5); background-color: rgba(255, 255, 255, 0.5);
} }
@ -80,6 +82,7 @@ body .el-table th.gutter {
.table-container { .table-container {
height: calc(100% - 100px); height: calc(100% - 100px);
} }
// .pagination-container{ // .pagination-container{
// text-align: right; // text-align: right;
// } // }
@ -92,10 +95,12 @@ body .el-table th.gutter {
border-left: 3px solid #0fc8e0; border-left: 3px solid #0fc8e0;
font-size: 13px; font-size: 13px;
margin-bottom: 10px; margin-bottom: 10px;
p { p {
margin: 0; margin: 0;
padding-left: 5px; padding-left: 5px;
} }
.add { .add {
position: absolute; position: absolute;
right: 10px; right: 10px;
@ -104,9 +109,11 @@ body .el-table th.gutter {
margin-top: -15px; margin-top: -15px;
} }
} }
.el-dialog__body { .el-dialog__body {
padding: 0 10px; padding: 0 10px;
} }
.el-date-editor.el-input, .el-date-editor.el-input,
.el-date-editor.el-input__inner, .el-date-editor.el-input__inner,
.el-select { .el-select {
@ -114,167 +121,229 @@ body .el-table th.gutter {
} }
} }
} }
.data-list { .data-list {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
flex: 1; flex: 1;
.toolbar { .toolbar {
display: flex; display: flex;
} }
.data-table { .data-table {
flex: 1; flex: 1;
padding: 5px 0px; padding: 5px 0px;
} }
.pagination { .pagination {
height: 32px; height: 32px;
text-align: right; text-align: right;
} }
} }
.is-fullscreen{ .is-fullscreen {
.el-dialog__headerbtn{ .el-dialog__headerbtn {
top:10px; top: 10px;
font-size: 30px; font-size: 30px;
} }
.el-dialog__body{
.el-dialog__body {
height: calc(100% - 70px); height: calc(100% - 70px);
padding: 0 20px; padding: 0 20px;
.base-modal-body{
.base-modal-body {
padding: 10px 20px; padding: 10px 20px;
height: 100%; height: 100%;
overflow-y: auto; overflow-y: auto;
} }
} }
.el-dialog__footer{
.el-dialog__footer {
padding: 10px; padding: 10px;
} }
.link-breadcrumb{
.link-breadcrumb {
cursor: pointer; cursor: pointer;
color: #428bca; color: #428bca;
} }
} }
.base-dialog-wrapper{ .base-dialog-wrapper {
.el-dialog__header{ .el-dialog__header {
padding: 15px; padding: 15px;
} }
.base-dialog-body{
.base-dialog-body {
border: 1px solid #e0e0e0; border: 1px solid #e0e0e0;
padding:10px; padding: 10px;
max-height:600px; max-height: 600px;
overflow-y: auto; overflow-y: auto;
} }
.base-dialog-footer{
text-align:right; .base-dialog-footer {
margin-top:10px; text-align: right;
margin-top: 10px;
} }
.el-dialog__body{
padding:10px; .el-dialog__body {
padding: 10px;
} }
.el-dialog__footer{
padding: 10px; .el-dialog__footer {
padding: 10px;
} }
} }
.el-descriptions{
box-sizing:border-box; .el-descriptions {
font-size:14px; box-sizing: border-box;
color:#303133 font-size: 14px;
color: #303133
} }
.el-descriptions__header{
display:flex; .el-descriptions__header {
justify-content:space-between; display: flex;
align-items:center; justify-content: space-between;
margin-bottom:20px align-items: center;
margin-bottom: 20px
} }
.el-descriptions__title{
font-size:16px; .el-descriptions__title {
font-weight:700 font-size: 16px;
font-weight: 700
} }
.el-descriptions__body{
color:#606266; .el-descriptions__body {
background-color:#fff color: #606266;
background-color: #fff
} }
.el-descriptions__body .el-descriptions__table{
border-collapse:collapse; .el-descriptions__body .el-descriptions__table {
width:100%; border-collapse: collapse;
table-layout:fixed width: 100%;
table-layout: fixed
} }
.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell{
box-sizing:border-box; .el-descriptions__body .el-descriptions__table .el-descriptions-item__cell {
text-align:left; box-sizing: border-box;
font-weight:400; text-align: left;
line-height:1.5 font-weight: 400;
line-height: 1.5
} }
.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-left{
text-align:left .el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-left {
text-align: left
} }
.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-center{
text-align:center .el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-center {
text-align: center
} }
.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-right{
text-align:right .el-descriptions__body .el-descriptions__table .el-descriptions-item__cell.is-right {
text-align: right
} }
.el-descriptions .is-bordered{
table-layout:auto .el-descriptions .is-bordered {
table-layout: auto
} }
.el-descriptions .is-bordered .el-descriptions-item__cell{
border:1px solid #ebeef5; .el-descriptions .is-bordered .el-descriptions-item__cell {
padding:12px 10px border: 1px solid #ebeef5;
padding: 12px 10px
} }
.el-descriptions :not(.is-bordered) .el-descriptions-item__cell{
padding-bottom:12px .el-descriptions :not(.is-bordered) .el-descriptions-item__cell {
padding-bottom: 12px
} }
.el-descriptions--medium.is-bordered .el-descriptions-item__cell{
padding:10px .el-descriptions--medium.is-bordered .el-descriptions-item__cell {
padding: 10px
} }
.el-descriptions--medium:not(.is-bordered) .el-descriptions-item__cell{
padding-bottom:10px .el-descriptions--medium:not(.is-bordered) .el-descriptions-item__cell {
padding-bottom: 10px
} }
.el-descriptions--small{
font-size:12px .el-descriptions--small {
font-size: 12px
} }
.el-descriptions--small.is-bordered .el-descriptions-item__cell{
padding:8px 10px .el-descriptions--small.is-bordered .el-descriptions-item__cell {
padding: 8px 10px
} }
.el-descriptions--small:not(.is-bordered) .el-descriptions-item__cell{
padding-bottom:8px .el-descriptions--small:not(.is-bordered) .el-descriptions-item__cell {
padding-bottom: 8px
} }
.el-descriptions--mini{
font-size:12px .el-descriptions--mini {
font-size: 12px
} }
.el-descriptions--mini.is-bordered .el-descriptions-item__cell{
padding:6px 10px .el-descriptions--mini.is-bordered .el-descriptions-item__cell {
padding: 6px 10px
} }
.el-descriptions--mini:not(.is-bordered) .el-descriptions-item__cell{
padding-bottom:6px .el-descriptions--mini:not(.is-bordered) .el-descriptions-item__cell {
padding-bottom: 6px
} }
.el-descriptions-item{
vertical-align:top .el-descriptions-item {
vertical-align: top
} }
.el-descriptions-item__container{
display:flex .el-descriptions-item__container {
display: flex
} }
.el-descriptions-item__container .el-descriptions-item__content,.el-descriptions-item__container .el-descriptions-item__label{
display:inline-flex; .el-descriptions-item__container .el-descriptions-item__content,
align-items:baseline .el-descriptions-item__container .el-descriptions-item__label {
display: inline-flex;
align-items: baseline
} }
.el-descriptions-item__container .el-descriptions-item__content{
flex:1 .el-descriptions-item__container .el-descriptions-item__content {
flex: 1
} }
.el-descriptions-item__label.has-colon:after{
content:":"; .el-descriptions-item__label.has-colon:after {
position:relative; content: ":";
top:-.5px position: relative;
top: -.5px
} }
.el-descriptions-item__label.is-bordered-label{
font-weight:700; .el-descriptions-item__label.is-bordered-label {
color:#909399; font-weight: 700;
background:#fafafa color: #909399;
background: #fafafa
} }
.el-descriptions-item__label:not(.is-bordered-label){
margin-right:10px .el-descriptions-item__label:not(.is-bordered-label) {
margin-right: 10px
} }
.el-descriptions-item__content{
word-break:break-word; .el-descriptions-item__content {
overflow-wrap:break-word word-break: break-word;
overflow-wrap: break-word
} }
.feedBack-box {
.el-dialog__wrapper {
z-index: 3999 !important;
}
}
.feedBack-select-box {
z-index: 4000 !important;
}
.feedBack-box-modal {
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
opacity: .5;
background: #000;
z-index: 3999;
}

View File

@ -35,6 +35,7 @@
v-model="searchData.UserTypeEnum" v-model="searchData.UserTypeEnum"
clearable clearable
style="width: 150px" style="width: 150px"
popper-class="feedBack-select-box"
> >
<el-option <el-option
v-for="item of UserTypeOptins" v-for="item of UserTypeOptins"
@ -58,6 +59,7 @@
v-model="searchData.QuestionType" v-model="searchData.QuestionType"
clearable clearable
style="width: 150px" style="width: 150px"
popper-class="feedBack-select-box"
> >
<el-option <el-option
v-for="item of QuestionTypeOptions" v-for="item of QuestionTypeOptions"
@ -77,7 +79,12 @@
</el-form-item> </el-form-item>
<!--状态--> <!--状态-->
<el-form-item :label="$t('feedBack:search:status')" v-if="level > 7"> <el-form-item :label="$t('feedBack:search:status')" v-if="level > 7">
<el-select v-model="searchData.State" clearable style="width: 150px"> <el-select
v-model="searchData.State"
clearable
style="width: 150px"
popper-class="feedBack-select-box"
>
<el-option <el-option
v-for="item of $d.FeedBackStatus" v-for="item of $d.FeedBackStatus"
:key="item.value" :key="item.value"
@ -97,6 +104,7 @@
value-format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss"
@change="handleDatetimeChange" @change="handleDatetimeChange"
style="width: 250px" style="width: 250px"
popper-class="feedBack-select-box"
/> />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>

View File

@ -72,7 +72,7 @@ export default {
position: fixed; position: fixed;
bottom: 50px; bottom: 50px;
right: -25px; right: -25px;
z-index: 2000; z-index: 3000;
width: 50px; width: 50px;
height: 50px; height: 50px;
background: rgba(64, 158, 255, 0.533); background: rgba(64, 158, 255, 0.533);

View File

@ -414,7 +414,6 @@
</el-dialog> </el-dialog>
<!-- 上传Dicom/非Dicom文件 --> <!-- 上传Dicom/非Dicom文件 -->
<div class="upload-dialog-box" v-if="uploadVisible">
<el-dialog <el-dialog
v-if="uploadVisible" v-if="uploadVisible"
:visible.sync="uploadVisible" :visible.sync="uploadVisible"
@ -519,7 +518,6 @@
</el-tabs> </el-tabs>
</div> </div>
</el-dialog> </el-dialog>
</div>
<!-- 检查列表 --> <!-- 检查列表 -->
@ -1704,11 +1702,6 @@ export default {
} }
</script> </script>
<style lang="scss"> <style lang="scss">
.upload-dialog-box{
.el-dialog__wrapper{
z-index: 1999 !important;
}
}
.visit-list{ .visit-list{
position: relative; position: relative;
.status-primary-circle{ .status-primary-circle{