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

董国庆

6 天以前 3c38a9fbad595a4c35d5928f77ccfc9cfa5e3f58

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

 culture/src/utils/baseurl.js

@@ -2,7 +2,7 @@
    // 开发环境
    development: {
        baseURL: "http://221.182.45.100:8081",
        imgUrl: "http://192.168.110.64:8081/open/file/upload",
        imgUrl: "http://221.182.45.100:8081/open/file/upload",
        showImgUrl:'http://221.182.45.100:9998/'
    },
    // 生产环境

 culture/src/views/strain-library/breeding-record/index.vue

@@ -49,6 +49,10 @@
            <span>{{ scope.row.preserveSource === 1 ? '来源菌株' : '来源物资' }}</span>
          </template>
        </el-table-column>
        <el-table-column prop="strainName" label="菌株名称">
        </el-table-column>
        <el-table-column prop="sourceMaterialTimeBatchNumber" label="来源物资、时间及批号">
        </el-table-column>
        <el-table-column prop="cultureMedium" label="培养基"></el-table-column>
        <el-table-column prop="temperature" label="培养温度"></el-table-column>
        <el-table-column prop="aerobicType" label="需氧类型">
@@ -64,7 +68,7 @@
          <template slot-scope="scope">
            <el-button  style="margin-right: 10px" type="text" @click="handleDetail(scope.row)">详情</el-button>
            <el-button  style="margin-right: 10px" type="text" @click="handleEdit(scope.row)"
              v-if="([1].includes(roleType) || ([1, 4].includes(roleType) && currentType != 'list'))">编辑</el-button>
              v-if="([1,4].includes(roleType) || ([1, 4].includes(roleType) && currentType != 'list'))">编辑</el-button>
            <el-button type="text" @click="handleDelete(scope.row)"
              v-if="[1].includes(roleType) || ([1, 4].includes(roleType) && currentType != 'list')">删除</el-button>
          </template>

 culture/src/views/strain-library/main-cell-library/add.vue

@@ -14,8 +14,8 @@
            </div>

            <div class="form-row">
                <el-form-item label="鉴定方法" prop="appraisalMethod">
                    <el-input v-model="form.appraisalMethod" placeholder="请输入"></el-input>
                <el-form-item label="鉴定方法" prop="appraisalMethod" class="full-width">
                    <el-input type="textarea" :rows="4" v-model="form.appraisalMethod" placeholder="请输入"></el-input>
                </el-form-item>
            </div>


 culture/src/views/strain-library/production-cell-library/add.vue

@@ -14,8 +14,8 @@
            </div>

            <div class="form-row">
                <el-form-item label="鉴定方法" prop="appraisalMethod">
                    <el-input v-model="form.appraisalMethod" placeholder="请输入"></el-input>
                <el-form-item label="鉴定方法" prop="appraisalMethod" class="full-width">
                    <el-input type="textarea" :rows="4" v-model="form.appraisalMethod" placeholder="请输入"></el-input>
                </el-form-item>
            </div>


 culture/src/views/strain-library/strain-library-manage/add.vue

@@ -14,8 +14,8 @@
            </div>

            <div class="form-row">
                <el-form-item label="鉴定方法" prop="appraisalMethod">
                    <el-input v-model="form.appraisalMethod" placeholder="请输入"></el-input>
                <el-form-item label="鉴定方法" prop="appraisalMethod" class="full-width">
                    <el-input type="textarea" :rows="4"  v-model="form.appraisalMethod" placeholder="请输入"></el-input>
                </el-form-item>
            </div>


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

@@ -64,7 +64,7 @@
                        <div slot="tip" class="el-upload__tip">支持任意格式文件上传</div>
                    </el-upload>
                </el-form-item>
                <div class="header-title" style="width: 100%;">
                <!-- <div class="header-title" style="width: 100%;">
                    <div class="header-title-left">
                        <img src="@/assets/public/headercard.png" />
                        <div>菌种实验员操作评定</div>
@@ -73,7 +73,6 @@

                <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>
                    <div class="header-title-right">
@@ -108,9 +107,9 @@
                            </div>
                        </div>
                    </div>
                </div>
                </div> -->

                <div class="table" style="margin-top: 38px">
                <!-- <div class="table" style="margin-top: 38px">
                    <el-table :data="assessmentTable" border style="width: 100%" :show-summary="true"
                        :span-method="tableSpanMethod" :summary-method="getTableSummary">
                        <el-table-column prop="category" label="菌种实验员专业能力考核项" width="180"></el-table-column>
