diff --git a/api/warn/autolog.js b/api/warn/autolog.js
new file mode 100644
index 0000000..00f0419
--- /dev/null
+++ b/api/warn/autolog.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询自动模式日志列表
+export function listAutolog(query) {
+ return request({
+ url: '/warn/autolog/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询自动模式日志详细
+export function getAutolog(id) {
+ return request({
+ url: '/warn/autolog/' + id,
+ method: 'get'
+ })
+}
+
+// 新增自动模式日志
+export function addAutolog(data) {
+ return request({
+ url: '/warn/autolog',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改自动模式日志
+export function updateAutolog(data) {
+ return request({
+ url: '/warn/autolog',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除自动模式日志
+export function delAutolog(id) {
+ return request({
+ url: '/warn/autolog/' + id,
+ method: 'delete'
+ })
+}
diff --git a/pages.json b/pages.json
index 7ec1c97..0c0397d 100644
--- a/pages.json
+++ b/pages.json
@@ -33,12 +33,12 @@
}
}
},
- {
- "path": "pages/data/indexDemo",
- "style": {
- "navigationBarTitleText": "数据中心11"
- }
- },
+// {
+// "path": "pages/data/indexDemo",
+// "style": {
+// "navigationBarTitleText": "数据中心11"
+// }
+// },
{
"path": "pages/news/index",
"style": {
@@ -219,12 +219,12 @@
"selectedIconPath": "static/images/tabbar/data_.png",
"text": "历史数据"
},
- {
- "pagePath": "pages/data/indexDemo",
- "iconPath": "static/images/tabbar/data.png",
- "selectedIconPath": "static/images/tabbar/data_.png",
- "text": "历史数据"
- },
+// {
+// "pagePath": "pages/data/indexDemo",
+// "iconPath": "static/images/tabbar/data.png",
+// "selectedIconPath": "static/images/tabbar/data_.png",
+// "text": "历史数据"
+// },
{
"pagePath": "pages/news/index",
"iconPath": "static/images/tabbar/news.png",
diff --git a/pages/news/subpages/deviceCenter/index.vue b/pages/news/subpages/deviceCenter/index.vue
index 5ab9d71..4039c36 100644
--- a/pages/news/subpages/deviceCenter/index.vue
+++ b/pages/news/subpages/deviceCenter/index.vue
@@ -44,7 +44,7 @@
@@ -139,12 +139,11 @@ export default {
}
},
onShow() {
+ // 只允许查询七天以内消息默认展示今天
this.getSortDate();
},
methods: {
- goTo(id) {
- this.scrollId = id;
- },
+
// 判断两个时间是否是同一天同一分钟
isSameMinute(time1, time2) {
const date1 = new Date(time1);
@@ -219,6 +218,7 @@ export default {
// 在数据更新后设置 scrollId
this.$nextTick(() => {
+ // 更新数据的长度
this.scrollId = "item"+this.messageList[10].id;
});
diff --git a/pages/news/subpages/deviceLog/log.vue b/pages/news/subpages/deviceLog/log.vue
new file mode 100644
index 0000000..e69de29
diff --git a/pages/news/subpages/eventCenter/index.vue b/pages/news/subpages/eventCenter/index.vue
index 31903e6..87f6d75 100644
--- a/pages/news/subpages/eventCenter/index.vue
+++ b/pages/news/subpages/eventCenter/index.vue
@@ -1,7 +1,10 @@
-
+
{{ item.time }}
+
diff --git a/pages/news/subpages/sysNotice/index.vue b/pages/news/subpages/sysNotice/index.vue
index a9878bd..a6c92fb 100644
--- a/pages/news/subpages/sysNotice/index.vue
+++ b/pages/news/subpages/sysNotice/index.vue
@@ -20,7 +20,7 @@
-
+
{{ item.time }}
+
{
+ this.$modal.msg("没有更早数据!");
+ // 结束刷新状态
+ this.status = 'nomore'
+ }, 800);
+ return;
+ }
+ // 模拟接口请求延迟
+ setTimeout(() => {
+ // 生成10条新数据
+ const newData = [];
+ for (let i = 0; i < 10; i++) {
+ newData.push({
+ title: '2024年春节放假通知',
+ content: '各位同事:一年一度的春节又到啦,根据国家法定节假日规定,2024年春节放假安排如下:02月01日—...',
+ author: '那只猪-图鸟人事部',
+ time: '2024-01-26 10:12',
+ dotColor: '#e53935',
+ dotInner: true,
+ })
+ }
+ this.noticeList = [ ...this.noticeList,...newData];
+ this.status = 'more'
+ }, 800);
+
+ },
},
onShow() {
// 系统通知按照最新时间升序排序
+ // 只允许查询七天以内消息默认展示今天
this.noticeList = this.contentList.filter(item =>
item.isRead===0);
},
@@ -210,7 +307,7 @@ page {
/* 页面容器 */
.notice-page {
-
+ height: 100vh;
display: flex;
flex-direction: column;
box-sizing: border-box;
@@ -258,6 +355,7 @@ page {
overflow: hidden;
/* 新增:H5端避免滚动条样式不一致 */
scrollbar-width: thin;
+ height: 100vh;
}
.notice-item {
background-color: #fff;
diff --git a/pages/news/subpages/videoCenter/index.vue b/pages/news/subpages/videoCenter/index.vue
index 96c276e..8e65f3f 100644
--- a/pages/news/subpages/videoCenter/index.vue
+++ b/pages/news/subpages/videoCenter/index.vue
@@ -120,6 +120,10 @@ export default {
]
}
},
+ mounted() {
+ // 只允许查询七天以内消息默认展示今天
+ // this.videoList = this.getDateList1();
+ },
methods: {
parseTime,
handleDateClick(item) {
@@ -274,6 +278,7 @@ export default {
.video-list {
flex: 1;
padding: 0 30rpx;
+ height: calc(100vh - var(--status-bar-height) - 180rpx);
}
.video-item {
display: flex;