From 4f0329fadcb8c09de243bca5d4e1d9aa284ae7de Mon Sep 17 00:00:00 2001 From: chenchen <2782712869@qq.com> Date: Mon, 16 Dec 2024 10:53:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E6=80=A5=E5=B9=BF=E6=92=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 4 +- src/views/screen/emergency-screen-two.vue | 113 +++++++++++++++++++--- 2 files changed, 102 insertions(+), 15 deletions(-) diff --git a/config/index.js b/config/index.js index a1ca6b1..34581f0 100644 --- a/config/index.js +++ b/config/index.js @@ -12,7 +12,7 @@ module.exports = { assetsPublicPath: '/', proxyTable: { '/api': { - target: 'http://192.168.111.144:9990', + target: 'http://127.0.0.1:9990', // target: 'http://60.255.186.185:9024/api', changeOrigin: true, pathRewrite: { @@ -21,7 +21,7 @@ module.exports = { }, '/localImage': { // target: 'http://60.255.186.185:9024/', - target: 'http://localhost:9990/', + target: 'http://127.0.0.1:9990/', changeOrigin: true, }, '/socket.io': { diff --git a/src/views/screen/emergency-screen-two.vue b/src/views/screen/emergency-screen-two.vue index 9e829fd..5dcd618 100644 --- a/src/views/screen/emergency-screen-two.vue +++ b/src/views/screen/emergency-screen-two.vue @@ -112,7 +112,7 @@ 发布单位
- 调度状态 + 播发状态
@@ -120,7 +120,8 @@
+ ) in infoTableData" :key="index" class="table-body-item" + @click="currentInfo = item; infoState = true">
- {{ item.senderName }} + {{ item.sendName }}
{{ - item.status == 1 - ? "已调度" - : "未调度" + item.broadcastStateName }}
@@ -224,6 +223,72 @@
+ + +
+
+ 事件类别：{{ currentInfo.eventTypeName }} +
+ +
+ 事件标题：{{ currentInfo.msgTitle }} +
+
+ 发布单位：{{ currentInfo.sendName }} +
+ +
+ 发布时间：{{ currentInfo.sendTime }} +
+ +
+ 开始时间：{{ currentInfo.startTime }} +
+ +
+ 结束时间：{{ currentInfo.endTime }} +
+
+ 播发状态： + + {{ currentInfo.broadcastStateName }} + +
+
+ @@ -276,6 +341,8 @@ export default { r_barChart2: null, r_barChart3: null, r_barChart4: null, + infoState: false, + currentInfo: {}, }; }, mounted() { @@ -395,16 +462,29 @@ export default { one: { name: "设备在线", value: data.totalOnlineCount, + color: '#01FF94' }, two: { name: "设备离线", value: data.totalOutlineCount, + color: '#01A4FF' } }); } } ) }, + blendColor(color, blend, percentage) { + const f = parseInt(color.slice(1), 16), + t = parseInt(blend.slice(1), 16), + R1 = f >> 16, + G1 = (f >> 8) & 0x00FF, + B1 = f & 0x0000FF; + const R2 = t >> 16, + G2 = (t >> 8) & 0x00FF, + B2 = t & 0x0000FF; + return `#${((1 << 24) + (Math.round((R2 - R1) * percentage) + R1 << 16) + (Math.round((G2 - G1) * percentage) + G1 << 8) + (Math.round((B2 - B1) * percentage) + B1)).toString(16).slice(1)}`; + }, // initBarChart initBarChart(config) { this[config.id] = echarts.init(document.getElementById(config.id)); @@ -424,13 +504,13 @@ export default { type: 'pie', radius: '50%', data: config.more ? [ - { value: config.one.value, name: config.one.name }, - { value: config.two.value, name: config.two.name }, - { value: config.three.value, name: config.three.name }, - { value: config.four.value, name: config.four.name }, + { value: config.one.value, name: config.one.name, itemStyle: { color: this.blendColor(config.one.color, '#223455', 0.5) } }, + { value: config.two.value, name: config.two.name, itemStyle: { color: this.blendColor(config.two.color, '#223455', 0.5) } }, + { value: config.three.value, name: config.three.name, itemStyle: { color: this.blendColor(config.three.color, '#223455', 0.5) } }, + { value: config.four.value, name: config.four.name, itemStyle: { color: this.blendColor(config.four.color, '#223455', 0.5) } }, ] : [ - { value: config.one.value, name: config.one.name }, - { value: config.two.value, name: config.two.name }, + { value: config.one.value, name: config.one.name, itemStyle: { color: this.blendColor(config.one.color, '#223455', 0.5) } }, + { value: config.two.value, name: config.two.name, itemStyle: { color: this.blendColor(config.two.color, '#223455', 0.5) } }, ], emphasis: { itemStyle: { @@ -464,10 +544,12 @@ export default { one: { name: "应急广播", value: item.emergency, + color: '#01FF94' }, two: { name: "日常广播", value: item.daily, + color: '#01A4FF' } }); }) @@ -478,18 +560,22 @@ export default { one: { name: "一级", value: item.broadcastLevelList[0].statistic, + color: '#01FF94' }, two: { name: "二级", value: item.broadcastLevelList[1].statistic, + color: '#01A4FF' }, three: { name: "三级", value: item.broadcastLevelList[2].statistic, + color: '#01A494' }, four: { name: "四级", value: item.broadcastLevelList[3].statistic, + color: '#02FDE4' }, more: true }); @@ -728,6 +814,7 @@ export default { display: flex; flex-direction: row; justify-content: space-between; + cursor: pointer; .table-info-item { text-align: center;