From 229ad23f68475710928865f3318582d75656df17 Mon Sep 17 00:00:00 2001 From: dhy1725534722 <1725534722@qq.com> Date: Mon, 23 Oct 2023 15:38:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/netWorkYq/index.js | 23 +- src/api/networkSecurity/index.js | 22 ++ src/api/zongzhi/common.js | 5 +- src/store/modules/dict.js | 39 ++-- src/utils/common.js | 32 +-- .../components/ReportingStatistics.vue | 198 ++++++++++-------- .../security/components/componentLeft.vue | 3 +- .../security/components/componentRight.vue | 2 - .../sentiment/components/TransferVolume.vue | 34 +-- .../sentiment/components/WordCloud.vue | 2 +- .../components/commandControl/index.vue | 53 ++++- .../sentiment/components/componentRight.vue | 67 +++--- 12 files changed, 292 insertions(+), 188 deletions(-) diff --git a/src/api/netWorkYq/index.js b/src/api/netWorkYq/index.js index e30fd10..a8af704 100644 --- a/src/api/netWorkYq/index.js +++ b/src/api/netWorkYq/index.js @@ -70,6 +70,13 @@ export function listYqyj(query) { params: query }) } +//查询舆情报告各个类型的个数 +export function numYqbg() { + return request({ + url: '/tcZz/networkEcology/screen/screenopinionreport', + method: 'get', + }) +} // 查询舆情报告列表 export function listYqbg(query) { return request({ @@ -81,9 +88,15 @@ export function listYqbg(query) { // 查询 转办量、转办详情列表 export function listZbxq(query) { return request({ - url: '/tcZz/netWorkYq/zbxq/list', - method: 'get', - params: query + url: '/tcZz/netWorkYq/zbxq/list', + method: 'get', + params: query }) - } - \ No newline at end of file +} +// 大屏转办量数据 +export function dataZb() { + return request({ + url: '/tcZz/networkEcology/screen/screendepartment', + method: 'get', + }) +} diff --git a/src/api/networkSecurity/index.js b/src/api/networkSecurity/index.js index 9188d4e..4dc5066 100644 --- a/src/api/networkSecurity/index.js +++ b/src/api/networkSecurity/index.js @@ -148,6 +148,14 @@ export function listBmtb(query) { params: query }) } +// 查询属地通报列表 +export function listSdtb(query) { + return request({ + url: '/tcZz/networkSecurity/sdtb/list', + method: 'get', + params: query + }) + } // 查询最新隐患列表 export function listZxyh(query) { return request({ @@ -163,4 +171,18 @@ export function listTbcz(query) { method: 'get', params: query }) +} +//获取大屏属地通报数据 +export function dataSdtb() { + return request({ + url: '/tcZz/networkEcology/screen/screenterritorial', + method: 'get', + }) +} +//获取大屏部门通报数据 +export function dataBmtb() { + return request({ + url: '/tcZz/networkEcology/screen/screendept', + method: 'get', + }) } \ No newline at end of file diff --git a/src/api/zongzhi/common.js b/src/api/zongzhi/common.js index 2ca6f31..9910d94 100644 --- a/src/api/zongzhi/common.js +++ b/src/api/zongzhi/common.js @@ -1,10 +1,9 @@ import request from '@/utils/request.js' // 查询字典 -export function getDictList(query) { +export function getDictList(dictType) { return request({ - url: '/system/dict/data/list', + url: `/system/dict/data/type/${dictType}`, method: 'get', - params: query }) } diff --git a/src/store/modules/dict.js b/src/store/modules/dict.js index 38e5bee..e688417 100644 --- a/src/store/modules/dict.js +++ b/src/store/modules/dict.js @@ -28,25 +28,32 @@ const dict = { actions: { getDictType({ commit }) { return new Promise((resolve, reject) => { - const query = { - dictType: "bg_type", - }; - getDictList(query) - .then((res) => { - // console.log(res) - commit("SET_DICT", res.data); - getownList().then((town) => { - commit("SET_TOWN", town); + let arr = ['tc_area', 'bg_type','tc_sdtbmc','bg_type'] + let arr1 = {} + arr.forEach((value, index) => { + getDictList(value).then(res => { + arr1[value] = res.data + if (index == arr.length - 1) { + commit("SET_DICT", arr1); resolve(); - }); - // getownList2().then((town) => { - // commit("SET_TOWN2", town); - // resolve(); - // }); - }) - .catch((error) => { + } + }).catch((error) => { reject(error); }); + }) + // getDictList(query) + // .then((res) => { + // // console.log(res) + // commit("SET_DICT", res.data); + // // getownList().then((town) => { + // // resolve(); + // // }); + // // getownList2().then((town) => { + // // commit("SET_TOWN2", town); + // // resolve(); + // // }); + // }) + }); }, }, diff --git a/src/utils/common.js b/src/utils/common.js index 076d8d9..025c1f7 100644 --- a/src/utils/common.js +++ b/src/utils/common.js @@ -1,24 +1,24 @@ import store from "@/store"; -export function filterDict(type, value, isTown = false) { +export function filterDict(type, value) { if (!value) return; - if (isTown) { - let ids = JSON.parse(value); - if (Array.isArray(ids)) { - return filterTown(ids); - } else { - // return filterTowns(ids); - return filterTown([ids]); - } + // if (isTown) { + // let ids = JSON.parse(value); + // if (Array.isArray(ids)) { + // return filterTown(ids); + // } else { + // // return filterTowns(ids); + // return filterTown([ids]); + // } + // } else { + const dict = store.getters.dictObject; + const result = dict[type].filter((item) => item.dictValue == value); + if (result.length > 0) { + return result[0].dictLabel; } else { - const dict = store.getters.dictObject; - const result = dict[type].filter((item) => item.dictValue == value); - if (result.length > 0) { - return result[0].dictLabel; - } else { - return "未匹配到"; - } + return "未匹配到"; } + // } } // export function filterTowns(id) { diff --git a/src/views/privateOrder/security/components/ReportingStatistics.vue b/src/views/privateOrder/security/components/ReportingStatistics.vue index 7f72764..96bff5c 100644 --- a/src/views/privateOrder/security/components/ReportingStatistics.vue +++ b/src/views/privateOrder/security/components/ReportingStatistics.vue @@ -25,27 +25,35 @@ -