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

fix

master
Loki 3 years ago
parent
78b68efdc8
commit
7771e5f727
3 changed files with 237 additions and 302 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      package.json
  2. 387
      src/views/farm/task/index.vue
  3. 19
      vue.config.js

3
package.json
Unescape View File

@ -42,6 +42,7 @@
"@babel/parser": "^7.7.4", "@babel/parser": "^7.7.4",
"@riophae/vue-treeselect": "0.4.0", "@riophae/vue-treeselect": "0.4.0",
"ant-design-vue": "1.5.2", "ant-design-vue": "1.5.2",
"area-data": "^5.0.6",
"axios": "0.24.0", "axios": "0.24.0",
"bpmn-js-token-simulation": "^0.10.0", "bpmn-js-token-simulation": "^0.10.0",
"cache-loader": "^2.0.1", "cache-loader": "^2.0.1",
@ -100,7 +101,7 @@
"bpmn-js": "8.9.0", "bpmn-js": "8.9.0",
"bpmn-js-properties-panel": "0.46.0", "bpmn-js-properties-panel": "0.46.0",
"chalk": "4.1.0", "chalk": "4.1.0",
"compression-webpack-plugin": "5.0.2", "compression-webpack-plugin": "^5.0.2",
"connect": "3.6.6", "connect": "3.6.6",
"eslint": "7.15.0", "eslint": "7.15.0",
"eslint-config-airbnb-base": "^14.0.0", "eslint-config-airbnb-base": "^14.0.0",

387
src/views/farm/task/index.vue
Unescape View File

