diff --git a/src/views/ThemeAnalize/tbEvent.js b/src/views/ThemeAnalize/tbEvent.js
index 1332940..4cb4ca6 100644
--- a/src/views/ThemeAnalize/tbEvent.js
+++ b/src/views/ThemeAnalize/tbEvent.js
@@ -53,6 +53,7 @@ export default {
getSchemeDataByGuid(obj).then(res => {
let data = res.data;
this.addForm = data;
+ this.selTime = [data.StartTime, data.EndTime]
this.doCombo();
this.doCombo2();
this.modalObj.visible = true;
@@ -164,6 +165,7 @@ export default {
},
//重置表单
reSet() {
+ this.selTime = [];
this.addForm = {
Name: "",
Classify: 0,
@@ -198,22 +200,7 @@ export default {
{
path: '/ThemeData',
query: {
- // action: "getList",
- // sTimeType,
- // sQuDao,
- // sQingGan,
- // iPageIndex,
- // iPageSize,
- startTime: sTime,
- endTime: eTime,
- // token: this.getToken,
- // sType: "ZhuTiFenXiBl",
- sGuid: guids,
- // iGroupBy,
- // isSourcetype,
- // listType,
- // website,
- // iTimeType
+ sGuid: guids,
},
}
)
diff --git a/src/views/ThemeData/getApi.js b/src/views/ThemeData/getApi.js
index 85e18b4..510844b 100644
--- a/src/views/ThemeData/getApi.js
+++ b/src/views/ThemeData/getApi.js
@@ -1,5 +1,6 @@
-import { getQuDao, getQingGan, getTwoTime,getQueryType ,getToExcelField} from "@/api/comm";
+import { getQuDao, getQingGan, getQueryType ,getToExcelField} from "@/api/comm";
import {getList} from "@/api/ThemeAnalizeDec"
+import {getSchemeDataByGuid} from "@/api/ThemeAnalize"
export default {
//获取表格数据
getTableData() {
@@ -14,11 +15,11 @@ export default {
let ssims = [];
let ssk = [...this.sk];
data.forEach((ele) => {
- let _source = ele._source;
- let id = _source.id;
- ssims.push(ele._source.ssid);
- ids.push(id);
- arr.push(_source);
+ let _source = ele._source;
+ let id = _source.id;
+ ssims.push(ele._source.ssid);
+ ids.push(id);
+ arr.push(_source);
});
if(this.tableAll) {
ids.forEach(ele => {
@@ -31,6 +32,11 @@ export default {
})
this.sk = ssk;
}
+ arr.forEach(ele => {
+ ele.title = ele.title.replace(/<.*?>/ig,"")
+ // let keyWords = ele.keywords.split(',');
+ // ele.kwList = ele.keywords.split(',');
+ })
this.tbData = arr;
this.tableLoading = false;
})
@@ -39,19 +45,21 @@ export default {
getListData() {
},
- // 获取时间选项
+ // 获取设置的时间
+ getSetTime() {},
+ // 获取设置的时间
getTime() {
+ let obj = {
+ token: this.getToken,
+ Guids: this.$route.query.sGuid
+ }
return new Promise((resolve, reject) => {
- getTwoTime().then((res) => {
+ getSchemeDataByGuid(obj).then((res) => {
let data = res.data;
- this.timesSel = data;
- this.form.sTimeType = this.timesSel[0].key;
- let arr = [];
- data.forEach((ele) => {
- let value = ele.value;
- arr.push(value);
- });
- this.buttonTime = arr;
+ this.form.sStartTime = data.StartTime;
+ this.form.sEndTime = data.EndTime
+ this.setStartTime = data.StartTime;
+ this.setEndTime = data.EndTime
resolve(data);
})
.catch(() => {
diff --git a/src/views/ThemeData/index.vue b/src/views/ThemeData/index.vue
index c96cbbd..8cf2358 100644
--- a/src/views/ThemeData/index.vue
+++ b/src/views/ThemeData/index.vue
@@ -6,9 +6,10 @@
返回主题分析
-
时间：
-
-
+ 时间：{{setStartTime}} — {{setEndTime}}
+ 自定义：
+
+
@@ -33,14 +34,10 @@
{{ item.value }}
-
-
-
-
- 去重筛选：
+ 去重筛选：
@@ -139,12 +136,14 @@ export default {
iTimeType: '' //时间筛选 0发布时间 1入库时间
},
//时间
- tValue: 0,
+ // tValue: 0,
selVal: 4,
selTime: [],
timesSel: [],
- buttonTime: [],
+ // buttonTime: [],
selectPriceDate: "",
+ setStartTime: '',
+ setEndTime: '',
//渠道
quDao: [],
plainOptions: [],
@@ -172,6 +171,11 @@ export default {
key: "title",
scopedSlots: { customRender: "titlex" },
},
+ {
+ title: "关键字",
+ dataIndex: "keywords",
+ key: "keywords",
+ },
{
title: "来源",
dataIndex: "source",
@@ -208,6 +212,11 @@ export default {
methods: {
...tableEvent,
...getApi
+ },
+ filters: {
+ keyStr(str) {
+
+ }
}
}
@@ -230,6 +239,11 @@ export default {
font-size: 14px;
color: #fff;
}
+ .s2 {
+ font-size: 14px;
+ color: #fff;
+ margin-left: 24px;
+ }
}
.d-inner-d2 {
display: flex;
diff --git a/src/views/ThemeData/tableEvent.js b/src/views/ThemeData/tableEvent.js
index 90ad63a..a79e3c2 100644
--- a/src/views/ThemeData/tableEvent.js
+++ b/src/views/ThemeData/tableEvent.js
@@ -51,9 +51,7 @@ export default {
this.doFormQudao(qudao);
this.doFormQS(series);
- this.form.sTimeType = this.$route.query.sTimeType || '4';
- this.form.sStartTime = this.$route.query.startTime || "";
- this.form.sEndTime = this.$route.query.endTime || "";
+ this.form.sTimeType = 4;
if (this.form.sStartTime && this.form.sEndTime) {
this.selTime = [this.form.sStartTime, this.form.sEndTime];
}
@@ -77,7 +75,7 @@ export default {
path: '/ThemeBoard',
query: {
sGuid: this.$route.query.sGuid,
- sType: 'ZhuTiFenXiBl',
+ // sType: 'ZhuTiFenXiBl',
token: this.getToken,
website: this.form.website,
sTitle: this.form.sTitle,
@@ -103,18 +101,20 @@ export default {
this.getTableData();
},
disabledDate(current) {
- return current > moment();
- },
- handlerTime(n) {
- let ele = this.timesSel[n];
- this.form.sTimeType = ele.key;
- this.sk = [];
- this.tableAll = false;
- if (ele.key != this.selVal) {
- this.getTableData();
- // this.getList();
- }
+ let s = moment(this.setStartTime);
+ let e = moment(this.setEndTime);
+ return current < s || current > e
},
+ // handlerTime(n) {
+ // let ele = this.timesSel[n];
+ // this.form.sTimeType = ele.key;
+ // this.sk = [];
+ // this.tableAll = false;
+ // if (ele.key != this.selVal) {
+ // this.getTableData();
+ // // this.getList();
+ // }
+ // },
// 选择情感和渠道的情况
onChange(val, type) {
this.noClick = true;