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
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      package.json
  2. 179
      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",
"@riophae/vue-treeselect": "0.4.0",
"ant-design-vue": "1.5.2",
"area-data": "^5.0.6",
"axios": "0.24.0",
"bpmn-js-token-simulation": "^0.10.0",
"cache-loader": "^2.0.1",
@ -100,7 +101,7 @@
"bpmn-js": "8.9.0",
"bpmn-js-properties-panel": "0.46.0",
"chalk": "4.1.0",
"compression-webpack-plugin": "5.0.2",
"compression-webpack-plugin": "^5.0.2",
"connect": "3.6.6",
"eslint": "7.15.0",
"eslint-config-airbnb-base": "^14.0.0",

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

@ -15,12 +15,12 @@
<el-input v-model="queryParams.resources" placeholder="请输入" clearable @keyup.enter.native="handleQuery" />
</el-form-item>
<el-form-item label="开始时间">
<el-date-picker v-model="dateRangePlanStartTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
<el-date-picker v-model="dateRangePlanStartTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="结束时间">
<el-date-picker v-model="dateRangePlanEndTime" style="width: 240px" value-format="yyyy-MM-dd"
type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
<el-date-picker v-model="dateRangePlanEndTime" style="width: 240px" value-format="yyyy-MM-dd" type="daterange"
range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="优先级" prop="weight">
<el-input v-model="queryParams.weight" placeholder="请输入优先级" clearable @keyup.enter.native="handleQuery" />
@ -38,8 +38,8 @@
v-hasPermi="['farm:task:create']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
v-hasPermi="['farm:task:export']">导出</el-button>
<el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
:loading="exportLoading" v-hasPermi="['farm:task:export']">导出</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
@ -76,15 +76,16 @@
<span> {{ cateTwoList.find(t => t.id == scope.row.taskCateName).name }} </span>
</template>
</el-table-column>
<el-table-column label="需要的资源" align="center" prop="resources" />
<el-table-column label="需要的资源" align="center" prop="resources">
<template slot-scope="scope">
<span>{{resouceConvert(scope.row.resources)}}</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[0] != null" style="" :src="scope.row.images[0]"
:preview-src-list="scope.row.images">
</el-image>
</template>
@ -124,11 +125,7 @@
<el-form-item label="项目选择" prop="projectId">
<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">
<el-option v-for="item in projectList" :key="item.id" :label="item.name" :value="item.id">
{{ item.name }}
</el-option>
</el-select>
@ -136,11 +133,7 @@
<el-form-item label="负责人" prop="mainPerson">
<el-select v-model="form.mainPerson" placeholder="请选择">
<el-option
v-for="item in cpUserList"
:key="item.id"
:label="item.name"
:value="item.id">
<el-option v-for="item in cpUserList" :key="item.id" :label="item.name" :value="item.id">
{{ item.name }}
</el-option>
</el-select>
@ -148,33 +141,20 @@
<el-form-item label="执行人" prop="executorPerson">
<el-select v-model="executorPerson" multiple placeholder="请选择">
<el-option
v-for="item in cpUserList"
:key="item.id"
:label="item.name"
:value="item.id">
<el-option v-for="item in cpUserList" :key="item.id" :label="item.name" :value="item.id">
{{ item.name }}
</el-option>
</el-select>
</el-form-item>
<el-form-item label="区域选择" prop="assemAreaList">
<el-cascader
:options="assemAreaList"
:props="props"
clearable
ref="chooseA"
v-model="form.areas">
<el-cascader :options="assemAreaList" :props="props" clearable ref="chooseA" v-model="form.areas">
</el-cascader>
</el-form-item>
<el-form-item label="作物选择" prop="cropId">
<el-select v-model="form.cropId" placeholder="请选择">
<el-option
v-for="item in cropList"
:key="item.id"
:label="item.name"
:value="item.id">
<el-option v-for="item in cropList" :key="item.id" :label="item.name" :value="item.id">
{{ item.name }}
</el-option>
</el-select>
@ -186,11 +166,7 @@
<el-form-item label="任务类型" prop="taskCateId">
<el-select v-model="form.taskCateId" placeholder="请选择" @change="changeCateOne">
<el-option
v-for="item in cateOneList"
:key="item.id"
:label="item.name"
:value="item.id">
<el-option v-for="item in cateOneList" :key="item.id" :label="item.name" :value="item.id">
{{ item.name }}
</el-option>
</el-select>
@ -198,52 +174,20 @@
<el-form-item label="任务内容" prop="taskCateName">
<el-select v-model="form.taskCateName" placeholder="请选择">
<el-option
v-for="item in cateTwoList"
:key="item.id"
:label="item.name"
:value="item.id">
<el-option v-for="item in cateTwoList" :key="item.id" :label="item.name" :value="item.id">
{{ item.name }}
</el-option>
</el-select>
</el-form-item>
<el-form-item label="资源选择" prop="resources">
<el-cascader
:options="twoList"
:props="props"
clearable
ref="chooseR"
@change="changeResources"
v-model="form.resources">
<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>
</el-form-item>
<!-- <el-form-item label="填写数量" prop="resources">
<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-input v-model="item.num"/>
</el-form-item>
</el-form>
@ -255,10 +199,12 @@
<imageUpload v-model="form.images" />
</el-form-item>
<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 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 label="优先级" prop="weight">
<el-input v-model="form.weight" placeholder="请输入优先级" />
@ -326,7 +272,8 @@ export default {
workingHours: null
},
// 表单参数
form: {},
form: {
},
// 表单校验
rules: {
projectId: [{ required: true, message: "不能为空", trigger: "blur" }],
@ -365,7 +312,6 @@ export default {
assemAreaList: [],
areasParentList: [],
areasSonList: [],
};
},
created() {
@ -378,6 +324,26 @@ export default {
this.getAreasList();
},
methods: {
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({
pageNo: 1,
@ -473,19 +439,7 @@ export default {
//无图片给个空
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);
let executorName = '';
@ -560,7 +514,7 @@ export default {
id: undefined,
taskCateId: undefined,
taskCateName: undefined,
resources: undefined,
resources: [],
images: undefined,
planStartTime: undefined,
planEndTime: undefined,
@ -570,7 +524,7 @@ export default {
cropNum: undefined,
mainPerson: undefined,
executorPerson: undefined,
workingHours: undefined
workingHours: undefined,
};
this.resetForm("form");
},
@ -637,7 +591,6 @@ export default {
return;
}
//资源转json
this.form.resources = JSON.stringify(this.selectResourceList);
this.form.executorPerson = JSON.stringify(this.executorPerson);
this.form.areas = JSON.stringify(this.form.areas);
//图片转json
@ -713,33 +666,7 @@ export default {
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 =>{
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 sonList = this.areasList.filter(s => s.parentId != 0);

19
vue.config.js
Unescape View File

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

Write Preview
Loading…
Cancel
Save