diff --git a/pages.json b/pages.json index 552ff61..9dfa0e9 100644 --- a/pages.json +++ b/pages.json @@ -1,179 +1,189 @@ -{ - "easycom": { - "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" - }, - "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages - - { - "path": "pages/login/login", - "style": { - "navigationBarTitleText": "巡查登录", - "enablePullDownRefresh": false, - "navigationStyle": "custom" - } - - }, - { - "path": "pages/index/index", - "style": { - "navigationBarTitleText": "巡查养护", - "app-plus": { //uni-app项目对应节点名称为"app-plus" - "titleNView": { - "autoBackButton":false, - "buttons": [ - { - "float": "left", - "type": "home" - } - ] - } - } - } - }, { - "path": "pages/mine/mine", - "style": { - "navigationBarTitleText": "我的", - "enablePullDownRefresh": false - } - - } - ,{ - "path" : "road/road/road", - "style" : - { - "navigationBarTitleText": "选择道路", - "enablePullDownRefresh": false - } - - } - - ], - "subPackages": [{ - "root": "packageA/pages", - "pages": [{ - "path": "generalPatrol/generalPatrol", - "style": { - "navigationBarTitleText": "通用巡查", - "enablePullDownRefresh": false - } - - }, { - "path": "generalList/generalList", - "style": { - "navigationBarTitleText": "通用巡查", - "enablePullDownRefresh": false - } - - }, { - "path": "generalPatrol/viewPatrol", - "style": { - "navigationBarTitleText": "通用巡查", - "enablePullDownRefresh": false - - } - - }] - }, { - "root": "packageB/pages", - "pages": [{ - "path": "dailyInspection/dailyInspection", - "style": { - "navigationBarTitleText": "日常监管巡查", - "enablePullDownRefresh": false - } - - },{ - "path": "dailyList/dailyList", - "style": { - "navigationBarTitleText": "日常监管巡查", - "enablePullDownRefresh": true - } - },{ - "path": "dailyInfo/dailyInfo", - "style": { - "navigationBarTitleText": "日常监管巡查", - "enablePullDownRefresh": false - - } - }] - },{ - "root": "rainmaintain", - "pages": [{ - "path": "rainmaintain/rainmaintain", - "style": { - "navigationBarTitleText": "雨管养护", - "enablePullDownRefresh": false - } - }, { - "path": "rainmaintainlist/rainmaintainList", - "style": { - "navigationBarTitleText": "雨管养护", - "enablePullDownRefresh": true, - "disableScroll": true - } - }, { - "path": "rainmaintaininfo/rainmaintainInfo", - "style": { - "navigationBarTitleText": "雨管养护", - "enablePullDownRefresh": false, - "disableScroll": true +{ + "easycom": { + "^u-(.*)": "uview-ui/components/u-$1/u-$1.vue" + }, + "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages - } - }] - },{ - "root": "raininspection", - "pages": [{ - "path": "raininspection/raininspection", - "style": { - "navigationBarTitleText": "雨管巡查", - "enablePullDownRefresh": false - } - }, { - "path": "raininspectionlist/raininspectionList", - "style": { - "navigationBarTitleText": "雨管巡查", - "enablePullDownRefresh": true, - "disableScroll": true - } - }, { - "path": "raininspectioninfo/raininspectionInfo", - "style": { - "navigationBarTitleText": "雨管巡查", - "enablePullDownRefresh": false, - "disableScroll": true + { + "path": "pages/login/login", + "style": { + "navigationBarTitleText": "巡查登录", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } + }, + { + "path": "pages/index/index", + "style": { + "navigationBarTitleText": "巡查养护", + "app-plus": { //uni-app项目对应节点名称为"app-plus" + "titleNView": { + "autoBackButton": false, + "buttons": [{ + "float": "left", + "type": "home" + }] + } } - }] - }, { - "root": "order/order", - "pages": [{ - "path": "order/order", - "style": { - "navigationBarTitleText": "我的工单", - "enablePullDownRefresh": false - } - - },{ - "path": "orderList/orderList", - "style": { - "navigationBarTitleText": "我的工单", + } + }, { + "path": "pages/mine/mine", + "style": { + "navigationBarTitleText": "我的", + "enablePullDownRefresh": false + } + + }, { + "path": "road/road/road", + "style": { + "navigationBarTitleText": "选择道路", + "enablePullDownRefresh": false + } + + } + + ], + "subPackages": [{ + "root": "packageA/pages", + "pages": [{ + "path": "generalPatrol/generalPatrol", + "style": { + "navigationBarTitleText": "通用巡查", + "enablePullDownRefresh": false + } + + }, { + "path": "generalList/generalList", + "style": { + "navigationBarTitleText": "通用巡查", + "enablePullDownRefresh": false + } + + }, { + "path": "generalPatrol/viewPatrol", + "style": { + "navigationBarTitleText": "通用巡查", + "enablePullDownRefresh": false + + } + + }] + }, { + "root": "packageB/pages", + "pages": [{ + "path": "dailyInspection/dailyInspection", + "style": { + "navigationBarTitleText": "日常监管巡查", + "enablePullDownRefresh": false + } + + }, { + "path": "dailyList/dailyList", + "style": { + "navigationBarTitleText": "日常监管巡查", + "enablePullDownRefresh": true + } + }, { + "path": "dailyInfo/dailyInfo", + "style": { + "navigationBarTitleText": "日常监管巡查", + "enablePullDownRefresh": false + + } + }] + }, { + "root": "rainmaintain", + "pages": [{ + "path": "rainmaintain/rainmaintain", + "style": { + "navigationBarTitleText": "雨管养护", + "enablePullDownRefresh": false + } + }, { + "path": "rainmaintainlist/rainmaintainList", + "style": { + "navigationBarTitleText": "雨管养护", + "enablePullDownRefresh": true, + "disableScroll": true + } + }, { + "path": "rainmaintaininfo/rainmaintainInfo", + "style": { + "navigationBarTitleText": "雨管养护", + "enablePullDownRefresh": false, + "disableScroll": true + + } + }, { + "path": "plan/plan", + "style": { + "navigationBarTitleText": "养护计划", + "enablePullDownRefresh": false + } + + }] + }, { + "root": "raininspection", + "pages": [{ + "path": "raininspection/raininspection", + "style": { + "navigationBarTitleText": "雨管巡查", + "enablePullDownRefresh": false + } + }, { + "path": "raininspectionlist/raininspectionList", + "style": { + "navigationBarTitleText": "雨管巡查", "enablePullDownRefresh": true, - "disableScroll": true - } - },{ - "path": "orderInfo/orderInfo", - "style": { - "navigationBarTitleText": "我的工单", - "enablePullDownRefresh": false, - "disableScroll": true - - } - }] - }], - "globalStyle": { - "navigationBarTextStyle": "white", - "navigationBarTitleText": "巡查养护", - "navigationBarBackgroundColor": "#0385e5", - "backgroundColor": "#F8F8F8" - } + "disableScroll": true + } + }, { + "path": "raininspectioninfo/raininspectionInfo", + "style": { + "navigationBarTitleText": "雨管巡查", + "enablePullDownRefresh": false, + "disableScroll": true + + } + }, { + "path": "plan/plan", + "style": { + "navigationBarTitleText": "巡查计划", + "enablePullDownRefresh": false + } + + }] + }, { + "root": "order/order", + "pages": [{ + "path": "order/order", + "style": { + "navigationBarTitleText": "我的工单", + "enablePullDownRefresh": false + } + + }, { + "path": "orderList/orderList", + "style": { + "navigationBarTitleText": "我的工单", + "enablePullDownRefresh": true, + "disableScroll": true + } + }, { + "path": "orderInfo/orderInfo", + "style": { + "navigationBarTitleText": "我的工单", + "enablePullDownRefresh": false, + "disableScroll": true + + } + }] + }], + "globalStyle": { + "navigationBarTextStyle": "white", + "navigationBarTitleText": "巡查养护", + "navigationBarBackgroundColor": "#0385e5", + "backgroundColor": "#F8F8F8" + } } diff --git a/pages/index/index.vue b/pages/index/index.vue index 5ade41f..977defc 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -8,12 +8,24 @@ + + + + 巡查计划 + + 雨管巡查 + + + + 养护计划 + + @@ -123,6 +135,18 @@ } }); }, + + toviewplan(type) { + var url = '/raininspection/plan/plan'; + if (type == 2) { + url = "/rainmaintain/plan/plan" + } + uni.navigateTo({ + url: url + }) + + + }, toview(type) { let url = "/packageA/pages/generalPatrol/generalPatrol"; // let url = "/road/road/road?type=general" diff --git a/raininspection/plan/plan.vue b/raininspection/plan/plan.vue new file mode 100644 index 0000000..4ebb688 --- /dev/null +++ b/raininspection/plan/plan.vue @@ -0,0 +1,246 @@ + + + + + + + diff --git a/rainmaintain/plan/plan.vue b/rainmaintain/plan/plan.vue new file mode 100644 index 0000000..8183fd0 --- /dev/null +++ b/rainmaintain/plan/plan.vue @@ -0,0 +1,22 @@ + + + + + diff --git a/utils/util.js b/utils/util.js index 2c792d1..c22eb02 100755 --- a/utils/util.js +++ b/utils/util.js @@ -1,7 +1,7 @@ import md5 from "./md5.min"; const HOSTARR = { - //'development': 'http://192.168.60.100:9001', - 'development': 'http://patrol.115.langye.net', + 'development': 'http://192.168.60.100:9001', + //'development': 'http://patrol.115.langye.net', 'production': 'http://192.168.60.100:9001' }; // 审核状态