|
|
|
|
@ -57,16 +57,6 @@
|
|
|
|
|
v-hasPermi="['report:report:remove']"
|
|
|
|
|
>删除</el-button>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="1.5">
|
|
|
|
|
<el-button
|
|
|
|
|
type="warning"
|
|
|
|
|
plain
|
|
|
|
|
icon="el-icon-download"
|
|
|
|
|
size="mini"
|
|
|
|
|
@click="handleExport"
|
|
|
|
|
v-hasPermi="['report:report:export']"
|
|
|
|
|
>导出</el-button>
|
|
|
|
|
</el-col>
|
|
|
|
|
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
|
@ -101,6 +91,13 @@
|
|
|
|
|
@click="handleDelete(scope.row)"
|
|
|
|
|
v-hasPermi="['report:report:remove']"
|
|
|
|
|
>删除</el-button>
|
|
|
|
|
<el-button
|
|
|
|
|
size="mini"
|
|
|
|
|
type="text"
|
|
|
|
|
icon="el-icon-delete"
|
|
|
|
|
@click="handleDetail(scope.row)"
|
|
|
|
|
v-hasPermi="['report:report:remove']"
|
|
|
|
|
>详情</el-button>
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
</el-table>
|
|
|
|
|
@ -114,37 +111,37 @@
|
|
|
|
|
/>
|
|
|
|
|
<!-- 添加或修改报告提交对话框 -->
|
|
|
|
|
<el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
|
|
|
|
|
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
|
|
|
|
|
<el-form-item label="报告名称" prop="title">
|
|
|
|
|
<el-form ref="form" :model="form" label-width="80px">
|
|
|
|
|
<el-form-item label="报告名称" >
|
|
|
|
|
<el-input v-model="form.title" placeholder="请输入实验报告名称" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="开始时间" prop="startTime">
|
|
|
|
|
<el-form-item label="开始时间" >
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="form.startTime"
|
|
|
|
|
style="width: 240px"
|
|
|
|
|
type="date"
|
|
|
|
|
type="datetime"
|
|
|
|
|
value-format="timestamp"
|
|
|
|
|
></el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="结束时间" prop="endTime">
|
|
|
|
|
<el-form-item label="结束时间" >
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="form.endTime"
|
|
|
|
|
style="width: 240px"
|
|
|
|
|
type="date"
|
|
|
|
|
type="datetime"
|
|
|
|
|
value-format="timestamp"
|
|
|
|
|
></el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="实验状态" prop="status">
|
|
|
|
|
<el-form-item label="实验状态" >
|
|
|
|
|
<el-select v-model="form.status">
|
|
|
|
|
<el-option value="1" label="未完成"/>
|
|
|
|
|
<el-option value="2" label="已完成"/>
|
|
|
|
|
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="合理用时" prop="timeUsed">
|
|
|
|
|
<el-form-item label="合理用时" >
|
|
|
|
|
<el-input v-model="form.timeUsed" placeholder="请输入合理用时" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="得分" prop="score">
|
|
|
|
|
<el-form-item label="得分" >
|
|
|
|
|
<el-input v-model="form.score" placeholder="请输入得分" />
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
|
@ -154,6 +151,8 @@
|
|
|
|
|
<el-button type="primary" @click="addform">添加</el-button>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
|
<!-- 动态表单 -->
|
|
|
|
|
<el-form :model="form_1" ref="form_1" label-width="120px" style="width:83%; margin-bottom: 8%;">
|
|
|
|
|
<div v-for="(item,index) in domains" :key="item.key">
|
|
|
|
|
@ -163,7 +162,9 @@
|
|
|
|
|
<span>步骤:{{index+1}}</span>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="7">
|
|
|
|
|
<el-form-item><el-input v-model="form_1[index].seq" value="index+1" hidden></el-input></el-form-item>
|
|
|
|
|
<el-form-item>
|
|
|
|
|
<el-input v-model="form_1[index].seq" hidden></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="标题" style="margin-bottom: 2%;">
|
|
|
|
|
<el-input v-model="form_1[index].title" style="width:300px"></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
@ -179,19 +180,19 @@
|
|
|
|
|
<el-form-item label="得分" style="margin-bottom: 2%;">
|
|
|
|
|
<el-input v-model="form_1[index].score" style="width:300px"></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="开始时间" prop="startTime">
|
|
|
|
|
<el-form-item label="开始时间" >
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="form_1[index].startTime"
|
|
|
|
|
style="width: 240px"
|
|
|
|
|
type="date"
|
|
|
|
|
type="datetime"
|
|
|
|
|
value-format="timestamp"
|
|
|
|
|
></el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="结束时间" prop="endTime">
|
|
|
|
|
<el-form-item label="结束时间" >
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="form_1[index].endTime"
|
|
|
|
|
style="width: 240px"
|
|
|
|
|
type="date"
|
|
|
|
|
type="datetime"
|
|
|
|
|
value-format="timestamp"
|
|
|
|
|
></el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
@ -211,7 +212,7 @@
|
|
|
|
|
</el-row>
|
|
|
|
|
</div>
|
|
|
|
|
</el-form>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</el-form>
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
|
@ -219,6 +220,121 @@
|
|
|
|
|
<el-button @click="cancel">取 消</el-button>
|
|
|
|
|
</div>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
<!--详情-->
|
|
|
|
|
<el-dialog :title="title" :visible.sync="openDetail" width="800px" append-to-body>
|
|
|
|
|
<el-form label-width="80px">
|
|
|
|
|
<el-form-item label="报告名称" >
|
|
|
|
|
<el-input v-model="form.title" placeholder="请输入实验报告名称" disabled/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="开始时间" >
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="form.startTime"
|
|
|
|
|
style="width: 240px"
|
|
|
|
|
type="datetime"
|
|
|
|
|
value-format="timestamp"
|
|
|
|
|
disabled
|
|
|
|
|
></el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="结束时间" >
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="form.endTime"
|
|
|
|
|
style="width: 240px"
|
|
|
|
|
type="datetime"
|
|
|
|
|
value-format="timestamp"
|
|
|
|
|
disabled
|
|
|
|
|
></el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="实验状态" >
|
|
|
|
|
<el-select v-model="form.status" disabled>
|
|
|
|
|
<el-option value="1" label="未完成"/>
|
|
|
|
|
<el-option value="2" label="已完成"/>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="合理用时" >
|
|
|
|
|
<el-input v-model="form.timeUsed" placeholder="请输入合理用时" disabled/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="得分" >
|
|
|
|
|
<el-input v-model="form.score" placeholder="请输入得分" disabled/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
|
<el-form-item label="步骤列表">
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="3">
|
|
|
|
|
<el-button type="primary" >步骤列表</el-button>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
|
|
|
|
|
<!-- 动态表单 -->
|
|
|
|
|
<el-form :model="form_1" ref="form_1" label-width="120px" style="width:83%; margin-bottom: 8%;">
|
|
|
|
|
<div v-for="(item,index) in domains" :key="item.key">
|
|
|
|
|
<el-row>
|
|
|
|
|
<el-col :span="1">
|
|
|
|
|
<i class="el-icon-delete-solid" style="color:red;" ></i>
|
|
|
|
|
<span>步骤:{{index+1}}</span>
|
|
|
|
|
</el-col>
|
|
|
|
|
<el-col :span="7">
|
|
|
|
|
<el-form-item>
|
|
|
|
|
<el-input v-model="form_1[index].seq" hidden></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="标题" style="margin-bottom: 2%;">
|
|
|
|
|
<el-input v-model="form_1[index].title" style="width:300px" disabled></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="评价" style="margin-bottom: 2%;">
|
|
|
|
|
<el-input v-model="form_1[index].evaluation" style="width:300px" disabled></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="重复次数" style="margin-bottom: 2%;">
|
|
|
|
|
<el-input v-model="form_1[index].repeatCount" style="width:300px" disabled></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="满分" style="margin-bottom: 2%;">
|
|
|
|
|
<el-input v-model="form_1[index].maxScore" style="width:300px" disabled></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="得分" style="margin-bottom: 2%;">
|
|
|
|
|
<el-input v-model="form_1[index].score" style="width:300px" disabled></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="开始时间" >
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="form_1[index].startTime"
|
|
|
|
|
style="width: 240px"
|
|
|
|
|
type="datetime"
|
|
|
|
|
value-format="timestamp"
|
|
|
|
|
disabled
|
|
|
|
|
></el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="结束时间" >
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="form_1[index].endTime"
|
|
|
|
|
style="width: 240px"
|
|
|
|
|
type="datetime"
|
|
|
|
|
value-format="timestamp"
|
|
|
|
|
disabled
|
|
|
|
|
></el-date-picker>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="合理用时" style="margin-bottom: 2%;">
|
|
|
|
|
<el-input v-model="form_1[index].expectTime" style="width:300px" disabled></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="实验用时" style="margin-bottom: 2%;">
|
|
|
|
|
<el-input v-model="form_1[index].timeUsed" style="width:300px" disabled></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="赋分模型" style="margin-bottom: 2%;">
|
|
|
|
|
<el-input v-model="form_1[index].scoringModel" style="width:300px" disabled></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="备注" style="margin-bottom: 2%;">
|
|
|
|
|
<el-input v-model="form_1[index].remarks" style="width:300px" disabled></el-input>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-col>
|
|
|
|
|
</el-row>
|
|
|
|
|
</div>
|
|
|
|
|
</el-form>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</el-form>
|
|
|
|
|
<div slot="footer" class="dialog-footer">
|
|
|
|
|
<el-button @click="cancel">返回</el-button>
|
|
|
|
|
</div>
|
|
|
|
|
</el-dialog>
|
|
|
|
|
</div>
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
@ -229,6 +345,7 @@ export default {
|
|
|
|
|
name: "Report",
|
|
|
|
|
data() {
|
|
|
|
|
return {
|
|
|
|
|
seqCount: 1,
|
|
|
|
|
// 遮罩层
|
|
|
|
|
loading: true,
|
|
|
|
|
// 选中数组
|
|
|
|
|
@ -247,6 +364,7 @@ export default {
|
|
|
|
|
title: "",
|
|
|
|
|
// 是否显示弹出层
|
|
|
|
|
open: false,
|
|
|
|
|
openDetail: false,
|
|
|
|
|
// 查询参数
|
|
|
|
|
queryParams: {
|
|
|
|
|
pageNum: 1,
|
|
|
|
|
@ -265,8 +383,7 @@ export default {
|
|
|
|
|
// 表单校验
|
|
|
|
|
rules: {
|
|
|
|
|
},
|
|
|
|
|
domains: [],
|
|
|
|
|
fromList:[]
|
|
|
|
|
domains: []
|
|
|
|
|
};
|
|
|
|
|
},
|
|
|
|
|
created() {
|
|
|
|
|
@ -281,10 +398,12 @@ export default {
|
|
|
|
|
this.total = response.total;
|
|
|
|
|
this.loading = false;
|
|
|
|
|
});
|
|
|
|
|
this.seqCount = 1 ;
|
|
|
|
|
},
|
|
|
|
|
// 取消按钮
|
|
|
|
|
cancel() {
|
|
|
|
|
this.open = false;
|
|
|
|
|
this.openDetail = false;
|
|
|
|
|
this.reset();
|
|
|
|
|
},
|
|
|
|
|
// 表单重置
|
|
|
|
|
@ -329,10 +448,24 @@ export default {
|
|
|
|
|
const id = row.id || this.ids
|
|
|
|
|
getReport(id).then(response => {
|
|
|
|
|
this.form = response.data;
|
|
|
|
|
this.domains = response.data.steps;
|
|
|
|
|
this.form_1 = response.data.steps;
|
|
|
|
|
this.open = true;
|
|
|
|
|
this.title = "修改报告提交";
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
/** 详情按钮操作 */
|
|
|
|
|
handleDetail(row) {
|
|
|
|
|
this.reset();
|
|
|
|
|
const id = row.id || this.ids
|
|
|
|
|
getReport(id).then(response => {
|
|
|
|
|
this.form = response.data;
|
|
|
|
|
this.domains = response.data.steps;
|
|
|
|
|
this.form_1 = response.data.steps;
|
|
|
|
|
this.openDetail = true;
|
|
|
|
|
this.title = "查看报告详情";
|
|
|
|
|
});
|
|
|
|
|
},
|
|
|
|
|
/** 提交按钮 */
|
|
|
|
|
submitForm() {
|
|
|
|
|
this.form.steps = this.form_1;
|
|
|
|
|
@ -373,7 +506,6 @@ export default {
|
|
|
|
|
//动态增加表单项
|
|
|
|
|
addform() {
|
|
|
|
|
this.domains.push({
|
|
|
|
|
formName: this.form.appUrl, //这里就是垃圾桶旁边的提示文字
|
|
|
|
|
key: Date.now()
|
|
|
|
|
})
|
|
|
|
|
this.form_1.push({
|
|
|
|
|
@ -384,7 +516,7 @@ export default {
|
|
|
|
|
timeUsed:null,
|
|
|
|
|
scoringModel:null,
|
|
|
|
|
remarks:null,
|
|
|
|
|
seq:null,
|
|
|
|
|
seq: this.seqCount++,
|
|
|
|
|
startTime:null,
|
|
|
|
|
endTime:null,
|
|
|
|
|
repeatCount:null
|
|
|
|
|
|
hujunbo
3 years ago