diff --git a/manifest.json b/manifest.json index 5e33094..f44337f 100644 --- a/manifest.json +++ b/manifest.json @@ -2,11 +2,11 @@ "name" : "作业管控智慧平台", "appid" : "__UNI__4165875", "description" : "作业管控智慧平台", - "versionName" : "1.0.4", - "versionCode" : 104, + "versionName" : "1.0.9", + "versionCode" : 109, "transformPx" : false, "app-plus" : { - "runmode":"liberate", + "runmode" : "liberate", "compatible" : { "ignoreVersion" : true }, @@ -30,7 +30,9 @@ "Camera" : {}, "VideoPlayer" : {}, "Barcode" : {}, - "FaceID" : {} + "FaceID" : {}, + "Contacts" : {}, + "Geolocation" : {} }, "distribute" : { "android" : { @@ -68,43 +70,59 @@ "urlschemewhitelist" : [ "baidumap", "iosamap" ], "dSYMs" : false, "privacyDescription" : { - "NSAppleMusicUsageDescription" : "访问媒体资料库" - } + "NSAppleMusicUsageDescription" : "库该应用需要访问你的媒体资料,以便为你编辑个人信息", + "NSPhotoLibraryUsageDescription" : "该应用需要读取你的相册,以便为你编辑个人信息", + "NSPhotoLibraryAddUsageDescription" : "该应用需要读取你的相册,以便为你编辑个人信息", + "NSCameraUsageDescription" : "该应用需要你的相机,以便你拍摄上传个人信息", + "NSMicrophoneUsageDescription" : "该应用需要你的麦克风,以便为你编辑个人信息", + "NSLocationWhenInUseUsageDescription" : "该应用需要你的位置信息,以便为你编辑个人信息", + "NSLocationAlwaysUsageDescription" : "该应用需要你的位置信息,以便为你编辑个人信息", + "NSLocationAlwaysAndWhenInUseUsageDescription" : "该应用需要你的位置信息,以便为你编辑个人信息", + "NSCalendarsUsageDescription" : "该应用需要你的日历,以便为你编辑个人信息", + "NSContactsUsageDescription" : "该应用需要你的通讯录,以便为你编辑个人信息", + "NSLocalNetworkUsageDescription" : "该应用需要你的网络,以便为你编辑个人信息" + }, + "idfa" : false }, "sdkConfigs" : { - "ad" : {} + "ad" : {}, + "geolocation" : { + "system" : { + "__platform__" : [ "ios", "android" ] + } + } }, "orientation" : [ "portrait-primary" ], "icons" : { "ios" : { "iphone" : { - "app@2x" : "", - "app@3x" : "", - "spotlight@2x" : "", - "notification@2x" : "", - "notification@3x" : "", - "settings@2x" : "", - "settings@3x" : "", - "spotlight@3x" : "" + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" }, - "appstore" : "", + "appstore" : "unpackage/res/icons/1024x1024.png", "ipad" : { - "app" : "", - "app@2x" : "", - "notification" : "", - "notification@2x" : "", - "proapp@2x" : "", - "settings" : "", - "settings@2x" : "", - "spotlight" : "", - "spotlight@2x" : "" + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" } }, "android" : { - "hdpi" : "", - "xhdpi" : "", - "xxhdpi" : "", - "xxxhdpi" : "" + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" } }, "splashscreen" : { diff --git a/pages.json b/pages.json index f267a3e..2c35a2d 100644 --- a/pages.json +++ b/pages.json @@ -233,6 +233,34 @@ "navigationStyle": "custom" } }, + + { + //首页二级跳转页面 -- 在建工程列表 + "path": "pages/realName/index/pages/project", + "style": { + "navigationStyle": "custom" + } + }, + { + //首页二级跳转页面 -- 分包列表 + "path": "pages/realName/index/pages/subList", + "style": { + "navigationStyle": "custom" + } + }, + { + //首页二级跳转页面 -- 班组列表 + "path": "pages/realName/index/pages/teamList", + "style": { + "navigationStyle": "custom" + } + },{ + //首页二级跳转页面 -- 人员列表 + "path": "pages/realName/index/pages/personList", + "style": { + "navigationStyle": "custom" + } + }, { //工作台 "path": "pages/realName/workbench/index", diff --git a/pages/realName/index/index.vue b/pages/realName/index/index.vue index 49ce18e..049de94 100644 --- a/pages/realName/index/index.vue +++ b/pages/realName/index/index.vue @@ -113,7 +113,7 @@

数据概览

- + {{ item.data_num }} @@ -604,7 +604,25 @@ export default { /* 跳转作业计划 */ onJumpWorkPlan() { uni.navigateTo({ url: '/pages/realName/workPlan/index' }) - } + }, + + //数据概览跳转 + godataView(item) { + console.log(item) + if(item.data_title=='在建工程'){ + uni.navigateTo({ url: '/pages/realName/index/pages/project' }) + } + if(item.data_title=='在用分包单位'){ + uni.navigateTo({ url: '/pages/realName/index/pages/subList' }) + } + if(item.data_title=='在用班组'){ + uni.navigateTo({ url: '/pages/realName/index/pages/teamList' }) + } + if(item.data_title=='在场人数'){ + uni.navigateTo({ url: '/pages/realName/index/pages/personList' }) + } + + }, }, onShow() {} } diff --git a/pages/realName/index/pages/personDetail.vue b/pages/realName/index/pages/personDetail.vue new file mode 100644 index 0000000..ed2b15b --- /dev/null +++ b/pages/realName/index/pages/personDetail.vue @@ -0,0 +1,435 @@ + + + + + diff --git a/pages/realName/index/pages/personList.vue b/pages/realName/index/pages/personList.vue new file mode 100644 index 0000000..26e5cc7 --- /dev/null +++ b/pages/realName/index/pages/personList.vue @@ -0,0 +1,485 @@ + + + + + diff --git a/pages/realName/index/pages/project.vue b/pages/realName/index/pages/project.vue new file mode 100644 index 0000000..f89c6d9 --- /dev/null +++ b/pages/realName/index/pages/project.vue @@ -0,0 +1,408 @@ + + + + + diff --git a/pages/realName/index/pages/subList.vue b/pages/realName/index/pages/subList.vue new file mode 100644 index 0000000..134d7a6 --- /dev/null +++ b/pages/realName/index/pages/subList.vue @@ -0,0 +1,408 @@ + + + + + diff --git a/pages/realName/index/pages/teamList.vue b/pages/realName/index/pages/teamList.vue new file mode 100644 index 0000000..b9c5e0f --- /dev/null +++ b/pages/realName/index/pages/teamList.vue @@ -0,0 +1,342 @@ + + + + + diff --git a/pages/realName/workPlan/index.vue b/pages/realName/workPlan/index.vue index 7f9c50c..20117bc 100644 --- a/pages/realName/workPlan/index.vue +++ b/pages/realName/workPlan/index.vue @@ -205,7 +205,7 @@ export default {