From b7ec20b3ec22c858f2db3d9285c5e9d38bd8a48f Mon Sep 17 00:00:00 2001
From: 13404089107 <puwei@sinata.cn>
Date: 星期四, 08 五月 2025 16:17:19 +0800
Subject: [PATCH] Merge branch 'main' of http://120.76.84.145:10101/gitblit/r/H5/leshan-laboratory
---
laboratory/src/views/dataManagement/schemeManagement/addPlan.vue | 189 ++++++++++++++---------------------------------
1 files changed, 56 insertions(+), 133 deletions(-)
diff --git a/laboratory/src/views/dataManagement/schemeManagement/addPlan.vue b/laboratory/src/views/dataManagement/schemeManagement/addPlan.vue
index f8eec6d..a2605d2 100644
--- a/laboratory/src/views/dataManagement/schemeManagement/addPlan.vue
+++ b/laboratory/src/views/dataManagement/schemeManagement/addPlan.vue
@@ -1,55 +1,27 @@
<template>
<Card>
<template style="position: relative">
- <el-form
- ref="form"
- :model="form"
- :rules="rules"
- inline
- label-position="top"
- >
- <div class="header-title" style="margin-bottom: 38px;justify-content: space-between;">
- <div style="display: flex;align-items: center;gap: 13px;">
+ <el-form ref="form" :model="form" :rules="rules" inline label-position="top">
+ <div class="header-title" style="margin-bottom: 38px; justify-content: space-between">
+ <div style="display: flex; align-items: center; gap: 13px">
<div class="header-title-left">
<img src="@/assets/public/headercard.png" />
<div>所属实验调度</div>
</div>
- <el-button
- @click="showScheduling = true"
- class="el-icon-plus"
- type="primary"
- >
- 选择实验调度</el-button
- >
+ <el-button @click="showScheduling = true" class="el-icon-plus" type="primary">
+ 选择实验调度</el-button>
</div>
- <el-button
- @click="handleStopExperiment"
- type="danger"
- >
- 申请终止实验</el-button
- >
+ <el-button @click="handleStopExperiment" type="danger">
+ 申请终止实验</el-button>
</div>
- <Table
- :data="groupTableData"
- :total="0"
- :height="null"
- class="groupTable"
- >
- <el-table-column
- type="index"
- label="序号"
- width="80"
- ></el-table-column>
+ <Table :data="groupTableData" :total="0" :height="null" class="groupTable">
+ <el-table-column type="index" label="序号" width="80"></el-table-column>
<el-table-column prop="groupName" label="组别"></el-table-column>
<el-table-column prop="remark" label="备注"></el-table-column>
<el-table-column label="操作" width="200">
<template slot-scope="scope">
- <el-button type="text" @click="handleEditGroup(scope.row)"
- >编辑</el-button
- >
- <el-button type="text" @click="handleDeleteGroup(scope.row)"
- >移除</el-button
- >
+ <el-button type="text" @click="handleEditGroup(scope.row)">编辑</el-button>
+ <el-button type="text" @click="handleDeleteGroup(scope.row)">移除</el-button>
</template>
</el-table-column>
</Table>
@@ -66,17 +38,8 @@
<!-- <el-button type="primary" class="el-icon-plus" @click="handleAddGroup">添加组别</el-button> -->
</div>
- <Table
- :data="groupTableData"
- :total="0"
- :height="null"
- class="groupTable"
- >
- <el-table-column
- type="index"
- label="序号"
- width="80"
- ></el-table-column>
+ <Table :data="groupTableData" :total="0" :height="null" class="groupTable">
+ <el-table-column type="index" label="序号" width="80"></el-table-column>
<el-table-column prop="groupName" label="组别"></el-table-column>
<el-table-column prop="remark" label="备注"></el-table-column>
</Table>
@@ -90,9 +53,7 @@
<div class="add-group">
<div>*</div>
<span>参加人员</span>
- <el-button type="primary" class="el-icon-plus" @click="addMember"
- >选择参加人员</el-button
- >
+ <el-button type="primary" class="el-icon-plus" @click="addMember">选择参加人员</el-button>
</div>
<div class="member-list">
<div v-for="item in 3" :key="item" class="member-list-card">
@@ -100,21 +61,9 @@
<div class="member-title">
{{ ["工艺工程师", "实验员", "化验师"][item - 1] }}
</div>
- <div
- :class="item == 1 || item == 2 ? 'member-name-box' : 'flex1'"
- >
- <div
- :class="
- item == 1 || item == 2
- ? 'member-name-box'
- : 'member-name-box-2'
- "
- >
- <div
- v-for="i in memberList(item)"
- :key="i"
- class="member-name"
- >
+ <div :class="item == 1 || item == 2 ? 'member-name-box' : 'flex1'">
+ <div :class="item == 1 || item == 2 ? 'member-name-box': 'member-name-box-2'">
+ <div v-for="i in memberList(item)" :key="i" class="member-name">
张三
</div>
</div>
@@ -133,12 +82,7 @@
</div>
</div>
<div class="content-box">
- <AiEditor
- ref="purposeEditor"
- v-model="editorContents.purpose"
- height="200px"
- placeholder="请输入实验目的..."
- />
+ <AiEditor ref="purposeEditor" v-model="editorContents.purpose" height="200px" placeholder="请输入实验目的..." />
</div>
<div class="header-title" style="margin-bottom: 38px">
@@ -148,12 +92,7 @@
</div>
</div>
<div class="content-box">
- <AiEditor
- ref="processEditor"
- v-model="editorContents.process"
- height="200px"
- placeholder="请输入工艺参数及路线..."
- />
+ <AiEditor ref="processEditor" v-model="editorContents.process" height="200px" placeholder="请输入工艺参数及路线..." />
</div>
<div class="header-title" style="margin-bottom: 38px">
@@ -162,16 +101,8 @@
<div>三、实验材料及设备</div>
</div>
</div>
- <DynamicComponent
- ref="materialComponent"
- title="实验材料"
- @submit="handleMaterialSubmit"
- />
- <DynamicComponent
- ref="equipmentComponent"
- title="实验所用设备"
- @submit="handleEquipmentSubmit"
- />
+ <DynamicComponent ref="materialComponent" title="实验材料" @submit="handleMaterialSubmit" />
+ <DynamicComponent ref="equipmentComponent" title="实验所用设备" @submit="handleEquipmentSubmit" />
<div class="header-title" style="margin-bottom: 38px">
<div class="header-title-left">
@@ -179,8 +110,7 @@
<div>四、实验操作步骤记录</div>
</div>
<el-button @click="handleAddStep" class="el-icon-plus" type="primary">
- 添加步骤</el-button
- >
+ 添加步骤</el-button>
</div>
<div class="step-list" v-for="(item, idx) in stepList" :key="idx">
@@ -190,33 +120,20 @@
</div>
<div class="step-list-item-control">
<div class="controlBtn edit" @click="handleEditStep(idx)">
- <img
- src="@/assets/public/edit.png"
- alt="编辑"
- class="edit-icon"
- />
+ <img src="@/assets/public/edit.png" alt="编辑" class="edit-icon" />
编辑
</div>
<div class="controlBtn delete" @click="handleDeleteStep(idx)">
- <img
- src="@/assets/public/delete.png"
- alt="删除"
- class="delete-icon"
- />
+ <img src="@/assets/public/delete.png" alt="删除" class="delete-icon" />
删除
</div>
</div>
</div>
- <DynamicComponent
- :ref="'stepContent' + idx"
- @submit="(content) => handleStepContentSubmit(idx, content)"
- />
+ <DynamicComponent :ref="'stepContent' + idx" @submit="(content) => handleStepContentSubmit(idx, content)" />
</div>
<div class="add-project-footer">
- <el-button type="primary" class="save-btn" @click="handleSave"
- >发送</el-button
- >
+ <el-button type="primary" class="save-btn" @click="handleSave">发送</el-button>
<el-button @click="handleSaveDraft">存草稿</el-button>
</div>
</el-form>
@@ -318,7 +235,7 @@
this.$message.success("删除成功");
}
})
- .catch(() => {});
+ .catch(() => { });
},
handleGroupSubmit(form) {
const index = this.groupTableData.findIndex(
@@ -349,7 +266,7 @@
this.$message.success("删除成功");
}
})
- .catch(() => {});
+ .catch(() => { });
},
handleTaskSubmit(form) {
const index = this.taskTableData.findIndex(
@@ -421,7 +338,7 @@
this.stepList.splice(index, 1);
this.$message.success("删除成功");
})
- .catch(() => {});
+ .catch(() => { });
},
handleEditStep(index) {
this.editingStepIndex = index;
@@ -450,7 +367,7 @@
return true;
},
handleStopExperiment() {
- this.$router.push('/dataManagement/scheme-management/stop-experiment')
+ this.$router.push("/dataManagement/scheme-management/stop-experiment");
},
},
};
@@ -467,6 +384,7 @@
flex-wrap: wrap;
gap: 13px;
margin-top: 38px;
+
.header-title-left {
display: flex;
align-items: center;
@@ -529,6 +447,7 @@
.header-title:first-child {
margin-top: 0px;
+
.header-title-left {
margin-top: 0;
}
@@ -558,6 +477,7 @@
width: 65%;
padding-left: 40px;
}
+
.rwuTable {
width: 85%;
padding-left: 40px;
@@ -577,35 +497,27 @@
border: 1px solid #dcdfe6;
&:nth-child(1) {
- background: linear-gradient(
- to bottom,
- rgba(4, 156, 154, 0.2) 0%,
- rgba(5, 242, 194, 0) 70%
- );
+ background: linear-gradient(to bottom,
+ rgba(4, 156, 154, 0.2) 0%,
+ rgba(5, 242, 194, 0) 70%);
}
&:nth-child(2) {
- background: linear-gradient(
- to bottom,
- rgba(5, 160, 193, 0.2) 0%,
- rgba(5, 242, 194, 0) 70%
- );
+ background: linear-gradient(to bottom,
+ rgba(5, 160, 193, 0.2) 0%,
+ rgba(5, 242, 194, 0) 70%);
}
&:nth-child(3) {
- background: linear-gradient(
- to bottom,
- rgba(255, 77, 79, 0.2) 0%,
- rgba(255, 242, 194, 0) 70%
- );
+ background: linear-gradient(to bottom,
+ rgba(255, 77, 79, 0.2) 0%,
+ rgba(255, 242, 194, 0) 70%);
}
&:nth-child(4) {
- background: linear-gradient(
- to bottom,
- rgba(250, 199, 20, 0.21) 0%,
- rgba(255, 242, 194, 0) 70%
- );
+ background: linear-gradient(to bottom,
+ rgba(250, 199, 20, 0.21) 0%,
+ rgba(255, 242, 194, 0) 70%);
}
.member-item {
@@ -623,6 +535,7 @@
line-height: 16px;
text-align: center;
}
+
.flex1 {
flex: 1;
}
@@ -664,6 +577,7 @@
padding: 10px 0;
margin-top: auto;
cursor: pointer;
+
.member-change-btn {
background: #fff1f0;
border-radius: 4px;
@@ -695,14 +609,17 @@
padding: 20px;
margin-top: 37px;
}
+
.step-list {
background: #eff8fa;
padding: 20px;
+
.step-list-item {
display: flex;
justify-content: space-between;
padding: 25px;
background: #ffffff;
+
.step-list-item-title {
font-weight: 500;
font-size: 14px;
@@ -711,9 +628,11 @@
flex-wrap: wrap;
flex: 1;
}
+
.step-list-item-control {
display: flex;
align-items: center;
+
.controlBtn {
height: 24px;
background: #ffffff;
@@ -722,6 +641,7 @@
display: flex;
align-items: center;
}
+
.edit {
border: 1px solid #44be09;
font-family: PingFangSC, PingFang SC;
@@ -731,6 +651,7 @@
line-height: 24px;
margin-right: 50px;
}
+
.delete {
border: 1px solid #ff4d4f;
font-family: PingFangSC, PingFang SC;
@@ -739,11 +660,13 @@
color: #ff4d4f;
line-height: 24px;
}
+
.edit-icon {
width: 14px;
height: 14px;
margin-right: 8px;
}
+
.delete-icon {
width: 13px;
height: 13px;
--
Gitblit v1.7.1