diff --git a/components/g-picker/g-picker.vue b/components/g-picker/g-picker.vue
new file mode 100644
index 00000000..7e291a37
--- /dev/null
+++ b/components/g-picker/g-picker.vue
@@ -0,0 +1,206 @@
+
+
+
+
+ {{value}}
+ {{placeholder}}
+
+
+
+
+
+ 取消
+ 确认
+
+
+
+ {{ col[filter.label] }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index 7c49cb48..9f916945 100644
--- a/manifest.json
+++ b/manifest.json
@@ -146,7 +146,22 @@
"androidStyle" : "common"
}
},
- "nativePlugins" : {}
+ "nativePlugins" : {
+ "KJ-NotificationAndroid" : {
+ "__plugin_info__" : {
+ "name" : "常驻通知栏、进度条通知栏(andorid) - [试用版,仅用于自定义调试基座]",
+ "description" : "常驻通知栏、进度条通知栏(andorid) 、请试用合适再购买、请试用合适再购买、请试用合适再购买",
+ "platforms" : "Android",
+ "url" : "https://ext.dcloud.net.cn/plugin?id=9659",
+ "android_package_name" : "",
+ "ios_bundle_id" : "",
+ "isCloud" : true,
+ "bought" : 0,
+ "pid" : "9659",
+ "parameters" : {}
+ }
+ }
+ }
},
/* 快应用特有相关 */
"quickapp" : {},
diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json
index f1bfc4a7..f976c672 100644
--- a/node_modules/.package-lock.json
+++ b/node_modules/.package-lock.json
@@ -1,6 +1,6 @@
{
"name": "zhgdyunapp",
- "lockfileVersion": 3,
+ "lockfileVersion": 2,
"requires": true,
"packages": {
"node_modules/@babel/runtime": {
diff --git a/pages.json b/pages.json
index 07189852..a1c14a19 100644
--- a/pages.json
+++ b/pages.json
@@ -2624,6 +2624,30 @@
}
},
// 巡检路线
+ {
+ "path": "pages/projectEnd/InspectionRoute/inspection",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+ {
+ "path": "pages/projectEnd/InspectionRoute/inspectionPointList",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+ {
+ "path": "pages/projectEnd/InspectionRoute/editInspectionPoint",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
+ {
+ "path": "pages/projectEnd/InspectionRoute/inspectionPlan",
+ "style": {
+ "navigationBarTitleText": ""
+ }
+ },
{
"path": "pages/projectEnd/InspectionRoute/inspectedstay",
"style": {
@@ -2684,6 +2708,20 @@
{
"navigationBarTitleText" : ""
}
+ },
+ {
+ "path" : "components/g-picker/g-picker",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
+ },
+ {
+ "path" : "pages/projectEnd/InspectionRoute/mapLocatoin/mapLocatoin",
+ "style" :
+ {
+ "navigationBarTitleText" : ""
+ }
}
],
// "subPackages":[{
diff --git a/pages/projectEnd/InspectionRoute/editInspectionPoint.vue b/pages/projectEnd/InspectionRoute/editInspectionPoint.vue
new file mode 100644
index 00000000..c8e84126
--- /dev/null
+++ b/pages/projectEnd/InspectionRoute/editInspectionPoint.vue
@@ -0,0 +1,569 @@
+
+
+
+
+
+ *巡检点名称:
+
+
+
+ *巡检点位置:
+
+
+
+ *所属区域:
+
+
+
+ 请选择
+
+
+ {{areaData.regionName}}
+
+
+
+
+
+ *责任企业:
+
+
+
+ *责任人:
+
+
+
+ *最低巡检时长(分钟):
+
+
+
+ 巡检点定位:
+
+ {{form.addr}}
+
+
+ 去获取定位
+
+
+
+ *自定义范围(米):
+
+
+
+ 请选择
+
+
+ {{form.standArea}}
+
+
+
+
+
+
+
+
+ 动态表单
+
+
+
+
+
+
+
+
+
+
+
+ 必填
+ 非必填
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/projectEnd/InspectionRoute/inspection.vue b/pages/projectEnd/InspectionRoute/inspection.vue
new file mode 100644
index 00000000..9c21d5d1
--- /dev/null
+++ b/pages/projectEnd/InspectionRoute/inspection.vue
@@ -0,0 +1,357 @@
+
+
+
+
+
+ 任务统计
+ {{nowTime}}
+
+
+
+ {{totalNum}}
+ 未开始
+
+
+ {{totalNum}}
+ 进行中
+
+
+ {{totalNum}}
+ 已预期
+
+
+ {{totalNum}}
+ 已巡检
+
+
+
+
+ 常用模块
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/projectEnd/InspectionRoute/inspectionPlan.vue b/pages/projectEnd/InspectionRoute/inspectionPlan.vue
new file mode 100644
index 00000000..e6cfea80
--- /dev/null
+++ b/pages/projectEnd/InspectionRoute/inspectionPlan.vue
@@ -0,0 +1,1707 @@
+
+
+
+
+
+
+
+
+
+ {{item.routeName}}
+
+
+ 巡检人员:
+ {{item.inspectUserIds}}
+
+
+ 巡检通知人员:
+ {{item.noticeUserNames}}
+
+
+ 巡检周期:
+ ({{item.startTime}} - {{item.endTime}})
+
+
+ 巡检频次:
+ {{item.enterpriseName}}
+
+
+ 查看5次巡检任务
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
+
+
+
+
+
+ ×
+
+
+ 筛选条件
+
+
+ 检查时间
+
+
+
+
+ {{inspectStartTime}}
+ ×
+
+ 一
+
+
+
+ {{inspectEndTime}}
+ ×
+
+
+
+
+ 巡检人员
+
+
+ {{ item.name ? item.name : item.value }}
+
+
+ 查看更多
+
+
+
+
+ 收起
+
+
+ 巡检通知人员
+
+
+ {{ item.name ? item.name : item.value }}
+
+
+ 查看更多
+
+
+
+
+ 收起
+
+
+ 分包单位
+
+
+ {{ item.name }}
+
+
+ 查看更多
+
+
+
+
+ 收起
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/projectEnd/InspectionRoute/inspectionPointList.vue b/pages/projectEnd/InspectionRoute/inspectionPointList.vue
new file mode 100644
index 00000000..eb75752b
--- /dev/null
+++ b/pages/projectEnd/InspectionRoute/inspectionPointList.vue
@@ -0,0 +1,494 @@
+
+
+
+
+
+
+
+
+ {{item.checkingPointName}}
+ (安全监管区域)
+
+
+ 巡检位置:
+ {{item.position}}
+
+
+ 最低巡检时长(分钟):
+ {{item.minInspectTime}}
+
+
+ 创建人:
+ {{item.createUserName}}
+ ({{item.createDate}})
+
+
+ 责任企业:
+ {{item.enterpriseName}}
+
+
+ 责任人:
+ {{item.inspectUserNames}}
+
+
+
+
+
+
+ 下载二维码
+
+
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/projectEnd/InspectionRoute/mapLocatoin/mapLocatoin.vue b/pages/projectEnd/InspectionRoute/mapLocatoin/mapLocatoin.vue
new file mode 100644
index 00000000..2d26e120
--- /dev/null
+++ b/pages/projectEnd/InspectionRoute/mapLocatoin/mapLocatoin.vue
@@ -0,0 +1,266 @@
+
+
+
+
+
+
+
+
+ 请选择
+
+
+
+ {{standArea}}米
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/projectEnd/projectIndex/projectIndex.vue b/pages/projectEnd/projectIndex/projectIndex.vue
index 85e67b0d..fca35fb5 100644
--- a/pages/projectEnd/projectIndex/projectIndex.vue
+++ b/pages/projectEnd/projectIndex/projectIndex.vue
@@ -575,7 +575,7 @@
break;
case "inspectRoute":
uni.navigateTo({
- url: '../../projectEnd/InspectionRoute/inspectedstay'
+ url: '../../projectEnd/InspectionRoute/inspection'
})
break;
case 'educationExam':
diff --git a/static/icon/delete.svg b/static/icon/delete.svg
new file mode 100644
index 00000000..f85a46d4
--- /dev/null
+++ b/static/icon/delete.svg
@@ -0,0 +1,6 @@
+
\ No newline at end of file
diff --git a/static/icon/edit.svg b/static/icon/edit.svg
new file mode 100644
index 00000000..6017fa91
--- /dev/null
+++ b/static/icon/edit.svg
@@ -0,0 +1,6 @@
+
\ No newline at end of file
diff --git a/static/icon/form.svg b/static/icon/form.svg
new file mode 100644
index 00000000..a6acb6a7
--- /dev/null
+++ b/static/icon/form.svg
@@ -0,0 +1,6 @@
+
\ No newline at end of file
diff --git a/static/icon/inspection_plan.png b/static/icon/inspection_plan.png
new file mode 100644
index 00000000..75d95de8
Binary files /dev/null and b/static/icon/inspection_plan.png differ
diff --git a/static/icon/inspection_point.png b/static/icon/inspection_point.png
new file mode 100644
index 00000000..9c6800de
Binary files /dev/null and b/static/icon/inspection_point.png differ
diff --git a/static/icon/inspection_task.png b/static/icon/inspection_task.png
new file mode 100644
index 00000000..8607f484
Binary files /dev/null and b/static/icon/inspection_task.png differ
diff --git a/static/icon/riLine-download-line.svg b/static/icon/riLine-download-line.svg
new file mode 100644
index 00000000..3696de4a
--- /dev/null
+++ b/static/icon/riLine-download-line.svg
@@ -0,0 +1,6 @@
+
\ No newline at end of file
diff --git a/static/icon/safety.png b/static/icon/safety.png
new file mode 100644
index 00000000..4198953b
Binary files /dev/null and b/static/icon/safety.png differ