Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-labor...

pyt

2025-05-08 70b02c4ea1064f19d528b2806c01c88d24557e09

Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory

 culture/src/views/strainReportLibrary/reportLibraryOne/add.vue

@@ -69,16 +69,32 @@
                </div>

                <div class="header-title" style="width: 100%;display: flex; align-items: center;">
                <div class="header-title-left mt-unset" >
                    <!-- <img src="@/assets/public/headercard.png" /> -->
                    <div>菌种实验员</div>
                    <div class="header-title-left mt-unset">
                        <!-- <img src="@/assets/public/headercard.png" /> -->
                        <div>菌种实验员</div>
                    </div>
                    <div class="header-title-right">
                        <el-button @click="showChoose = true" class="el-icon-circle-plus-outline" type="primary">
                            选择菌种实验员</el-button>
                    </div>
                </div>
                <div class="header-title-right">
                    <el-button @click="showChoose = true" class="el-icon-circle-plus-outline" type="primary">
                        选择菌种实验员</el-button>
                <div class="member-list">
                    <div class="member-list-card">
                        <div class="member-item">
                            <div class="member-title">
                                菌种实验员
                            </div>
                            <div class="member-name-box">
                                <div class="member-name">
                                    张三
                                </div>
                            </div>
                            <div class="member-change">
                                <div class="member-change-btn">修改</div>
                            </div>
                        </div>
                    </div>
                </div>

            </div>

                <div class="end-btn" style="margin-top: 38px">
                    <el-button type="primary">发送</el-button>
@@ -123,9 +139,10 @@
</script>

<style lang="less" scoped>
.mt-unset{
.mt-unset {
    margin-top: unset !important;
}

.header-title {
    display: flex;
    align-items: center;
@@ -180,15 +197,102 @@
    }
}

.end-btn{
.end-btn {
    display: flex;
    align-items: center;
    gap: 10px;

    button{
    button {
        width: 180px;
        height: 36px;
        // background: #409EFF; 
    }
}

.member-list {
    margin-top: 18px;
    display: flex;
    flex-wrap: wrap;
    gap: 28px;

    .member-list-card {
        width: 340px;
        height: 400px;
        border-radius: 8px;
        border: 1px solid #dcdfe6;
        background: linear-gradient(to bottom,
                rgba(5, 160, 193, 0.2) 0%,
                rgba(5, 242, 194, 0) 70%);

        .member-item {
            height: 100%;
            display: flex;
            flex-direction: column;

            .member-title {
                margin-top: 20px;
                width: 100%;
                font-family: "Source Han Sans CN Bold Bold";
                font-weight: bold;
                font-size: 16px;
                color: rgba(0, 0, 0, 0.8);
                line-height: 16px;
                text-align: center;
            }

            .flex1 {
                flex: 1;
            }

            .member-name-box {
                flex: 1;
                display: flex;
                align-items: center;
                justify-content: center;
            }

            .member-name-box-2 {
                flex: 1;
                padding: 0 20px;
                padding-top: 40px;
                display: grid;
                grid-template-columns: repeat(4, 1fr);
                gap: 20px;
                justify-items: center;
                align-items: start;
            }

            .member-name {
                width: 60px;
                height: 60px;
                background: #7d8b79;
                border-radius: 50%;
                text-align: center;
                line-height: 60px;
                font-weight: 500;
                font-size: 16px;
                color: #ffffff;
                margin: 0;
            }

            .member-change {
                display: flex;
                justify-content: center;
                padding: 10px 0;
                margin-top: auto;
                cursor: pointer;

                .member-change-btn {
                    background: #fff1f0;
                    border-radius: 4px;
                    border: 1px solid #ffccc7;
                    padding: 1px 8px;
                    font-weight: 400;
                    font-size: 12px;
                    color: #ff4d4f;
                }
            }
        }
    }
}
</style>

 laboratory/src/utils/request.js

@@ -60,7 +60,7 @@
      if (!res.data) {
        return Promise.resolve({})
      }
      return Promise.resolve(res.data)
      return Promise.resolve(res.data.data)
    } else {
      if (res.data.code == 103 || res.data.code == 401) {
        Message({