From 8232f315a1d4530a76846ce4b9c790a4c18071a0 Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Thu, 4 Aug 2022 15:31:00 +0800
Subject: [PATCH] zx
---
components/option/bubbleWord.js | 2 +-
pages/insight/pages/addTheme/index.js | 32 +++++++++++++------
pages/insight/pages/addTheme/index.wxml | 22 ++++++-------
pages/insight/pages/addTheme/index.wxss | 2 +-
.../pages/brandInsight/TailInsight/index.js | 11 ++-----
.../pages/brandInsight/TailInsight/index.wxml | 3 +-
.../pages/brandInsight/weiboInsight/index.js | 11 ++-----
.../pages/eventInsight/evTailwing/index.js | 11 ++-----
.../pages/eventInsight/evTotal/index.js | 11 ++-----
.../pages/modalInsight/TailInsight/index.js | 11 ++-----
.../pages/modalInsight/weiboInsight/index.js | 11 ++-----
11 files changed, 50 insertions(+), 77 deletions(-)
diff --git a/components/option/bubbleWord.js b/components/option/bubbleWord.js
index eedd2c1..f98ceed 100644
--- a/components/option/bubbleWord.js
+++ b/components/option/bubbleWord.js
@@ -69,7 +69,7 @@ export default function createWordCloud(data) {
shape: 'circle',
// rotationRange: [0, 0], //旋转角度的范围
rotationStep: 90, //旋转角度的步长
- //shape: 'circle',
+ shape: 'circle',
sizeRange: [6, 48], //字体大小范围
gridSize: 8, //字间距
// maskImage: maskImage,
diff --git a/pages/insight/pages/addTheme/index.js b/pages/insight/pages/addTheme/index.js
index 42f1f07..692bbd7 100644
--- a/pages/insight/pages/addTheme/index.js
+++ b/pages/insight/pages/addTheme/index.js
@@ -18,12 +18,19 @@ Page({
activeIcon: 'more',
}
],
+ //表单
+ Name: '',
+ StartTime: moment().valueOf(),
+ EndTime: moment().valueOf(),
+ DetailsData: [],
+ AnalyzeWord: '', // 和 或 的主体词
+ HuoWord:'', // 和 或 的可选词
+ HuoWord2:'', // 或 的可选词
+ PaiChu: '', // 排除词
+ highAnalizeWord: '', // 高级模式分析词
+ //
active: 0,
activeNames: [],
- start: moment().format("YYYY-MM-DD HH:mm:ss"),
- startTime: moment().valueOf(),
- end: moment().format("YYYY-MM-DD HH:mm:ss"),
- endTime: moment().valueOf(),
show1: false,
show2: false,
dt: '',
@@ -40,21 +47,28 @@ Page({
onShow() {
},
+ //表单
+ themeNameInput(event) {
+ this.setData({ Name: event.detail.value})
+ },
+ //
changeTips(value) {
this.setData({
activeNames: value.detail,
});
},
- onConfirm() {
+ onConfirm(event) {
+ var time = moment(event.detail).format("YYYY-MM-DD HH:mm:ss")
this.setData({
show1: false,
- start: this.data.dt
+ StartTime: time
});
},
- onConfirm2() {
+ onConfirm2(event) {
+ var time = moment(event.detail).format("YYYY-MM-DD HH:mm:ss")
this.setData({
- show2: false,
- start: this.data.dt2
+ show1: false,
+ EndTime: time
});
},
onDisplay() {
diff --git a/pages/insight/pages/addTheme/index.wxml b/pages/insight/pages/addTheme/index.wxml
index 5e1fb38..123b2f4 100644
--- a/pages/insight/pages/addTheme/index.wxml
+++ b/pages/insight/pages/addTheme/index.wxml
@@ -11,7 +11,7 @@
主题名称
-
+
监测开始时间
@@ -21,10 +21,10 @@
-
+
-
+
@@ -76,27 +76,27 @@
必选词（必选词逗号间是和的关系）
-
+
可选词（可选词与必选词是或的关系）
-
+
- 主题词（主题词逗号之间是或的关系）
-
+ 主体词（主体词逗号之间是或的关系）
+
关键词组一（主题词逗号之间是或的关系）
-
+
关键词组二（主题词逗号之间是或的关系）
-
+
排除词（搜索结果将不会含有排除词的数据）
-
+
分析词设置
-
+
diff --git a/pages/insight/pages/addTheme/index.wxss b/pages/insight/pages/addTheme/index.wxss
index 95482f2..6bf4614 100644
--- a/pages/insight/pages/addTheme/index.wxss
+++ b/pages/insight/pages/addTheme/index.wxss
@@ -1,6 +1,6 @@
.at-content{
margin-top: 34rpx;
- width: 686rpx;
+ width: 92%;
/* height: 528rpx; */
margin-left:32rpx;
padding: 0rpx 0rpx 32rpx 0rpx;
diff --git a/pages/insight/pages/brandInsight/TailInsight/index.js b/pages/insight/pages/brandInsight/TailInsight/index.js
index 296df8a..064b0f0 100644
--- a/pages/insight/pages/brandInsight/TailInsight/index.js
+++ b/pages/insight/pages/brandInsight/TailInsight/index.js
@@ -101,18 +101,11 @@ Component({
sBrand: wx.getStorageSync('sBrand') || '',
}).then(res => {
let arr1 = [];
- let skey = {
- 34: 50,
- 3: 416,
- 20: 1500,
- 23: 250
- };
Object.keys(res).forEach(key => {
- let o = [key, res[key] / skey[wx.getStorageSync('sTimeType')]]
+ let o = [key, res[key]]
arr1.push(o)
});
- const resArr = arr1.slice(0,50);
- this.setData({wordCloudData: resArr})
+ this.setData({wordCloudData: arr1})
});
},
toEventDetail(value) {
diff --git a/pages/insight/pages/brandInsight/TailInsight/index.wxml b/pages/insight/pages/brandInsight/TailInsight/index.wxml
index dd2cd4d..5adbaa8 100644
--- a/pages/insight/pages/brandInsight/TailInsight/index.wxml
+++ b/pages/insight/pages/brandInsight/TailInsight/index.wxml
@@ -53,7 +53,8 @@
-
+
+
diff --git a/pages/insight/pages/brandInsight/weiboInsight/index.js b/pages/insight/pages/brandInsight/weiboInsight/index.js
index 9ee4cb7..6ac2401 100644
--- a/pages/insight/pages/brandInsight/weiboInsight/index.js
+++ b/pages/insight/pages/brandInsight/weiboInsight/index.js
@@ -377,18 +377,11 @@ Component({
sBrand: wx.getStorageSync('sBrand') || '',
}).then(res => {
let arr1 = [];
- let skey = {
- 34: 50,
- 3: 416,
- 20: 1500,
- 23: 250
- };
Object.keys(res).forEach(key => {
- let o = [key, res[key] / skey[wx.getStorageSync('sTimeType')]]
+ let o = [key, res[key]]
arr1.push(o)
});
- const resArr = arr1.slice(0,50);
- this.setData({wordCloudData: resArr})
+ this.setData({wordCloudData: arr1})
});
},
getKol() {
diff --git a/pages/insight/pages/eventInsight/evTailwing/index.js b/pages/insight/pages/eventInsight/evTailwing/index.js
index 46a48b5..4f7dac2 100644
--- a/pages/insight/pages/eventInsight/evTailwing/index.js
+++ b/pages/insight/pages/eventInsight/evTailwing/index.js
@@ -60,18 +60,11 @@ Component({
sRele: wx.getStorageSync('sRele') || '',
}).then(res => {
let arr1 = [];
- let skey = {
- 34: 50,
- 3: 400,
- 20: 1500,
- 23: 240
- };
Object.keys(res).forEach(key => {
- let o = [key, res[key] / skey[wx.getStorageSync('sTimeType')]]
+ let o = [key, res[key]]
arr1.push(o)
});
- const resArr = arr1.slice(0,50);
- this.setData({wordCloudData: resArr})
+ this.setData({wordCloudData: arr1})
});
},
changeWordCloud(event) {
diff --git a/pages/insight/pages/eventInsight/evTotal/index.js b/pages/insight/pages/eventInsight/evTotal/index.js
index fa9dd9c..41acaaf 100644
--- a/pages/insight/pages/eventInsight/evTotal/index.js
+++ b/pages/insight/pages/eventInsight/evTotal/index.js
@@ -129,18 +129,11 @@ Component({
sRele: wx.getStorageSync('sRele') || '',
}).then(res => {
let arr1 = [];
- let skey = {
- 34: 50,
- 3: 416,
- 20: 1500,
- 23: 250
- };
Object.keys(res).forEach(key => {
- let o = [key, res[key] / skey[wx.getStorageSync('sTimeType')]]
+ let o = [key, res[key]]
arr1.push(o)
});
- const resArr = arr1.slice(0,50);
- this.setData({wordCloudData: resArr})
+ this.setData({wordCloudData: arr1})
});
},
changeWordCloud(event) {
diff --git a/pages/insight/pages/modalInsight/TailInsight/index.js b/pages/insight/pages/modalInsight/TailInsight/index.js
index 97de4b4..f8faa88 100644
--- a/pages/insight/pages/modalInsight/TailInsight/index.js
+++ b/pages/insight/pages/modalInsight/TailInsight/index.js
@@ -89,18 +89,11 @@ Component({
sSeriesName: wx.getStorageSync('sSeriesName') || ''
}).then(res => {
let arr1 = [];
- let skey = {
- 34: 50,
- 3: 416,
- 20: 1500,
- 23: 250
- };
Object.keys(res).forEach(key => {
- let o = [key, res[key] / skey[wx.getStorageSync('sTimeType')]]
+ let o = [key, res[key]]
arr1.push(o)
});
- const resArr = arr1.slice(0,50);
- this.setData({wordCloudData: resArr})
+ this.setData({wordCloudData: arr1})
});
},
toEventDetail(value) {
diff --git a/pages/insight/pages/modalInsight/weiboInsight/index.js b/pages/insight/pages/modalInsight/weiboInsight/index.js
index 8d528c3..64984a0 100644
--- a/pages/insight/pages/modalInsight/weiboInsight/index.js
+++ b/pages/insight/pages/modalInsight/weiboInsight/index.js
@@ -285,18 +285,11 @@ Component({
sSeriesName: wx.getStorageSync('sSeriesName') || ''
}).then(res => {
let arr1 = [];
- let skey = {
- 34: 5,
- 3: 41,
- 20: 150,
- 23: 25
- };
Object.keys(res).forEach(key => {
- let o = [key, res[key] / skey[wx.getStorageSync('sTimeType')]]
+ let o = [key, res[key]]
arr1.push(o)
});
- const resArr = arr1.slice(0,50);
- this.setData({wordCloudData: resArr})
+ this.setData({wordCloudData: arr1})
});
},
getKol() {