Loki/yudao-ui-admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

页面报错修复

Browse Source
This commit is contained in:
小久哥
2022-06-15 18:23:04 +08:00
parent 29a579ab77
commit 9e2d01a33d
6 changed files with 52 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/api/farm/task.js
+9
View File
@@ -43,6 +43,15 @@ export function getTaskPage(query) {
})
}
//一次性获得农场任务分页数据
export function getAdminTaskPage(query){
return request({
url: '/farm/task/apiPage',
method: 'get',
params: query
})
}
// 条件搜索获得农场任务分页
export function getTaskSearchPage(query) {
return request({
src/views/farm/discuss/index.vue
+3 -3
View File
@@ -41,7 +41,7 @@
<el-table-column label="事件图片" align="center" prop="images">
<template slot-scope="scope">
<el-image
v-if="scope.row.images[0] != null"
v-if="scope.row.images != null && scope.row.images[0] != null"
:src="scope.row.images[0]" :preview-src-list="scope.row.images">
</el-image>
</template>
@@ -162,7 +162,7 @@ export default {
getProject(){
getProjectPage({
pageNo: 1,
pageSize: 10,
pageSize: 400,
name: null,
}).then(res=>{
this.projectList = res.data.list;
@@ -173,7 +173,7 @@ export default {
getTask(){
getTaskPage({
pageNo: 1,
pageSize: 10,
pageSize: 400,
name: null,
}).then(res=>{
this.taskList = res.data.list;
src/views/farm/event/index.vue
-19
View File
@@ -43,14 +43,11 @@
<span>{{projectList.find(p => p.id == scope.row.projectId).name}}</span>
</template>
</el-table-column>
<!-- <el-table-column label="任务名" align="center" prop="taskId" /> -->
<el-table-column label="任务类型及内容" align="center" prop="taskId">
<template slot-scope="scope">
<span>{{taskConvert(scope.row.taskId)}}</span>
</template>
</el-table-column>
<el-table-column label="事件名" align="center" prop="name" />
<el-table-column label="事件内容" align="center" prop="content" />
<el-table-column label="事件图片" align="center" prop="images">
@@ -231,22 +228,6 @@ export default {
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行查询
getEventPage(params).then(response => {
// //循环遍历List
// response.data.list.forEach(eve => {
// //循环对比 project
// this.projectList.forEach(project =>{
// if(project.id == eve.projectId){
// eve.projectId = project.name;
// }
// });
// this.taskList.forEach(task =>{
// if (task.id == eve.taskId) {
// eve.taskId = task.name;
// }
// })
// });
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
src/views/farm/project/index.vue
+1 -1
View File
@@ -262,7 +262,7 @@ export default {
getCpUserList(){
getCpUserPage({
pageNo: 1,
pageSize: 100
pageSize: 400
}).then(res =>{
this.membersList = res.data.list;
})
src/views/farm/task/index.vue
+38 -43
View File
@@ -49,49 +49,50 @@
<el-table-column label="任务ID" align="center" prop="id" />
<el-table-column label="项目名" align="center" prop="projectName">
<template slot-scope="scope">
<span> {{ projectList.find(t => t.id == scope.row.projectId).name }} </span>
<span>{{scope.row.projectName}}</span>
</template>
</el-table-column>
<el-table-column label="负责人" align="center" prop="mainPerson">
<template slot-scope="scope">
<span> {{ cpUserList.find(t => t.id == scope.row.mainPerson).name }} </span>
<span>{{scope.row.mainPersonName}}</span>
</template>
</el-table-column>
<el-table-column label="执行人" align="center" prop="executorPerson" width="80" >
<template slot-scope="scope">
<span>{{executorPersonConvert(scope.row.executorPerson)}}</span>
<span>{{executorPersonConvert(scope.row.executorNameList)}}</span>
</template>
</el-table-column>
<el-table-column label="区域" align="center" prop="areas" width="180" >
<template slot-scope="scope">
<span>{{areaConvert(scope.row.areas)}}</span>
<span>{{areaConvert(scope.row.areaNameList)}}</span>
</template>
</el-table-column>
<el-table-column label="作物名" align="center" prop="cropName">
<template slot-scope="scope">
<span> {{ cropList.find(t => t.id == scope.row.cropId).name }} </span>
<span> {{scope.row.cropName}} </span>
</template>
</el-table-column>
<el-table-column label="作物数量" align="center" prop="cropNum" />
<el-table-column label="任务名" align="center" prop="taskCateId">
<template slot-scope="scope">
<span> {{ cateOneList.find(t => t.id == scope.row.taskCateId).name }} </span>
<span> {{scope.row.taskName}} </span>
</template>
</el-table-column>
<el-table-column label="任务内容" align="center" prop="taskCateName">
<template slot-scope="scope">
<span> {{ cateTwoList.find(t => t.id == scope.row.taskCateName).name }} </span>
<span> {{scope.row.taskMsg}} </span>
</template>
</el-table-column>
<el-table-column label="需要的资源" align="center" prop="resources" width="180">
<template slot-scope="scope">
<span>{{resouceConvert(scope.row.resources)}}</span>
<span>{{resouceConvert(scope.row.taskResourceList)}}</span>
</template>
</el-table-column>
<el-table-column label="工时" align="center" prop="workingHours" />
<el-table-column label="图片" align="center" prop="images">
<template slot-scope="scope">
<el-image v-if="scope.row.images[0] != null" style="" :src="scope.row.images[0]"
<el-image v-if="scope.row.images != null && scope.row.images[0] != null" style="" :src="scope.row.images[0]"
:preview-src-list="scope.row.images">
</el-image>
</template>
@@ -211,7 +212,7 @@
</template>
<script>
import { createTask, updateTask, deleteTask, getTask, getTaskPage, getTaskSearchPage, exportTaskExcel } from "@/api/farm/task";
import { createTask, updateTask, deleteTask, getTask, getTaskPage, getTaskSearchPage, exportTaskExcel, getAdminTaskPage} from "@/api/farm/task";
import ImageUpload from '@/components/ImageUpload';
import Editor from '@/components/Editor';
import { getResourcePage } from "@/api/farm/resource";
@@ -306,48 +307,40 @@ export default {
};
},
created() {
this.getResource();
this.getResourceTypeList();
this.getProjectList();
this.getCpUserList();
this.getCropList();
this.getTaskCateList();
this.getAreasList();
this.getList()
},
methods: {
startMethod(){
this.getResource();
this.getResourceTypeList();
this.getProjectList();
this.getCpUserList();
this.getCropList();
this.getTaskCateList();
this.getAreasList();
this.twoRescoure();
},
executorPersonConvert(executorPerson){
let executorPersonName = "";
if (executorPerson != null) {
executorPerson.forEach(person => {
this.cpUserList.forEach( user => {
if (person == user.id) {
executorPersonName += user.name + "\n";
}
})
})
}
executorPerson.forEach(person => {
executorPersonName += person + "\n";
})
return executorPersonName;
},
areaConvert(area){
if (area != null) {
let areaMsg = "";
let parentLsit = this.areasList.filter(t => t.parentId == 0);
let sonList = this.areasList.filter(s => s.parentId != 0);
area.forEach(item =>{
let parentName = parentLsit.filter(parent => parent.id == item[0])[0].name;
let sonName = sonList.filter(son => son.id == item[1])[0].name;
areaMsg += parentName +"/"+ sonName +"\n";
areaMsg += item +"\n";
})
return areaMsg;
}
},
resouceConvert(resources){
let resouceMsg = "";
resources.forEach(item =>{
let typeName = this.resourceTypeList.filter(type => type.id == item.resourceId[0])[0].name;
let resouceName = this.resourceList.filter(type => type.id == item.resourceId[1])[0].name;
resouceMsg += typeName +"/" + resouceName +":" + item.num +"\n";
})
if(resources != null){
resources.forEach(item =>{
resouceMsg += item.resourceType +"/" + item.resourceName +":" + item.num +"\n";
})
}
return resouceMsg;
},
ziyuanxuanze(item,index,obj){
@@ -392,7 +385,7 @@ export default {
getCpUserList() {
getCpUserPage({
pageNo: 1,
pageSize: 100
pageSize: 400
}).then(res => {
this.cpUserList = res.data.list;
})
@@ -440,13 +433,13 @@ export default {
this.addBeginAndEndTime(params, this.dateRangePlanStartTime, 'planStartTime');
this.addBeginAndEndTime(params, this.dateRangePlanEndTime, 'planEndTime');
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行查询
getTaskPage(params).then(response => {
getAdminTaskPage(params).then(response =>{
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
});
this.twoRescoure();
})
},
/** 搜索条件查询任务列表 */
getSearchList() {
@@ -504,6 +497,7 @@ export default {
},
/** 新增按钮操作 */
handleAdd() {
this.startMethod();
this.reset();
this.twoRescoure();
this.assemArea();
@@ -513,6 +507,7 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
this.startMethod();
this.reset();
this.assemArea();
const id = row.id;
src/views/farm/workHour/index.vue
+1 -1
View File
@@ -203,7 +203,7 @@ export default {
getCpUserPageList(){
getCpUserPage({
pageNo:1,
pageSize:100
pageSize:400
}).then(res => {
this.cpUserList = res.data.list;
})