diff --git a/src/api/netWorkYq/index.js b/src/api/netWorkYq/index.js
index a8af704..c9fbd7c 100644
--- a/src/api/netWorkYq/index.js
+++ b/src/api/netWorkYq/index.js
@@ -62,6 +62,14 @@ export function listCy(query) {
params: query
})
}
+// 查询词云列表
+export function getAllCy(query) {
+ return request({
+ url: '/tcZz/networkEcology/screen/getAllCy',
+ method: 'get',
+ params: query
+ })
+}
// 查询舆情预警列表
export function listYqyj(query) {
return request({
diff --git a/src/views/privateOrder/Screen.vue b/src/views/privateOrder/Screen.vue
index a5496e9..a059815 100644
--- a/src/views/privateOrder/Screen.vue
+++ b/src/views/privateOrder/Screen.vue
@@ -37,7 +37,7 @@
-
+
diff --git a/src/views/privateOrder/ecosphere/components/componentRight.vue b/src/views/privateOrder/ecosphere/components/componentRight.vue
index 4361ea8..a172a38 100644
--- a/src/views/privateOrder/ecosphere/components/componentRight.vue
+++ b/src/views/privateOrder/ecosphere/components/componentRight.vue
@@ -3,7 +3,7 @@
* @Author: kery.chen
* @Description: 总体概览右侧
* @Date: 2021-11-30 11:08:50
- * @LastEditTime: 2024-10-09 17:18:59
+ * @LastEditTime: 2024-10-11 11:57:43
* @FilePath : \\tcingiocpro\\src\\views\\privateOrder\\ecosphere\\components\\componentRight.vue
-->
@@ -213,19 +213,19 @@ export default {
num: 0
},
{
- name: (nmonth - 1) + '月',
+ name: (nmonth - 2) + '月',
num: 0
},
{
- name: (nmonth - 1) + '月',
+ name: (nmonth - 3) + '月',
num: 0
},
{
- name: (nmonth - 1) + '月',
+ name: (nmonth - 4) + '月',
num: 0
},
{
- name: (nmonth - 1) + '月',
+ name: (nmonth - 5) + '月',
num: 0
},
// {
@@ -382,20 +382,17 @@ export default {
async managescreenData(){
// let res = await managescreen()
screenqinglang().then(res=>{
- let data1 = res.data.screenQinglangWeiguiResponse || [];
- let data2 = res.data.screenQinglangWeifanResponse || [];
+ let data1 = res.data
let arr1 = [],arr2 = [];
data1.forEach(item=>{
let obj = {};
+ let objTwo = {};
obj.name = this.getDate(item.dateTime)
obj.num = item.count2;
+ objTwo.name = this.getDate(item.dateTime)
+ objTwo.num = item.count1;
arr2.push(obj)
- })
- data2.forEach(item=>{
- let obj = {};
- obj.name = this.getDate(item.dateTime)
- obj.num = item.count1;
- arr1.push(obj)
+ arr1.push(objTwo)
})
return {arr1,arr2}
}).then((res)=>{
@@ -482,7 +479,8 @@ export default {
},
getDate(date){
// 2023-10-17 15:14:07 截取月份
- const result = /-(\d{2})-/.exec(date);
+ // const result = /-(\d{2})-/.exec(date);
+ const result = date.split("-")
if (result !== null && result.length > 1) {
const month = result[1];
switch(month){
diff --git a/src/views/privateOrder/positiveEnergy/components/componentRight.vue b/src/views/privateOrder/positiveEnergy/components/componentRight.vue
index 56971aa..d0dbd2b 100644
--- a/src/views/privateOrder/positiveEnergy/components/componentRight.vue
+++ b/src/views/privateOrder/positiveEnergy/components/componentRight.vue
@@ -2,7 +2,7 @@
* @Author: lough
* @Date: 2021-12-17 10:07:07
* @LastEditors: JC9527
- * @LastEditTime: 2024-10-10 10:48:11
+ * @LastEditTime: 2024-10-11 09:43:02
* @Description:
-->
@@ -128,8 +128,8 @@ export default {
this.bjNumName = '本级网评指令比例';
this.sjNum = res.rows[0].count2;
this.sjNumName = '上级网评指令比例';
- this.sjdata = Math.round(this.bjNum);
- this.bjdata = Math.round(this.sjNum);
+ this.sjdata = Math.round(this.sjNum);
+ this.bjdata = Math.round(this.bjNum);
this.inItCylinder();
})
},
diff --git a/src/views/privateOrder/sentiment/components/WordCloud.vue b/src/views/privateOrder/sentiment/components/WordCloud.vue
index 8f50287..0d542d0 100644
--- a/src/views/privateOrder/sentiment/components/WordCloud.vue
+++ b/src/views/privateOrder/sentiment/components/WordCloud.vue
@@ -44,7 +44,7 @@ class Tag {
}
import { keyWords } from "@/api/common";
import { wordCloud } from "@/api/publicOpinion";
-import { listCy } from "@/api/netWorkYq";
+import { getAllCy } from "@/api/netWorkYq";
export default {
props: {},
@@ -77,8 +77,8 @@ export default {
// count: 888,
// });
// });
- listCy({ areaId: 1 }).then((res) => {
- res.rows.forEach((value) => {
+ getAllCy().then((res) => {
+ res.data.forEach((value) => {
this.data.push({
name: value.cyName,
count: value.cyCount,