diff --git a/config/index.js b/config/index.js index 6096860..6627110 100644 --- a/config/index.js +++ b/config/index.js @@ -13,20 +13,20 @@ module.exports = { proxyTable: { '/api': { target: 'http://localhost:9990', - // target: 'http://60.255.185.166:9030/api', + // target: 'http://60.255.186.185:9024/api', changeOrigin: true, pathRewrite: { '^/api': '' } }, '/localImage': { - // target: 'http://60.255.185.166:9030/', + // target: 'http://60.255.186.185:9024/', target: 'http://localhost:9990/', changeOrigin: true, }, '/socket.io': { - // target: 'http://localhost:19990/', - target: 'http://60.255.185.166:9030/', + target: 'http://localhost:19990/', + // target: 'http://60.255.185.166:9024/', changeOrigin: true, } }, diff --git a/src/router/router.js b/src/router/router.js index 3b23328..f7d3218 100644 --- a/src/router/router.js +++ b/src/router/router.js @@ -65,7 +65,7 @@ export const screenRouter = [ { path: "/mediaBigScreen", name: "mediaBigScreen", - title: "媒体融合", + title: "三江翠屏", component: () => import("@/views/screen/media-screen.vue") }, diff --git a/src/views/screen/car-warring.vue b/src/views/screen/car-warring.vue index 4fa44d2..d6d665c 100644 --- a/src/views/screen/car-warring.vue +++ b/src/views/screen/car-warring.vue @@ -23,7 +23,7 @@
-
+
预警信息
@@ -170,42 +170,7 @@ export default { }, // 点击切换详情 queryDetail (item) { - switch (item.contentType) { - case 12: - this.jumpWindow(item.linkUrl, item.title); - break; - case 9: - let url = item.shareUlr || item.shareUrl - this.jumpWindow(url, item.title); - break; - case 5: - this.getContentById(item); - break; - case "tvLive": - this.getTvLiveById(item) - - break; - - default: - break; - } - }, - getTvLiveById(item) { - let url = "/links/getLiveRoomInfo"; - let params = { - jumpId: item.id, - }; - - this.$http.post(url, this.common.request(params)).then((res) => { - if (res && res.data.code >= 200 && res.data.code < 400) { - let data = res.data.data; - // this.showDetail = true - // this.detailData = data - this.jumpWindow(data.shareUrl, data.title); - } else { - this.$Message.error("获取数据失败"); - } - }); + this.jumpWindow(item.url, item.title); }, getContentById(item) { let url = "/links/getImageTextContentById"; diff --git a/src/views/screen/county-screen.vue b/src/views/screen/county-screen.vue index 6119f4a..b76d376 100644 --- a/src/views/screen/county-screen.vue +++ b/src/views/screen/county-screen.vue @@ -233,6 +233,8 @@ import { Swiper, SwiperSlide } from "vue-awesome-swiper"; import * as echarts from "echarts"; import { echartsFocus, echartsClear } from "@/utils/autoEcharts"; import CommonModal from "@/views/common-components/common-modal.vue"; +import axios from "axios"; + export default { name: "CountyScreen", components: { @@ -370,6 +372,14 @@ export default { menuItem: "媒体融合", routerPath: "/new-media", }, + { + menuItem: "三江翠屏", + routerPath: "/mediaBigScreen", + }, + { + menuItem: "人人通", + routerPath: "/rrt-screen", + }, ], }, { @@ -566,8 +576,8 @@ export default { }, methods: { jumpSystem(item) { - this.currentMenu = item - this.appState = true + this.currentMenu = item; + this.appState = true; }, // 获取数据 initDataInfo(type, callback) { @@ -1035,7 +1045,7 @@ export default { echartsFocus(myChart, xdata.length); }, toMenu(index) { - let item = this.currentMenu.children[index] + let item = this.currentMenu.children[index]; if (item.routerPath && !item.isShowTwon) { this.$router.push(item.routerPath); } else if (item.isShowTwon) { @@ -1064,7 +1074,7 @@ export default { } this.townModal = true; } else if (item.url) { - window.open(item.url) + window.open(item.url); } }, goTown() { @@ -1105,8 +1115,8 @@ export default { }); return; } - if (item.areaName != "红岩村") { - this.$message.info("除红岩村,其余尚未建设!"); + if (item.areaName != "高桥村") { + this.$message.info("除高桥村,其余尚未建设!"); return; } if (this.currentType == "village") { diff --git a/src/views/screen/cultural-center.vue b/src/views/screen/cultural-center.vue index 2fe0917..76d2675 100644 --- a/src/views/screen/cultural-center.vue +++ b/src/views/screen/cultural-center.vue @@ -93,7 +93,7 @@
+ style="font-size: 18px;color: #fff;padding: 0 20px;box-sizing: border-box;width: 100%;">
-
+
预警信息
@@ -66,34 +68,75 @@ import Content from "./components/mediaBigScreen/content"; export default { data() { return { - title: "媒体融合", + title: "三江翠屏", flog: 0, dataFilter: { page: 1, pageSize: 20, total: 0, }, - tagTitle: [], + tagTitle: [ + { + columnName: "翠屏", + columnId: "3f7adceb-fcf9-4adb-956d-7987b42cd10f", + }, + { + columnName: "部门动态", + columnId: "16653738-7af1-45d3-b6a3-ab13c49b2760", + }, + { + columnName: "电视新闻", + columnId: "9d3fe8a8-a994-475e-981c-aac2bce70c9b", + }, + { + columnName: "微视频", + columnId: "bdb2782e-eaba-4bd9-9f1e-09d85e32c73d", + }, + { + columnName: "镇村动态", + columnId: "28009c03-4766-40eb-b86d-fe09bb11ac21", + }, + { + columnName: "法治翠屏", + columnId: "1d15515f-e7d5-4efd-bcdb-12d65104c14d", + }, + { + columnName: "医保动态", + columnId: "972136f0-172f-436e-9fa9-332ea58fa3d4", + }, + { + columnName: "办事指南", + columnId: "cd775f6e-d6f5-4b10-a78f-80042e0aa6de", + }, + { + columnName: "医保政策", + columnId: "a914aa8c-27b9-4ff3-ba83-54811b41fe0b", + }, + { + columnName: "直播", + columnId: "08d99eb1-b653-4386-955a-53a43c5139c3", + }, + ], scrollData: [], tenantDomainName: "", tabJumpId: "", loadState: false, settingData: {}, infoState: true, - currentColumnName: "" + currentColumnName: "", }; }, - components: { MainTitle, Content, }, + components: { MainTitle, Content }, mounted() { const { calcRate, windowDraw } = useIndex(this.$refs.appRef); calcRate(); windowDraw(); - this.queryTagTitle(); + this.onClick(this.tagTitle[0], 0); }, created() {}, methods: { - openInfo (data) { - this.infoState = data + openInfo(data) { + this.infoState = data; }, // 左边切换 // 点击切换tag @@ -103,137 +146,29 @@ export default { this.flog = index; this.dataFilter.page = 1; this.dataFilter.total = 0; - this.tabJumpId = item.columnId - this.infoState = true - this.currentColumnName = item.columnName - if (item.columnName == "电视直播") { - this.queryTvLiveList() - return - } - if (item.columnName == "综合广播") { - this.queryGdList() - return - } - if (item.columnName == "电视新闻") { - this.queryTvList() - return - } + this.tabJumpId = item.columnId; + this.infoState = true; + this.currentColumnName = item.columnName; this.queryScrollDataList(item); }, - // 查询电视直播列表 - queryTvLiveList () { - let url = "/links/listLiveRoom"; - let params = { - page: this.dataFilter.page - 1, - }; - - this.$http.post(url, this.common.request(params)).then((res) => { - if (res && res.data.code >= 200 && res.data.code < 400) { - this.loadState = false; - let data = res.data.data.list - - this.scrollData = data.map((item) => { - item.img = item.imgUrl - item.contentType = "tvLive" - return item - }) - if (res.data.data.total) { - this.dataFilter.total = Number(res.data.data.total); - } - } else { - this.$Message.error("获取数据失败"); - } - }); - }, - // 查询综合广播列表 - queryGdList () { - let url = "/links/getBroadcastInfoPage"; - let params = { - page: this.dataFilter.page - 1, - }; - - this.$http.post(url, this.common.request(params)).then((res) => { - if (res && res.data.code >= 200 && res.data.code < 400) { - this.loadState = false; - this.loadState = false; - this.scrollData = res.data.data.contentList; - this.scrollData.forEach((item) => { - if (item.imgUrl) { - item.img = item.imgUrl; - } - }); - if (res.data.data.total) { - this.dataFilter.total = Number(res.data.data.total); - } - } else { - this.$Message.error("获取数据失败"); - } - }); - }, - // 查询电视新闻列表 - queryTvList () { - let url = "/links/getTVInfoPage"; - let params = { - page: this.dataFilter.page - 1, - }; - - this.$http.post(url, this.common.request(params)).then((res) => { - if (res && res.data.code >= 200 && res.data.code < 400) { - this.loadState = false; - this.loadState = false; - this.scrollData = res.data.data.contentList; - this.scrollData.forEach((item) => { - if (item.imgUrl) { - item.img = item.imgUrl; - } - }); - if (res.data.data.total) { - this.dataFilter.total = Number(res.data.data.total); - } - } else { - this.$Message.error("获取数据失败"); - } - }); - }, - queryTagTitle() { - this.$http - .post( - "links/listMemberSubscribe", - this.common.request({}) - ) - .then((res) => { - if (res && res.data.code >= 200 && res.data.code < 400) { - let data = res.data.data.array; - if (data.length > 0) { - this.tagTitle = data - this.tagTitle.push(...[{columnName: "电视直播"}, {columnName: "综合广播"}, {columnName: "电视新闻"},]) - } - this.onClick(this.tagTitle[0], 0); - } else { - this.$Message.error("获取数据失败"); - } - }); - }, // 查询列表 - queryScrollDataList (item) { - let url = "/links/getColumnInfoPage"; + queryScrollDataList(item) { + let url = "/convergenceMedia/selectByAppSpecial"; let params = { - jumpId: item.columnId, - page: this.dataFilter.page - 1, + appInfoId: 516, + columnId: item.columnId, + pageNum: this.dataFilter.page - 1, + pageSize: 10, + url: "http://hongqi.wengegroup.com:9001/newNews/getNewsColumnData", + userId: "", }; this.$http.post(url, this.common.request(params)).then((res) => { if (res && res.data.code >= 200 && res.data.code < 400) { - console.log(res.data.data); this.loadState = false; - this.scrollData = res.data.data.contentList; - this.scrollData.forEach((item) => { - if (item.imgList.length > 0) { - item.img = item.imgList[0].url; - } - }); - if (res.data.data.total) { - this.dataFilter.total = Number(res.data.data.total); + this.scrollData = res.data.data[0].list; + if (res.data.data[0].total) { + this.dataFilter.total = res.data.data[0].total } } else { this.$Message.error("获取数据失败"); @@ -241,26 +176,24 @@ export default { }); }, // 分页查询列表 - queryPageList () { - this.scrollData = [] - this.loadState = true - let url = "/links/getColumnInfoPage"; + queryPageList() { + this.scrollData = []; + this.loadState = true; + let url = "/convergenceMedia/selectByAppSpecial"; let params = { - jumpId: this.tabJumpId, - page: this.dataFilter.page - 1, + appInfoId: 516, + columnId: this.tabJumpId, + pageNum: this.dataFilter.page - 1, + pageSize: 10, + url: "http://hongqi.wengegroup.com:9001/newNews/getNewsColumnData", + userId: "", }; this.$http.post(url, this.common.request(params)).then((res) => { if (res && res.data.code >= 200 && res.data.code < 400) { - console.log(res.data.data); this.loadState = false; - this.scrollData = res.data.data.contentList; - this.scrollData.forEach((item) => { - if (item.imgList.length > 0) { - item.img = item.imgList[0].url; - } - }); - if (res.data.data.total) { - this.dataFilter.total = Number(res.data.data.total); + this.scrollData = res.data.data[0].list; + if (res.data.data[0].total) { + this.dataFilter.total = res.data.data[0].total } } else { this.$Message.error("获取数据失败"); @@ -271,22 +204,8 @@ export default { * @description 分页更换事件回调 */ pageChange(p) { - console.log(p); this.dataFilter.page = p; - if (this.currentColumnName == "电视直播") { - this.queryTvLiveList() - return - } - if (this.currentColumnName == "综合广播") { - this.queryGdList() - return - } - if (this.currentColumnName == "电视新闻") { - this.queryTvList() - return - } this.queryPageList(); - // this.initData(); }, }, }; diff --git a/src/views/screen/museum-center.vue b/src/views/screen/museum-center.vue index 292531d..1b42c90 100644 --- a/src/views/screen/museum-center.vue +++ b/src/views/screen/museum-center.vue @@ -172,9 +172,7 @@
-
+
预警信息
-
+
活跃用户数
@@ -97,7 +97,7 @@
-
+
喜爱节目排行
@@ -184,6 +184,8 @@
+
+