Browse Source

优化 换行

master
小久哥 3 years ago
parent
commit
cf00693e8a
  1. 6
      src/views/farm/discuss/index.vue
  2. 14
      src/views/farm/project/index.vue
  3. 15
      src/views/farm/task/index.vue

6
src/views/farm/discuss/index.vue

@ -3,13 +3,13 @@
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="" prop="projectId"> <el-form-item label="项目名" prop="projectId">
<el-input v-model="queryParams.projectId" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.projectId" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label="" prop="taskId"> <el-form-item label="任务名" prop="taskId">
<el-input v-model="queryParams.taskId" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.taskId" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/>
</el-form-item> </el-form-item>
<el-form-item label=""> <el-form-item label="讨论发表时间">
<el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd" <el-date-picker v-model="dateRangeCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" /> type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item> </el-form-item>

14
src/views/farm/project/index.vue

@ -1,7 +1,7 @@
<style> <style>
.el-table .cell.el-tooltip { .el-table .cell{
white-space: pre-wrap; white-space: pre-line;
} }
</style> </style>
@ -53,12 +53,12 @@
</el-row> </el-row>
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" :data="list" stripe style="white-space: pre-wrap;"> <el-table v-loading="loading" :data="list" stripe >
<el-table-column label="ID" align="center" prop="id" /> <el-table-column label="ID" align="center" prop="id" />
<el-table-column label="项目名" align="center" prop="name" /> <el-table-column label="项目名" align="center" prop="name" />
<el-table-column label="项目内容" align="center" prop="content" /> <el-table-column label="项目内容" align="center" prop="content" />
<el-table-column label="资源名" align="center" prop="resources" /> <el-table-column label="资源名" align="center" prop="resources"/>
<el-table-column label="图片" align="center" prop="images"> <el-table-column label="图片" align="center" prop="images">
<template slot-scope="scope"> <template slot-scope="scope">
@ -146,8 +146,6 @@ import ImageUpload from '@/components/ImageUpload';
import Editor from '@/components/Editor'; import Editor from '@/components/Editor';
import { getResourcePage } from "@/api/farm/resource"; import { getResourcePage } from "@/api/farm/resource";
export default { export default {
name: "Project", name: "Project",
components: { components: {
@ -228,7 +226,7 @@ export default {
//3 resouce resourceList //3 resouce resourceList
this.resourceList.forEach((resource) =>{ this.resourceList.forEach((resource) =>{
if(inn == resource.id){ if(inn == resource.id){
resourceName += (resource.name + ","); resourceName += (resource.name + "、\n");
} }
} }
) )

15
src/views/farm/task/index.vue

@ -1,3 +1,9 @@
<style>
.el-table .cell{
white-space: pre-line;
}
</style>
<template> <template>
<div class="app-container"> <div class="app-container">
@ -186,7 +192,6 @@ export default {
}, },
created() { created() {
this.getResource(); this.getResource();
this.getList();
}, },
methods: { methods: {
/**查询资源*/ /**查询资源*/
@ -197,6 +202,7 @@ export default {
name: null, name: null,
}).then(res=>{ }).then(res=>{
this.resourceList = res.data.list; this.resourceList = res.data.list;
this.getList();
}) })
}, },
/** 查询任务列表 */ /** 查询任务列表 */
@ -226,7 +232,8 @@ export default {
//3 resouce resourceList //3 resouce resourceList
this.resourceList.forEach((resource) =>{ this.resourceList.forEach((resource) =>{
if(inn == resource.id){ if(inn == resource.id){
resourceName += (resource.name + ","); resourceName += (resource.name + "、\n");
console.log("11", resourceName);
} }
} }
) )
@ -276,7 +283,7 @@ export default {
handleAdd() { handleAdd() {
this.reset(); this.reset();
this.open = true; this.open = true;
this.title = "添加农场项目"; this.title = "添加农场任务";
}, },
/** 修改按钮操作 */ /** 修改按钮操作 */
handleUpdate(row) { handleUpdate(row) {
@ -296,7 +303,7 @@ export default {
} }
this.open = true; this.open = true;
this.title = "修改农场项目"; this.title = "修改农场任务";
}); });
}, },
/** 提交按钮 */ /** 提交按钮 */

Loading…
Cancel
Save