diff --git a/common/css/base.scss b/common/css/base.scss
index 26333dc..0a3b94f 100644
--- a/common/css/base.scss
+++ b/common/css/base.scss
@@ -42,6 +42,10 @@ page {
align-items: center;
justify-content: center;
}
+.space-between{
+ display: flex;
+ justify-content: space-between;
+}
.hide-txt {
overflow-x: hidden;
diff --git a/manifest.json b/manifest.json
index e03eb73..45ec424 100644
--- a/manifest.json
+++ b/manifest.json
@@ -131,5 +131,5 @@
"uniStatistics" : {
"enable" : false
},
- "vueVersion" : "3"
+ "vueVersion" : "2"
}
diff --git a/pages.json b/pages.json
index 6c431e6..b660da2 100644
--- a/pages.json
+++ b/pages.json
@@ -187,6 +187,12 @@
"navigationBarTitleText": "暂态事件"
}
},
+ {
+ "path": "pages/message/incidentDetail",
+ "style": {
+ "navigationBarTitleText": "暂态事件详情"
+ }
+ },
{
"path": "pages/message/term",
"style": {
@@ -340,8 +346,9 @@
"navigationBarTextStyle": "black",
"navigationBarTitleText": "灿能电力",
"navigationBarBackgroundColor": "#ffffff",
- "backgroundColor": "#f3f4f5",
+ "backgroundColor": "#f3f4f5"
// #ifdef H5
+ ,
"navigationStyle": "custom"
// #endif
},
diff --git a/pages/message/incident.vue b/pages/message/incident.vue
index 479f79a..b375661 100644
--- a/pages/message/incident.vue
+++ b/pages/message/incident.vue
@@ -65,7 +65,7 @@ export default {
methods: {
jump () {
console.log(123);
- uni.navigateTo({ url: '/pages/message/termDetail' })
+ uni.navigateTo({ url: '/pages/message/incidentDetail' })
}
}
}
@@ -97,6 +97,6 @@ export default {
}
/deep/ .uni-card__header-extra-text {
color: #dd524d !important;
-
+ font-size: 20rpx;
}
diff --git a/pages/message/incidentDetail.vue b/pages/message/incidentDetail.vue
new file mode 100644
index 0000000..d15eb8e
--- /dev/null
+++ b/pages/message/incidentDetail.vue
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+ 2023-02-14
+
+
+ 基础信息
+ CN_NPQS682
+ 发生暂降事件,特征幅值:88%,持续时间:0.047s
+
+ 南京市 灿能园区
+
+
+ 电压等级:0.38kV
+
+
+ 网路参数:00-B7-8D-A8-00-D3
+
+
+
+
+ 瞬时波形图
+
+
+
+ RMS波形图
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/message/report.vue b/pages/message/report.vue
index ad788a3..c1e783d 100644
--- a/pages/message/report.vue
+++ b/pages/message/report.vue
@@ -1,7 +1,7 @@
-
@@ -35,5 +35,7 @@ export default {
}
/deep/ .uni-badge {
background-color: unset !important;
+ color: #dd524d !important;
+ font-size: 28rpx !important;
}
diff --git a/pages/message/term.vue b/pages/message/term.vue
index 6065a6b..7d5f291 100644
--- a/pages/message/term.vue
+++ b/pages/message/term.vue
@@ -40,4 +40,9 @@ export default {
/deep/ .uni-list-item {
background-color: $uni-theme-white !important;
}
+/deep/ .uni-badge {
+ background-color: unset !important;
+ color: #dd524d !important;
+ font-size: 28rpx !important;
+}
diff --git a/static/boxing1.jpeg b/static/boxing1.jpeg
new file mode 100644
index 0000000..043acc4
Binary files /dev/null and b/static/boxing1.jpeg differ
diff --git a/static/boxing2.jpeg b/static/boxing2.jpeg
new file mode 100644
index 0000000..2c98f8a
Binary files /dev/null and b/static/boxing2.jpeg differ
diff --git a/tsconfig.json b/tsconfig.json
deleted file mode 100644
index bd542c7..0000000
--- a/tsconfig.json
+++ /dev/null
@@ -1,29 +0,0 @@
-// tsconfig.json
-{
- "compilerOptions": {
- "target": "esnext",
- "module": "esnext",
- "strict": true,
- "jsx": "preserve",
- "moduleResolution": "node",
- "esModuleInterop": true,
- "sourceMap": true,
- "skipLibCheck": true,
- "importHelpers": true,
- "allowSyntheticDefaultImports": true,
- "useDefineForClassFields": true,
- "resolveJsonModule": true,
- "lib": [
- "esnext",
- "dom"
- ],
- "types": [
- "@dcloudio/types"
- ]
- },
- "exclude": [
- "node_modules",
- "unpackage",
- "src/**/*.nvue"
- ]
-}