Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

2024-08-20 11:05:53 +08:00 · 2024-08-20 11:05:53 +08:00 · 64a5a7f89c
parent c90e423268 d1bf7f1088
commit 64a5a7f89c
6 changed files with 185 additions and 108 deletions
--- a/src/components/feedBack/index.vue
+++ b/src/components/feedBack/index.vue
@ -1,12 +1,14 @@
 <template>
  <!--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
      :visible.sync="visible"
      v-dialogDrag
      width="800px"
      :close-on-click-modal="false"
      @close="cancel"
+      :modal="false"
    >
      <div slot="title">
        {{ title }}
@ -58,7 +60,11 @@
          prop="QuestionType"
          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
              v-for="item in QuestionTypeOptions"
              :key="item.id"
--- a/src/components/feedBackTable/index.vue
+++ b/src/components/feedBackTable/index.vue
@ -1,5 +1,5 @@
 <template>
-  <div v-if="visible" @click.stop="() => false">
+  <div v-if="visible" @click.stop="() => false" class="feedBack-box">
    <el-dialog
      :visible.sync="visible"
      v-dialogDrag
@ -58,4 +58,5 @@ export default {
 //   padding-bottom: 0;
 //   height: 500px;
 // }
-// </style>
+//
+</style>
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@ -9,7 +9,7 @@ body {
  -moz-osx-font-smoothing: grayscale;
  -webkit-font-smoothing: antialiased;
  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: -apple-system, BlinkMacSystemFont, "Segoe UI", "PingFang SC",
  //   "Hiragino Sans GB", "Microsoft YaHei", "Helvetica Neue", Helvetica, Arial,
@ -52,6 +52,7 @@ a:hover {
 div:focus {
  outline: none;
 }
+
 body .el-table th.gutter {
  display: table-cell !important;
 }
@ -66,6 +67,7 @@ body .el-table th.gutter {
    height: 0;
  }
 }
+
 .el-loading-mask {
  background-color: rgba(255, 255, 255, 0.5);
 }
@ -80,6 +82,7 @@ body .el-table th.gutter {
  .table-container {
    height: calc(100% - 100px);
  }
+
  // .pagination-container{
  //   text-align: right;
  // }
@ -92,10 +95,12 @@ body .el-table th.gutter {
      border-left: 3px solid #0fc8e0;
      font-size: 13px;
      margin-bottom: 10px;
+
      p {
        margin: 0;
        padding-left: 5px;
      }
+
      .add {
        position: absolute;
        right: 10px;
@ -104,9 +109,11 @@ body .el-table th.gutter {
        margin-top: -15px;
      }
    }
+
    .el-dialog__body {
      padding: 0 10px;
    }
+
    .el-date-editor.el-input,
    .el-date-editor.el-input__inner,
    .el-select {
@ -114,167 +121,229 @@ body .el-table th.gutter {
    }
  }
 }
+
 .data-list {
  display: flex;
  flex-direction: column;
  flex: 1;
+
  .toolbar {
    display: flex;
  }
+
  .data-table {
    flex: 1;
    padding: 5px 0px;
  }
+
  .pagination {
    height: 32px;
    text-align: right;
  }
 }

-.is-fullscreen{
-  .el-dialog__headerbtn{
-    top:10px;
+.is-fullscreen {
+  .el-dialog__headerbtn {
+    top: 10px;
    font-size: 30px;
  }
-  .el-dialog__body{
+
+  .el-dialog__body {
    height: calc(100% - 70px);
    padding: 0 20px;
-    .base-modal-body{
+
+    .base-modal-body {
      padding: 10px 20px;
      height: 100%;
      overflow-y: auto;
    }
  }
-  .el-dialog__footer{
+
+  .el-dialog__footer {
    padding: 10px;
  }
-  .link-breadcrumb{
+
+  .link-breadcrumb {
    cursor: pointer;
    color: #428bca;
  }
 }

-.base-dialog-wrapper{
-  .el-dialog__header{
+.base-dialog-wrapper {
+  .el-dialog__header {
    padding: 15px;
  }
-  .base-dialog-body{
+
+  .base-dialog-body {
    border: 1px solid #e0e0e0;
-    padding:10px;
-    max-height:600px;
+    padding: 10px;
+    max-height: 600px;
    overflow-y: auto;
  }
-  .base-dialog-footer{
-    text-align:right;
-    margin-top:10px;
+
+  .base-dialog-footer {
+    text-align: right;
+    margin-top: 10px;
  }
-  .el-dialog__body{
-    padding:10px;
+
+  .el-dialog__body {
+    padding: 10px;
  }
-  .el-dialog__footer{
+
+  .el-dialog__footer {
    padding: 10px;
  }
 }
-.el-descriptions{
-  box-sizing:border-box;
-  font-size:14px;
-  color:#303133
+
+.el-descriptions {
+  box-sizing: border-box;
+  font-size: 14px;
+  color: #303133
 }
-.el-descriptions__header{
-  display:flex;
-  justify-content:space-between;
-  align-items:center;
-  margin-bottom:20px
+
+.el-descriptions__header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  margin-bottom: 20px
 }
-.el-descriptions__title{
-  font-size:16px;
-  font-weight:700
+
+.el-descriptions__title {
+  font-size: 16px;
+  font-weight: 700
 }
-.el-descriptions__body{
-  color:#606266;
-  background-color:#fff
+
+.el-descriptions__body {
+  color: #606266;
+  background-color: #fff
 }
-.el-descriptions__body .el-descriptions__table{
-  border-collapse:collapse;
-  width:100%;
-  table-layout:fixed
+
+.el-descriptions__body .el-descriptions__table {
+  border-collapse: collapse;
+  width: 100%;
+  table-layout: fixed
 }
-.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell{
-  box-sizing:border-box;
-  text-align:left;
-  font-weight:400;
-  line-height:1.5
+
+.el-descriptions__body .el-descriptions__table .el-descriptions-item__cell {
+  box-sizing: border-box;
+  text-align: left;
+  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;
-  padding:12px 10px
+
+.el-descriptions .is-bordered .el-descriptions-item__cell {
+  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;
-  align-items:baseline
+
+.el-descriptions-item__container .el-descriptions-item__content,
+.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:":";
-  position:relative;
-  top:-.5px
+
+.el-descriptions-item__label.has-colon:after {
+  content: ":";
+  position: relative;
+  top: -.5px
 }
-.el-descriptions-item__label.is-bordered-label{
-  font-weight:700;
-  color:#909399;
-  background:#fafafa
+
+.el-descriptions-item__label.is-bordered-label {
+  font-weight: 700;
+  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;
-  overflow-wrap:break-word
+
+.el-descriptions-item__content {
+  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;
 }
--- a/src/views/feedBack/index.vue
+++ b/src/views/feedBack/index.vue
@ -35,6 +35,7 @@
            v-model="searchData.UserTypeEnum"
            clearable
            style="width: 150px"
+            popper-class="feedBack-select-box"
          >
            <el-option
              v-for="item of UserTypeOptins"
@ -58,6 +59,7 @@
            v-model="searchData.QuestionType"
            clearable
            style="width: 150px"
+            popper-class="feedBack-select-box"
          >
            <el-option
              v-for="item of QuestionTypeOptions"
@ -77,7 +79,12 @@
        </el-form-item>
        <!--状态-->
        <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
              v-for="item of $d.FeedBackStatus"
              :key="item.value"
@ -97,6 +104,7 @@
            value-format="yyyy-MM-dd HH:mm:ss"
            @change="handleDatetimeChange"
            style="width: 250px"
+            popper-class="feedBack-select-box"
          />
        </el-form-item>
        <el-form-item>
--- a/src/views/trials/trials-layout/components/feedBack.vue
+++ b/src/views/trials/trials-layout/components/feedBack.vue
@ -72,7 +72,7 @@ export default {
  position: fixed;
  bottom: 50px;
  right: -25px;
-  z-index: 2000;
+  z-index: 3000;
  width: 50px;
  height: 50px;
  background: rgba(64, 158, 255, 0.533);
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@ -414,7 +414,6 @@
    </el-dialog>

    <!-- 上传Dicom/非Dicom文件 -->
-    <div class="upload-dialog-box" v-if="uploadVisible">
      <el-dialog
        v-if="uploadVisible"
        :visible.sync="uploadVisible"
@ -519,7 +518,6 @@
          </el-tabs>
        </div>
      </el-dialog>
-    </div>


    <!-- 检查列表 -->
@ -1704,11 +1702,6 @@ export default {
 }
 </script>
 <style lang="scss">
-.upload-dialog-box{
-  .el-dialog__wrapper{
-    z-index: 1999 !important;
-  }
-}
 .visit-list{
  position: relative;
  .status-primary-circle{