+
预警信息
diff --git a/src/views/screen/emergency-screen.vue b/src/views/screen/emergency-screen.vue
index 4e300c2..838302c 100644
--- a/src/views/screen/emergency-screen.vue
+++ b/src/views/screen/emergency-screen.vue
@@ -1030,7 +1030,7 @@ export default {
align-items: center;
.databox {
- .content-pub-style(439px, 252px);
+ .content-pub-style(100%, calc(100% - 44px));
display: flex;
padding-top: 20px;
flex-direction: column;
@@ -1046,7 +1046,7 @@ export default {
align-items: center;
.databox {
- .content-pub-style(439px, 252px);
+ .content-pub-style(100%, calc(100% - 44px));
display: flex;
padding-top: 20px;
flex-direction: column;
@@ -1062,7 +1062,7 @@ export default {
align-items: center;
.databox {
- .content-pub-style(439px, 272px);
+ .content-pub-style(100%, calc(100% - 44px));
display: flex;
flex-direction: column;
align-items: center;
diff --git a/src/views/screen/gov-service.vue b/src/views/screen/gov-service.vue
index 1249966..e108358 100644
--- a/src/views/screen/gov-service.vue
+++ b/src/views/screen/gov-service.vue
@@ -769,7 +769,7 @@ export default {
z-index: 99;
.databox {
- .content-pub-style(761px, 176px);
+ .content-pub-style(100%, calc(100% - 44px));
padding: 20px;
display: flex;
@@ -830,7 +830,7 @@ export default {
align-items: center;
.databox {
- .content-pub-style(761px, 304px);
+ .content-pub-style(100%, calc(100% - 44px));
padding: 20px;
display: flex;
justify-content: space-between;
@@ -912,7 +912,7 @@ export default {
flex-direction: column;
align-items: center;
.databox {
- .content-pub-style(761px, 272px);
+ .content-pub-style(100%, calc(100% - 44px));
display: flex;
flex-direction: column;
align-items: center;
@@ -983,7 +983,7 @@ export default {
align-items: center;
.databox {
- .content-pub-style(991px, 534px);
+ .content-pub-style(100%, calc(100% - 44px));
padding: 20px;
display: flex;
@@ -1236,7 +1236,7 @@ export default {
flex-direction: column;
align-items: center;
.databox {
- .content-pub-style(663px, 272px);
+ .content-pub-style(100%, calc(100% - 44px));
display: flex;
justify-content: center;
align-items: center;
@@ -1362,7 +1362,7 @@ export default {
justify-content: space-between;
align-items: center;
.databox {
- .content-pub-style(291px, 272px);
+ .content-pub-style(100%, calc(100% - 44px));
display: flex;
justify-content: center;
align-items: center;
diff --git a/src/views/screen/media-screen.vue b/src/views/screen/media-screen.vue
index 4df8d0f..f9a270d 100644
--- a/src/views/screen/media-screen.vue
+++ b/src/views/screen/media-screen.vue
@@ -16,7 +16,9 @@
- {{ item.columnName }}
+ {{
+ item.columnName
+ }}
@@ -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 @@
-
+
预警信息
diff --git a/src/views/screen/rrt-home.vue b/src/views/screen/rrt-home.vue
index 356c1f4..c12dda5 100644
--- a/src/views/screen/rrt-home.vue
+++ b/src/views/screen/rrt-home.vue
@@ -86,7 +86,7 @@
-
+
活跃用户数
@@ -97,7 +97,7 @@
-
+
喜爱节目排行
@@ -184,6 +184,8 @@
+
+