From cf22b295bcafb138ea182866bdb36fb4071b0139 Mon Sep 17 00:00:00 2001 From: SunTao <328867980@qq.com> Date: Wed, 20 Nov 2024 14:46:20 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=96=B0=E5=A2=9E=E9=A2=84?= =?UTF-8?q?=E8=AD=A6=E9=80=9A=E7=9F=A5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Navbar.vue | 21 +- src/views/big-screen/index.vue | 407 ++++++++---------- src/views/index.vue | 2 +- .../inspection-warn/warning-center/index.vue | 296 +++++++++++++ 4 files changed, 485 insertions(+), 241 deletions(-) create mode 100644 src/views/xj/inspection-warn/warning-center/index.vue diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 5bb23ee..4003702 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -19,7 +19,6 @@ -
@@ -96,8 +95,8 @@ export default { }, methods: { /* 点击跳转大屏页面 */ - goBigScreen() { - this.$router.push("/screen"); + goBigScreen(){ + this.$router.push("/screen") }, toggleSideBar() { this.$store.dispatch("app/toggleSideBar"); @@ -164,7 +163,7 @@ export default { outline: none; } - .header-news { + .menu-return { height: 100%; margin-right: 0.5rem; @@ -172,19 +171,7 @@ export default { cursor: pointer; font-size: 1.4rem; line-height: 3.1rem; - font-weight: 400; - } - } - - .menu-return { - height: 100%; - margin-right: 1rem; - - i { - cursor: pointer; - font-size: 1.4rem; - line-height: 3.1rem; - font-weight: 400; + font-weight: bold; } } diff --git a/src/views/big-screen/index.vue b/src/views/big-screen/index.vue index 0549ecf..3a48173 100644 --- a/src/views/big-screen/index.vue +++ b/src/views/big-screen/index.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-17 11:34:00 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-11-19 14:16:56 + * @LastEditTime: 2024-11-20 14:32:46 * @FilePath: \znxjxt-ui\src\views\big-screen\index.vue * @Description: 大屏首页 --> @@ -20,7 +20,72 @@ >
-
+ +
+ +
+
+ +
+
+
+ + + + +
+
+ {{ item.time }} +
+
+ {{ item.car }} +
+
+
+ {{ item.content }} +
+
+
+
+ +
+ +
48
+
+
+
{{ dataTime }}
{{ weekTime }} @@ -311,6 +376,10 @@ export default { weekTime: "", // 年 yearTime: "", + + // 预警中心消息数据 + messageList: [], + // 数据栏右上角选择框 selectTypeArr: [], // 左侧切换模块 @@ -373,224 +442,7 @@ export default { // 图片背景下病害类型下拉选择绑定 mapCareSelect: "", // 图片背景下病害类型下拉选择数据 - dieaseOptions: [ - { - value: "zhinan", - label: "指南", - children: [ - { - value: "shejiyuanze", - label: "设计原则", - }, - { - value: "daohang", - label: "导航", - }, - ], - }, - { - value: "zujian", - label: "组件", - children: [ - { - value: "basic", - label: "Basic", - }, - { - value: "form", - label: "Form", - children: [ - { - value: "radio", - label: "Radio 单选框", - }, - { - value: "checkbox", - label: "Checkbox 多选框", - }, - { - value: "input", - label: "Input 输入框", - }, - { - value: "input-number", - label: "InputNumber 计数器", - }, - { - value: "select", - label: "Select 选择器", - }, - { - value: "cascader", - label: "Cascader 级联选择器", - }, - { - value: "switch", - label: "Switch 开关", - }, - { - value: "slider", - label: "Slider 滑块", - }, - { - value: "time-picker", - label: "TimePicker 时间选择器", - }, - { - value: "date-picker", - label: "DatePicker 日期选择器", - }, - { - value: "datetime-picker", - label: "DateTimePicker 日期时间选择器", - }, - { - value: "upload", - label: "Upload 上传", - }, - { - value: "rate", - label: "Rate 评分", - }, - { - value: "form", - label: "Form 表单", - }, - ], - }, - { - value: "data", - label: "Data", - children: [ - { - value: "table", - label: "Table 表格", - }, - { - value: "tag", - label: "Tag 标签", - }, - { - value: "progress", - label: "Progress 进度条", - }, - { - value: "tree", - label: "Tree 树形控件", - }, - { - value: "pagination", - label: "Pagination 分页", - }, - { - value: "badge", - label: "Badge 标记", - }, - ], - }, - { - value: "notice", - label: "Notice", - children: [ - { - value: "alert", - label: "Alert 警告", - }, - { - value: "loading", - label: "Loading 加载", - }, - { - value: "message", - label: "Message 消息提示", - }, - { - value: "message-box", - label: "MessageBox 弹框", - }, - { - value: "notification", - label: "Notification 通知", - }, - ], - }, - { - value: "navigation", - label: "Navigation", - children: [ - { - value: "menu", - label: "NavMenu 导航菜单", - }, - { - value: "tabs", - label: "Tabs 标签页", - }, - { - value: "breadcrumb", - label: "Breadcrumb 面包屑", - }, - { - value: "dropdown", - label: "Dropdown 下拉菜单", - }, - { - value: "steps", - label: "Steps 步骤条", - }, - ], - }, - { - value: "others", - label: "Others", - children: [ - { - value: "dialog", - label: "Dialog 对话框", - }, - { - value: "tooltip", - label: "Tooltip 文字提示", - }, - { - value: "popover", - label: "Popover 弹出框", - }, - { - value: "card", - label: "Card 卡片", - }, - { - value: "carousel", - label: "Carousel 走马灯", - }, - { - value: "collapse", - label: "Collapse 折叠面板", - }, - ], - }, - ], - }, - { - value: "ziyuan", - label: "资源", - children: [ - { - value: "axure", - label: "Axure Components", - }, - { - value: "sketch", - label: "Sketch Templates", - }, - { - value: "jiaohu", - label: "组件交互文档", - }, - ], - }, - ], + dieaseOptions: [], // 路段下拉绑定 roadList: [], // 地图打点-路段绑定 @@ -651,6 +503,7 @@ export default { this.getMapCare(); this.getRoadList(); this.getDieaseTypeList(); + this.getMessageList(); // this.initWebSocket(); }, methods: { @@ -687,6 +540,54 @@ export default { }, 1000); }, + /* 获取消息中心数据 */ + getMessageList() { + // getMessageList().then(({ code, data }) => { + // if (code === 200) { + // this.messageList = data; + // } + // }); + this.messageList = [ + { + status: "1", + time: "2024/45/62", + car: "辽jskdn", + content: "骄傲的是否哈德half绝对符合卡的法拉第", + }, + { + status: "2", + time: "2024/45/62", + car: "辽jskdn", + content: "骄傲的是否哈德half绝对符合卡的法拉第", + }, + { + status: "3", + time: "2024/45/62", + car: "辽jskdn", + content: "骄傲的是否哈德half绝对符合卡的法拉第", + }, + ]; + }, + + /** + * @description: 消息中心点击具体数据事件 + * @return {*} + */ + handleMessageItemClick(value) { + this.$router.push({ + name: "Warning-center", + params: { status: value }, + }); + }, + + /** + * @description: 消息中心查看更多事件 + * @return {*} + */ + handleMessageClick() { + this.$router.push("/inspection_warn/warning-center"); + }, + /* 获取数据栏右上角选项数据 */ getSelect() { selectTypeList().then(({ code, data }) => { @@ -1526,10 +1427,25 @@ export default { align-items: flex-end; } + // 消息中心样式 .header-news { - cursor: pointer; - font-size: 1.5rem; - color:red; + i { + position: relative; + cursor: pointer; + font-size: 1.5rem; + + .num { + min-width: 0.9rem; + position: absolute; + top: -0.2rem; + right: -0.5rem; + padding: 0.2rem; + font-size: 0.6rem; + border-radius: 0.5rem; + color: #ffffff; + background-color: red; + } + } } .header-data { @@ -1788,4 +1704,49 @@ input[aria-hidden="true"] { .el-radio:focus:not(.is-focus):not(:active):not(.is-disabled) .el-radio__inner { box-shadow: none; } + +// 大屏消息弹出框样式 +.screen-message-popover { + background-color: rgba(0, 0, 0, 0.8); + border: none; + + .screen-message-content { + width: 100%; + color: #ffffff; + + .message-content { + width: 100%; + height: 12rem; + + .message-item { + padding: 0.5rem 0; + border-bottom: 1px dashed rgb(115, 115, 116); + + .item-top { + width: 100%; + display: flex; + + &:hover { + span { + color: rgb(113, 179, 255); + } + } + + .time { + width: 40%; + } + } + + .item-content { + padding-left: 1rem; + } + } + } + + .message-footer { + display: flex; + justify-content: flex-end; + } + } +} diff --git a/src/views/index.vue b/src/views/index.vue index 0af96cb..adc0007 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -2,7 +2,7 @@ * @Author: SunTao 328867980@qq.com * @Date: 2024-10-08 09:26:24 * @LastEditors: SunTao 328867980@qq.com - * @LastEditTime: 2024-11-18 15:06:35 + * @LastEditTime: 2024-11-20 10:21:45 * @FilePath: \znxjxt-ui\src\views\index.vue * @Description: 系统首页 --> diff --git a/src/views/xj/inspection-warn/warning-center/index.vue b/src/views/xj/inspection-warn/warning-center/index.vue new file mode 100644 index 0000000..2d336d2 --- /dev/null +++ b/src/views/xj/inspection-warn/warning-center/index.vue @@ -0,0 +1,296 @@ + + + + + + + \ No newline at end of file