Merge branch 'master' of http://192.168.11.205:9000/r/~shiwenshuai/DTKZZTX

surprise

2024-04-29 298a0cf614095e1bcbb96ca940a6389d4b67cb09

 src/views/Tools/Popup.vue

@@ -38,10 +38,7 @@
            >
              <slot></slot>
            </div>
            <div
              class="popupBtn"
              v-if="showBtn"
            >
            <div class="popupBtn" v-if="showBtn">
              <div v-if="btnArr && btnArr.length">
                <el-button
                  v-for="item in btnArr"
@@ -49,18 +46,14 @@
                  size="mini"
                  :type="item.type"
                  @click="item.fun"
                >{{ item.name }}</el-button>
                  >{{ item.name }}</el-button
                >
              </div>
              <div v-else>
                <el-button
                  size="mini"
                  @click="cancel"
                >取消</el-button>
                <el-button
                  type="primary"
                  size="mini"
                  @click="yes"
                >确定</el-button>
                <el-button size="mini" @click="cancel">取消</el-button>
                <el-button type="primary" size="mini" @click="yes"
                  >确定</el-button
                >
              </div>
            </div>
          </div>
@@ -174,7 +167,7 @@

  .popupContainer {
    position: absolute;
    background-color: rgba(0, 0, 0, 0.6);
    background-color: rgba(37, 85, 156, 0.7) !important;
    border: 1px solid rgba(32, 160, 255, 0.6);
    border-radius: 5px;
    pointer-events: all;
@@ -187,7 +180,7 @@
      cursor: move;
      line-height: 40px;
      position: relative;

      color: #fff;
      span {
        margin-left: 15px;
      }
@@ -195,7 +188,12 @@
      .el-button-group {
        position: absolute;
        right: 0px;

        /deep/ .el-icon-arrow-up {
          color: #fff !important;
        }
        /deep/ .el-icon-close {
          color: #fff !important;
        }
        .el-button {
          color: #fff;
          font-size: 22px;