diff --git a/src/views/BrandComparison/brandEventComparison/opt.js b/src/views/BrandComparison/brandEventComparison/opt.js
index 99156d1..97a31e2 100644
--- a/src/views/BrandComparison/brandEventComparison/opt.js
+++ b/src/views/BrandComparison/brandEventComparison/opt.js
@@ -62,7 +62,7 @@ let colors = [new echarts.graphic.LinearGradient(0, 0, 0, 1, [
offset: 1,
color: '#CC5B4166'
}
-], false)]
+], false)]
function createData(dataList = [],dx = []) {
let arr = [];
diff --git a/src/views/BrandInsight/popularEvents/opt.js b/src/views/BrandInsight/popularEvents/opt.js
index 4ea1436..0d95d47 100644
--- a/src/views/BrandInsight/popularEvents/opt.js
+++ b/src/views/BrandInsight/popularEvents/opt.js
@@ -25,7 +25,7 @@ function createData(obj = {}) {
data: obj[key],
type: 'scatter',
symbolSize: function (data) {
- return data[2] / 0.023e2;
+ return data[2] / 0.007e2;
}
}
arr.push(o)
diff --git a/src/views/ModelInsight/mlPopularEvents/opt.js b/src/views/ModelInsight/mlPopularEvents/opt.js
index d6dcdc8..32619b6 100644
--- a/src/views/ModelInsight/mlPopularEvents/opt.js
+++ b/src/views/ModelInsight/mlPopularEvents/opt.js
@@ -18,7 +18,7 @@ function createData(obj = {}) {
data: obj[key],
type: 'scatter',
symbolSize: function (data) {
- return data[2] / 0.023e2
+ return data[2] / 0.007e2;
}
}
arr.push(o)
diff --git a/src/views/ThemeBoard/BigvAnalize/opt.js b/src/views/ThemeBoard/BigvAnalize/opt.js
index 6b0e19c..c1c6186 100644
--- a/src/views/ThemeBoard/BigvAnalize/opt.js
+++ b/src/views/ThemeBoard/BigvAnalize/opt.js
@@ -13,7 +13,7 @@ function createData(ds=[], colors=[]) {
let ele = ds[i];
if(true) {
let obj = { value: ele.value*1, name: ele.key, itemStyle: {
- color: colors[index]
+ color: colors[i]
}};
arr.push(obj)
}
diff --git a/src/views/ThemeBoard/CoreTransformUser/opt.js b/src/views/ThemeBoard/CoreTransformUser/opt.js
index 1bf8b50..672dc58 100644
--- a/src/views/ThemeBoard/CoreTransformUser/opt.js
+++ b/src/views/ThemeBoard/CoreTransformUser/opt.js
@@ -13,7 +13,7 @@ function createData(ds=[], colors=[]) {
let ele = ds[i];
if(ele.value*1 > 0) {
let obj = { value: ele.value*1, name: ele.key, itemStyle: {
- color: colors[index]
+ color: colors[i]
}};
arr.push(obj)
}
diff --git a/src/views/ThemeBoard/SourceDivide/index.vue b/src/views/ThemeBoard/SourceDivide/index.vue
index 1e9c791..30f7941 100644
--- a/src/views/ThemeBoard/SourceDivide/index.vue
+++ b/src/views/ThemeBoard/SourceDivide/index.vue
@@ -97,7 +97,6 @@ export default {
this.labelData = labelData;
this.total = totalVal
this.opt = createOpt(labelData, this.colors);
- this.load = false
});
getSummarizeMerge(obj).then(res => {
let data = res.data.Affections;
@@ -115,6 +114,7 @@ export default {
this.total2 = totalVal2
this.opt2 = createOpt(labelData2, this.colors);
})
+ this.load = false
},
handlerTab(active) {
this.active = active
diff --git a/src/views/ThemeBoard/SourceDivide/opt.js b/src/views/ThemeBoard/SourceDivide/opt.js
index 1bf8b50..672dc58 100644
--- a/src/views/ThemeBoard/SourceDivide/opt.js
+++ b/src/views/ThemeBoard/SourceDivide/opt.js
@@ -13,7 +13,7 @@ function createData(ds=[], colors=[]) {
let ele = ds[i];
if(ele.value*1 > 0) {
let obj = { value: ele.value*1, name: ele.key, itemStyle: {
- color: colors[index]
+ color: colors[i]
}};
arr.push(obj)
}
diff --git a/src/views/ThemeData/getApi.js b/src/views/ThemeData/getApi.js
index a0d6bc7..30f9b62 100644
--- a/src/views/ThemeData/getApi.js
+++ b/src/views/ThemeData/getApi.js
@@ -1,4 +1,4 @@
-import { getQuDao, getQingGan, getQueryType ,getToExcelField} from "@/api/comm";
+import { getQuDao, getQingGan, getCrisis, getQueryType ,getToExcelField} from "@/api/comm";
import {getList} from "@/api/ThemeAnalizeDec"
import { doStr } from "@/utils/gol/dataTool";
import {getSchemeDataByGuid} from "@/api/ThemeAnalize"
@@ -128,6 +128,28 @@ export default {
});
});
},
+ // 获取负面等级
+ getCrisis() {
+ return new Promise((resolve, reject) => {
+ getCrisis()
+ .then((res) => {
+ let data = res.data;
+ let arr = [];
+ data.forEach((ele) => {
+ let obj = {
+ label: ele.value,
+ value: ele.key,
+ };
+ arr.push(obj);
+ });
+ this.plainOptions3 = arr;
+ resolve(arr);
+ })
+ .catch(() => {
+ reject(false);
+ });
+ });
+ },
//获取查询类型
getQueryType() {
return new Promise((resolve, reject) => {
@@ -158,15 +180,23 @@ export default {
// 给后台传情感和负面等级
doFormQS(val = []) {
let qingGan = [];
+ let crisis = [];
val.forEach((ele) => {
let n1 = this.plainOptions1.findIndex((e) => {
return e.label === ele;
});
+ let n2 = this.plainOptions3.findIndex((e) => {
+ return e.label === ele;
+ });
if (n1 != -1) {
qingGan.push(this.plainOptions1[n1].value);
}
+ if (n2 != -1) {
+ crisis.push(this.plainOptions3[n2].value);
+ }
});
this.form.sQingGan = qingGan.toString();
+ this.form.sCrisis = crisis.toString();
},
// 获取导出字段
getToExcelField(sType, token) {
diff --git a/src/views/ThemeData/index.vue b/src/views/ThemeData/index.vue
index 36bdeaf..e17e3ea 100644
--- a/src/views/ThemeData/index.vue
+++ b/src/views/ThemeData/index.vue
@@ -25,7 +25,8 @@
全部
-
+
+
关键词：
@@ -122,6 +123,7 @@ export default {
sEndTime: '',
sQuDao: '',
sQingGan: '',
+ sCrisis: '',
iPageIndex: 1,
iPageSize: 20,
sTitle: "",
@@ -163,6 +165,8 @@ export default {
btnTimes2:['不去重','相似度去重'],
//搜索框
plainOptions2:[],
+ plainOptions3: [],
+ plainOptions5: [],
searchTitle: '',
//表格
columns: [
diff --git a/src/views/ThemeData/tableEvent.js b/src/views/ThemeData/tableEvent.js
index 3c0f0de..d6d5da5 100644
--- a/src/views/ThemeData/tableEvent.js
+++ b/src/views/ThemeData/tableEvent.js
@@ -38,6 +38,7 @@ export default {
this.getQingGan(),
this.getQueryType(),
this.getQuDao(),
+ this.getCrisis(),
]).then(() => {
this.form.token = this.getToken;
this.form.sGuid = this.$route.query.sGuid;
@@ -46,8 +47,12 @@ export default {
this.form.listType = '0';
this.form.isSourcetype = 0;
this.form.sTitleType = -1;
+
let series = this.$route.query.series || [];
let qudao = this.$route.query.qudao || [];
+ this.doFormQudao(qudao);
+ this.plainOptions5 = this.doQingGanAndCrisis();
+ this.doFormQS(series);
this.form.sTimeType = 4;
if (this.form.sStartTime && this.form.sEndTime) {
@@ -61,8 +66,6 @@ export default {
} else {
this.gValue = x;
}
- this.doFormQudao(qudao);
- this.doFormQS(series);
this.getTableData();
this.getListData();
})
@@ -125,16 +128,30 @@ export default {
this.qdCheckAll = this.quDao.length === this.plainOptions.length;
this.form.sQuDao = this.quDao.toString();
} else if (type === "diaoXing") {
- this.dxIndeterminate = !!this.diaoXing.length && this.diaoXing.length < this.plainOptions1.length;
- this.dxCheckAll = this.diaoXing.length === this.plainOptions1.length;
- // this.doFormQS(this.diaoXing);
- this.form.sQingGan = this.diaoXing.toString();
+ this.dxIndeterminate = !!this.diaoXing.length && this.diaoXing.length < this.plainOptions5.length;
+ this.dxCheckAll = this.diaoXing.length === this.plainOptions5.length;
+ this.doFormQS(this.diaoXing);
+
+ // this.form.sQingGan = this.diaoXing.toString();
}
this.form.iPageIndex = 1;
Promise.all([this.getTableData(),this.getListData()]).then(() => {
this.noClick = false;
});
},
+ // 处理情感和负面等级
+ doQingGanAndCrisis() {
+ let arr = [];
+ let tes = [...this.plainOptions1, ...this.plainOptions3];
+ tes.forEach((ele) => {
+ let obj = {
+ label: ele.label,
+ value: ele.label,
+ };
+ arr.push(obj);
+ });
+ return arr;
+ },
//渠道全选
onCheckAllChangeQd(e) {
let arr = [];
@@ -159,7 +176,7 @@ export default {
//调性全选
onCheckAllChangeDx(e) {
let arr = [];
- this.plainOptions1.forEach(ele => {
+ this.plainOptions5.forEach(ele => {
let value = ele.value;
arr.push(value)
})