@ -1,29 +1,29 @@
<style> <style>
.el-table .cell{ .el-table .cell {
white-space: pre-line; white-space: pre-line;
} }
</style> </style>
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<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="taskCateId"> <el-form-item label="任务名" prop="taskCateId">
<el-input v-model="queryParams.taskCateId" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.taskCateId" placeholder="请输入" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item label="资源名" prop="resources"> <el-form-item label="资源名" prop="resources">
<el-input v-model="queryParams.resources" placeholder="请输入" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.resources" 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="dateRangePlanStartTime" style="width: 240px" value-format="yyyy-MM-dd" <el-date-picker v-model="dateRangePlanStartTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" /> range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item> </el-form-item>
<el-form-item label="结束时间"> <el-form-item label="结束时间">
<el-date-picker v-model="dateRangePlanEndTime" style="width: 240px" value-format="yyyy-MM-dd" <el-date-picker v-model="dateRangePlanEndTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" /> range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item> </el-form-item>
<el-form-item label="优先级" prop="weight"> <el-form-item label="优先级" prop="weight">
<el-input v-model="queryParams.weight" placeholder="请输入优先级" clearable @keyup.enter.native="handleQuery"/> <el-input v-model="queryParams.weight" placeholder="请输入优先级" clearable @keyup.enter.native="handleQuery" />
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
@ -38,8 +38,8 @@
v-hasPermi="['farm:task:create']">新增</el-button> v-hasPermi="['farm:task:create']">新增</el-button>
</el-col> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading" <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
v-hasPermi="['farm:task:export']">导出</el-button> :loading="exportLoading" v-hasPermi="['farm:task:export']">导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
@ -47,44 +47,45 @@
<!-- 列表 --> <!-- 列表 -->
<el-table v-loading="loading" stripe :data="list"> <el-table v-loading="loading" stripe :data="list">
<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="projectName" > <el-table-column label="项目名" align="center" prop="projectName">
<template slot-scope="scope"> <template slot-scope="scope">
<span> {{projectList.find(t=>t.id == scope.row.projectId ).name}} </span> <span> {{ projectList.find(t => t.id == scope.row.projectId).name }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="负责人" align="center" prop="mainPerson" > <el-table-column label="负责人" align="center" prop="mainPerson">
<template slot-scope="scope"> <template slot-scope="scope">
<span> {{cpUserList.find(t=>t.id == scope.row.mainPerson ).name}} </span> <span> {{ cpUserList.find(t => t.id == scope.row.mainPerson).name }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="执行人" align="center" prop="executorPerson"/> <el-table-column label="执行人" align="center" prop="executorPerson" />
<el-table-column label="区域" align="center" prop="areas" width="180"/> <el-table-column label="区域" align="center" prop="areas" width="180" />
<el-table-column label="作物名" align="center" prop="cropName" > <el-table-column label="作物名" align="center" prop="cropName">
<template slot-scope="scope"> <template slot-scope="scope">
<span> {{cropList.find(t=>t.id == scope.row.cropId ).name}} </span> <span> {{ cropList.find(t => t.id == scope.row.cropId).name }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="作物数量" align="center" prop="cropNum" /> <el-table-column label="作物数量" align="center" prop="cropNum" />
<el-table-column label="任务名" align="center" prop="taskCateId" > <el-table-column label="任务名" align="center" prop="taskCateId">
<template slot-scope="scope"> <template slot-scope="scope">
<span> {{cateOneList.find(t=>t.id == scope.row.taskCateId ).name}} </span> <span> {{ cateOneList.find(t => t.id == scope.row.taskCateId).name }} </span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="任务内容" align="center" prop="taskCateName" > <el-table-column label="任务内容" align="center" prop="taskCateName">
<template slot-scope="scope"> <template slot-scope="scope">
<span> {{cateTwoList.find(t=>t.id == scope.row.taskCateName ).name}} </span> <span> {{ cateTwoList.find(t => t.id == scope.row.taskCateName).name }} </span>
</template>
</el-table-column>
<el-table-column label="需要的资源" align="center" prop="resources">
<template slot-scope="scope">
<span>{{resouceConvert(scope.row.resources)}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="需要的资源" align="center" prop="resources" />
<el-table-column label="工时" align="center" prop="workingHours" /> <el-table-column label="工时" align="center" prop="workingHours" />
<el-table-column label="图片" align="center" prop="images" > <el-table-column label="图片" align="center" prop="images">
<template slot-scope="scope"> <template slot-scope="scope">
<el-image <el-image v-if="scope.row.images[0] != null" style="" :src="scope.row.images[0]"
v-if="scope.row.images[0] != null"
style=""
:src="scope.row.images[0]"
:preview-src-list="scope.row.images"> :preview-src-list="scope.row.images">
</el-image> </el-image>
</template> </template>
@ -116,7 +117,7 @@
</el-table> </el-table>
<!-- 分页组件 --> <!-- 分页组件 -->
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
@pagination="getList"/> @pagination="getList" />
<!-- 对话框(添加 / 修改) --> <!-- 对话框(添加 / 修改) -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@ -124,126 +125,69 @@
<el-form-item label="项目选择" prop="projectId"> <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 <el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id">
v-for="item in projectList" {{ item.name }}
:key="item.id"
:label="item.name"
:value="item.id">
{{item.name}}
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="负责人" prop="mainPerson"> <el-form-item label="负责人" prop="mainPerson">
<el-select v-model="form.mainPerson" placeholder="请选择"> <el-select v-model="form.mainPerson" placeholder="请选择">
<el-option <el-option v-for="item in cpUserList" :key="item.id" :label="item.name" :value="item.id">
v-for="item in cpUserList" {{ item.name }}
:key="item.id"
:label="item.name"
:value="item.id">
{{item.name}}
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="执行人" prop="executorPerson"> <el-form-item label="执行人" prop="executorPerson">
<el-select v-model="executorPerson" multiple placeholder="请选择" > <el-select v-model="executorPerson" multiple placeholder="请选择">
<el-option <el-option v-for="item in cpUserList" :key="item.id" :label="item.name" :value="item.id">
v-for="item in cpUserList" {{ item.name }}
:key="item.id"
:label="item.name"
:value="item.id">
{{item.name}}
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="区域选择" prop="assemAreaList"> <el-form-item label="区域选择" prop="assemAreaList">
<el-cascader <el-cascader :options="assemAreaList" :props="props" clearable ref="chooseA" v-model="form.areas">
:options="assemAreaList"
:props="props"
clearable
ref="chooseA"
v-model="form.areas">
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="作物选择" prop="cropId"> <el-form-item label="作物选择" prop="cropId">
<el-select v-model="form.cropId" placeholder="请选择"> <el-select v-model="form.cropId" placeholder="请选择">
<el-option <el-option v-for="item in cropList" :key="item.id" :label="item.name" :value="item.id">
v-for="item in cropList" {{ item.name }}
:key="item.id"
:label="item.name"
:value="item.id">
{{item.name}}
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="作物数量" prop="cropNum"> <el-form-item label="作物数量" prop="cropNum">
<el-input v-model="form.cropNum" placeholder="请输入"/> <el-input v-model="form.cropNum" placeholder="请输入" />
</el-form-item> </el-form-item>
<el-form-item label="任务类型" prop="taskCateId"> <el-form-item label="任务类型" prop="taskCateId">
<el-select v-model="form.taskCateId" placeholder="请选择" @change="changeCateOne"> <el-select v-model="form.taskCateId" placeholder="请选择" @change="changeCateOne">
<el-option <el-option v-for="item in cateOneList" :key="item.id" :label="item.name" :value="item.id">
v-for="item in cateOneList" {{ item.name }}
:key="item.id"
:label="item.name"
:value="item.id">
{{item.name}}
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="任务内容" prop="taskCateName"> <el-form-item label="任务内容" prop="taskCateName">
<el-select v-model="form.taskCateName" placeholder="请选择"> <el-select v-model="form.taskCateName" placeholder="请选择">
<el-option <el-option v-for="item in cateTwoList" :key="item.id" :label="item.name" :value="item.id">
v-for="item in cateTwoList" {{ item.name }}
:key="item.id"
:label="item.name"
:value="item.id">
{{item.name}}
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="资源选择" prop="resources"> <el-button type="primary" @click="addResource">主要按钮</el-button>
<el-cascader
:options="twoList" <el-form-item label="资源选择" v-for="(item,index) in form.resources" :key="index">
:props="props" <el-cascader :options="twoList" clearable v-model="item.resourceId" @change="(obj)=>ziyuanxuanze(item,index,obj)">
clearable
ref="chooseR"
@change="changeResources"
v-model="form.resources">
</el-cascader> </el-cascader>
</el-form-item>
<!-- <el-form-item label="填写数量" prop="resources"> <el-input v-model="item.num"/>
<div v-for="(item, index) of resourceNumberList" :v-model="item.id" :key="index" >
<el-col>
<span>{{item.pValue}}/{{item.value}}</span>
</el-col>
<el-col :span="8">
<el-input placeholder="请输入数量" />
</el-col>
</div>
</el-form-item> -->
<el-form ref="form" :model="formR" :rules="rules" label-width="80px">
<el-form-item label="填写数量" prop="resources">
<el-col >
<span v-for="(item, index) of resourceNumberList" :key="index">
{{item.pValue}}/{{item.value}}
</span>
</el-col>
<el-col :span="8">
<el-input v-for="(item, index) of resourceNumberList" v-model="item.id" :key="index" placeholder="请输入数量" />
</el-col>
</el-form-item> </el-form-item>
</el-form>
@ -252,13 +196,15 @@
</el-form-item> </el-form-item>
<el-form-item label="任务图片"> <el-form-item label="任务图片">
<imageUpload v-model="form.images"/> <imageUpload v-model="form.images" />
</el-form-item> </el-form-item>
<el-form-item label="任务开始时间" prop="planStartTime"> <el-form-item label="任务开始时间" prop="planStartTime">
<el-date-picker clearable v-model="form.planStartTime" type="datetime" value-format="timestamp" placeholder="选择" /> <el-date-picker clearable v-model="form.planStartTime" type="datetime" value-format="timestamp"
placeholder="选择" />
</el-form-item> </el-form-item>
<el-form-item label="任务结束时间" prop="planEndTime"> <el-form-item label="任务结束时间" prop="planEndTime">
<el-date-picker clearable v-model="form.planEndTime" type="datetime" value-format="timestamp" placeholder="选择" /> <el-date-picker clearable v-model="form.planEndTime" type="datetime" value-format="timestamp"
placeholder="选择" />
</el-form-item> </el-form-item>
<el-form-item label="优先级" prop="weight"> <el-form-item label="优先级" prop="weight">
<el-input v-model="form.weight" placeholder="请输入优先级" /> <el-input v-model="form.weight" placeholder="请输入优先级" />
@ -277,12 +223,12 @@ import { createTask, updateTask, deleteTask, getTask, getTaskPage, getTaskSearch
import ImageUpload from '@/components/ImageUpload'; 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";
import { getProjectPage} from "@/api/farm/project"; import { getProjectPage } from "@/api/farm/project";
import { getCropPage} from "@/api/farm/crop"; import { getCropPage } from "@/api/farm/crop";
import { getResourceTypePage} from "@/api/farm/resourceType"; import { getResourceTypePage } from "@/api/farm/resourceType";
import { getTaskCatePage} from "@/api/farm/taskCate"; import { getTaskCatePage } from "@/api/farm/taskCate";
import { getCpUserPage} from "@/api/system/cpUser"; import { getCpUserPage } from "@/api/system/cpUser";
import { getAreaPage} from "@/api/farm/area"; import { getAreaPage } from "@/api/farm/area";
import { values } from 'min-dash'; import { values } from 'min-dash';
@ -326,7 +272,8 @@ export default {
workingHours: null workingHours: null
}, },
// 表单参数 // 表单参数
form: {}, form: {
},
// 表单校验 // 表单校验
rules: { rules: {
projectId: [{ required: true, message: "不能为空", trigger: "blur" }], projectId: [{ required: true, message: "不能为空", trigger: "blur" }],
@ -340,32 +287,31 @@ export default {
planEndTime: [{ required: true, message: "不能为空", trigger: "blur" }], planEndTime: [{ required: true, message: "不能为空", trigger: "blur" }],
weight: [{ required: true, message: "不能为空", trigger: "blur" }], weight: [{ required: true, message: "不能为空", trigger: "blur" }],
}, },
resourceList:[], resourceList: [],
selectResourceList:[], selectResourceList: [],
projectList:[], projectList: [],
cropList:[], cropList: [],
resourceTypeList:[], resourceTypeList: [],
resourceNumberList:[], resourceNumberList: [],
twoList:[], twoList: [],
props: { multiple: true }, props: { multiple: true },
cpUserList:[], cpUserList: [],
executorPerson:[], executorPerson: [],
taskCateAllList:[], //未组装的 taskCateAllList: [], //未组装的
taskCateList:[], //组装好的 taskCateList: [], //组装好的
cateOneList:[], cateOneList: [],
cateTwoList:[], cateTwoList: [],
formR:{}, formR: {},
areasList:[],
assemAreaList:[],
areasParentList:[],
areasSonList:[],
areasList: [],
assemAreaList: [],
areasParentList: [],
areasSonList: [],
}; };
}, },
created() { created() {
@ -378,19 +324,39 @@ export default {
this.getAreasList(); this.getAreasList();
}, },
methods: { methods: {
getAreasList(){ resouceConvert(resources){
let rnameArr = this.resourceList.filter(s=>{
if (resources.length > 0){
return resources[0].resourceId.indexOf(s.id)>= 0;
}
} );
let rname = "";
rnameArr.forEach(s=>{
rname += s.name + "-";
})
return rname;
},
ziyuanxuanze(item,index,obj){
this.form.resource[index].reource = obj[1];
console.log(this.form.resource);
},
addResource(){
let resourceTmp = {reource:0,num:1}
this.form.resources = this.form.resources.concat(resourceTmp)
},
getAreasList() {
getAreaPage({ getAreaPage({
pageNo: 1, pageNo: 1,
pageSize: 100 pageSize: 100
}).then(res =>{ }).then(res => {
this.areasList = res.data.list; this.areasList = res.data.list;
}) })
}, },
getTaskCateList(){ getTaskCateList() {
getTaskCatePage({ getTaskCatePage({
pageNo: 1, pageNo: 1,
pageSize: 100 pageSize: 100
}).then(res=>{ }).then(res => {
this.taskCateList = res.data.list; this.taskCateList = res.data.list;
this.taskCateAllList = res.data.list; this.taskCateAllList = res.data.list;
@ -400,55 +366,55 @@ export default {
let cateFirstList = []; let cateFirstList = [];
catefilterList.forEach(one => { catefilterList.forEach(one => {
let cateSecondList = []; let cateSecondList = [];
this.taskCateList.forEach(two =>{ this.taskCateList.forEach(two => {
if (one.id == two.parentId) { if (one.id == two.parentId) {
cateSecondList.push({value: two.id, label: two.name}) cateSecondList.push({ value: two.id, label: two.name })
} }
}) })
cateFirstList.push({value: one.id, label: one.name, children: cateSecondList}) cateFirstList.push({ value: one.id, label: one.name, children: cateSecondList })
}); });
this.taskCateList = cateFirstList; this.taskCateList = cateFirstList;
}) })
}, },
getCpUserList(){ getCpUserList() {
getCpUserPage({ getCpUserPage({
pageNo: 1, pageNo: 1,
pageSize: 100 pageSize: 100
}).then(res=>{ }).then(res => {
this.cpUserList = res.data.list; this.cpUserList = res.data.list;
}) })
}, },
getCropList(){ getCropList() {
getCropPage({ getCropPage({
pageNo: 1, pageNo: 1,
pageSize: 100 pageSize: 100
}).then(res=>{ }).then(res => {
this.cropList = res.data.list; this.cropList = res.data.list;
}) })
}, },
getProjectList(){ getProjectList() {
getProjectPage({ getProjectPage({
pageNo: 1, pageNo: 1,
pageSize: 100 pageSize: 100
}).then(res=>{ }).then(res => {
this.projectList = res.data.list; this.projectList = res.data.list;
}) })
}, },
/**查询资源*/ /**查询资源*/
getResource(){ getResource() {
getResourcePage({ getResourcePage({
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
}).then(res=>{ }).then(res => {
this.resourceList = res.data.list; this.resourceList = res.data.list;
this.getList(); this.getList();
}) })
}, },
getResourceTypeList(){ getResourceTypeList() {
getResourceTypePage({ getResourceTypePage({
pageNo: 1, pageNo: 1,
pageSize: 100 pageSize: 100
}).then(res=>{ }).then(res => {
this.resourceTypeList = res.data.list; this.resourceTypeList = res.data.list;
}) })
}, },
@ -457,7 +423,7 @@ export default {
this.loading = true; this.loading = true;
// this.assemArea(); // this.assemArea();
// 处理查询参数 // 处理查询参数
let params = {...this.queryParams}; let params = { ...this.queryParams };
this.addBeginAndEndTime(params, this.dateRangePlanStartTime, 'planStartTime'); this.addBeginAndEndTime(params, this.dateRangePlanStartTime, 'planStartTime');
this.addBeginAndEndTime(params, this.dateRangePlanEndTime, 'planEndTime'); this.addBeginAndEndTime(params, this.dateRangePlanEndTime, 'planEndTime');
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime'); this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
@ -466,33 +432,21 @@ export default {
//1 循环list //1 循环list
response.data.list.forEach(element => { response.data.list.forEach(element => {
if(element.images != null){ if (element.images != null) {
//有图片转json //有图片转json
element.images = JSON.parse(element.images); element.images = JSON.parse(element.images);
}else{ } else {
//无图片给个空 //无图片给个空
element.images = []; element.images = [];
} }
//2 循环每个list对象的resource
element.resources = JSON.parse(element.resources);
let resourceName = '';
element.resources.forEach((inn) =>{
//3 每个resouce循环比较 resourceList，取得名字
this.resourceList.forEach((resource) =>{
if(inn == resource.id){
resourceName += (resource.name + "、\n");
}
}
)
})
element.resources = resourceName;
element.executorPerson = JSON.parse(element.executorPerson); element.executorPerson = JSON.parse(element.executorPerson);
let executorName = ''; let executorName = '';
element.executorPerson.forEach((exe)=>{ element.executorPerson.forEach((exe) => {
this.cpUserList.forEach((cp)=>{ this.cpUserList.forEach((cp) => {
if(exe == cp.id){ if (exe == cp.id) {
executorName += (cp.name +"、\n"); executorName += (cp.name + "、\n");
} }
}) })
}) })
@ -501,10 +455,10 @@ export default {
if (element.areas != null) { if (element.areas != null) {
element.areas = JSON.parse(element.areas); element.areas = JSON.parse(element.areas);
let areaName = ""; let areaName = "";
element.areas.forEach(item =>{ element.areas.forEach(item => {
let p = this.areasList.filter(t => t.id == item[0])[0].name; let p = this.areasList.filter(t => t.id == item[0])[0].name;
let s = this.areasList.filter(t => t.id == item[1])[0].name; let s = this.areasList.filter(t => t.id == item[1])[0].name;
areaName += p +"/" + s +"、\n"; areaName += p + "/" + s + "、\n";
}) })
element.areas = areaName; element.areas = areaName;
} }
@ -519,23 +473,23 @@ export default {
getSearchList() { getSearchList() {
this.loading = true; this.loading = true;
// 处理查询参数 // 处理查询参数
let params = {...this.queryParams}; let params = { ...this.queryParams };
this.addBeginAndEndTime(params, this.dateRangePlanStartTime, 'planStartTime'); this.addBeginAndEndTime(params, this.dateRangePlanStartTime, 'planStartTime');
this.addBeginAndEndTime(params, this.dateRangePlanEndTime, 'planEndTime'); this.addBeginAndEndTime(params, this.dateRangePlanEndTime, 'planEndTime');
this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime'); this.addBeginAndEndTime(params, this.dateRangeCreateTime, 'createTime');
// 执行查询 // 执行查询
getTaskSearchPage(params).then(response => { getTaskSearchPage(params).then(response => {
response.data.list.forEach(element => { response.data.list.forEach(element => {
if(element.images != null){ if (element.images != null) {
element.images = JSON.parse(element.images); element.images = JSON.parse(element.images);
}else{ } else {
element.images = []; element.images = [];
} }
element.resources = JSON.parse(element.resources); element.resources = JSON.parse(element.resources);
let resourceName = ''; let resourceName = '';
element.resources.forEach((inn) =>{ element.resources.forEach((inn) => {
this.resourceList.forEach((resource) =>{ this.resourceList.forEach((resource) => {
if(inn == resource.id){ if (inn == resource.id) {
resourceName += (resource.name + "、\n"); resourceName += (resource.name + "、\n");
} }
} }
@ -560,7 +514,7 @@ export default {
id: undefined, id: undefined,
taskCateId: undefined, taskCateId: undefined,
taskCateName: undefined, taskCateName: undefined,
resources: undefined, resources: [],
images: undefined, images: undefined,
planStartTime: undefined, planStartTime: undefined,
planEndTime: undefined, planEndTime: undefined,
@ -570,7 +524,7 @@ export default {
cropNum: undefined, cropNum: undefined,
mainPerson: undefined, mainPerson: undefined,
executorPerson: undefined, executorPerson: undefined,
workingHours: undefined workingHours: undefined,
}; };
this.resetForm("form"); this.resetForm("form");
}, },
@ -606,13 +560,13 @@ export default {
const id = row.id; const id = row.id;
getTask(id).then(response => { getTask(id).then(response => {
this.form = response.data; this.form = response.data;
if(response.data.resources != null){ if (response.data.resources != null) {
let resourceArr = JSON.parse(response.data.resources); let resourceArr = JSON.parse(response.data.resources);
this.form.resources = resourceArr; this.form.resources = resourceArr;
this.selectResourceList = resourceArr; this.selectResourceList = resourceArr;
} }
if(response.data.images != null){ if (response.data.images != null) {
let imagesArr = JSON.parse(response.data.images); let imagesArr = JSON.parse(response.data.images);
this.form.images = imagesArr; this.form.images = imagesArr;
} }
@ -637,7 +591,6 @@ export default {
return; return;
} }
//资源转json //资源转json
this.form.resources = JSON.stringify(this.selectResourceList);
this.form.executorPerson = JSON.stringify(this.executorPerson); this.form.executorPerson = JSON.stringify(this.executorPerson);
this.form.areas = JSON.stringify(this.form.areas); this.form.areas = JSON.stringify(this.form.areas);
//图片转json //图片转json
@ -671,17 +624,17 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const id = row.id; const id = row.id;
this.$modal.confirm('是否确认删除农场项目编号为"' + id + '"的数据项?').then(function() { this.$modal.confirm('是否确认删除农场项目编号为"' + id + '"的数据项?').then(function () {
return deleteTask(id); return deleteTask(id);
}).then(() => { }).then(() => {
this.getList(); this.getList();
this.$modal.msgSuccess("删除成功"); this.$modal.msgSuccess("删除成功");
}).catch(() => {}); }).catch(() => { });
}, },
/** 导出按钮操作 */ /** 导出按钮操作 */
handleExport() { handleExport() {
// 处理查询参数 // 处理查询参数
let params = {...this.queryParams}; let params = { ...this.queryParams };
params.pageNo = undefined; params.pageNo = undefined;
params.pageSize = undefined; params.pageSize = undefined;
this.addBeginAndEndTime(params, this.dateRangePlanStartTime, 'planStartTime'); this.addBeginAndEndTime(params, this.dateRangePlanStartTime, 'planStartTime');
@ -694,53 +647,27 @@ export default {
}).then(response => { }).then(response => {
this.$download.excel(response, '${table.classComment}.xls'); this.$download.excel(response, '${table.classComment}.xls');
this.exportLoading = false; this.exportLoading = false;
}).catch(() => {}); }).catch(() => { });
}, },
twoRescoure(){ twoRescoure() {
let firstList = []; let firstList = [];
this.resourceTypeList.forEach((type) =>{ this.resourceTypeList.forEach((type) => {
let secondList = []; let secondList = [];
this.resourceList.forEach((res)=>{ this.resourceList.forEach((res) => {
if(res.resourceType == type.id){ if (res.resourceType == type.id) {
secondList.push({value: res.id, label:res.name}); secondList.push({ value: res.id, label: res.name });
} }
}) })
firstList.push({value: type.id, label : type.name, children: secondList}); firstList.push({ value: type.id, label: type.name, children: secondList });
}) })
this.twoList = firstList; this.twoList = firstList;
}, },
changeCateOne(row){ changeCateOne(row) {
this.cateTwoList = this.taskCateAllList.filter(t => t.parentId == row); this.cateTwoList = this.taskCateAllList.filter(t => t.parentId == row);
}, },
changeResources(row){
let selectROW = this.$refs['chooseR'].getCheckedNodes();
if (row.length == 0) {
this.resourceNumberList = [];
return ;
}
if (selectROW.filter(t=>t.hasChildren).length == 0) {
//节点数量为0 清除待填数据
this.resourceNumberList = [];
}
selectROW.forEach(item =>{ assemArea() {
if(!item.hasChildren){
//没有腹肌才算
let obj = {
pId: item.parent.data.value,
pValue: item.parent.data.label,
id:item.data.value,
value: item.data.label
};
var index = this.resourceNumberList.findIndex(item => item.id === obj.id);
if(index == -1){
this.resourceNumberList.push(obj);
}
}
})
},
assemArea(){
let parentLsit = this.areasList.filter(t => t.parentId == 0); let parentLsit = this.areasList.filter(t => t.parentId == 0);
let sonList = this.areasList.filter(s => s.parentId != 0); let sonList = this.areasList.filter(s => s.parentId != 0);
@ -751,20 +678,20 @@ export default {
sonList.forEach(s => { sonList.forEach(s => {
if (p.id == s.parentId) { if (p.id == s.parentId) {
this.areasSonList.push(s); this.areasSonList.push(s);
secondList.push({value:s.id, label:s.name}); secondList.push({ value: s.id, label: s.name });
} }
}) })
firstList.push({value: p.id, label:p.name, children: secondList}) firstList.push({ value: p.id, label: p.name, children: secondList })
}) })
this.assemAreaList = firstList; this.assemAreaList = firstList;
}, },
changeProject(row){ changeProject(row) {
this.form.areas = null; this.form.areas = null;
this.assemArea(); this.assemArea();
let projectArea = JSON.parse(this.projectList.filter(project => project.id == row)[0].areas); let projectArea = JSON.parse(this.projectList.filter(project => project.id == row)[0].areas);
let filterArr = []; let filterArr = [];
this.assemAreaList.forEach(t=>{ this.assemAreaList.forEach(t => {
projectArea.forEach(a=>{ projectArea.forEach(a => {
if (a == t.value) { if (a == t.value) {
filterArr.push(t); filterArr.push(t);
} }

19
vue.config.js
Unescape View File

@ -77,12 +77,12 @@ module.exports = {
}, },
plugins: [ plugins: [
// http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件 // http://doc.ruoyi.vip/ruoyi-vue/other/faq.html#使用gzip解压缩静态文件
new CompressionPlugin({ // new CompressionPlugin({
test: /\.(js|css|html)?$/i, // 压缩文件格式 // test: /\.(js|css|html)?$/i, // 压缩文件格式
filename: '[path].gz[query]', // 压缩后的文件名 // filename: '[path].gz[query]', // 压缩后的文件名
algorithm: 'gzip', // 使用gzip压缩 // algorithm: 'gzip', // 使用gzip压缩
minRatio: 0.8 // 压缩率小于1才会压缩 // minRatio: 0.8 // 压缩率小于1才会压缩
}) // })
], ],
}, },
chainWebpack(config) { chainWebpack(config) {
@ -138,6 +138,13 @@ module.exports = {
inline: /runtime\..*\.js$/ inline: /runtime\..*\.js$/
}]) }])
.end() .end()
config.plugin('compressionPlugin').use(new CompressionPlugin({
test: /\.(js|css|less)$/, // 匹配文件名
threshold: 10240, // 对超过10k的数据压缩
deleteOriginalAssets: true // 删除源文件
}))
config config
.optimization.splitChunks({ .optimization.splitChunks({
chunks: 'all', chunks: 'all',

Write Preview
Loading…
Cancel
Save