diff --git a/monitorMobile/components/tki-tree/style.css b/monitorMobile/components/tki-tree/style.css
index d6301ae..0e40b12 100644
--- a/monitorMobile/components/tki-tree/style.css
+++ b/monitorMobile/components/tki-tree/style.css
@@ -108,16 +108,16 @@
}
.tki-tree-check-yes,
.tki-tree-check-no {
- width: 20px;
- height: 20px;
+ width: 18px;
+ height: 18px;
border-top-left-radius: 20%;
border-top-right-radius: 20%;
border-bottom-right-radius: 20%;
border-bottom-left-radius: 20%;
- border-top-width: 1rpx;
- border-left-width: 1rpx;
- border-bottom-width: 1rpx;
- border-right-width: 1rpx;
+ border-top-width: 1px;
+ border-left-width: 1px;
+ border-bottom-width: 1px;
+ border-right-width: 1px;
border-style: solid;
border-color: #2388FF;
display: flex;
@@ -126,8 +126,8 @@
box-sizing: border-box;
}
.tki-tree-check-yes-b {
- width: 12px;
- height: 12px;
+ width: 18px;
+ height: 18px;
border-top-left-radius: 20%;
border-top-right-radius: 20%;
border-bottom-right-radius: 20%;
@@ -145,6 +145,10 @@
border-top-right-radius: 50%;
border-bottom-right-radius: 50%;
border-bottom-left-radius: 50%;
+ color: #fff;
+ display: flex;
+ justify-content: center;
+ align-items: center;
}
.hover-c {
opacity: 0.6;
diff --git a/monitorMobile/components/tki-tree/tki-tree.vue b/monitorMobile/components/tki-tree/tki-tree.vue
index 2a31da5..54e716d 100644
--- a/monitorMobile/components/tki-tree/tki-tree.vue
+++ b/monitorMobile/components/tki-tree/tki-tree.vue
@@ -27,7 +27,7 @@
-
+
diff --git a/monitorMobile/pages/earlyWarning/components/warningInfo.vue b/monitorMobile/pages/earlyWarning/components/warningInfo.vue
index 69671f0..9c1efec 100644
--- a/monitorMobile/pages/earlyWarning/components/warningInfo.vue
+++ b/monitorMobile/pages/earlyWarning/components/warningInfo.vue
@@ -175,7 +175,7 @@
+ :options="warnOption" title="预警类型" search-place-holder="预警类型" />
@@ -199,6 +199,24 @@
StartTick: '开始时间',
EndTick: '结束时间',
},
+ warnOption: [
+ {
+ label: '人群聚集',
+ value: 1
+ },
+ {
+ label: '烟火警告',
+ value: 2
+ },
+ {
+ label: '未佩戴口罩检查',
+ value: 3
+ },
+ {
+ label: '周界入侵',
+ value: 4
+ },
+ ],
warnList: [{
warnHand: 1
}, {
diff --git a/monitorMobile/pages/earlyWarning/detail.vue b/monitorMobile/pages/earlyWarning/detail.vue
index 93b29a8..c806832 100644
--- a/monitorMobile/pages/earlyWarning/detail.vue
+++ b/monitorMobile/pages/earlyWarning/detail.vue
@@ -3,7 +3,7 @@
周界入侵-2024-08-20 18:01:41
-
+
所属学校:
diff --git a/monitorMobile/pages/monitor/index.vue b/monitorMobile/pages/monitor/index.vue
index 1b7e684..a754c50 100644
--- a/monitorMobile/pages/monitor/index.vue
+++ b/monitorMobile/pages/monitor/index.vue
@@ -1,9 +1,7 @@
-
-
@@ -12,7 +10,7 @@
-
+
@@ -27,68 +25,7 @@
-
-
-
-
-
-
-
- {{searchForm.alarmType}}
-
-
-
-
-
-
-
-
-
-
-
- {{searchForm.warnHand}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{searchForm.StartTick}}
-
- 至
-
- {{searchForm.EndTick}}
-
-
-
-
-
-
-
-
-
-
-
- 重置
-
-
- 确认
-
-
-
-
-
@@ -448,7 +385,7 @@
// height: calc(100% - 375rpx);
.inspectionCenter {
width: 100%;
- height: 100%;
+ height: calc(100% - 44rpx);
position: relative;
.u-modal__title {
@@ -645,6 +582,7 @@
height: 100%;
padding: 0 30rpx;
box-sizing: border-box;
+
.liBox {
background: #fff;
padding: 24rpx 30rpx;
diff --git a/monitorMobile/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue b/monitorMobile/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
index da283c7..6b20724 100644
--- a/monitorMobile/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
+++ b/monitorMobile/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
@@ -6,9 +6,13 @@
-
+
+
+
+
+