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

页面优化

Browse Source
This commit is contained in:
zhanyunjiu
2022-07-14 18:37:36 +08:00
parent cd9b22729a
commit bf06a98345
4 changed files with 22 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/views/farm/task/index.vue
+10 -12
View File
@@ -92,9 +92,9 @@
<el-table-column label="任务ID" fixed align="center" prop="id" />
<el-table-column label="任务状态" fixed align="center" prop="status" >
<template slot-scope="scope">
<el-button type="success" v-if="scope.row.status == 'PLAN'">计划中</el-button>
<el-button type="success" v-if="scope.row.status == 'READY'">准备中</el-button>
<el-button type="success" v-if="scope.row.status == 'STARTED'">已开始</el-button>
<el-button type="info" v-if="scope.row.status == 'PLAN'">计划中</el-button>
<el-button type="info" v-if="scope.row.status == 'READY'">准备中</el-button>
<el-button type="primary" v-if="scope.row.status == 'STARTED'">已开始</el-button>
<el-button type="danger" v-if="scope.row.status == 'EXCEPTION'">异常状态</el-button>
<el-button type="success" v-if="scope.row.status == 'COMPLETE'">任务完成</el-button>
<el-button type="danger" v-if="scope.row.status == 'RETRY'">返工</el-button>
@@ -184,14 +184,14 @@
<el-dialog :title="title" :visible.sync="open" :close-on-click-modal="false" width="900px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="项目选择" prop="projectId">
<el-select v-model="form.projectId" placeholder="请选择" @change="changeProject">
<el-select v-model="form.projectId" placeholder="只能选择进行中的项目" @change="changeProject">
<el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id">
{{ item.name }}
</el-option>
</el-select>
</el-form-item>
<el-form-item label="作物选择" prop="cropId">
<el-select v-model="form.cropId" placeholder="请选择">
<el-select v-model="form.cropId" placeholder="请先选择项目">
<el-option v-for="item in selectCropList" :key="item.id" :label="item.name" :value="item.id">
{{ item.name }}
</el-option>
@@ -213,7 +213,7 @@
</el-select>
</el-form-item> -->
<el-form-item label="区域选择" prop="assemAreaList">
<el-cascader :options="assemAreaList" :props="props" emitPath clearable ref="chooseA" v-model="form.areas">
<el-cascader :options="assemAreaList" :props="props" emitPath clearable ref="chooseA" v-model="form.areas" placeholder="请先选择项目">
</el-cascader>
</el-form-item>
@@ -234,7 +234,7 @@
</el-option>
</el-select>
</el-form-item>
<el-button type="primary" @click="addResource">主要按钮</el-button>
<el-button type="primary" @click="addResource">添加资源</el-button>
<el-form-item label="资源选择" v-for="(item,index) in form.resources" :key="index">
<el-cascader :options="twoList" clearable v-model="item.resourceId" @change="(obj)=>ziyuanxuanze(item,index,obj)">
</el-cascader>
@@ -264,7 +264,7 @@
<el-radio :label="0">计划中</el-radio>
<el-radio :label="1">准备中 </el-radio>
<el-radio :label="2">已开始</el-radio>
<el-radio :label="4">完成</el-radio>
<!-- <el-radio :label="4">完成</el-radio> -->
</el-radio-group>
</el-form-item>
</el-form>
@@ -288,8 +288,6 @@ import { getTaskCatePage } from "@/api/farm/taskCate";
import { getCpUserPage } from "@/api/system/cpUser";
import { getAreaPage } from "@/api/farm/area";
import { values } from 'min-dash';
import { ifStatement } from "@babel/types";
export default {
name: "Task",
@@ -430,7 +428,6 @@ export default {
this.form.resources = this.form.resources.concat(resourceTmp)
},
deleteResource(item){
console.log(this.form.resources);
this.form.resources = this.form.resources.filter(res => res!=item)
},
getAreasList() {
@@ -484,7 +481,8 @@ export default {
getProjectList() {
getProjectPage({
pageNo: 1,
pageSize: 100
pageSize: 100,
state: 'STARTING' //只看进行中的项目
}).then(res => {
this.projectList = res.data.list;
})