From 708cc8873878f11355a6c104c36f06908fa79fdd Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 04 Nov 2021 15:10:47 +0800
Subject: [PATCH] +
---
src/views/activitys/real.vue | 122 ++++++++--------------------------------
1 files changed, 24 insertions(+), 98 deletions(-)
diff --git a/src/views/activitys/real.vue b/src/views/activitys/real.vue
index 77e1ee7..cc54eb2 100644
--- a/src/views/activitys/real.vue
+++ b/src/views/activitys/real.vue
@@ -1,5 +1,5 @@
<template>
- <basic-container>
+ <basic-container class="activitys">
<avue-crud
:option="option"
:table-loading="loading"
@@ -37,7 +37,7 @@
</el-button>
</template>
- <template slot="menuLeft">
+ <!-- <template slot="menuLeft">
<el-button
v-bind:class="activeClass == 0 ? 'btn-color' : ''"
size="mini"
@@ -62,9 +62,9 @@
@click="getQBdata(3)"
>全部
</el-button>
- </template>
+ </template> -->
- <template slot="menuLeft">
+ <!-- <template slot="menuLeft">
<el-button
type="warning"
size="mini"
@@ -81,7 +81,7 @@
@click="handleExportStatis"
>导出报表
</el-button>
- </template>
+ </template> -->
<template slot-scope="{ row }" slot="jtype">
<el-tag
@@ -189,8 +189,8 @@
{
label: "任务标题",
prop: "rname",
- search: false,
- searchSpan: 3,
+ search: true,
+ searchSpan: 4,
span: 12,
rules: [
{
@@ -307,7 +307,7 @@
{
label: "省份",
prop: "province",
- search: true,
+ // search: true,
width: 100,
searchSpan: 2,
searchLabelWidth: 45,
@@ -336,7 +336,7 @@
searchLabelWidth: 1,
value: "3601",
searchSpan: 2,
- search: true,
+ // search: true,
props: {
label: "name",
value: "code",
@@ -356,7 +356,7 @@
width: 100,
searchPlaceholder: "区县",
placeholder: "区县",
- search: true,
+ // search: true,
prop: "district",
type: "select",
props: {
@@ -601,6 +601,7 @@
},
rotesData() {
// console.log(this.rotesData, "rotesDatarotesDatarotesData");
+ console.log(this.rotesData, "this.rotesDatathis.rotesData");
if (this.rotesData) {
// var haveMap = (this.option.column[9].value = "已选择路径！");
// haveMap.value = "已选择路径！";
@@ -660,7 +661,7 @@
content: row.content, //内容
rtype: row.rtype, //任务状态
};
- console.log(d);
+ // console.log(d);
// done();
// return;
let that = this;
@@ -671,7 +672,6 @@
type: "success",
message: "操作成功!",
});
- that.$store.commit("setRotesData", false); //用vuex传最终数据 清除
done();
},
(error) => {
@@ -684,10 +684,14 @@
var that = this;
if (this.$refs.modalForm == undefined) {
setTimeout(function () {
- that.$refs.modalForm.addLinesDraw(val);
+ try {
+ that.$refs.modalForm.addLinesDraw(val);
+ } catch (error) {}
}, 1500);
} else {
- that.$refs.modalForm.addLinesDraw(val);
+ try {
+ that.$refs.modalForm.addLinesDraw(val);
+ } catch (error) {}
}
},
rowUpdate(row, index, done, loading) {
@@ -699,7 +703,6 @@
type: "success",
message: "操作成功!",
});
- that.$store.commit("setRotesData", false); //用vuex传最终数据 清除
done();
},
(error) => {
@@ -770,6 +773,7 @@
});
},
beforeOpen(done, type) {
+ // console.log(type, "this.formthis.formthis.form");
// console.log(type);
// if (["edit", "view"].includes(type)) {
// getclient(this.form.id).then((res) => {
@@ -777,6 +781,11 @@
// });
// }
// console.log(this.form);
+ if (type == "add") {
+ this.$store.commit("setRotesData", false); //用vuex传最终数据 清除
+ done();
+ return;
+ }
if (this.form.line != "" && this.form != undefined) {
this.form["haveMap"] = "已绘制路径！";
} else {
@@ -794,89 +803,6 @@
this.onLoad(this.page, this.query);
},
onLoad(page, params = {}) {
- // const { releaseTimeRange } = this.query;
- // let values = {
- // ...params,
- // };
-
- // if (
- // this.$route.query.waringType &&
- // this.$route.query != undefined &&
- // this.$route.query != null &&
- // this.$route.query != ""
- // ) {
- // if (
- // this.$route.query.status != undefined &&
- // this.$route.query.status != null &&
- // this.$route.query.status == ""
- // ) {
- // this.activeClass = this.$route.query.status;
- // this.page.currentPage = 1;
- // if (this.$route.query.status == 0) {
- // params = {
- // waringType: this.$route.query.waringType,
- // beginTime: this.dateTime.day.beginTime,
- // endTime: this.dateTime.day.endTime,
- // };
- // } else if (this.$route.query.status == 1) {
- // params = {
- // waringType: this.$route.query.waringType,
- // beginTime: this.dateTime.week.beginTime,
- // endTime: this.dateTime.week.endTime,
- // };
- // } else if (this.$route.query.status == 2) {
- // params = {
- // waringType: this.$route.query.waringType,
- // beginTime: this.dateTime.month.beginTime,
- // endTime: this.dateTime.month.endTime,
- // };
- // }
- // } else {
- // this.activeClass = 0;
- // this.page.currentPage = 1;
- // params = {
- // waringType: this.$route.query.waringType,
- // beginTime: this.dateTime.day.beginTime,
- // endTime: this.dateTime.day.endTime,
- // };
- // }
-
- // if (
- // this.$route.query.startTime != undefined &&
- // this.$route.query.startTime != null &&
- // this.$route.query.startTime != ""
- // ) {
- // params = {
- // waringType: this.$route.query.waringType,
- // beginTime: this.$route.query.startTime,
- // endTime: this.$route.query.endTime,
- // };
- // }
- // }
- // if (releaseTimeRange) {
- // values = {
- // ...params,
- // beginTime: releaseTimeRange[0],
- // endTime: releaseTimeRange[1],
- // ...this.query,
- // };
- // values.releaseTimeRange = null;
- // } else {
- // values = {
- // ...params,
- // ...this.query,
- // };
- // }
-
- // if (this.$route.query.timeDesc) {
- // values = {
- // ...params,
- // timeDesc: this.$route.query.timeDesc,
- // ...this.query,
- // };
- // }
-
- // this.loading = true;
getList(page.currentPage, page.pageSize).then((res) => {
const data = res.data.data;
this.page.total = data.total;
--
Gitblit v1.9.3