diff --git a/project/fengdu/AppBIBoard/AppBIBoard.vue b/project/fengdu/AppBIBoard/AppBIBoard.vue index 3adc9b0f..dba89bb5 100644 --- a/project/fengdu/AppBIBoard/AppBIBoard.vue +++ b/project/fengdu/AppBIBoard/AppBIBoard.vue @@ -3,7 +3,7 @@
@@ -52,17 +52,51 @@
-
- - +
+
+ +
- + +
+
+
获取总积分
+

+

+
+
+
+
+ +
+
+
+
+
兑换总积分
+

+

+
+
+
+
+ +
+
+
+
+
+ +
+
- - + +
@@ -90,6 +124,7 @@ export default { }, data() { return { + areaId: '', scale: 1, fullscreen: false, sta: { @@ -138,7 +173,7 @@ export default { fontSize: 24, formatter: '{value}%', color: "#02FEFF", - fontFamily: "DINAlternate-Bold", + fontFamily: "DIN", width: 50, lineHeight: 50, padding: 12, @@ -182,11 +217,50 @@ export default { ['三合街道丁庄社区互助会', '张珊珊', '女', 32], ] }, - current: 1 + appSta: { + header: ['应用名称', '本日点击', '累计点击'], + headerBGC: 'rgba(33, 180, 253, 0.1)', + oddRowBGC: 'rgba(112, 112, 112, 0)', + evenRowBGC: 'rgba(112, 112, 112, 0)', + rowNum: 7, + headerHeight: 38, + columnWidth: [250], + align: ['left', 'right', 'right'], + data: [ + ['渝快办', 178, 266], + ['公交乘车码', 178, 266], + ['警快办', 178, 266], + ['医保电子凭证', 178, 266], + ['居民上报', 178, 266], + ['医保电子凭证', 178, 266], + ['居民上报', 178, 266], + ] + }, + current: 1, + realtimeEvents: { + rowNum: 6, + oddRowBGC: 'rgba(112, 112, 112, 0)', + evenRowBGC: 'rgba(112, 112, 112, 0)', + columnWidth: [226], + align: ['center', 'left'], + data: [ + ['
2023-10-19 14:55:32
', '汇南社区-张三 创建了新的居民群'], + ['
2023-10-19 14:55:32
', '汇南社区-张三 邀请居民"蓝天白云"加入居民群“书院社区2群”'], + ['
2023-10-19 14:55:32
', '汇南社区-张三 将居民"蓝天白云"踢出居民群 “书院社区2群”'], + ['
2023-10-19 14:55:32
', '滨江东路社区居民-陈思宇在丰收号小程序中进行了打卡签到'], + ['
2023-10-19 14:55:32
', '滨江东路社区居民-陈思宇在丰收号小程序中进行了积分申请'], + ['
2023-10-19 14:55:32
', '滨滨江东路社区居民-陈思宇在丰收号小程序中进行了物品兑换'], + ['
2023-10-18 14:55:32
', '三角路社区居民-陈思宇在丰收号小程序中进行了物品兑换'], + ['
2023-10-18 14:55:32
', '三角路社区居民-陈思宇在丰收号小程序中进行了物品兑换'], + ['
2023-10-18 14:55:32
', '三角路社区居民-陈思宇在丰收号小程序中进行了物品兑换'], + ] + }, + shortcut: 0 } }, computed: { - tablePages: v => Math.ceil(v.volunteerConfig.data.length / v.volunteerConfig.rowNum) || 0 + tablePages: v => Math.ceil(v.volunteerConfig.data.length / v.volunteerConfig.rowNum) || 0, + shortcuts: () => Object.assign({0: '昨日', 1: '近七天', 2: '近30天', 3: '近一年'}) }, methods: { handleFullScreen() { @@ -207,10 +281,19 @@ export default { } else if (c < 5) { setTimeout(() => this.watchTablePageChange(++c), 500) } + }, + getData() { + const {areaId} = this.$data + this.instance.post("/app/fdDiy/realTimeDynamic", null, {params: {areaId}}).then(res => { + if (res?.data) { + + } + }) } }, created() { Vue.use(scrollBoard) + this.getData() }, mounted() { this.watchTablePageChange() @@ -267,7 +350,11 @@ export default { gap: 14px; &.c-2 { - grid-template-columns:1fr 1fr + grid-template-columns:1fr 1fr; + } + + &.c-3 { + grid-template-columns:1fr 1fr 1fr; } } @@ -275,35 +362,45 @@ export default { text-align: center; font-size: 15px; line-height: 20px; - background-size: 100% 100%; background: url("./assets/staPanel-bg.png") no-repeat; + background-size: 100% 100%; height: 80px; padding-top: 14px; - - &.simple { - background: #ffffff0a; - padding-top: 0; - } - + width: 100%; b { - font-family: DINAlternate-Bold; + font-family: DIN; font-size: 22px; color: #02FEFF; letter-spacing: 0; line-height: 36px; } + + &.simple { + background: #ffffff0a; + padding-top: 0; + + &.right { + color: #9BB7D4; + + b { + color: #FFFFFF; + } + } + } } .chart { - height: 200px; - .legend { position: absolute; left: 0; right: 0; bottom: 0; } + + .AiEchart { + height: 204px; + } } .title { @@ -334,7 +431,17 @@ export default { } .row-item { + height: 38px; line-height: 38px; + border-bottom: 1px solid #154270; + margin-top: -1px; + } + + .timeRow { + background-image: url("./assets/realtimeIcon.png"); + background-repeat: no-repeat; + background-position: 20px center; + text-indent: 24px; } } @@ -359,5 +466,54 @@ export default { } } } + + .centerBottom { + position: absolute; + bottom: 0; + left: 0; + right: 0; + } + + .shortcut { + background: #1f9ecc29; + padding: 4px 13px; + color: #1FBECC; + font-size: 13px; + margin-left: 4px; + margin-top: -7px; + border: 1px solid transparent; + cursor: pointer; + height: fit-content; + + &:first-of-type { + margin-left: 0; + } + + &.active { + border-color: #20B4C5; + color: #4ED8E4; + } + } + + .boxSta { + margin-top: 16px; + padding-right: 70px; + justify-content: flex-end; + background: url("./assets/box.png") no-repeat 80px center; + height: 82px; + font-size: 16px; + + .text { + color: #FFFFFF; + width: 156px; + justify-content: space-between; + + & > p { + font-family: DIN; + font-size: 26px; + color: #02FEFF; + } + } + } } diff --git a/project/fengdu/AppBIBoard/assets/box.png b/project/fengdu/AppBIBoard/assets/box.png new file mode 100644 index 00000000..a51ed40b Binary files /dev/null and b/project/fengdu/AppBIBoard/assets/box.png differ diff --git a/project/fengdu/AppBIBoard/assets/realtimeIcon.png b/project/fengdu/AppBIBoard/assets/realtimeIcon.png new file mode 100644 index 00000000..6df78e19 Binary files /dev/null and b/project/fengdu/AppBIBoard/assets/realtimeIcon.png differ diff --git a/project/fengdu/AppBIBoard/components/fengduHead.vue b/project/fengdu/AppBIBoard/components/fengduHead.vue index 7862a4fe..d1dfd565 100644 --- a/project/fengdu/AppBIBoard/components/fengduHead.vue +++ b/project/fengdu/AppBIBoard/components/fengduHead.vue @@ -34,7 +34,7 @@ export default { computed: { ...mapState(['user']), currentRoot: v => v.user.info.areaId.substr(0, 6).padEnd(12, '0'), - tabs: v => [...v.views ] + tabs: v => [...v.views] }, data() { return { @@ -47,20 +47,13 @@ export default { handler(v) { if (v != this.current) this.current = this.$copy(this.active) } - } - }, - methods: { - getWeather() { - this.$request.post("/app/weather/queryWeather").then(res => { - if (res?.data) { - - } - }) + }, + current(v) { + this.$emit("change", v) } }, created() { this.current = this.$copy(this.user.info.areaId) - // this.getWeather() } } diff --git a/ui/lib/styles/common.scss b/ui/lib/styles/common.scss index 491cc8fd..1df54672 100644 --- a/ui/lib/styles/common.scss +++ b/ui/lib/styles/common.scss @@ -73,6 +73,10 @@ $--font-path: '~element-ui/lib/theme-chalk/fonts'; height: 100%; } +.relative { + position: relative; +} + /** 不换行文本 */