diff --git a/package-lock.json b/package-lock.json index 9761044..666048b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11990,9 +11990,9 @@ } }, "node_modules/uview-plus": { - "version": "3.3.62", - "resolved": "https://repo.huaweicloud.com/repository/npm/uview-plus/-/uview-plus-3.3.62.tgz", - "integrity": "sha512-RDSEiu4uuZf4Aq5S7McSsVPOHrlEsjIVcGT1U6vgnfD7HsZzPx71TaBY3kHHmawLeQ5oS4BSviBRRb+Y3gX0NA==", + "version": "3.4.11", + "resolved": "https://repo.huaweicloud.com/repository/npm/uview-plus/-/uview-plus-3.4.11.tgz", + "integrity": "sha512-lCi/w1NuLbv0g++ynySJQRfhYLBK3BkQ8lO7nz0YPrTOPjqdraI35Tmdpjerjc/VVIzz0IAOSi0scVEwtd4MaA==", "dependencies": { "clipboard": "^2.0.11", "dayjs": "^1.11.3" diff --git a/src/App.vue b/src/App.vue index 7263b55..441f45a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -20,4 +20,8 @@ page { height: 100%; width: 100%; } + +::v-deep .u-form-item__body__right__message { + margin-left: 0 !important; +} diff --git a/src/components/NavBarModal/index.vue b/src/components/NavBarModal/index.vue new file mode 100644 index 0000000..999aa83 --- /dev/null +++ b/src/components/NavBarModal/index.vue @@ -0,0 +1,43 @@ + + + + + diff --git a/src/components/TitleTipModal/index.vue b/src/components/TitleTipModal/index.vue new file mode 100644 index 0000000..5764596 --- /dev/null +++ b/src/components/TitleTipModal/index.vue @@ -0,0 +1,44 @@ + + + + + diff --git a/src/pages.json b/src/pages.json index fdaab2f..e2774f8 100644 --- a/src/pages.json +++ b/src/pages.json @@ -16,17 +16,69 @@ "navigationBarTitleText": "项目全过程影像管理工具" } }, + // tabBar 工作台页面 { "path": "pages/workbenches/index", "style": { "navigationBarTitleText": "工作台" } }, + // tabBar 我的页面 { "path": "pages/my/index", "style": { "navigationBarTitleText": "我的" } + }, + // 二级页面 + { + "path": "pages/my/edit-password/index", + "style": { + "navigationBarTitleText": "修改密码" + } + }, + // 业务 一级页面 ---- 安全违章 + { + "path": "pages/safetyViolations/index", + "style": { + "navigationBarTitleText": "custom", + "navigationStyle": "custom" + } + }, + // 业务 一级页面 ---- 质量检查 + { + "path": "pages/qualityInspection/index", + "style": { + "navigationBarTitleText": "质量检查" + } + }, + // 业务 一级页面 ---- 安全措施落实 + { + "path": "pages/safetyMeasure/index", + "style": { + "navigationBarTitleText": "安全措施落实" + } + }, + // 业务 一级页面 ---- 协调照片 + { + "path": "pages/coordinatePhotos/index", + "style": { + "navigationBarTitleText": "协调照片" + } + }, + // 业务 一级页面 ---- 重要事项 + { + "path": "pages/importantMatters/index", + "style": { + "navigationBarTitleText": "重要事项" + } + }, + // 业务 一级页面 ---- 综合查询 + { + "path": "pages/comprehensiveQuery/index", + "style": { + "navigationBarTitleText": "综合查询" + } } ], "globalStyle": { diff --git a/src/pages/comprehensiveQuery/index.vue b/src/pages/comprehensiveQuery/index.vue new file mode 100644 index 0000000..8c577af --- /dev/null +++ b/src/pages/comprehensiveQuery/index.vue @@ -0,0 +1,16 @@ + + + + + diff --git a/src/pages/coordinatePhotos/index.vue b/src/pages/coordinatePhotos/index.vue new file mode 100644 index 0000000..2b797ad --- /dev/null +++ b/src/pages/coordinatePhotos/index.vue @@ -0,0 +1,16 @@ + + + + + diff --git a/src/pages/importantMatters/index.vue b/src/pages/importantMatters/index.vue new file mode 100644 index 0000000..d63d4d1 --- /dev/null +++ b/src/pages/importantMatters/index.vue @@ -0,0 +1,16 @@ + + + + + diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 5250805..cb9be24 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -28,10 +28,19 @@ + > + + @@ -44,10 +53,11 @@ + + diff --git a/src/pages/my/index.vue b/src/pages/my/index.vue index 50634f2..228cb9f 100644 --- a/src/pages/my/index.vue +++ b/src/pages/my/index.vue @@ -18,13 +18,65 @@ - - - + + + + + + + + + + + + + - + diff --git a/src/pages/qualityInspection/index.vue b/src/pages/qualityInspection/index.vue new file mode 100644 index 0000000..0197156 --- /dev/null +++ b/src/pages/qualityInspection/index.vue @@ -0,0 +1,16 @@ + + + + + diff --git a/src/pages/safetyMeasure/index.vue b/src/pages/safetyMeasure/index.vue new file mode 100644 index 0000000..8c8c140 --- /dev/null +++ b/src/pages/safetyMeasure/index.vue @@ -0,0 +1,16 @@ + + + + + diff --git a/src/pages/safetyViolations/componetns/addAndEditForm.vue b/src/pages/safetyViolations/componetns/addAndEditForm.vue new file mode 100644 index 0000000..f318739 --- /dev/null +++ b/src/pages/safetyViolations/componetns/addAndEditForm.vue @@ -0,0 +1,509 @@ + + + + + diff --git a/src/pages/safetyViolations/index.vue b/src/pages/safetyViolations/index.vue new file mode 100644 index 0000000..287c574 --- /dev/null +++ b/src/pages/safetyViolations/index.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/pages/workbenches/components/icon-card.vue b/src/pages/workbenches/components/icon-card.vue new file mode 100644 index 0000000..76536ba --- /dev/null +++ b/src/pages/workbenches/components/icon-card.vue @@ -0,0 +1,62 @@ + + + + + diff --git a/src/pages/workbenches/index.vue b/src/pages/workbenches/index.vue index b3741de..c709cd8 100644 --- a/src/pages/workbenches/index.vue +++ b/src/pages/workbenches/index.vue @@ -1,18 +1,60 @@ diff --git a/src/static/image/home_1.png b/src/static/image/home_1.png new file mode 100644 index 0000000..a952cf9 Binary files /dev/null and b/src/static/image/home_1.png differ diff --git a/src/static/image/home_2.png b/src/static/image/home_2.png new file mode 100644 index 0000000..8e5b61d Binary files /dev/null and b/src/static/image/home_2.png differ diff --git a/src/static/image/home_3.png b/src/static/image/home_3.png new file mode 100644 index 0000000..e12bd31 Binary files /dev/null and b/src/static/image/home_3.png differ diff --git a/src/static/image/home_4.png b/src/static/image/home_4.png new file mode 100644 index 0000000..94ddc8c Binary files /dev/null and b/src/static/image/home_4.png differ diff --git a/src/static/image/home_5.png b/src/static/image/home_5.png new file mode 100644 index 0000000..787ef30 Binary files /dev/null and b/src/static/image/home_5.png differ diff --git a/src/static/image/home_6.png b/src/static/image/home_6.png new file mode 100644 index 0000000..e6ef53d Binary files /dev/null and b/src/static/image/home_6.png differ