@@ -142,7 +141,7 @@
                            </template>
                        </el-table-column>
                    </el-table>
                </div>
                </div> -->

                <div class="end-btn" style="margin-top: 38px">
                    <el-button type="primary" @click="addData" :loading="submitLoading">发送</el-button>
@@ -359,21 +358,21 @@
                        this.submitLoading = false;
                        return;
                    }
                    if (!this.selectedMember || !this.selectedMember[0]) {
                        this.$message.warning('请选择菌种实验员');
                        this.submitLoading = false;
                        return;
                    }
                    // if (!this.selectedMember || !this.selectedMember[0]) {
                    //     this.$message.warning('请选择菌种实验员');
                    //     this.submitLoading = false;
                    //     return;
                    // }
                    const params = {
                        isDraft: 0,
                        projectId: this.projectData[0].id,
                        experimentId: this.selectedMember[0].userId,
                        // experimentId: this.selectedMember[0].userId,
                        enclosureUrl: this.fileList.length && JSON.stringify(this.fileList),
                        // reportCode: this.form.reportCode,
                        reportContent: this.$refs.materialEditor.getContent(),
                        reportName: this.form.reportName,
                        evaluateTotal: this.totalScore,
                        evaluate: str.join(','),
                        // evaluate: str.join(','),
                        reportType: 4
                    };
                    if (this.$route.query.id) {

 culture/src/views/strainReportLibrary/reportLibraryOneFour/components/approval/index.vue

@@ -64,7 +64,7 @@
                                </el-upload>
                            </el-form-item>

                            <div class="header-title" style="width: 100%;">
                            <!-- <div class="header-title" style="width: 100%;">
                                <div class="header-title-left">
                                    <img src="@/assets/public/headercard.png" />
                                    <div>菌种实验员操作评定</div>
@@ -103,7 +103,7 @@
                                        </template>
                                    </el-table-column>
                                </el-table>
                            </div>
                            </div> -->



@@ -272,7 +272,7 @@
                    processData: []
                };

                let arr = data.evaluate.split(',')
                let arr = (data.evaluate||'').split(',')
                this.fileList = (data.enclosureUrl ? JSON.parse(data.enclosureUrl) : [])
                this.assessmentTable = this.assessmentTable.map((item, index) => {
                    item.selectedScore = Number(arr[index])
@@ -412,7 +412,7 @@
    .approval-flow {
        padding: 40px 20px;
        // width: 405px;
        flex: 2;
        flex: 1;
        background: #ffffff;
        box-shadow: 0px 4px 12px 4px rgba(0, 0, 0, 0.08);
        border-radius: 10px;

 culture/src/views/strainReportLibrary/reportLibraryOneFour/index.vue

@@ -57,8 +57,8 @@
                <el-table-column prop="teamName" label="所属项目组" />
                <el-table-column prop="reportCode" label="报告编号" />
                <el-table-column prop="reportName" label="报告名称" />
                <el-table-column prop="experimentName" label="菌种实验员">
                </el-table-column>
                <!-- <el-table-column prop="experimentName" label="菌种实验员"> -->
                <!-- </el-table-column> -->
                <el-table-column prop="createBy" label="创建人" />
                <el-table-column prop="createTime" label="创建时间" />
                <el-table-column prop="status" label="状态" v-if="!isDraft">

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

@@ -64,7 +64,7 @@
                        <div slot="tip" class="el-upload__tip">支持任意格式文件上传</div>
                    </el-upload>
                </el-form-item>
                <div class="header-title" style="width: 100%;">
                <!-- <div class="header-title" style="width: 100%;">
                    <div class="header-title-left">
                        <img src="@/assets/public/headercard.png" />
                        <div>菌种实验员操作评定</div>
@@ -73,7 +73,6 @@

                <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>
                    <div class="header-title-right">
@@ -108,9 +107,9 @@
                            </div>
                        </div>
                    </div>
                </div>
                </div> -->

                <div class="table" style="margin-top: 38px">
                <!-- <div class="table" style="margin-top: 38px">
                    <el-table :data="assessmentTable" border style="width: 100%" :show-summary="true"
                        :span-method="tableSpanMethod" :summary-method="getTableSummary">
                        <el-table-column prop="category" label="菌种实验员专业能力考核项" width="180"></el-table-column>
@@ -142,7 +141,7 @@
                            </template>
                        </el-table-column>
                    </el-table>
                </div>
                </div> -->

                <div class="end-btn" style="margin-top: 38px">
                    <el-button type="primary" @click="addData" :loading="loading" :disabled="loading">发送</el-button>
@@ -359,21 +358,21 @@
                    this.loading = false;
                    return;
                }
                if (!this.selectedMember || !this.selectedMember[0]) {
                    this.$message.warning('请选择菌种实验员');
                    this.loading = false;
                    return;
                }
                // if (!this.selectedMember || !this.selectedMember[0]) {
                //     this.$message.warning('请选择菌种实验员');
                //     this.loading = false;
                //     return;
                // }
                const params = {
                    isDraft: 0,
                    projectId: this.projectData[0].id,
                    experimentId: this.selectedMember[0].userId,
                    // experimentId: this.selectedMember[0].userId,
                    enclosureUrl: this.fileList.length && JSON.stringify(this.fileList),
                    // reportCode: this.form.reportCode,
                    reportContent: this.$refs.materialEditor.getContent(),
                    reportName: this.form.reportName,
                    evaluateTotal: this.totalScore,
                    evaluate: str.join(','),
                    // evaluate: str.join(','),
                    reportType: 2
                };

@@ -425,7 +424,7 @@
                    const params = {
                        isDraft: 1,
                        projectId: this.projectData[0].id,
                        experimentId: this.selectedMember[0].userId,
                        // experimentId: this.selectedMember[0].userId,
                        enclosureUrl: this.fileList.length && JSON.stringify(this.fileList),
                        // reportCode: this.form.reportCode,
                        reportContent: this.$refs.materialEditor.getContent(),

 culture/src/views/strainReportLibrary/reportLibraryOneTWO/components/approval/index.vue

@@ -71,14 +71,14 @@
                                </el-upload>
                            </el-form-item>

                            <div class="header-title" style="width: 100%;">
                            <!-- <div class="header-title" style="width: 100%;">
                                <div class="header-title-left">
                                    <img src="@/assets/public/headercard.png" />
                                    <div>菌种实验员操作评定</div>
                                </div>
                            </div>
                            </div> -->

                            <div class="table" style="margin-top: 38px">
                            <!-- <div class="table" style="margin-top: 38px">
                                <el-table :data="assessmentTable" border style="width: 100%" :show-summary="true"
                                    :span-method="tableSpanMethod" :summary-method="getTableSummary">
                                    <el-table-column prop="category" label="菌种实验员专业能力考核项" width="180"></el-table-column>
@@ -110,7 +110,7 @@
                                        </template>
                                    </el-table-column>
                                </el-table>
                            </div>
                            </div> -->



@@ -278,7 +278,7 @@
                    processData: []
                };

                let arr = data.evaluate.split(',')
                let arr = (data.evaluate||'').split(',')
                this.fileList = data.enclosureUrl ? JSON.parse(data.enclosureUrl) : []
                this.assessmentTable = this.assessmentTable.map((item, index) => {
                    item.selectedScore = Number(arr[index])
@@ -418,7 +418,7 @@
    .approval-flow {
        padding: 40px 20px;
        // width: 405px;
        flex: 2;
        flex: 1;
        background: #ffffff;
        box-shadow: 0px 4px 12px 4px rgba(0, 0, 0, 0.08);
        border-radius: 10px;

 culture/src/views/strainReportLibrary/reportLibraryOneTWO/index.vue

@@ -57,8 +57,8 @@
                <el-table-column prop="teamName" label="所属项目组" />
                <el-table-column prop="reportCode" label="报告编号" />
                <el-table-column prop="reportName" label="报告名称" />
                <el-table-column prop="experimentName" label="菌种实验员">
                </el-table-column>
                <!-- <el-table-column prop="experimentName" label="菌种实验员"> -->
                <!-- </el-table-column> -->
                <el-table-column prop="createBy" label="创建人" />
                <el-table-column prop="createTime" label="创建时间" />
                <el-table-column prop="status" label="状态" v-if="!isDraft">

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

@@ -64,17 +64,16 @@
                        <div slot="tip" class="el-upload__tip">支持任意格式文件上传</div>
                    </el-upload>
                </el-form-item>
                <div class="header-title" style="width: 100%;">
                <!-- <div class="header-title" style="width: 100%;">
                    <div class="header-title-left">
                        <img src="@/assets/public/headercard.png" />
                        <div>菌种实验员操作评定</div>
                    </div>
                </div>
                </div> -->

                <div class="header-title" style="width: 100%;display: flex; align-items: center;">
                <!-- <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>菌种实验员</div>
                    </div>
                    <div class="header-title-right">
                        <el-button @click="getMember" class="el-icon-circle-plus-outline" type="primary">
@@ -108,9 +107,9 @@
                            </div>
                        </div>
                    </div>
                </div>
                </div> -->

                <div class="table" style="margin-top: 38px">
                <!-- <div class="table" style="margin-top: 38px">
                    <el-table :data="assessmentTable" border style="width: 100%" :show-summary="true"
                        :span-method="tableSpanMethod" :summary-method="getTableSummary">
                        <el-table-column prop="category" label="菌种实验员专业能力考核项" width="180"></el-table-column>
@@ -142,7 +141,7 @@
                            </template>
                        </el-table-column>
                    </el-table>
                </div>
                </div> -->

                <div class="end-btn" style="margin-top: 38px">
                    <el-button type="primary" @click="addData" :loading="sendLoading">发送</el-button>
@@ -358,21 +357,21 @@
                    this.sendLoading = false;
                    return;
                }
                if (!this.selectedMember || !this.selectedMember[0]) {
                    this.$message.warning('请选择菌种实验员');
                    this.sendLoading = false;
                    return;
                }
                    // if (!this.selectedMember || !this.selectedMember[0]) {
                    //     this.$message.warning('请选择菌种实验员');
                    //     this.sendLoading = false;
                    //     return;
                    // }
                const params = {
                    isDraft: 0,
                    projectId: this.projectData[0].id,
                    experimentId: this.selectedMember[0].userId,
                    // experimentId: this.selectedMember[0].userId,
                    enclosureUrl: this.fileList.length && JSON.stringify(this.fileList),
                    // reportCode: this.form.reportCode,
                    reportContent: this.$refs.materialEditor.getContent(),
                    reportName: this.form.reportName,
                    evaluateTotal: this.totalScore,
                    evaluate: str.join(','),
                    // evaluate: str.join(','),
                    reportType: 3
                };
                console.log('params', params);

 culture/src/views/strainReportLibrary/reportLibraryOneThree/components/approval/index.vue

@@ -70,7 +70,7 @@
                                </el-upload>
                            </el-form-item>

                            <div class="header-title" style="width: 100%;">
                            <!-- <div class="header-title" style="width: 100%;">
                                <div class="header-title-left">
                                    <img src="@/assets/public/headercard.png" />
                                    <div>菌种实验员操作评定</div>
@@ -109,7 +109,7 @@
                                        </template>
                                    </el-table-column>
                                </el-table>
                            </div>
                            </div> -->



@@ -270,7 +270,7 @@
                    processData: []
                };

                let arr = data.evaluate.split(',')
                let arr = (data.evaluate||'').split(',')
                this.fileList = (data.enclosureUrl ? JSON.parse(data.enclosureUrl) : [])
                this.assessmentTable = this.assessmentTable.map((item, index) => {
                    item.selectedScore = Number(arr[index])
@@ -410,7 +410,7 @@
    .approval-flow {
        padding: 40px 20px;
        // width: 405px;
        flex: 2;
        flex: 1;
        background: #ffffff;
        box-shadow: 0px 4px 12px 4px rgba(0, 0, 0, 0.08);
        border-radius: 10px;

 culture/src/views/strainReportLibrary/reportLibraryOneThree/index.vue

@@ -57,8 +57,8 @@
                <el-table-column prop="teamName" label="所属项目组" />
                <el-table-column prop="reportCode" label="报告编号" />
                <el-table-column prop="reportName" label="报告名称" />
                <el-table-column prop="experimentName" label="菌种实验员">
                </el-table-column>
                <!-- <el-table-column prop="experimentName" label="菌种实验员"> -->
                <!-- </el-table-column> -->
                <el-table-column prop="createBy" label="创建人" />
                <el-table-column prop="createTime" label="创建时间" />
                <el-table-column prop="status" label="状态" v-if="!isDraft">

 laboratory/.gitignore

@@ -2,6 +2,7 @@
node_modules
/dist
package-lock.json
/laboratory

# local env files
.env.local

 laboratory/src/utils/baseurl.js

@@ -1,15 +1,17 @@
const apiConfig = {
    // 开发环境
    development: {
        baseURL: "/",
        imgUrl: "/open/file/upload",
        showImgUrl: 'http://221.182.45.100:11222/',
    },
    // 生产环境
    production: {
        baseURL: "",
        imgUrl: "",
    },
  // 开发环境
  development: {
    baseURL: "/laboratory",
    imgUrl: "http://127.0.0.1:11222/laboratory/open/file/upload",
    // showImgUrl: "http://221.182.45.100:11222/",
    showImgUrl: "http://127.0.0.1:11222/",
  },
  // 生产环境
  production: {
    baseURL: "/laboratory",
    imgUrl: "http://127.0.0.1:11222/laboratory/open/file/upload",
    showImgUrl: "http://127.0.0.1:11222/",
  },
};

export default apiConfig[process.env.VUE_APP_ENV];
export default apiConfig[process.env.VUE_APP_ENV];