From b957281412c0235c8ae33768831f24586d0c17de Mon Sep 17 00:00:00 2001
From: paidaxing444 <12qwaszx>
Date: Fri, 9 Oct 2020 15:47:44 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/benyi/assessmentcontent/index.vue | 57 ++-----------------
.../views/benyi/assessmentintroduce/index.vue | 51 +++--------------
2 files changed, 15 insertions(+), 93 deletions(-)
diff --git a/ruoyi-ui/src/views/benyi/assessmentcontent/index.vue b/ruoyi-ui/src/views/benyi/assessmentcontent/index.vue
index 237c9b3d5..e90895201 100644
--- a/ruoyi-ui/src/views/benyi/assessmentcontent/index.vue
+++ b/ruoyi-ui/src/views/benyi/assessmentcontent/index.vue
@@ -6,28 +6,10 @@
:inline="true"
label-width="68px"
>
- <el-form-item label="父id" prop="parentid">
+ <el-form-item label="名称" prop="name">
<el-input
- v-model="queryParams.parentid"
- placeholder="请输入父id"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="是否元素" prop="iselement">
- <el-input
- v-model="queryParams.iselement"
- placeholder="请输入是否元素"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
- <el-form-item label="元素才有适用范围;应该以幼儿的岁数为准" prop="scope">
- <el-input
- v-model="queryParams.scope"
- placeholder="请输入元素才有适用范围;应该以幼儿的岁数为准"
+ v-model="queryParams.name"
+ placeholder="请输入名称"
clearable
size="small"
@keyup.enter.native="handleQuery"
@@ -80,16 +62,6 @@
>删除</el-button
>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['benyi:assessmentcontent:export']"
- >导出</el-button
- >
- </el-col>
</el-row>
<el-table
@@ -98,12 +70,12 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="编号" align="center" prop="id" />
- <el-table-column label="父id" align="center" prop="parentid" />
+ <!-- <el-table-column label="编号" align="center" prop="id" /> -->
+ <!-- <el-table-column label="父id" align="center" prop="parentid" /> -->
<el-table-column label="名称" align="center" prop="name" />
<el-table-column label="是否元素" align="center" prop="iselement" />
<el-table-column
- label="元素才有适用范围;应该以幼儿的岁数为准"
+ label="适用范围"
align="center"
prop="scope"
/>
@@ -182,7 +154,6 @@ import {
delAssessmentcontent,
addAssessmentcontent,
updateAssessmentcontent,
- exportAssessmentcontent,
} from "@/api/benyi/assessmentcontent";
export default {
@@ -327,22 +298,6 @@ export default {
})
.catch(function () {});
},
- /** 导出按钮操作 */
- handleExport() {
- const queryParams = this.queryParams;
- this.$confirm("是否确认导出所有评估内容数据项?", "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(function () {
- return exportAssessmentcontent(queryParams);
- })
- .then((response) => {
- this.download(response.msg);
- })
- .catch(function () {});
- },
},
};
</script>
\ No newline at end of file
diff --git a/ruoyi-ui/src/views/benyi/assessmentintroduce/index.vue b/ruoyi-ui/src/views/benyi/assessmentintroduce/index.vue
index ac7a7dba8..637479e3d 100644
--- a/ruoyi-ui/src/views/benyi/assessmentintroduce/index.vue
+++ b/ruoyi-ui/src/views/benyi/assessmentintroduce/index.vue
@@ -6,7 +6,7 @@
:inline="true"
label-width="68px"
>
- <el-form-item label="标题" prop="title">
+ <el-form-item label="评估标题" prop="title">
<el-input
v-model="queryParams.title"
placeholder="请输入标题"
@@ -15,15 +15,6 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
- <el-form-item label="内容" prop="content">
- <el-input
- v-model="queryParams.content"
- placeholder="请输入内容"
- clearable
- size="small"
- @keyup.enter.native="handleQuery"
- />
- </el-form-item>
<el-form-item>
<el-button
type="primary"
@@ -71,16 +62,6 @@
>删除</el-button
>
</el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- icon="el-icon-download"
- size="mini"
- @click="handleExport"
- v-hasPermi="['benyi:assessmentintroduce:export']"
- >导出</el-button
- >
- </el-col>
</el-row>
<el-table
@@ -89,9 +70,9 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="编号" align="center" prop="id" />
+ <!-- <el-table-column label="编号" align="center" prop="id" /> -->
<el-table-column label="标题" align="center" prop="title" />
- <el-table-column label="内容" align="center" prop="content" />
+ <el-table-column label="内容" align="center" show-overflow-tooltip="true" prop="content" />
<el-table-column
label="操作"
align="center"
@@ -127,13 +108,13 @@
/>
<!-- 添加或修改评估体系介绍对话框 -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+ <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-input v-model="form.title" placeholder="请输入标题" />
</el-form-item>
<el-form-item label="内容" prop="content">
- <el-input v-model="form.content" placeholder="请输入内容" />
+ <el-input type="textarea" v-model="form.content" placeholder="请输入内容" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -151,7 +132,6 @@ import {
delAssessmentintroduce,
addAssessmentintroduce,
updateAssessmentintroduce,
- exportAssessmentintroduce,
} from "@/api/benyi/assessmentintroduce";
export default {
@@ -184,7 +164,10 @@ export default {
// 表单参数
form: {},
// 表单校验
- rules: {},
+ rules: {
+ title: [{ required: true, message: "名称不能为空", trigger: "blur" }],
+ content: [{ required: true, message: "内容不能为空", trigger: "blur" }],
+ },
};
},
created() {
@@ -292,22 +275,6 @@ export default {
})
.catch(function () {});
},
- /** 导出按钮操作 */
- handleExport() {
- const queryParams = this.queryParams;
- this.$confirm("是否确认导出所有评估体系介绍数据项?", "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- })
- .then(function () {
- return exportAssessmentintroduce(queryParams);
- })
- .then((response) => {
- this.download(response.msg);
- })
- .catch(function () {});
- },
},
};
</script>
\ No newline at end of file