diff --git a/weapp/images/arrow_right_blue.svg b/weapp/images/arrow_right_blue.svg
new file mode 100644
index 0000000..1ab8c04
--- /dev/null
+++ b/weapp/images/arrow_right_blue.svg
@@ -0,0 +1,3 @@
+
diff --git a/weapp/images/calendar_card_bg.png b/weapp/images/calendar_card_bg.png
new file mode 100644
index 0000000..d8eef34
Binary files /dev/null and b/weapp/images/calendar_card_bg.png differ
diff --git a/weapp/images/calendar_icon.png b/weapp/images/calendar_icon.png
new file mode 100644
index 0000000..798e6ec
Binary files /dev/null and b/weapp/images/calendar_icon.png differ
diff --git a/weapp/images/fault_icon.png b/weapp/images/fault_icon.png
new file mode 100644
index 0000000..0b0b509
Binary files /dev/null and b/weapp/images/fault_icon.png differ
diff --git a/weapp/images/right_bg.png b/weapp/images/right_bg.png
new file mode 100644
index 0000000..9ed3e1f
Binary files /dev/null and b/weapp/images/right_bg.png differ
diff --git a/weapp/images/right_card_bg.png b/weapp/images/right_card_bg.png
new file mode 100644
index 0000000..e9a3cac
Binary files /dev/null and b/weapp/images/right_card_bg.png differ
diff --git a/weapp/images/right_icon.png b/weapp/images/right_icon.png
new file mode 100644
index 0000000..a4c5467
Binary files /dev/null and b/weapp/images/right_icon.png differ
diff --git a/weapp/package/riskManagement/riskCalendar/riskCalendar.js b/weapp/package/riskManagement/riskCalendar/riskCalendar.js
index 2ecf54c..ee3afca 100644
--- a/weapp/package/riskManagement/riskCalendar/riskCalendar.js
+++ b/weapp/package/riskManagement/riskCalendar/riskCalendar.js
@@ -5,7 +5,20 @@ Page({
* 页面的初始数据
*/
data: {
+ show: false,
+ level: ['轻微', '中度', '严重'],
+ curLevel: '轻微',
+ todayAlarm: [1, 2, 3],
+ },
+ showPopup() {
+ this.setData({ show: true })
+ },
+ onCancel() {
+ this.setData({ show: false })
+ },
+ onConfirm(e) {
+ this.setData({ curLevel: e.detail.value, show: false })
},
/**
diff --git a/weapp/package/riskManagement/riskCalendar/riskCalendar.json b/weapp/package/riskManagement/riskCalendar/riskCalendar.json
index c4b1c7b..16fa6f0 100644
--- a/weapp/package/riskManagement/riskCalendar/riskCalendar.json
+++ b/weapp/package/riskManagement/riskCalendar/riskCalendar.json
@@ -1,9 +1,11 @@
{
- "navigationBarBackgroundColor": "#1979ff",
+ "navigationBarBackgroundColor": "#006BE3",
"navigationBarTextStyle": "white",
- "navigationBarTitleText": "故障日历",
+ "navigationBarTitleText": "故障风险管理",
"enablePullDownRefresh": false,
"usingComponents": {
- "ec-canvas": "../../components/ec-canvas/ec-canvas"
+ "van-calendar": "@vant/weapp/calendar/index",
+ "van-picker": "@vant/weapp/picker/index",
+ "van-popup": "@vant/weapp/popup/index"
}
}
\ No newline at end of file
diff --git a/weapp/package/riskManagement/riskCalendar/riskCalendar.wxml b/weapp/package/riskManagement/riskCalendar/riskCalendar.wxml
index b0ffd05..63b9159 100644
--- a/weapp/package/riskManagement/riskCalendar/riskCalendar.wxml
+++ b/weapp/package/riskManagement/riskCalendar/riskCalendar.wxml
@@ -1,2 +1,74 @@
-package/riskManagement/riskCalendar/riskCalendar.wxml
\ No newline at end of file
+
+
+
+
+
+ 巡检日历
+
+ {{'2023-10-20'}}
+
+
+
+
+
+
+
+
+ 异常等级
+
+ {{curLevel}}
+
+
+
+
+
+
+
+
+
+
+
+ 结构物A
+
+ 查看详情
+
+
+
+
+ 本次巡检日期
+ 2020/12/21 17:00:00
+
+
+ 点位
+ 点位A
+
+
+ 巡检人
+ 离成功
+
+
+ 巡检结果
+ 异常
+
+
+ 异常等级
+ 轻微
+
+
+
+
diff --git a/weapp/package/riskManagement/riskCalendar/riskCalendar.wxss b/weapp/package/riskManagement/riskCalendar/riskCalendar.wxss
index e0888af..b0af8e2 100644
--- a/weapp/package/riskManagement/riskCalendar/riskCalendar.wxss
+++ b/weapp/package/riskManagement/riskCalendar/riskCalendar.wxss
@@ -1 +1,104 @@
-/* package/riskManagement/riskCalendar/riskCalendar.wxss */
\ No newline at end of file
+/* package/riskManagement/riskCalendar/riskCalendar.wxss */
+.risk-calendar {
+ height: 100%;
+ background-image: linear-gradient(179deg, #006BE3 0%, #4E87FF 16%, #4e87ff00 93%);
+ padding: 0 15px;
+}
+
+.card {
+ box-sizing: border-box;
+ background: #FFFFFF;
+ box-shadow: 2px 2px 11px 0 #00000008, 0 0 4px 0 #00000012;
+ border-radius: 4px;
+}
+
+.card-top {
+ height: 68px;
+ background-image: linear-gradient(0deg, #F3F7FF 84%, #DBE6FF 100%);
+ border-radius: 4px;
+ position: relative;
+}
+
+.card-bg {
+ position: absolute;
+ top: 0;
+ right: 11px;
+ width: 115px;
+ height: 67px;
+}
+
+.card-left {
+ margin-left: 23px;
+ font-weight: 500;
+ font-size: 16px;
+ color: #000000d9;
+}
+
+.card-right {
+ margin-right: 18px;
+ color: #1684FF;
+}
+
+.card-right-btn {
+ width: 76px;
+ height: 26px;
+ margin-right: 18px;
+ background: #1684FF;
+ border-radius: 16px;
+ color: #fff;
+ font-size: 13px;
+}
+
+.card-icon {
+ width: 30px;
+ height: 30px;
+ margin-right: 8px;
+}
+
+.calendar-box {
+ padding-bottom: 12px;
+}
+
+.calendar {
+ --calendar-height: 300px;
+}
+
+.title-box {
+ margin: 10px 0;
+}
+
+.title {
+ font-weight: 600;
+ font-size: 16px;
+ color: #383A3B;
+}
+
+.picker-text {
+ font-weight: 600;
+ color: #1684FF;
+ text-align: right;
+}
+
+.arrow {
+ width: 12px;
+ height: 12px;
+ transform: rotate(90deg);
+ margin-left: 9px;
+}
+
+.card-content {
+ padding-bottom: 10px;
+}
+
+.row {
+ margin: 4px 26px;
+ color: #31373E;
+}
+
+.content-left {
+ font-size: 12px;
+}
+
+.content-right {
+ font-size: 14px;
+}
\ No newline at end of file
diff --git a/weapp/package/riskManagement/riskManagement.js b/weapp/package/riskManagement/riskManagement.js
index 1965a6a..ffa65f0 100644
--- a/weapp/package/riskManagement/riskManagement.js
+++ b/weapp/package/riskManagement/riskManagement.js
@@ -38,7 +38,7 @@ Page({
lazyLoad: true, // 将 lazyLoad 设为 true 后，需要手动初始化图表
},
isLoaded: false,
- list: [1,2,3]
+ list: [1, 2, 3, 4],
},
// 初始化图表
@@ -65,6 +65,12 @@ Page({
});
},
+ toCalendar() {
+ wx.navigateTo({
+ url: '/package/riskManagement/riskCalendar/riskCalendar',
+ })
+ },
+
/**
* 生命周期函数--监听页面加载
*/
diff --git a/weapp/package/riskManagement/riskManagement.wxml b/weapp/package/riskManagement/riskManagement.wxml
index 76f12e8..5e32908 100644
--- a/weapp/package/riskManagement/riskManagement.wxml
+++ b/weapp/package/riskManagement/riskManagement.wxml
@@ -1,5 +1,7 @@
+
+
故障统计
@@ -15,8 +17,7 @@
-
-
+
历史风险趋势
@@ -26,16 +27,45 @@
-
-
+
故障排行榜
- 查看详情 >
+ 查看详情 >
+
+ 【故障次数统计】
+
+ 设备{{item}}
+
+
+
+ 所属结构物
+ 故障次数
+ 问题概述
+
+
+ 管廊{{item}}
+ {{10}}次
+ {{'设备损坏' + item}}
+
+
- 【故障次数统计】
+ 【故障评分统计】
设备{{item}}
+
+
+
+ 所属结构物
+ 故障评分
+ 等级分布
+
+
+ 管廊{{item}}
+ {{15 - item}}
+ 严重：{{5-item}}次，中等{{2}}次，轻微{{1}}次
+
+
diff --git a/weapp/package/riskManagement/riskManagement.wxss b/weapp/package/riskManagement/riskManagement.wxss
index e2f371f..f25181f 100644
--- a/weapp/package/riskManagement/riskManagement.wxss
+++ b/weapp/package/riskManagement/riskManagement.wxss
@@ -1,10 +1,18 @@
/* package/riskManagement/riskManagement.wxss */
.risk-management {
- height: 100vh;
+ height: 100%;
background-image: linear-gradient(179deg, #006BE3 0%, #4E87FF 16%, #4e87ff00 93%);
padding: 0 15px;
}
+.page-bg {
+ position: absolute;
+ width: 161px;
+ height: 174px;
+ opacity: 0.61;
+ right: 43px;
+}
+
.icon {
width: 61px;
height: 31.86px;
@@ -22,6 +30,7 @@
}
.title-item {
+ margin-top: 50px;
width: 150px;
color: #ffffffd9;
}
@@ -43,6 +52,7 @@
border-radius: 4px;
padding: 12px;
margin-top: 12px;
+ position: relative;
}
.card-img {
@@ -73,4 +83,37 @@
margin-top: 10px;
padding: 10px 7px;
background-color: #F1F7FF;
+ border-radius: 4px;
+}
+
+.list-title {
+ font-weight: 500;
+ font-size: 15px;
+ color: #1684FF;
+}
+
+.list-line {
+ width: 100%;
+ border-top: 1px solid #DAE6F6;
+ margin: 5px 0;
+}
+
+.list-content {
+ color: #31373E;
+}
+
+.content-item {
+ height: 72px;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-evenly;
+}
+
+.content-left {
+ font-size: 12px;
+}
+
+.content-right {
+ font-size: 14px;
+ text-align: right;
}
\ No newline at end of file