From 73aff9408729cf29b397f1651c8a37eff3a070be Mon Sep 17 00:00:00 2001
From: 董国庆 <364620639@qq.com>
Date: 星期四, 22 一月 2026 10:45:26 +0800
Subject: [PATCH] 文档9-11-12
---
culture/src/views/strain-library/validation/primitive-cell/index.vue | 8 +++++++-
culture/src/views/strain-library/validation/primitive-cell/DetailConditionDialog.vue | 1 -
culture/vue.config.js | 10 ++++++++++
culture/src/views/strain-library/validation/primitive-cell/confirm-detail.vue | 2 +-
culture/src/views/strain-library/validation/chief-cell/index.vue | 27 +++++++++++++++++++--------
culture/src/views/strain-library/breeding-record/add.vue | 4 ++--
culture/src/views/strain-library/validation/chief-cell/DetailConditionDialog.vue | 2 +-
culture/src/views/strain-library/validation/chief-cell/confirm-detail.vue | 2 +-
culture/src/utils/utils.js | 1 +
9 files changed, 42 insertions(+), 15 deletions(-)
diff --git a/culture/src/utils/utils.js b/culture/src/utils/utils.js
index 3e08a18..33b166c 100644
--- a/culture/src/utils/utils.js
+++ b/culture/src/utils/utils.js
@@ -90,5 +90,6 @@
export function getAllocateIp() {
const userInfo = JSON.parse(sessionStorage.getItem("userInfo") || "{}");
+ return apiConfig.showImgUrl
return userInfo.allocateIp ? 'http://'+userInfo.allocateIp +':11223/images/' : apiConfig.showImgUrl;
}
diff --git a/culture/src/views/strain-library/breeding-record/add.vue b/culture/src/views/strain-library/breeding-record/add.vue
index 551dd0a..4563bcb 100644
--- a/culture/src/views/strain-library/breeding-record/add.vue
+++ b/culture/src/views/strain-library/breeding-record/add.vue
@@ -111,8 +111,8 @@
<Table ref="separationTable" :data="separationTableData" :height="null"
:total="form.separationOfCultureDishesList.length" :queryForm="separationPagination" :type="2"
@handleCurrentChange="handleSeparationPageChange" @handleSizeChange="handleSeparationSizeChange">
- <el-table-column width="100" type="index" label="培养皿序号" />
- <el-table-column prop="separateBacterialColoniesCode" label="分离菌落编号" />
+ <el-table-column width="100" type="index" label="序号" />
+ <el-table-column prop="separateBacterialColoniesCode" label="培养皿-分离菌落编号" />
<el-table-column prop="handleSignature" label="接种操作人签字">
<template slot-scope="scope">
<el-image :preview-src-list="[getFullUrl(scope.row.handleSignature)]" style="width: 120px;height: 48px;"
diff --git a/culture/src/views/strain-library/validation/chief-cell/DetailConditionDialog.vue b/culture/src/views/strain-library/validation/chief-cell/DetailConditionDialog.vue
index e91f961..bd83966 100644
--- a/culture/src/views/strain-library/validation/chief-cell/DetailConditionDialog.vue
+++ b/culture/src/views/strain-library/validation/chief-cell/DetailConditionDialog.vue
@@ -220,13 +220,13 @@
.info-item {
display: flex;
font-size: 15px;
- height: 45px;
line-height: 45px;
}
.label {
color: #666;
font-weight: 500;
+ flex-shrink: 0;
}
.sign-col {
diff --git a/culture/src/views/strain-library/validation/chief-cell/confirm-detail.vue b/culture/src/views/strain-library/validation/chief-cell/confirm-detail.vue
index 2df6702..86b0e67 100644
--- a/culture/src/views/strain-library/validation/chief-cell/confirm-detail.vue
+++ b/culture/src/views/strain-library/validation/chief-cell/confirm-detail.vue
@@ -232,13 +232,13 @@
.info-item {
display: flex;
font-size: 15px;
- height: 45px;
line-height: 45px;
}
.label {
color: #666;
font-weight: 500;
+ flex-shrink: 0;
}
.sign-col {
diff --git a/culture/src/views/strain-library/validation/chief-cell/index.vue b/culture/src/views/strain-library/validation/chief-cell/index.vue
index c160070..9a52071 100644
--- a/culture/src/views/strain-library/validation/chief-cell/index.vue
+++ b/culture/src/views/strain-library/validation/chief-cell/index.vue
@@ -28,7 +28,7 @@
<div class="title" :class="{ active: currentType === 'list' }" @click="handleTypeChange('list')">
母代菌种库验证资料列表
</div>
- <div class="drafts" v-if="roleType == 4|| roleType==3" :class="{ active: currentType === 'draft' }"
+ <div class="drafts" v-if="roleType == 4 || roleType == 3" :class="{ active: currentType === 'draft' }"
@click="handleTypeChange('draft')">
草稿箱
</div>
@@ -41,7 +41,13 @@
</template>
<template #table>
- <el-table-column prop="strainSource" label="菌种来源" />
+ <el-table-column prop="strainSource" label="菌种来源">
+ <template #default="{ row }">
+ <el-tooltip :content="row.strainSource" placement="top" effect="dark" >
+ <div class="ellipsis-text">{{ row.strainSource }}</div>
+ </el-tooltip>
+ </template>
+ </el-table-column>
<el-table-column prop="identifyingStrainCode" label="鉴别菌株编号" />
<el-table-column prop="identifyingStrainName" label="鉴别菌株名称">
<template #default="{ row }">
@@ -61,13 +67,18 @@
</el-table-column>
<el-table-column label="操作" width="200">
<template #default="{ row }">
- <el-button type="text" v-if="row.status == 1 && roleType == 3&¤tType != 'draft'"
- style="margin-right: 10px;"
+ <el-button type="text" v-if="row.status == 1 && roleType == 3 && currentType != 'draft'"
+ style="margin-right: 10px;"
@click="$router.push('/strain/validation/confirm-detail?id=' + row.id)">确认</el-button>
- <el-button type="text" style="margin-right: 10px;" v-if="roleType == 4" @click="handleDetail(row)">详情</el-button>
- <el-button type="text" style="margin-right: 10px;" v-if="roleType != 4" @click="handleDetail2(row)">详情</el-button>
- <el-button type="text" style="margin-right: 10px;" v-if="(roleType == 4 && currentType == 'draft') || (roleType == 1)" @click="handleEdit(row)">编辑</el-button>
- <el-button type="text" v-if="(roleType == 4 && currentType == 'draft') || (roleType == 1)" @click="handleDelete(row)">删除</el-button>
+ <el-button type="text" style="margin-right: 10px;" v-if="roleType == 4"
+ @click="handleDetail(row)">详情</el-button>
+ <el-button type="text" style="margin-right: 10px;" v-if="roleType != 4"
+ @click="handleDetail2(row)">详情</el-button>
+ <el-button type="text" style="margin-right: 10px;"
+ v-if="(roleType == 4 && currentType == 'draft') || (roleType == 1)"
+ @click="handleEdit(row)">编辑</el-button>
+ <el-button type="text" v-if="(roleType == 4 && currentType == 'draft') || (roleType == 1)"
+ @click="handleDelete(row)">删除</el-button>
</template>
</el-table-column>
</template>
diff --git a/culture/src/views/strain-library/validation/primitive-cell/DetailConditionDialog.vue b/culture/src/views/strain-library/validation/primitive-cell/DetailConditionDialog.vue
index 62c5ff3..cd0aaae 100644
--- a/culture/src/views/strain-library/validation/primitive-cell/DetailConditionDialog.vue
+++ b/culture/src/views/strain-library/validation/primitive-cell/DetailConditionDialog.vue
@@ -220,7 +220,6 @@
.info-item {
display: flex;
font-size: 15px;
- height: 45px;
line-height: 45px;
}
diff --git a/culture/src/views/strain-library/validation/primitive-cell/confirm-detail.vue b/culture/src/views/strain-library/validation/primitive-cell/confirm-detail.vue
index 8f2a2ba..22aa97f 100644
--- a/culture/src/views/strain-library/validation/primitive-cell/confirm-detail.vue
+++ b/culture/src/views/strain-library/validation/primitive-cell/confirm-detail.vue
@@ -239,13 +239,13 @@
.info-item {
display: flex;
font-size: 15px;
- height: 45px;
line-height: 45px;
}
.label {
color: #666;
font-weight: 500;
+ flex-shrink: 0;
}
.sign-col {
diff --git a/culture/src/views/strain-library/validation/primitive-cell/index.vue b/culture/src/views/strain-library/validation/primitive-cell/index.vue
index c210af4..cfb8e67 100644
--- a/culture/src/views/strain-library/validation/primitive-cell/index.vue
+++ b/culture/src/views/strain-library/validation/primitive-cell/index.vue
@@ -41,7 +41,13 @@
</template>
<template #table>
- <el-table-column prop="strainSource" label="菌种来源" />
+ <el-table-column prop="strainSource" label="菌种来源">
+ <template #default="{ row }">
+ <el-tooltip :content="row.strainSource" placement="top" effect="dark">
+ <div class="ellipsis-text">{{ row.strainSource }}</div>
+ </el-tooltip>
+ </template>
+ </el-table-column>
<el-table-column prop="identifyingStrainCode" label="鉴别菌株编号" />
<el-table-column prop="identifyingStrainName" label="鉴别菌株名称" >
<template #default="{ row }">
diff --git a/culture/vue.config.js b/culture/vue.config.js
index 8df9880..0ba7571 100644
--- a/culture/vue.config.js
+++ b/culture/vue.config.js
@@ -29,6 +29,16 @@
"^/": "/",
},
},
+ "/open": {
+ // 设置以什么前缀开头的请求用来代理
+ // target: "http://221.182.45.100:8081", //要访问的跨域的域名
+ target: "http://192.168.110.64:8082",
+ secure: false, // 使用的是http协议则设置为false，https协议则设置为true
+ changeOrigin: true, //开启代理
+ pathRewrite: {
+ "^/open": "/",
+ },
+ },
},
},
configureWebpack: {
--
Gitblit v1.7.1