diff --git a/miniprogram/app.js b/miniprogram/app.js index dadc49d..c803550 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -10,7 +10,7 @@ onShareAppMessage () { return { title: '智慧工地优管',//分享标题 - path: '/pages/login/login',//分享用户点开后页面 + path: '/pages/login/index',//分享用户点开后页面 success (res) { console.log('分享成功！') } @@ -29,10 +29,10 @@ App({ userProjectId:'', appId: "wx9997d071b4996f23", // 智慧工地后台接口访问域名 - //reqUrl:'https://szgcwx.jhncidg.com', - reqUrl:'http://127.0.0.1:8091', - //uploadUrl:"https://szgcwx.jhncidg.com/wechat", - uploadUrl:'http://192.168.43.53:8091/wechat', + reqUrl:'https://szgcwx.jhncidg.com', + //reqUrl:'http://127.0.0.1:8091', + uploadUrl:"https://szgcwx.jhncidg.com/wechat", + //uploadUrl:'http://127.0.0.1:8091/wechat', //御景路数字化集成管控平台接口访问域名 szhUrl:'https://szh.makalu.cc', diff --git a/miniprogram/app.json b/miniprogram/app.json index 7591f8c..a4c9154 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -1,16 +1,15 @@ { "pages": [ - "pages/login/login", - "pages/gongchengliebiao/gongchengliebiao", - "pages/gengduogongneng/gengduogongneng", - "pages/xiangmugaikuang/xiangmugaikuang", + "pages/login/index", + "pages/gongchengliebiao/index", + "pages/gengduogongneng/index", + "pages/xiangmugaikuang/index", "pages/renyuanguanli/renyuanguanli", "pages/map/map", "pages/winter-training/index", "pages/Highlight-photos/index", "pages/construction/index", "pages/Construction-Log/index", - "pages/updatePassword/updatePassword", "pages/safety_manage/index", "pages/quality_manage/index", "pages/progress_manage/index", @@ -156,7 +155,8 @@ "select-group-person": "./newComponents/select-group-person/index", "van-dropdown-menu": "@vant/weapp/dropdown-menu/index", "van-dropdown-item": "@vant/weapp/dropdown-item/index", - "curve-echarts": "pages/components/curve-echarts/index" + "curve-echarts": "pages/components/curve-echarts/index", + "user-infos":"pages/components/user-infos/index" }, "window": { "backgroundTextStyle": "light", diff --git a/miniprogram/app.wxss b/miniprogram/app.wxss index 3408813..8dbb445 100644 --- a/miniprogram/app.wxss +++ b/miniprogram/app.wxss @@ -7,164 +7,96 @@ justify-content: space-between; padding: 200rpx 0; box-sizing: border-box; - -} -page{ + +} + +page { background: #191d28; color: #ffffff; font-size: 30rpx; - height:100vh; + height: 100vh; } /* 自定义顶部样式 */ -.header_title{ +.header_title { position: fixed; - width:100%; + width: 100%; z-index: 5; margin: 0; - padding: 85rpx 0 30rpx; + padding: 85rpx 0 30rpx; background: #191d28; } + /* 自定义顶部样式 */ -.header_title_saft{ - width:100%; +.header_title_saft { + width: 100%; z-index: 5; margin: 0; - padding: 85rpx 0 30rpx; + padding: 85rpx 0 30rpx; background: #191d28; } -.header_name{ + +.header_name { text-align: center; } -.header_img{ + +.header_img { padding-left: 30rpx; padding-top: 10rpx; } -.header_fh{ + +.header_img image { + width: 30rpx; + height: 30rpx; +} + +.header_fh { font-size: 28rpx; position: relative; top: -5rpx; } -.header_img image{ - width: 30rpx; - height:30rpx; -} /* 中间内容用含有max_content 的 view 包起来 */ -.max_content{ +.max_content { padding: 166rpx 0 180rpx; } -.max_content_scroll{ + +.max_content_scroll { padding: 166rpx 0 10rpx; } -.min_content{ + +.min_content { padding: 166rpx 0 20rpx; } -.max_new_content{ + +.max_new_content { padding: 0 0 120rpx; } -/* 左侧菜单 */ -.left_max{ - padding-top: 180rpx; -} -.left_head{ - width: 140rpx; - height: 140rpx; - margin: auto; - background: #2b345b; - border-radius: 50%; -} -.left_head image{ - width: 140rpx; - height: 140rpx; - border-radius: 50%; -} -.left_info{ - font-size: 28rpx; - padding-top: 10rpx; -} -.left_info_name{ - padding: 10rpx; -} -.left_info_dept{ - text-align: center; - margin-bottom: 40rpx; -} -.left_manage_max{ - padding: 50rpx 0; -} -.left_manage_min{ - padding: 0 5%; - margin-top: 40rpx; -} -.left_manage{ - padding: 20rpx 20rpx 15rpx; - background: #2b345b; - border-radius: 100rpx; - font-size: 28rpx; - text-align: center; -} -.left_manage:active{ - background: #232a4a; -} -.left_pro{ - position: relative; - top: -10rpx; - padding-left: 20rpx; -} -.left_icon{ - width: 40rpx; - height: 40rpx; - float: left; -} -.left_flaot{ - width: 40rpx; - height: 40rpx; - float: right; -} -.left_password{ - text-align: center; - padding-bottom: 5rpx; -} -.left_sign{ - text-align: center; - padding-bottom: 5rpx; - color: #F56C6C; -} -.left_begin{ - text-align: center; - padding-bottom: 5rpx; - color: #faf8ff; -} -.left_manage2{ - float: left; - width: 50%; - margin-bottom: 35rpx; - color: #ffffff; -} - /* 底部导航 */ -.van-tabbar.van-tabbar--fixed{ +.van-tabbar.van-tabbar--fixed { background-image: linear-gradient(#33426b, #202b47); } + .van-tabbar.van-tabbar--fixed:after { border-width: 0px 0; } /* 页面公用部分样式 */ -.video_add{ +.video_add { padding: 20rpx 30rpx; } -.video_address{ - background:#30343f; - padding:0 20rpx; - border-radius:50rpx; + +.video_address { + background: #30343f; + padding: 0 20rpx; + border-radius: 50rpx; font-size: 28rpx; } -.video_address_min{ - background:url("http://fileimg.makalu.cc/CORE_B1C818B4CF2C44FE9D96624589329EBC.png") no-repeat left/40rpx; - height: 80rpx; + +.video_address_min { + background: url("https://szgcwx.jhncidg.com/staticFiles/img/menu/CORE_B1C818B4CF2C44FE9D96624589329EBC.png") no-repeat left/40rpx; + height: 80rpx; line-height: 80rpx; padding-left: 50rpx; white-space: nowrap; @@ -172,6 +104,7 @@ page{ overflow: hidden; word-break: break-all; } + /* 清除上浮 */ .clearfix:after { content: "."; @@ -180,20 +113,23 @@ page{ clear: both; visibility: hidden; } -.gif{ - margin:400rpx auto 0; + +.gif { + margin: 400rpx auto 0; text-align: center; } -.gif image{ + +.gif image { width: 60rpx; height: 60rpx; } -.gif view{ + +.gif view { padding-top: 20rpx; } /* 建安公司新页面 */ -.modify_video_nav{ +.modify_video_nav { background: #32416a; margin-top: 20rpx; display: flex; @@ -202,121 +138,145 @@ page{ padding: 25rpx 0; color: #7c95d7; } -.modify_video_nav .active{ + +.modify_video_nav .active { color: #ffffff; } -.modify_video_nav .active text{ + +.modify_video_nav .active text { padding: 15rpx 0; border-bottom: 3px solid #5c9efe; } -.modify_echarts_max{ + +.modify_echarts_max { margin-top: 30rpx; - padding:0 20rpx; + padding: 0 20rpx; } -.modify_echarts_min{ - background:#1e2336 ; + +.modify_echarts_min { + background: #1e2336; font-size: 28rpx; padding: 30rpx; } -.modify_echarts_title_min{ + +.modify_echarts_title_min { padding: 10rpx; display: flex; justify-content: space-between; align-items: center; } -.modify_eharts_title{ + +.modify_eharts_title { height: 40rpx; line-height: 40rpx; padding-left: 40rpx; - background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/menu/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; } -.modify_list_btn{ + +.modify_list_btn { font-size: 28rpx; color: #7a8fce; } -.modify_video_work_area{ + +.modify_video_work_area { margin-top: 20rpx; - padding:10rpx 30rpx; + padding: 10rpx 30rpx; } -.modify_video_work_area{ + +.modify_video_work_area { height: 40rpx; line-height: 40rpx; padding-left: 40rpx; font-size: 28rpx; - background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/menu/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; } -.video_ai_survey{ - padding: 15rpx ; +.video_ai_survey { + padding: 15rpx; } -.ai_video_con{ + +.ai_video_con { display: flex; justify-content: space-between; align-items: center; - padding: 30rpx 0 30rpx 30rpx; + padding: 30rpx 0 30rpx 30rpx; color: #ffffff; } -.ai_video_con_title{ + +.ai_video_con_title { display: flex; align-items: center; } -.ai_video_con_title image{ + +.ai_video_con_title image { width: 40rpx; height: 40rpx; } -.ai_video_con_title text{ + +.ai_video_con_title text { padding-left: 15rpx; } -.ai_video_con_number text{ + +.ai_video_con_number text { font-size: 35rpx; font-weight: bold; color: #00ecfe; } -.video_list_max{ +.video_list_max { padding: 15rpx; } -.ai_warning_list{ + +.ai_warning_list { padding: 30rpx 0; border-bottom: 1px solid #404a74; display: flex; align-items: center; } -.ai_warning_list_img{ + +.ai_warning_list_img { width: 220rpx; height: 180rpx; border-radius: 8rpx; } -.ai_warning_list_con{ + +.ai_warning_list_con { padding-left: 20rpx; font-size: 30rpx; width: calc(100% - 240rpx); } -.ai_warning_list_con .ai_warning_list_project{ + +.ai_warning_list_con .ai_warning_list_project { padding: 5rpx 0; color: #ffffff; font-weight: bold; } -.ai_warning_list_con view{ + +.ai_warning_list_con view { padding: 7rpx 0; } -.ai_warning_list_reason text{ + +.ai_warning_list_reason text { color: #ff8909; } -.ai_warning_list_position text{ + +.ai_warning_list_position text { color: #00a8ff; } -.ai_warning_list_time{ + +.ai_warning_list_time { font-size: 26rpx; display: flex; align-items: center; justify-content: space-between; } -.ai_warning_list_time_date{ + +.ai_warning_list_time_date { color: #89a3ed; } -.ai_warning_list_video_btn{ + +.ai_warning_list_video_btn { background: #404a74; font-size: 22rpx; border-radius: 5rpx; @@ -325,99 +285,116 @@ page{ display: flex; align-items: center; } -.ai_warning_list_video_btn image{ + +.ai_warning_list_video_btn image { width: 22rpx; height: 22rpx; margin-right: 10rpx; } -.video_icon text{ +.video_icon text { font-size: 36rpx; color: #00a8ff; } -.video_num{ - padding:0 30rpx; + +.video_num { + padding: 0 30rpx; height: 120rpx; } + .video_icon { font-size: 28rpx; text-align: center; padding: 30rpx 0; } -.video_icon image{ + +.video_icon image { width: 40rpx; height: 40rpx; position: relative; top: 10rpx; } -.vehicle_video_nav_max{ - padding:10rpx 20rpx; +.vehicle_video_nav_max { + padding: 10rpx 20rpx; } -.vehicle_video_nav_min{ + +.vehicle_video_nav_min { background: #1c2232; display: flex; align-items: center; } -.vehicle_video_nav{ + +.vehicle_video_nav { padding: 20rpx; font-size: 28rpx; } -.vehicle_video_nav.active{ + +.vehicle_video_nav.active { background: #2b345b; border-radius: 10rpx; } -.modify_vehicle_video{ + +.modify_vehicle_video { padding: 30rpx 10rpx 0; } -.modify_vehicle_video video{ + +.modify_vehicle_video video { width: 100%; height: 350rpx; border-radius: 10rpx; } -.modify_list_license_plate_max{ - padding:30rpx 5rpx; +.modify_list_license_plate_max { + padding: 30rpx 5rpx; } -.modify_list_license_plate{ + +.modify_list_license_plate { border: 2px solid #2b4169; text-align: center; padding: 10rpx 0; background: #1f253b; } -.modify_list_license_direction{ + +.modify_list_license_direction { padding: 30rpx 10rpx 10rpx; font-size: 28rpx; - color:#8ba3ed; + color: #8ba3ed; } -.modify_list_photos_max{ + +.modify_list_photos_max { padding: 20rpx 10rpx; } -.modify_list_photos_min{ + +.modify_list_photos_min { width: 100%; height: 220rpx; - background: #232943 url("http://fileimg.makalu.cc/WEB_6F3E3915E1A44AF6BE55F4B1BE0E277F.png") no-repeat center/130rpx 130rpx; + background: #232943 url("https://szgcwx.jhncidg.com/staticFiles/img/menu/WEB_6F3E3915E1A44AF6BE55F4B1BE0E277F.png") no-repeat center/130rpx 130rpx; border-radius: 10rpx; } -.modify_list_photos_min image{ + +.modify_list_photos_min image { width: 100%; height: 100%; border-radius: 10rpx; } -.modify_list_photos_time{ + +.modify_list_photos_time { padding: 20rpx 0 0; font-size: 28rpx; text-align: center; } /* 安全管控 */ -.deep_select{ +.deep_select { padding: 15rpx; } -.deep_select_padding{ + +.deep_select_padding { padding: 15rpx; } -.deep_point_position{ + +.deep_point_position { display: flex; justify-content: space-evenly; align-items: center; @@ -426,89 +403,108 @@ page{ padding: 20rpx 0; margin-bottom: 30rpx; } -.deep_point_position .active{ + +.deep_point_position .active { color: #88a2ec; } -.deep_point_position .active text{ + +.deep_point_position .active text { color: #08d6eb; } -.deep_modular_max{ - padding:50rpx 30rpx; + +.deep_modular_max { + padding: 50rpx 30rpx; } -.deep_modular_min{ + +.deep_modular_min { background: #1e2336; margin-bottom: 30rpx; } -.deep_modular_title{ - padding:20rpx 20rpx; + +.deep_modular_title { + padding: 20rpx 20rpx; display: flex; align-items: center; justify-content: space-between; font-size: 28rpx; } -.deep_qingxie{ - background: url("http://fileimg.makalu.cc/WEB_EE67AE44D92E4894AEF2AAD8A511CFE1.png") no-repeat left/30rpx 30rpx; + +.deep_qingxie { + background: url("https://szgcwx.jhncidg.com/staticFiles/img/menu/WEB_EE67AE44D92E4894AEF2AAD8A511CFE1.png") no-repeat left/30rpx 30rpx; padding-left: 40rpx; } -.deep_weiyi{ - background: url("http://fileimg.makalu.cc/WEB_80265DAD5962462DA855FE1E6E735650.png") no-repeat left/30rpx 30rpx; + +.deep_weiyi { + background: url("https://szgcwx.jhncidg.com/staticFiles/img/menu/WEB_80265DAD5962462DA855FE1E6E735650.png") no-repeat left/30rpx 30rpx; padding-left: 40rpx; } -.modify_video_nav_af{ + +.modify_video_nav_af { margin: 0; } -.modify_video_add{ +.modify_video_add { margin-bottom: 30rpx; } -.dangerous_node{ + +.dangerous_node { display: flex; align-items: center; justify-content: space-evenly; padding: 40rpx 0; } -.dangerous_node_min{ + +.dangerous_node_min { text-align: center; } -.dangerous_node_number{ + +.dangerous_node_number { font-size: 38rpx; padding: 15rpx 0; } -.cyan{ + +.cyan { color: #08d6ed; } -.blue{ + +.blue { color: #1879da; } -.orange{ + +.orange { color: #fd9729; } -.dangerous_node_title{ + +.dangerous_node_title { display: flex; align-items: center; justify-content: center; padding-top: 15rpx; } -.dangerous_node_title image{ + +.dangerous_node_title image { width: 40rpx; height: 40rpx; margin-right: 15rpx; } -.timeline_max{ +.timeline_max { padding: 30rpx 30rpx 30rpx 40rpx; } -.timeline_for{ + +.timeline_for { padding-bottom: 50rpx; border-left: 1px solid #1d2b52; } -.timeline_for_title{ + +.timeline_for_title { padding-bottom: 20rpx; display: flex; align-items: center; position: relative; } -.timeline_for_dot{ + +.timeline_for_dot { width: 20rpx; height: 20rpx; background: #ff0000; @@ -516,129 +512,150 @@ page{ left: -10rpx; border-radius: 50%; } -.timeline_for_text{ + +.timeline_for_text { padding-left: 40rpx; } -.timeline_for_list{ + +.timeline_for_list { padding: 10rpx 0 10rpx 40rpx; display: flex; align-items: center; color: #d4d9ec; } -.timeline_for_time{ +.timeline_for_time { color: #43aeff; } -.timeline_for_state_1{ + +.timeline_for_state_1 { padding: 2px 24rpx; height: 40rpx; width: 160rpx; text-align: center; line-height: 40rpx; font-size: 26rpx; - background: url("http://fileimg.makalu.cc/WEB_F5E44186F6C44161B99491284E33EEE6.png") no-repeat center/100% 100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/menu/WEB_F5E44186F6C44161B99491284E33EEE6.png") no-repeat center/100% 100%; } -.timeline_for_state_2{ + +.timeline_for_state_2 { padding: 2px 24rpx; height: 40rpx; width: 160rpx; text-align: center; line-height: 40rpx; font-size: 26rpx; - background: url("http://fileimg.makalu.cc/WEB_345B9059DAD1492EB37EC4814EB340F0.png") no-repeat center/100% 100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_345B9059DAD1492EB37EC4814EB340F0.png") no-repeat center/100% 100%; } -.timeline_for_file{ + +.timeline_for_file { padding: 10rpx 0 10rpx 40rpx; font-size: 28rpx; color: #d4d9ec; display: flex; } -.timeline_for_list_title{ + +.timeline_for_list_title { width: 140rpx; padding-top: 10rpx; } -.timeline_for_list_file{ +.timeline_for_list_file { padding-top: 10rpx; width: calc(100% - 140rpx); } -.zs_level_list_label{ - padding:0 10rpx; + +.zs_level_list_label { + padding: 0 10rpx; } -.zs_level_list_label view{ + +.zs_level_list_label view { padding: 10rpx 0; color: #7f91f5; text-decoration: underline; } -.zs_level_list_label view:active{ + +.zs_level_list_label view:active { color: #4f6aff; } -.pz_list_max{ +.pz_list_max { padding: 30rpx 10rpx; } -.pz_list_for{ + +.pz_list_for { padding: 30rpx; background: #1e2336; margin-bottom: 30rpx; } -.pz_list_for_list{ - padding: 10rpx 0 ; + +.pz_list_for_list { + padding: 10rpx 0; } -.modify_video_add{ +.modify_video_add { margin-bottom: 30rpx; } -.dangerous_node{ + +.dangerous_node { display: flex; align-items: center; justify-content: space-evenly; padding: 40rpx 0; } -.dangerous_node_min{ + +.dangerous_node_min { text-align: center; } -.dangerous_node_number{ + +.dangerous_node_number { font-size: 38rpx; padding: 15rpx 0; } -.cyan{ + +.cyan { color: #08d6ed; } -.blue{ + +.blue { color: #1879da; } -.orange{ + +.orange { color: #fd9729; } -.dangerous_node_title{ + +.dangerous_node_title { display: flex; align-items: center; justify-content: center; padding-top: 15rpx; } -.dangerous_node_title image{ + +.dangerous_node_title image { width: 40rpx; height: 40rpx; margin-right: 15rpx; } -.timeline_max{ +.timeline_max { padding: 30rpx 30rpx 30rpx 40rpx; } -.timeline_for{ + +.timeline_for { padding-bottom: 50rpx; border-left: 2px solid #3c59a8; } -.timeline_for_title{ + +.timeline_for_title { padding-bottom: 20rpx; display: flex; align-items: center; position: relative; } -.timeline_for_dot{ +.timeline_for_dot { width: 20rpx; height: 20rpx; border: 1px solid #b2badf; @@ -647,53 +664,60 @@ page{ left: -14rpx; border-radius: 50%; } -.dot_blue{ + +.dot_blue { border: 1px solid #1680d6; background: #1680d6; } -.dot_red{ + +.dot_red { border: 1px solid #ff0000; background: #ff0000; } -.timeline_for_time{ +.timeline_for_time { color: #43aeff; } -.timeline_for_file{ +.timeline_for_file { padding: 10rpx 0 10rpx 40rpx; font-size: 28rpx; color: #d4d9ec; display: flex; } -.timeline_for_list_title{ + +.timeline_for_list_title { width: 140rpx; padding-top: 10rpx; } -.timeline_for_list_file{ +.timeline_for_list_file { padding-top: 10rpx; width: calc(100% - 140rpx); } -.zs_level_list_label{ - padding:0 10rpx; + +.zs_level_list_label { + padding: 0 10rpx; } -.zs_level_list_label view{ + +.zs_level_list_label view { padding: 10rpx 0; color: #7f91f5; text-decoration: underline; } -.zs_level_list_label view:active{ + +.zs_level_list_label view:active { color: #4f6aff; } -.timeline_for_text{ +.timeline_for_text { padding-left: 40rpx; } -.timeline_for_list{ + +.timeline_for_list { padding: 10rpx 0 10rpx 40rpx; display: flex; align-items: center; @@ -703,16 +727,18 @@ page{ -.pz_list_max{ +.pz_list_max { padding: 30rpx 10rpx; } -.pz_list_for{ + +.pz_list_for { padding: 30rpx; background: #1e2336; margin-bottom: 30rpx; } -.pz_list_for_list{ - padding: 10rpx 0 ; + +.pz_list_for_list { + padding: 10rpx 0; } @@ -721,7 +747,7 @@ page{ /* 2022-12-22 新增样式 */ -.add_to_btn{ +.add_to_btn { position: fixed; width: 100%; height: 100%; @@ -734,67 +760,78 @@ page{ justify-content: center; font-size: 32rpx; } -.add_to_btn image{ + +.add_to_btn image { width: 36rpx; height: 36rpx; margin-right: 15rpx; } -.add_to_btn:active{ + +.add_to_btn:active { background: #1e2336; } -.ai_video_popup video{ +.ai_video_popup video { height: 500rpx; width: 100%; } + /* 凭证管理新增 */ -.add_max{ +.add_max { padding: 30rpx 40rpx; } -.add_title{ + +.add_title { color: #8ca0e7; - padding:0 15rpx 30rpx; + padding: 0 15rpx 30rpx; } -.add_textarea{ - height: 150rpx ; - width:calc(100% - 40rpx); + +.add_textarea { + height: 150rpx; + width: calc(100% - 40rpx); background: #212737; border-radius: 10rpx; padding: 20rpx; } -.add_btn{ + +.add_btn { padding-top: 100rpx; display: flex; justify-content: space-evenly; align-items: center; } -.add_btn_qx{ + +.add_btn_qx { background: #3f424b; - height:80rpx; + height: 80rpx; width: 250rpx; text-align: center; line-height: 80rpx; border-radius: 10rpx; } -.add_btn_qx:active{ + +.add_btn_qx:active { background: #3a3e49; } -.add_btn_bc{ + +.add_btn_bc { background: #523fa8; - height:80rpx; + height: 80rpx; width: 250rpx; text-align: center; line-height: 80rpx; border-radius: 10rpx; } -.add_btn_bc:active{ + +.add_btn_bc:active { background: #4a35aa; } -.van-picker__mask { +.van-picker__mask { background-image: none !important; } + .van-hairline--top-bottom:after { border-top: 1px solid #3a4c8b !important; border-bottom: 1px solid #3a4c8b !important; @@ -811,112 +848,132 @@ page{ /* 2023-5-4 新样式 */ -.module_max{ +.module_max { margin-top: 30rpx; - padding:0 30rpx; + padding: 0 30rpx; } -.module_min{ - background:#1e2336 ; +.module_min { + background: #1e2336; font-size: 30rpx; padding: 30rpx 20rpx; border-radius: 15rpx; } -.module_title{ + +.module_title { height: 40rpx; line-height: 40rpx; padding-left: 40rpx; - background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/menu/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; } -.module_title_2{ + +.module_title_2 { height: 40rpx; line-height: 40rpx; padding-left: 40rpx; - background: url("http://fileimg.makalu.cc/CORE_B1C818B4CF2C44FE9D96624589329EBC.png") no-repeat left/35rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/menu/CORE_B1C818B4CF2C44FE9D96624589329EBC.png") no-repeat left/35rpx; } -.module_title_3{ + +.module_title_3 { height: 50rpx; line-height: 50rpx; padding-left: 40rpx; - background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/menu/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; } -.safety_inspect{ - padding:30rpx 20rpx; + +.safety_inspect { + padding: 30rpx 20rpx; } -.safety_inspect_title{ + +.safety_inspect_title { color: #e9fbf9; font-size: 26rpx; padding: 20rpx; - background: url("http://fileimg.makalu.cc/WEB_F9046A91C12646ECAEB6024455C35F15.png") no-repeat left/15rpx 30rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_F9046A91C12646ECAEB6024455C35F15.png") no-repeat left/15rpx 30rpx; } -.safety_prop{ + +.safety_prop { display: flex; align-items: center; padding: 20rpx 0 20rpx 20rpx; color: #cbdaff; - background: url("http://fileimg.makalu.cc/WEB_23ADD5DCCD3C42BA9FF57BE9838766B4.png") no-repeat left/15rpx 25rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_23ADD5DCCD3C42BA9FF57BE9838766B4.png") no-repeat left/15rpx 25rpx; } -.safety_prop_val{ + +.safety_prop_val { color: #687a92; } -.safety_prop_val text{ + +.safety_prop_val text { color: #ffffff; font-size: 32rpx; } -.safety_issue{ + +.safety_issue { padding-top: 20rpx; } -.safety_issue_number{ - padding:0 20rpx; + +.safety_issue_number { + padding: 0 20rpx; height: 50rpx; display: flex; align-items: center; - background: url("http://fileimg.makalu.cc/WEB_FD18DB06491847FA913067FF7B812FBA.png") no-repeat left/100% 100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_FD18DB06491847FA913067FF7B812FBA.png") no-repeat left/100% 100%; } -.safety_deep{ + +.safety_deep { display: flex; align-items: center; justify-content: space-around; } -.safety_deep_row{ + +.safety_deep_row { display: flex; align-items: center; padding: 40rpx 0; } -.safety_deep_img{ + +.safety_deep_img { height: 110rpx; width: 110rpx; text-align: center; line-height: 140rpx; } -.safety_deep_img_1{ - background: url("http://fileimg.makalu.cc/WEB_F2CA2559EEB9456791461DBC9F8026C8.png") no-repeat center/100rpx 100rpx; + +.safety_deep_img_1 { + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_F2CA2559EEB9456791461DBC9F8026C8.png") no-repeat center/100rpx 100rpx; } -.safety_deep_img_2{ - background: url("http://fileimg.makalu.cc/WEB_93D3C5384E774B77AA5B105BE448F2D8.png") no-repeat center/100rpx 100rpx; + +.safety_deep_img_2 { + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_93D3C5384E774B77AA5B105BE448F2D8.png") no-repeat center/100rpx 100rpx; } -.safety_deep_img image{ + +.safety_deep_img image { width: 50rpx; height: 50rpx; } -.safety_deep_col{ + +.safety_deep_col { padding-left: 10rpx; color: #cbdaff; } -.safety_deep_col_text{ + +.safety_deep_col_text { padding: 10rpx 0; } -.safety_deep_col_number text{ + +.safety_deep_col_number text { font-size: 34rpx; color: #80cefc; font-weight: bold; } -.safety_deep_col_green text{ + +.safety_deep_col_green text { color: #62efbb; } -.safety_electric{ +.safety_electric { color: #cbdaff; display: flex; align-items: center; @@ -924,109 +981,132 @@ page{ padding: 20rpx 0; font-size: 26rpx; } -.safety_electric_threshold{ + +.safety_electric_threshold { color: #ff0000; font-size: 26rpx; } -.safety_electric_row{ + +.safety_electric_row { display: flex; align-items: center; padding: 30rpx 0 30rpx 10rpx; } -.safety_electric_threshold text{ + +.safety_electric_threshold text { padding-right: 5rpx; font-size: 32rpx; } -.safety_electric_img{ + +.safety_electric_img { height: 110rpx; width: 110rpx; text-align: center; line-height: 140rpx; - background: url("http://fileimg.makalu.cc/WEB_2FECA878591045B39AEBB41FE248C97B.png") no-repeat center/100rpx 100rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_2FECA878591045B39AEBB41FE248C97B.png") no-repeat center/100rpx 100rpx; } -.safety_electric_img image{ + +.safety_electric_img image { height: 50rpx; width: 50rpx; } -.safety_electric_col{ + +.safety_electric_col { padding-left: 15rpx; color: #cbdaff; } -.safety_electric_number text{ + +.safety_electric_number text { font-size: 34rpx; color: #80cefc; font-weight: bold; } -.safety_deep_col_blue text{ + +.safety_deep_col_blue text { color: #028ffb; } -.module_title_flex{ +.module_title_flex { display: flex; align-items: center; justify-content: space-between; } -.module_see_info{ + +.module_see_info { font-size: 26rpx; color: #028ffb; display: flex; align-items: center; } -.module_see_info:active{ + +.module_see_info:active { color: #39a6fa; } -.safety_highlights{ + +.safety_highlights { padding: 30rpx 0; } -.safety_highlights_img{ + +.safety_highlights_img { padding: 20rpx 10rpx; text-align: center; } -.safety_highlights_img image{ + +.safety_highlights_img image { width: 270rpx; height: 270rpx; } /* 施工安全交底学习 */ -.study_min{ +.study_min { font-size: 30rpx; padding: 30rpx; } + .study_video { width: 100%; } -swiper-item video{ + +swiper-item video { width: 100%; height: 100%; } -.study_examination_questions{ + +.study_examination_questions { padding: 15rpx 30rpx; } -.study_examination_questions_con{ - display:inline-table; - width: 100% ; - + +.study_examination_questions_con { + display: inline-table; + width: 100%; + } -.study_examination_questions_topic{ + +.study_examination_questions_topic { white-space: normal; } -.study_examination_questions_radio{ - padding:30rpx 15rpx; + +.study_examination_questions_radio { + padding: 30rpx 15rpx; } -.study_examination_questions_list{ + +.study_examination_questions_list { padding: 20rpx 0; display: flex; color: #69709a; } -.study_examination_questions_list.active{ + +.study_examination_questions_list.active { color: #899ef1; } -.study_examination_questions_list.error{ + +.study_examination_questions_list.error { color: #ff0000; } -.study_radio{ + +.study_radio { width: 30rpx; height: 30rpx; border: 1px solid #69709a; @@ -1035,149 +1115,176 @@ swiper-item video{ position: relative; top: 7rpx; } -.study_examination_questions_list.active .study_radio{ + +.study_examination_questions_list.active .study_radio { border: 1px solid #899ef1; color: #899ef1; } -.study_examination_questions_list.error .study_radio{ + +.study_examination_questions_list.error .study_radio { border: 1px solid #ff0000; color: #ff0000; } -.study_radio_subject{ +.study_radio_subject { width: calc(100% - 50rpx); padding-left: 20rpx; white-space: normal; } -.study_video_tips{ + +.study_video_tips { padding: 30rpx; font-size: 28rpx; color: #028ffb; } -.answer_result{ + +.answer_result { background: #232e49; padding: 30rpx; font-size: 35rpx; border-radius: 10rpx } -.switch_button{ - padding:50rpx 30rpx; + +.switch_button { + padding: 50rpx 30rpx; display: flex; align-items: center; justify-content: space-around; } -.switch_button button{ + +.switch_button button { width: 250rpx !important; font-weight: 400 !important; background: #3f424b; color: #ffffff; } -.switch_button_to{ + +.switch_button_to { background: #5140a6 !important; } /* 承诺书 */ -.cns_rich_text_title{ +.cns_rich_text_title { padding: 30rpx 50rpx; color: #00a8ff; } -.cns_rich_content{ + +.cns_rich_content { padding: 30rpx 30rpx 0; } -.cns_rich_text{ + +.cns_rich_text { padding: 0 20rpx; background: #1e2336; color: #cdd9ff; } -.cns_confirm{ + +.cns_confirm { padding: 30rpx; } -.cns_confirm_title{ + +.cns_confirm_title { padding: 20rpx; color: #00a8ff; } -.cns_confirm_text{ + +.cns_confirm_text { padding: 20rpx; } -.cns_confirm_sign{ + +.cns_confirm_sign { padding: 20rpx 0; } -.cns_confirm_sign_case{ + +.cns_confirm_sign_case { height: 300rpx; - background: rgba(255,255,255,0.1); + background: rgba(255, 255, 255, 0.1); } /* 安全管理 安全检查 */ -.inspect_max{ +.inspect_max { padding: 10rpx 30rpx; } -.inspect_list{ + +.inspect_list { padding: 10rpx 0; } -.inspect_max_scroll{ - height:75vh; +.inspect_max_scroll { + height: 75vh; } -.inspect_list_scroll{ + +.inspect_list_scroll { padding: 10rpx 0; } -.inspect_for{ +.inspect_for { padding: 20rpx 0; font-size: 30rpx; } -.inspect_for_scroll{ + +.inspect_for_scroll { padding: 20rpx 30rpx; font-size: 30rpx; } -.inspect_for_bgd{ + +.inspect_for_bgd { background: #1e2336; - padding:0 30rpx; + padding: 0 30rpx; border-radius: 10rpx 10rpx 0 0; } -.inspect_list_title{ + +.inspect_list_title { border-bottom: 1px solid #323b86; height: 80rpx; display: flex; justify-content: space-between; align-items: center; } -.inspect_list_title_label{ + +.inspect_list_title_label { display: flex; align-items: center; width: calc(100% - 150rpx); } -.inspect_list_title_width{ + +.inspect_list_title_width { width: 100%; } -.module_title_text{ +.module_title_text { width: calc(100% - 150rpx); white-space: nowrap; text-overflow: ellipsis; overflow: hidden; } -.inspect_list_title_state{ + +.inspect_list_title_state { width: 150rpx; font-size: 26rpx; text-align: right; } -.inspect_list_title_state text{ - padding:5rpx 10rpx; + +.inspect_list_title_state text { + padding: 5rpx 10rpx; border-radius: 20rpx 0 20rpx 0; } -.state_colour_0{ + +.state_colour_0 { background: #f3642a; } -.state_colour_1{ + +.state_colour_1 { background: #359a00; } -.state_colour_2{ + +.state_colour_2 { background: #404a6d; color: #8aa4ee; } -.inspect_list_title_number{ + +.inspect_list_title_number { width: 80rpx; height: 80rpx; border-bottom: 1px solid #6879fd; @@ -1185,61 +1292,74 @@ swiper-item video{ line-height: 80rpx; color: #6879fd; } -.inspect_list_title_text{ + +.inspect_list_title_text { width: calc(100% - 80rpx); white-space: nowrap; text-overflow: ellipsis; overflow: hidden; } -.inspect_list_title_text_2{ + +.inspect_list_title_text_2 { width: calc(100% - 240rpx); white-space: nowrap; text-overflow: ellipsis; overflow: hidden; } -.inspect_list_info{ + +.inspect_list_info { padding: 30rpx 5rpx; color: #d5dbeb; } -.inspect_list_info_details{ + +.inspect_list_info_details { display: flex; align-items: center; } -.inspect_list_info_img{ + +.inspect_list_info_img { width: 150rpx; } -.inspect_list_info_img_text{ + +.inspect_list_info_img_text { text-align: center; color: #89a3ee; padding-top: 5rpx; padding-right: 20rpx; } -.inspect_list_info_data{ + +.inspect_list_info_data { width: calc(100% - 150rpx); } -.inspect_list_info_data_num{ + +.inspect_list_info_data_num { display: flex; align-items: center; padding: 10rpx 0; } -.inspect_list_info_data_rec{ + +.inspect_list_info_data_rec { width: calc(100% - 300rpx); } -.inspect_list_info_data_prop_rec{ + +.inspect_list_info_data_prop_rec { padding: 5rpx 0; color: #d5dbeb; } -.inspect_list_info_padding{ + +.inspect_list_info_padding { padding: 6px 0; color: #d5dbeb; } -.inspect_list_info_flex{ + +.inspect_list_info_flex { display: flex; justify-content: space-between; align-items: center; } -.inspect_list_info_upload{ - background-image: linear-gradient(to right, #884cf9 , #7457ff); + +.inspect_list_info_upload { + background-image: linear-gradient(to right, #884cf9, #7457ff); padding: 2rpx 15rpx; border-radius: 30rpx; } @@ -1248,35 +1368,44 @@ swiper-item video{ .inspect_list_info_data_num_option { width: 50%; } -.inspect_list_info_data_prop{ + +.inspect_list_info_data_prop { padding: 10rpx 0; word-break: break-all; } -.color_orange{ + +.color_orange { color: #fd8401; } -.color_green{ - color: #1ab400 ; + +.color_green { + color: #1ab400; } + .color_blue { color: #45affb; } -.color_purple{ + +.color_purple { color: #89a3ee; } -.color_type{ + +.color_type { color: #65779b; } -.inspect_list_info_position{ + +.inspect_list_info_position { padding-top: 20rpx; } -.inspect_list_info_data_bgd{ - padding:20rpx 30rpx; + +.inspect_list_info_data_bgd { + padding: 20rpx 30rpx; background: #313a57; border-radius: 0 0 10rpx 10rpx; color: #d5dbeb; } -.inspect_add_to{ + +.inspect_add_to { position: fixed; right: 30rpx; bottom: 50rpx; @@ -1288,11 +1417,13 @@ swiper-item video{ font-size: 26rpx; color: #b0ccf5 } -.inspect_add_to image{ + +.inspect_add_to image { width: 40rpx; height: 40rpx; } -.inspect_add_to_darft{ + +.inspect_add_to_darft { position: fixed; left: 30rpx; bottom: 50rpx; @@ -1304,137 +1435,169 @@ swiper-item video{ font-size: 26rpx; color: #b0ccf5 } -.inspect_add_to_darft image{ + +.inspect_add_to_darft image { width: 40rpx; height: 40rpx; } -.add_to_font_size{ + +.add_to_font_size { font-size: 50rpx !important; } + /* 问题整改 */ -.inspect_overview_max{ +.inspect_overview_max { background: #191d28; padding-bottom: 30rpx; } -.inspect_overview{ + +.inspect_overview { background: #1e222e; - padding:0 30rpx; + padding: 0 30rpx; } -.module_title_padding{ + +.module_title_padding { padding: 30rpx 0 30rpx 40rpx; border-bottom: 1px solid #303c84; } -.inspect_overview_list_max{ + +.inspect_overview_list_max { padding: 20rpx 0 20rpx 20rpx; } -.inspect_overview_list{ + +.inspect_overview_list { padding: 20rpx 0; } -.problem_list_max{ + +.problem_list_max { padding-bottom: 50rpx; } -.problem_list_for{ + +.problem_list_for { margin-bottom: 25rpx; } -.problem_list_title{ + +.problem_list_title { padding: 30rpx; background: #313b56; } -.problem_list_title:active{ + +.problem_list_title:active { background: #29375e } -.problem_list_content{ - padding:0 30rpx; + +.problem_list_content { + padding: 0 30rpx; background: #1d212d; } -.problem_list_content_title{ - background: url("http://fileimg.makalu.cc/WEB_80CDF4BF20E1432EAB6469D9E0252224.png") no-repeat left/7rpx 30rpx; - padding:30rpx 20rpx; + +.problem_list_content_title { + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_80CDF4BF20E1432EAB6469D9E0252224.png") no-repeat left/7rpx 30rpx; + padding: 30rpx 20rpx; } -.problem_list_info{ - padding:10rpx 20rpx; + +.problem_list_info { + padding: 10rpx 20rpx; } -.problem_list_info_title{ + +.problem_list_info_title { color: #83a5ef } -.problem_list_info_con{ + +.problem_list_info_con { padding: 20rpx 10rpx; } -.problem_list_img{ + +.problem_list_img { padding: 15rpx 0; } -.problem_list_module_border{ +.problem_list_module_border { border-top: 1px solid #343a86; } -.problem_list_btn_max{ + +.problem_list_btn_max { padding: 30rpx; display: flex; justify-content: flex-end; align-items: center; } -.problem_list_btn{ + +.problem_list_btn { background: #30384b; padding: 13rpx 40rpx; margin: 0 10rpx; border-radius: 6rpx; color: #879ff9; } -.problem_list_btn:active{ + +.problem_list_btn:active { background: #384461; } -.problem_list_btn_confirm{ + +.problem_list_btn_confirm { color: #ffffff; background: #495679; } -.problem_list_btn_confirm:active{ + +.problem_list_btn_confirm:active { background: rgb(61, 76, 124); } -.problem_list_info_input{ + +.problem_list_info_input { padding: 20rpx 0; } -.problem_submit_to{ - padding: 40rpx ; + +.problem_submit_to { + padding: 40rpx; display: flex; align-items: center; justify-content: space-around; } -.problem_submit_to_btn{ + +.problem_submit_to_btn { padding: 20rpx 0; width: 220rpx; text-align: center; border-radius: 10rpx; background: #3e4148; } -.problem_submit_to_btn:active{ + +.problem_submit_to_btn:active { background: #292d35; } -.problem_submit_to_save{ + +.problem_submit_to_save { background: #513ea7; } -.problem_submit_to_save:active{ + +.problem_submit_to_save:active { background: #372a70; } /* 新增安全检查 */ -.inspect_info{ +.inspect_info { padding: 30rpx; background: #1e222e; margin-bottom: 30rpx; } -.inspect_info_list{ + +.inspect_info_list { padding: 10rpx 0; } -.inspect_info_title{ + +.inspect_info_title { padding: 10rpx 0; color: #83a5ef } -.inspect_info_type{ + +.inspect_info_type { padding: 20rpx 0; display: flex; justify-content: space-around; } -.inspect_info_type view{ + +.inspect_info_type view { width: 30%; padding: 18rpx 0; background: #262c3c; @@ -1442,27 +1605,31 @@ swiper-item video{ border-radius: 10rpx; color: #6a77a3; } -.inspect_info_type .active{ + +.inspect_info_type .active { color: #ffffff; background: #576691; } -.inspect_input_fill_in{ + +.inspect_input_fill_in { height: 90rpx; background: #212737; border-radius: 10rpx; padding: 0 30rpx; } -.inspect_info_content{ + +.inspect_info_content { padding: 20rpx 0; } -.module_see_info_delete{ + +.module_see_info_delete { font-size: 26rpx; color: #ef4a4a; display: flex; align-items: center; } -.module_see_info_switct{ +.module_see_info_switct { font-size: 26rpx; font-weight: 600; color: greenyellow; @@ -1470,10 +1637,11 @@ swiper-item video{ align-items: center; } -.inspect_new_issues_max{ +.inspect_new_issues_max { padding: 30rpx 0; } -.inspect_new_issues{ + +.inspect_new_issues { width: 300rpx; border-radius: 100rpx; padding: 20rpx 0; @@ -1484,9 +1652,9 @@ swiper-item video{ font-size: 34rpx; } -.check_issue_finish_btn{ +.check_issue_finish_btn { position: relative; - top:10rpx; + top: 10rpx; right: 0rpx; text-align: center; line-height: 100rpx; @@ -1495,8 +1663,9 @@ swiper-item video{ height: 100rpx; background-color: #495679; } -.voucher_select_max{ - padding:0 25rpx; + +.voucher_select_max { + padding: 0 25rpx; display: flex; align-items: center; background: #212737; @@ -1504,63 +1673,64 @@ swiper-item video{ border-radius: 10rpx; } -.voucher_select_min{ +.voucher_select_min { width: calc(100% - 30rpx); overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } -.result_project_name{ + +.result_project_name { padding: 50rpx 0; text-align: center; } + /* 全部下拉选择器 */ -.hj_float{ - float: right; - padding: 5rpx 50rpx 5rpx 20rpx; - background: #2e355f url("http://fileimg.makalu.cc/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png") no-repeat right/35rpx; - border-radius: 40rpx; - } - .hj_float:active{ - background: #2e355f url("http://fileimg.makalu.cc/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png") no-repeat right/35rpx; - } - .van-popup--bottom.van-popup--round{ - border-radius: 0 !important - } - .van-popup{ - background-color: var(--popup-background-color,#232a44) !important - } - .van-action-sheet__cancel,.van-action-sheet__item{ - background-color: var(--popup-background-color,#232a44) !important; - color: #0ad7ec; - } - .password-icon{ - width: 40rpx; - height: 40rpx; - position: absolute; - right: 60rpx; - margin-top: -45rpx; - } - .pass{ - padding-right: 25rpx; - } -.problem_submit_to_delete{ +.hj_float { + float: right; + padding: 5rpx 50rpx 5rpx 20rpx; + background: #2e355f url("https://szgcwx.jhncidg.com/staticFiles/img/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png") no-repeat right/35rpx; + border-radius: 40rpx; +} + +.hj_float:active { + background: #2e355f url("https://szgcwx.jhncidg.com/staticFiles/img/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png") no-repeat right/35rpx; +} + +.van-popup--bottom.van-popup--round { + border-radius: 0 !important +} + +.van-popup { + background-color: var(--popup-background-color, #232a44) !important +} + +.van-action-sheet__cancel, +.van-action-sheet__item { + background-color: var(--popup-background-color, #232a44) !important; + color: #0ad7ec; +} + +.problem_submit_to_delete { border-bottom: 1px solid #ff6d6d; background-color: #ff6d6d; } -.problem_submit_to_warning{ + +.problem_submit_to_warning { border-bottom: 1px solid #E6A23C; background-color: #E6A23C; } -.code_label{ - font-size: 1.0rem; - width: 180rpx; - margin: auto; - text-align: center; - margin-left: 48rpx; - border-radius: 0.8rem 0 0.8rem 0; + +.code_label { + font-size: 1.0rem; + width: 180rpx; + margin: auto; + text-align: center; + margin-left: 48rpx; + border-radius: 0.8rem 0 0.8rem 0; } -.code_label_2{ + +.code_label_2 { font-size: 0.8rem; width: 120rpx; margin: auto; @@ -1570,7 +1740,8 @@ swiper-item video{ margin-left: -1rpx; margin-bottom: 10rpx; } -.code_label_3{ + +.code_label_3 { font-size: 0.8rem; width: 120rpx; margin: auto; @@ -1578,52 +1749,61 @@ swiper-item video{ padding: 0.1rem; border-radius: 0.5rem 0 0.5rem 0; } -.code_label_green{ + +.code_label_green { background: green; color: #FFFFFF; } -.code_label_red{ + +.code_label_red { background: red; color: #FFFFFF; } -.code_label_blueviolet{ + +.code_label_blueviolet { background: blueviolet; color: #FFFFFF; } -.code_label_yellow{ + +.code_label_yellow { background: #ff9800; color: #FFFFFF; } -.file{ - width: auto; - zoom:1; + +.file { + width: auto; + zoom: 1; } -.files{ + +.files { word-break: break-all; text-decoration: underline; padding-bottom: 20rpx; } -.zxjc{ + +.zxjc { border: 5rpx solid #3fabb7; border-radius: 12px; margin-bottom: 12rpx; } -.tabNum{ - position: absolute; - background-color: #f56c6c; - border-radius: 10px; - color: #fff; - display: inline-block; - font-size: 12px; - height: 18px; - line-height: 18px; - padding: 0 6px; - text-align: center; - white-space: nowrap; - margin-top: -50rpx; - margin-left: -15rpx; + +.tabNum { + position: absolute; + background-color: #f56c6c; + border-radius: 10px; + color: #fff; + display: inline-block; + font-size: 12px; + height: 18px; + line-height: 18px; + padding: 0 6px; + text-align: center; + white-space: nowrap; + margin-top: -50rpx; + margin-left: -15rpx; } -.tabNum_active{ + +.tabNum_active { position: absolute; background-color: #f56c6c; border-radius: 10px; @@ -1638,9 +1818,10 @@ swiper-item video{ margin-left: 110rpx; margin-top: 16rpx; } -.tabNum_defalut{ + +.tabNum_defalut { position: absolute; - background-color: blueviolet; + background-color: #00a6ff; border-radius: 10px; color: #fff; display: inline-block; @@ -1652,47 +1833,11 @@ swiper-item video{ white-space: nowrap; margin-left: 110rpx; } -.van-col--18{ - word-wrap:break-word; + +.van-col--18 { + word-wrap: break-word; } -.inspect_list_info_data_2{ + +.inspect_list_info_data_2 { width: 100%; -} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +} \ No newline at end of file diff --git a/miniprogram/components/@mkl/tabs/index.wxss b/miniprogram/components/@mkl/tabs/index.wxss index 9de5325..87e42b8 100644 --- a/miniprogram/components/@mkl/tabs/index.wxss +++ b/miniprogram/components/@mkl/tabs/index.wxss @@ -113,7 +113,7 @@ .van-tab--active .mkl-ellipsis .mkl-active { /* font-weight: 500; color: #323233; */ - background: url("http://fileimg.makalu.cc/CORE_38D582DD840F4816B1F14D964F0046E9.png") no-repeat bottom/100% 15rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/CORE_38D582DD840F4816B1F14D964F0046E9.png") no-repeat bottom/100% 15rpx; font-size: 30rpx; color: #000; font-weight: bold; diff --git a/miniprogram/config.js b/miniprogram/config.js index 17e3de7..371fe15 100644 --- a/miniprogram/config.js +++ b/miniprogram/config.js @@ -2,7 +2,7 @@ module.exports = { timeout: 60000, appId: "wx9997d071b4996f23", - //baseUrl: 'https://szgcwx.jhncidg.com', - baseUrl: 'http://127.0.0.1:8091', + baseUrl: 'https://szgcwx.jhncidg.com', + //baseUrl: 'http://127.0.0.1:8091', noSecuritys:['/wechat/captchaImage','/wxApi/login'] }; \ No newline at end of file diff --git a/miniprogram/newComponents/number/index.wxss b/miniprogram/newComponents/number/index.wxss index 821ae20..9f5d1be 100644 --- a/miniprogram/newComponents/number/index.wxss +++ b/miniprogram/newComponents/number/index.wxss @@ -18,7 +18,7 @@ .number_con{ width: 40rpx; height: 70rpx; - background: url("http://fileimg.makalu.cc/WEB_3976596DEC1B4726BDDB70F17DC3D58D.png") no-repeat center/100% 100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_3976596DEC1B4726BDDB70F17DC3D58D.png") no-repeat center/100% 100%; font-family: 'numberfont' !important; text-align: center; line-height: 70rpx; diff --git a/miniprogram/newComponents/safety-bar-charts/index.js b/miniprogram/newComponents/safety-bar-charts/index.js index c2c592d..0dc0e83 100644 --- a/miniprogram/newComponents/safety-bar-charts/index.js +++ b/miniprogram/newComponents/safety-bar-charts/index.js @@ -202,7 +202,7 @@ Component({ // width:20, // height:15, // backgroundColor: { - // image: "http://fileimg.makalu.cc/WEB_2B7C06210CD44D55BFEE6205A35DE4A7.png", + // image: "https://szgcwx.jhncidg.com/staticFiles/img/WEB_2B7C06210CD44D55BFEE6205A35DE4A7.png", // }, // }, diff --git a/miniprogram/newComponents/select-group-person/index.wxss b/miniprogram/newComponents/select-group-person/index.wxss index 3e7240e..7f1b909 100644 --- a/miniprogram/newComponents/select-group-person/index.wxss +++ b/miniprogram/newComponents/select-group-person/index.wxss @@ -16,7 +16,6 @@ background: #232a44; border-radius: 15rpx; position: relative; - margin-bottom: -57rpx; } .rectifier_title{ position: relative; diff --git a/miniprogram/newComponents/select-person/index.js b/miniprogram/newComponents/select-person/index.js index 03040ab..33196c9 100644 --- a/miniprogram/newComponents/select-person/index.js +++ b/miniprogram/newComponents/select-person/index.js @@ -17,19 +17,19 @@ Component({ rectifierData:{ type:Array, value:[ - {state:false,name:'党鹏',url:'http://fileimg.makalu.cc/WEB_44D7C71ACA8E4D40B323AC929315045B.jpg'}, - {state:false,name:'董超',url:'http://fileimg.makalu.cc/WEB_B3F05B5BC25C452F90EAA2347833D228.jpg'}, - {state:false,name:'黄海军',url:'http://fileimg.makalu.cc/WEB_08FE97020FBD49C3A775B97B5FAA05DF.jpg'}, - {state:false,name:'黄嘉伟',url:'http://fileimg.makalu.cc/WEB_65398BB3CB5A4098B5D222AFB6C286EF.jpg'}, - {state:false,name:'李鑫',url:'http://fileimg.makalu.cc/WEB_F62AAB25BA4946BB8CC406BA2AAF4CA7.jpg'}, - {state:false,name:'聂少刚',url:'http://fileimg.makalu.cc/WEB_9D3E6D980B2A4B57AC4A32C16CB384A0.jpg'}, - {state:false,name:'王晨',url:'http://fileimg.makalu.cc/WEB_E8BD336312324B69924D7264AC726D65.jpg'}, - {state:false,name:'王程',url:'http://fileimg.makalu.cc/WEB_F5E8BF2385E747AA8D9FD328A413E021.jpg'}, - {state:false,name:'王国雄',url:'http://fileimg.makalu.cc/WEB_37C63EB77EC240598C72979582273990.jpg'}, - {state:false,name:'杨启明',url:'http://fileimg.makalu.cc/WEB_A09316E46D1C4A1AB558258918740247.jpg'}, - {state:false,name:'赵平印',url:'http://fileimg.makalu.cc/WEB_CA897DDFF6294940ADB187099F77F6FE.jpg'}, - {state:false,name:'张明亮',url:'http://fileimg.makalu.cc/WEB_B2C7971895B74BA6B33A6D17F132E86E.jpg'}, - {state:false,name:'张露露',url:'http://fileimg.makalu.cc/WEB_0185D8D49A00474D8058A9651E96506A.jpg'} + {state:false,name:'党鹏',url:'https://szgcwx.jhncidg.com/staticFiles/img/WEB_44D7C71ACA8E4D40B323AC929315045B.jpg'}, + {state:false,name:'董超',url:'https://szgcwx.jhncidg.com/staticFiles/img/WEB_44D7C71ACA8E4D40B323AC929315045B.jpg'}, + {state:false,name:'黄海军',url:'https://szgcwx.jhncidg.com/staticFiles/img/WEB_44D7C71ACA8E4D40B323AC929315045B.jpg'}, + {state:false,name:'黄嘉伟',url:'https://szgcwx.jhncidg.com/staticFiles/img/WEB_44D7C71ACA8E4D40B323AC929315045B.jpg'}, + {state:false,name:'李鑫',url:'https://szgcwx.jhncidg.com/staticFiles/img/WEB_44D7C71ACA8E4D40B323AC929315045B.jpg'}, + {state:false,name:'聂少刚',url:'https://szgcwx.jhncidg.com/staticFiles/img/WEB_44D7C71ACA8E4D40B323AC929315045B.jpg'}, + {state:false,name:'王晨',url:'https://szgcwx.jhncidg.com/staticFiles/img/WEB_44D7C71ACA8E4D40B323AC929315045B.jpg'}, + {state:false,name:'王程',url:'https://szgcwx.jhncidg.com/staticFiles/img/WEB_44D7C71ACA8E4D40B323AC929315045B.jpg'}, + {state:false,name:'王国雄',url:'https://szgcwx.jhncidg.com/staticFiles/img/WEB_44D7C71ACA8E4D40B323AC929315045B.jpg'}, + {state:false,name:'杨启明',url:'https://szgcwx.jhncidg.com/staticFiles/img/WEB_44D7C71ACA8E4D40B323AC929315045B.jpg'}, + {state:false,name:'赵平印',url:'https://szgcwx.jhncidg.com/staticFiles/img/WEB_44D7C71ACA8E4D40B323AC929315045B.jpg'}, + {state:false,name:'张明亮',url:'https://szgcwx.jhncidg.com/staticFiles/img/WEB_44D7C71ACA8E4D40B323AC929315045B.jpg'}, + {state:false,name:'张露露',url:'https://szgcwx.jhncidg.com/staticFiles/img/WEB_44D7C71ACA8E4D40B323AC929315045B.jpg'} ] } }, diff --git a/miniprogram/pageage/AIWarningList/index.wxml b/miniprogram/pageage/AIWarningList/index.wxml index a3303be..6ea8c73 100644 --- a/miniprogram/pageage/AIWarningList/index.wxml +++ b/miniprogram/pageage/AIWarningList/index.wxml @@ -30,7 +30,7 @@ {{item.dateTime}} - + 查看视频 diff --git a/miniprogram/pageage/AIvideoAnalysis/index.js b/miniprogram/pageage/AIvideoAnalysis/index.js index 50a51ad..101c975 100644 --- a/miniprogram/pageage/AIvideoAnalysis/index.js +++ b/miniprogram/pageage/AIvideoAnalysis/index.js @@ -187,7 +187,7 @@ Page({ */ goGCLB:function(){ wx.redirectTo({ - url: '../../pages/gengduogongneng/gengduogongneng' + url: '../../pages/gengduogongneng/index' }) }, diff --git a/miniprogram/pageage/AIvideoAnalysis/index.wxml b/miniprogram/pageage/AIvideoAnalysis/index.wxml index 035a03a..0fd1343 100644 --- a/miniprogram/pageage/AIvideoAnalysis/index.wxml +++ b/miniprogram/pageage/AIvideoAnalysis/index.wxml @@ -22,7 +22,7 @@ - + @@ -53,7 +53,7 @@ - + 算法接入 @@ -62,7 +62,7 @@ - + 异常预警 @@ -71,7 +71,7 @@ - + 预警次数 @@ -98,7 +98,7 @@ {{item.dateTime}} - + 查看视频 diff --git a/miniprogram/pageage/Material-Management/index.js b/miniprogram/pageage/Material-Management/index.js index fe07f92..c2a7bfb 100644 --- a/miniprogram/pageage/Material-Management/index.js +++ b/miniprogram/pageage/Material-Management/index.js @@ -735,7 +735,7 @@ onSelect1(e){ */ goGCLB:function(){ wx.redirectTo({ - url: '../../pages/gengduogongneng/gengduogongneng' + url: '../../pages/gengduogongneng/index' }) }, diff --git a/miniprogram/pageage/Material-Management/index.wxml b/miniprogram/pageage/Material-Management/index.wxml index e1d60f5..6a3029e 100644 --- a/miniprogram/pageage/Material-Management/index.wxml +++ b/miniprogram/pageage/Material-Management/index.wxml @@ -64,7 +64,7 @@ - + @@ -81,7 +81,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -118,7 +118,7 @@ - + @@ -207,7 +207,7 @@ @@ -224,7 +224,7 @@ @@ -244,7 +244,7 @@ @@ -261,7 +261,7 @@ @@ -326,7 +326,7 @@ - + diff --git a/miniprogram/pageage/Material-Management/index.wxss b/miniprogram/pageage/Material-Management/index.wxss index f23a975..e37267c 100644 --- a/miniprogram/pageage/Material-Management/index.wxss +++ b/miniprogram/pageage/Material-Management/index.wxss @@ -9,11 +9,11 @@ .hj_float{ float: right; padding: 5rpx 50rpx 5rpx 20rpx; - background: #2e355f url("http://fileimg.makalu.cc/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png") no-repeat right/35rpx; + background: #2e355f url("https://szgcwx.jhncidg.com/staticFiles/img/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png") no-repeat right/35rpx; border-radius: 40rpx; } .hj_float:active{ - background: #2e355f url("http://fileimg.makalu.cc/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png") no-repeat right/35rpx; + background: #2e355f url("https://szgcwx.jhncidg.com/staticFiles/img/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png") no-repeat right/35rpx; } .van-popup--bottom.van-popup--round{ border-radius: 0 !important @@ -53,7 +53,7 @@ padding-left: 50rpx; margin-left: 20rpx; font-size: 32rpx; - background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/menu/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; } .header-cailiao-right{ display: flex; @@ -98,7 +98,7 @@ height: 40rpx; line-height: 40rpx; padding-left: 40rpx; - background: url("http://fileimg.makalu.cc/WEB_F6B0554C215E496195EA7D6FCE2C0B8E.png") no-repeat left/35rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_F6B0554C215E496195EA7D6FCE2C0B8E.png") no-repeat left/35rpx; } .wanjieNum-over-bottom{ display: flex; @@ -123,7 +123,7 @@ align-items: center; width: 40%; height: 100rpx; - background: url("http://fileimg.makalu.cc/WEB_EBD7748CB73A4D2D8BD74617F84528DE.png") no-repeat center/100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_EBD7748CB73A4D2D8BD74617F84528DE.png") no-repeat center/100%; } .wanjieNum-over-bottom-top-box-Img-small{ width: 38rpx; @@ -150,7 +150,7 @@ align-items: center; width: 40%; height: 100rpx; - background: url("http://fileimg.makalu.cc/WEB_09B5E990ABB5491D979F19A299532C13.png") no-repeat center/100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_09B5E990ABB5491D979F19A299532C13.png") no-repeat center/100%; } .wanjieNum-over-bottom-top-box-ImgB{ display: flex; @@ -158,7 +158,7 @@ align-items: center; width: 40%; height: 100rpx; - background: url("http://fileimg.makalu.cc/WEB_AA8F63B6D1C44A14BE1A6C5720E14371.png") no-repeat center/100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_AA8F63B6D1C44A14BE1A6C5720E14371.png") no-repeat center/100%; } .wanjieNum-over-bottom-top-box-ImgC{ display: flex; @@ -166,7 +166,7 @@ align-items: center; width: 40%; height: 100rpx; - background: url("http://fileimg.makalu.cc/WEB_735D7FFF509C4DAA98ADC7C10AB9E89D.png") no-repeat center/100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_735D7FFF509C4DAA98ADC7C10AB9E89D.png") no-repeat center/100%; } .wanjieNum-over-bottom-top-box-ImgD{ display: flex; @@ -174,7 +174,7 @@ align-items: center; width: 40%; height: 100rpx; - background: url("http://fileimg.makalu.cc/WEB_1E99222D2C104243896FBAE1D53AF5AB.png") no-repeat center/100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_1E99222D2C104243896FBAE1D53AF5AB.png") no-repeat center/100%; } /* 超耗材料 */ .chaohao{ diff --git a/miniprogram/pageage/Progress-management/index.js b/miniprogram/pageage/Progress-management/index.js index f3df4d7..c420bdb 100644 --- a/miniprogram/pageage/Progress-management/index.js +++ b/miniprogram/pageage/Progress-management/index.js @@ -560,7 +560,7 @@ Page({ goGCLB:function(){ wx.redirectTo({ - url: '../../pages/gengduogongneng/gengduogongneng' + url: '../../pages/gengduogongneng/index' }) }, diff --git a/miniprogram/pageage/Progress-management/index.wxml b/miniprogram/pageage/Progress-management/index.wxml index a7adf60..6855bf1 100644 --- a/miniprogram/pageage/Progress-management/index.wxml +++ b/miniprogram/pageage/Progress-management/index.wxml @@ -25,7 +25,7 @@ - + @@ -100,8 +100,8 @@ - - + + @@ -117,7 +117,7 @@ - + @@ -160,7 +160,7 @@ - + diff --git a/miniprogram/pageage/Progress-management/index.wxss b/miniprogram/pageage/Progress-management/index.wxss index ad9ac16..5821bf4 100644 --- a/miniprogram/pageage/Progress-management/index.wxss +++ b/miniprogram/pageage/Progress-management/index.wxss @@ -32,7 +32,7 @@ line-height: 40rpx; padding-left: 50rpx; margin-left: 20rpx; - background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/menu/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; } .gongqigaikuo-content{ width: 100%; diff --git a/miniprogram/pageage/biangeng/index.wxml b/miniprogram/pageage/biangeng/index.wxml index c18b593..ffcfe71 100644 --- a/miniprogram/pageage/biangeng/index.wxml +++ b/miniprogram/pageage/biangeng/index.wxml @@ -22,7 +22,7 @@ - + @@ -52,21 +52,21 @@ {{allPoint}} - + 总数 {{comPoint}} - + 已通过 {{outPoint}} - + 未通过 @@ -111,7 +111,7 @@ - + @@ -146,7 +146,7 @@ - + 新增 diff --git a/miniprogram/pageage/educations-list/index.wxss b/miniprogram/pageage/educations-list/index.wxss index 94df71d..17017bd 100644 --- a/miniprogram/pageage/educations-list/index.wxss +++ b/miniprogram/pageage/educations-list/index.wxss @@ -101,7 +101,7 @@ width: 100rpx; height: 100rpx; margin-right: 16rpx; - background: url("http://fileimg.makalu.cc/WEB_DC5E7AB4FFB4412A886A44BDC2B820E0.png") no-repeat center/100% 100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_DC5E7AB4FFB4412A886A44BDC2B820E0.png") no-repeat center/100% 100%; } .Winter-training-bottomBox-left-box image{ width: 100%; diff --git a/miniprogram/pageage/project_checkDetection/info/index.wxml b/miniprogram/pageage/project_checkDetection/info/index.wxml index 1a872f8..bd69588 100644 --- a/miniprogram/pageage/project_checkDetection/info/index.wxml +++ b/miniprogram/pageage/project_checkDetection/info/index.wxml @@ -144,7 +144,7 @@ - + 下载附件 diff --git a/miniprogram/pageage/project_checkDetection/list/index.js b/miniprogram/pageage/project_checkDetection/list/index.js index 4fcc118..934deb8 100644 --- a/miniprogram/pageage/project_checkDetection/list/index.js +++ b/miniprogram/pageage/project_checkDetection/list/index.js @@ -66,7 +66,7 @@ Page({ }, /** - * 查询项目举牌验收数据 + * 查询项目材料进场验收数据 */ getListData(projectId,deptId,minRoleId) { var that = this; @@ -150,7 +150,7 @@ Page({ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ if(wx.getStorageSync('nav-menu')=="gd"){ wx.redirectTo({ - url: '../../../pages/gengduogongneng/gengduogongneng', + url: '../../../pages/gengduogongneng/index', }) }else{ wx.redirectTo({ diff --git a/miniprogram/pageage/project_checking/list/index.js b/miniprogram/pageage/project_checking/list/index.js index 1b1a0ff..6357172 100644 --- a/miniprogram/pageage/project_checking/list/index.js +++ b/miniprogram/pageage/project_checking/list/index.js @@ -136,7 +136,7 @@ Page({ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ if(wx.getStorageSync('nav-menu')=="gd"){ wx.redirectTo({ - url: '../../../pages/gengduogongneng/gengduogongneng', + url: '../../../pages/gengduogongneng/index', }) }else{ wx.redirectTo({ diff --git a/miniprogram/pageage/project_deptWorks/list/index.js b/miniprogram/pageage/project_deptWorks/list/index.js index 322f76c..6df016b 100644 --- a/miniprogram/pageage/project_deptWorks/list/index.js +++ b/miniprogram/pageage/project_deptWorks/list/index.js @@ -92,7 +92,7 @@ Page({ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ if(wx.getStorageSync('nav-menu')=="gd"){ wx.redirectTo({ - url: '../../../pages/gengduogongneng/gengduogongneng', + url: '../../../pages/gengduogongneng/index', }) }else{ wx.redirectTo({ diff --git a/miniprogram/pageage/project_insurance/info/index.wxml b/miniprogram/pageage/project_insurance/info/index.wxml index 3e38e0c..4a9c00e 100644 --- a/miniprogram/pageage/project_insurance/info/index.wxml +++ b/miniprogram/pageage/project_insurance/info/index.wxml @@ -31,7 +31,7 @@ 保险合同 - + 下载附件 diff --git a/miniprogram/pageage/project_insurance/list/index.js b/miniprogram/pageage/project_insurance/list/index.js index 37f9636..5ee44c9 100644 --- a/miniprogram/pageage/project_insurance/list/index.js +++ b/miniprogram/pageage/project_insurance/list/index.js @@ -92,7 +92,7 @@ Page({ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ if(wx.getStorageSync('nav-menu')=="gd"){ wx.redirectTo({ - url: '../../../pages/gengduogongneng/gengduogongneng', + url: '../../../pages/gengduogongneng/index', }) }else{ wx.redirectTo({ diff --git a/miniprogram/pageage/project_materialSeal/info/index.wxml b/miniprogram/pageage/project_materialSeal/info/index.wxml index 5a6d03a..16f3475 100644 --- a/miniprogram/pageage/project_materialSeal/info/index.wxml +++ b/miniprogram/pageage/project_materialSeal/info/index.wxml @@ -101,7 +101,7 @@ - + 下载附件 @@ -116,7 +116,7 @@ - + 下载附件 diff --git a/miniprogram/pageage/project_materialSeal/list/index.js b/miniprogram/pageage/project_materialSeal/list/index.js index dd864fa..57ca912 100644 --- a/miniprogram/pageage/project_materialSeal/list/index.js +++ b/miniprogram/pageage/project_materialSeal/list/index.js @@ -58,7 +58,7 @@ Page({ }, /** - * 查询项目举牌验收数据 + * 查询项目材料封样数据 */ getListData(projectId,deptId,minRoleId) { var that = this; @@ -123,7 +123,7 @@ Page({ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ if(wx.getStorageSync('nav-menu')=="gd"){ wx.redirectTo({ - url: '../../../pages/gengduogongneng/gengduogongneng', + url: '../../../pages/gengduogongneng/index', }) }else{ wx.redirectTo({ diff --git a/miniprogram/pageage/project_measure/list/index.js b/miniprogram/pageage/project_measure/list/index.js index 0841c17..d3a997b 100644 --- a/miniprogram/pageage/project_measure/list/index.js +++ b/miniprogram/pageage/project_measure/list/index.js @@ -61,7 +61,7 @@ Page({ }, /** - * 查询项目举牌验收数据 + * 查询项目实测实量数据 */ getListData(projectId,deptId,minRoleId) { var that = this; @@ -140,7 +140,7 @@ Page({ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ if(wx.getStorageSync('nav-menu')=="gd"){ wx.redirectTo({ - url: '../../../pages/gengduogongneng/gengduogongneng', + url: '../../../pages/gengduogongneng/index', }) }else{ wx.redirectTo({ diff --git a/miniprogram/pageage/project_problemmodify/quality/list/index.js b/miniprogram/pageage/project_problemmodify/quality/list/index.js index 551e5c6..4f3a48d 100644 --- a/miniprogram/pageage/project_problemmodify/quality/list/index.js +++ b/miniprogram/pageage/project_problemmodify/quality/list/index.js @@ -87,7 +87,7 @@ Page({ }, /** - * 查询项目举牌验收数据 + * 查询项目质量隐患排查数据 */ getListData() { //进入这里说明数据加载完毕 @@ -219,7 +219,7 @@ Page({ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ if(wx.getStorageSync('nav-menu')=="gd"){ wx.redirectTo({ - url: '../../../../pages/gengduogongneng/gengduogongneng', + url: '../../../../pages/gengduogongneng/index', }) }else{ wx.redirectTo({ diff --git a/miniprogram/pageage/project_problemmodify/security/list/index.js b/miniprogram/pageage/project_problemmodify/security/list/index.js index 71679a6..feb5a7b 100644 --- a/miniprogram/pageage/project_problemmodify/security/list/index.js +++ b/miniprogram/pageage/project_problemmodify/security/list/index.js @@ -80,7 +80,7 @@ Page({ }, /** - * 查询项目举牌验收数据 + * 查询项目安全隐患排查数据 */ getListData() { //进入这里说明数据加载完毕 @@ -195,7 +195,7 @@ Page({ returnToPage: function () { if(wx.getStorageSync('nav-menu')=="gd"){ wx.redirectTo({ - url: '../../../../pages/gengduogongneng/gengduogongneng', + url: '../../../../pages/gengduogongneng/index', }) }else{ wx.redirectTo({ diff --git a/miniprogram/pageage/project_schedule/list/index.js b/miniprogram/pageage/project_schedule/list/index.js index 04b1922..fe2bf24 100644 --- a/miniprogram/pageage/project_schedule/list/index.js +++ b/miniprogram/pageage/project_schedule/list/index.js @@ -82,7 +82,7 @@ Page({ }, /** - * 查询项目举牌验收数据 + * 查询项目形象进度数据 */ getListData(projectId) { var that = this; @@ -103,7 +103,7 @@ Page({ returnToPage: function () { /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ wx.redirectTo({ - url: '../../../pages/gengduogongneng/gengduogongneng', + url: '../../../pages/gengduogongneng/index', }) }, diff --git a/miniprogram/pageage/project_special/info/index.wxml b/miniprogram/pageage/project_special/info/index.wxml index 32aff07..25506a9 100644 --- a/miniprogram/pageage/project_special/info/index.wxml +++ b/miniprogram/pageage/project_special/info/index.wxml @@ -33,7 +33,7 @@ 证书附件 - + 下载附件 diff --git a/miniprogram/pageage/project_special/list/index.js b/miniprogram/pageage/project_special/list/index.js index 8bfd951..02f6cb8 100644 --- a/miniprogram/pageage/project_special/list/index.js +++ b/miniprogram/pageage/project_special/list/index.js @@ -88,7 +88,7 @@ Page({ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ if(wx.getStorageSync('nav-menu')=="gd"){ wx.redirectTo({ - url: '../../../pages/gengduogongneng/gengduogongneng', + url: '../../../pages/gengduogongneng/index', }) }else{ wx.redirectTo({ diff --git a/miniprogram/pageage/project_special/list/index.wxml b/miniprogram/pageage/project_special/list/index.wxml index f194b25..aface61 100644 --- a/miniprogram/pageage/project_special/list/index.wxml +++ b/miniprogram/pageage/project_special/list/index.wxml @@ -26,7 +26,7 @@ - + 人员姓名：{{item.name}} diff --git a/miniprogram/pageage/project_standard/info/index.wxml b/miniprogram/pageage/project_standard/info/index.wxml index fed686c..b0c2547 100644 --- a/miniprogram/pageage/project_standard/info/index.wxml +++ b/miniprogram/pageage/project_standard/info/index.wxml @@ -6,7 +6,7 @@ - 实测实量详情 + 项目标准详情 diff --git a/miniprogram/pageage/project_standard/list/index.js b/miniprogram/pageage/project_standard/list/index.js index 47c946b..6907c32 100644 --- a/miniprogram/pageage/project_standard/list/index.js +++ b/miniprogram/pageage/project_standard/list/index.js @@ -124,7 +124,7 @@ Page({ }, /** - * 查询项目举牌验收数据 + * 查询项目项目标准化数据 */ getListData(projectId, deptId, minRoleId) { var that = this; @@ -143,9 +143,18 @@ Page({ data: param, method: "get", success: function (res) { - that.setData({ - listData: res.data.data - }) + if(res.data.data.length>0){ + res.data.data.forEach(item =>{ + item.minImageUrl = config.baseUrl+item.imageFile+".min.jpg" + }) + that.setData({ + listData: res.data.data + }) + }else{ + that.setData({ + listData: [] + }) + } } }); }, @@ -188,7 +197,7 @@ Page({ returnToPage: function () { /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ wx.redirectTo({ - url: '../../../pages/gengduogongneng/gengduogongneng', + url: '../../../pages/gengduogongneng/index', }) }, diff --git a/miniprogram/pageage/project_standard/list/index.wxml b/miniprogram/pageage/project_standard/list/index.wxml index ce56779..3ba812e 100644 --- a/miniprogram/pageage/project_standard/list/index.wxml +++ b/miniprogram/pageage/project_standard/list/index.wxml @@ -37,7 +37,7 @@ - + diff --git a/miniprogram/pageage/project_train/list/index.js b/miniprogram/pageage/project_train/list/index.js index 3209fdf..7bfc2c0 100644 --- a/miniprogram/pageage/project_train/list/index.js +++ b/miniprogram/pageage/project_train/list/index.js @@ -106,7 +106,7 @@ Page({ /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ if(wx.getStorageSync('nav-menu')=="gd"){ wx.redirectTo({ - url: '../../../pages/gengduogongneng/gengduogongneng', + url: '../../../pages/gengduogongneng/index', }) }else{ wx.redirectTo({ diff --git a/miniprogram/pageage/safetyManagement/securityCheck/index.wxml b/miniprogram/pageage/safetyManagement/securityCheck/index.wxml index 5330bbe..df66ee8 100644 --- a/miniprogram/pageage/safetyManagement/securityCheck/index.wxml +++ b/miniprogram/pageage/safetyManagement/securityCheck/index.wxml @@ -34,7 +34,7 @@ - + @@ -135,7 +135,7 @@ - + 新增 diff --git a/miniprogram/pageage/safetyManagement/securityCheckGR/index.wxml b/miniprogram/pageage/safetyManagement/securityCheckGR/index.wxml index fe1384c..20a1790 100644 --- a/miniprogram/pageage/safetyManagement/securityCheckGR/index.wxml +++ b/miniprogram/pageage/safetyManagement/securityCheckGR/index.wxml @@ -98,7 +98,7 @@ - + 新增 diff --git a/miniprogram/pageage/samplingRetesting/index.wxml b/miniprogram/pageage/samplingRetesting/index.wxml index 48fd717..f2a948e 100644 --- a/miniprogram/pageage/samplingRetesting/index.wxml +++ b/miniprogram/pageage/samplingRetesting/index.wxml @@ -46,7 +46,7 @@ - + 新增 diff --git a/miniprogram/pageage/shipinquanping/shipingquanping.js b/miniprogram/pageage/shipinquanping/shipingquanping.js index 1460225..7764288 100644 --- a/miniprogram/pageage/shipinquanping/shipingquanping.js +++ b/miniprogram/pageage/shipinquanping/shipingquanping.js @@ -134,14 +134,14 @@ Page({ this.setData({ bottom: -((this.data.resinit-150) / 2) + 'px', btnbottom: 150+'px', - down:'rgba(0,0,0,0.3) url("http://fileimg.makalu.cc/WEB_BE024BE5CFF04825B96441B57BF221D5.png") no-repeat center/15px', + down:'rgba(0,0,0,0.3) url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_BE024BE5CFF04825B96441B57BF221D5.png") no-repeat center/15px', show: true }) }else{ this.setData({ bottom: -((this.data.resinit-150) / 2 + 150) + 'px', btnbottom:0, - down:'rgba(0,0,0,0.3) url("http://fileimg.makalu.cc/WEB_121316FF680C47009E7768A13F3C5AAD.png") no-repeat center/15px;', + down:'rgba(0,0,0,0.3) url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_121316FF680C47009E7768A13F3C5AAD.png") no-repeat center/15px;', show: false }) } diff --git a/miniprogram/pageage/shipinquanping/shipingquanping.wxss b/miniprogram/pageage/shipinquanping/shipingquanping.wxss index 8f526c9..516d0e4 100644 --- a/miniprogram/pageage/shipinquanping/shipingquanping.wxss +++ b/miniprogram/pageage/shipinquanping/shipingquanping.wxss @@ -43,7 +43,7 @@ page{ width: 300rpx; height: 300rpx; margin: auto; - background: url("http://fileimg.makalu.cc/WEB_18985E338B994679BD9849D18A5C3EB8.png") no-repeat center/100% 100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_18985E338B994679BD9849D18A5C3EB8.png") no-repeat center/100% 100%; } .video_tele_top{ width: 80rpx; @@ -51,7 +51,7 @@ page{ margin: auto; } .video_tele_top:active{ - background: url("http://fileimg.makalu.cc/WEB_121316FF680C47009E7768A13F3C5AAD.png") no-repeat center/40rpx 40rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_121316FF680C47009E7768A13F3C5AAD.png") no-repeat center/40rpx 40rpx; } .video_tele_bottom{ width: 80rpx; @@ -59,7 +59,7 @@ page{ margin: auto; } .video_tele_bottom:active{ - background: url("http://fileimg.makalu.cc/WEB_BE024BE5CFF04825B96441B57BF221D5.png") no-repeat center/40rpx 40rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_BE024BE5CFF04825B96441B57BF221D5.png") no-repeat center/40rpx 40rpx; } .video_tele_middle{ height: 135rpx; @@ -72,7 +72,7 @@ page{ width: 50rpx; } .video_tele_left:active{ - background: url("http://fileimg.makalu.cc/WEB_66C6D4090DB740859D0128493C9895A8.png") no-repeat center/40rpx 40rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_66C6D4090DB740859D0128493C9895A8.png") no-repeat center/40rpx 40rpx; } .video_tele_right{ float: right; @@ -80,7 +80,7 @@ page{ width: 50rpx; } .video_tele_right:active{ - background: url("http://fileimg.makalu.cc/WEB_A1ED3A414F3945328C554AF247F0AA4E.png") no-repeat center/40rpx 40rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_A1ED3A414F3945328C554AF247F0AA4E.png") no-repeat center/40rpx 40rpx; } .video_focusing_padding{ padding-top: 50rpx; @@ -131,5 +131,5 @@ page{ z-index: 9999; } .left_img{ - background: rgba(0,0,0,0.3) url("http://fileimg.makalu.cc/WEB_121316FF680C47009E7768A13F3C5AAD.png") no-repeat center/15px; + background: rgba(0,0,0,0.3) url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_121316FF680C47009E7768A13F3C5AAD.png") no-repeat center/15px; } \ No newline at end of file diff --git a/miniprogram/pageage/technical-management/index.js b/miniprogram/pageage/technical-management/index.js index cdeeabc..74aedd9 100644 --- a/miniprogram/pageage/technical-management/index.js +++ b/miniprogram/pageage/technical-management/index.js @@ -781,7 +781,7 @@ Page({ */ goGCLB:function(){ wx.redirectTo({ - url: '../../pages/gengduogongneng/gengduogongneng' + url: '../../pages/gengduogongneng/index' }) }, diff --git a/miniprogram/pageage/technical-management/index.wxml b/miniprogram/pageage/technical-management/index.wxml index 4d4686d..12eb5b2 100644 --- a/miniprogram/pageage/technical-management/index.wxml +++ b/miniprogram/pageage/technical-management/index.wxml @@ -26,7 +26,7 @@ - + @@ -50,7 +50,7 @@ - + 管理交底 @@ -59,7 +59,7 @@ - + 施组交底 @@ -70,7 +70,7 @@ - + 危大工程交底 @@ -82,7 +82,7 @@ - + 技术交底 @@ -104,14 +104,14 @@ 查看详情 - + - + 方案总数 @@ -120,7 +120,7 @@ - + 方节点数 @@ -139,7 +139,7 @@ 查看详情 - + @@ -191,7 +191,7 @@ 查看详情 - + --> @@ -236,11 +236,11 @@ - + - + @@ -259,7 +259,7 @@ 查看详情 - + --> diff --git a/miniprogram/pageage/technical-management/index.wxss b/miniprogram/pageage/technical-management/index.wxss index dd24f84..1365c0b 100644 --- a/miniprogram/pageage/technical-management/index.wxss +++ b/miniprogram/pageage/technical-management/index.wxss @@ -22,7 +22,7 @@ padding-left: 50rpx; margin-left: 20rpx; font-size: 34rpx; - background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/menu/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; } /* 四级交底 */ .sijijiaodi{ @@ -45,12 +45,12 @@ .sijijiaodi-content-top-left{ width:100rpx; height:100rpx; - background: url("http://fileimg.makalu.cc/WEB_FC70D73C3D5F435FAC8C8A962D5448FA.png") no-repeat center/100% 100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_FC70D73C3D5F435FAC8C8A962D5448FA.png") no-repeat center/100% 100%; } .sijijiaodi-content-top-right{ width:100rpx; height:100rpx; - background: url("http://fileimg.makalu.cc/WEB_E55AA3585A9B4B168401D7647BA9260B.png") no-repeat center/100% 100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_E55AA3585A9B4B168401D7647BA9260B.png") no-repeat center/100% 100%; } /* 危大工程 */ .weidagongcheng{ @@ -88,12 +88,12 @@ .weidagongcheng-footer-bottom-Img{ width:100rpx; height:100rpx; - background: url(http://fileimg.makalu.cc/WEB_2D6ECDC834D64D8CA1CB91B49E251470.png) no-repeat center/100% 100%; + background: url(https://szgcwx.jhncidg.com/staticFiles/img/WEB_2D6ECDC834D64D8CA1CB91B49E251470.png) no-repeat center/100% 100%; } .weidagongcheng-footer-bottom-Imgs{ width:100rpx; height:100rpx; - background: url(http://fileimg.makalu.cc/WEB_9903C7AD38DF4AFAA06E66CD2505F8BF.png) no-repeat center/100% 100%; + background: url(https://szgcwx.jhncidg.com/staticFiles/img/WEB_9903C7AD38DF4AFAA06E66CD2505F8BF.png) no-repeat center/100% 100%; } /* 变更签认 */ .biangengqianren{ diff --git a/miniprogram/pageage/vehicleManage/index.js b/miniprogram/pageage/vehicleManage/index.js index 19a5fe2..e965de2 100644 --- a/miniprogram/pageage/vehicleManage/index.js +++ b/miniprogram/pageage/vehicleManage/index.js @@ -133,7 +133,7 @@ Page({ */ goGCLB:function(){ wx.redirectTo({ - url: '../../pages/gengduogongneng/gengduogongneng' + url: '../../pages/gengduogongneng/index' }) }, diff --git a/miniprogram/pageage/vehicleManage/index.wxml b/miniprogram/pageage/vehicleManage/index.wxml index 5140038..a9b69e1 100644 --- a/miniprogram/pageage/vehicleManage/index.wxml +++ b/miniprogram/pageage/vehicleManage/index.wxml @@ -22,7 +22,7 @@ - + @@ -47,7 +47,7 @@ - + 今日进场数： @@ -55,7 +55,7 @@ - + 今日出场数： diff --git a/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.js b/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.js index 87ecf02..86318bb 100644 --- a/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.js +++ b/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.js @@ -909,14 +909,14 @@ Page({ wx.clearStorageSync(); wx.setStorageSync('isReload', "1") wx.redirectTo({ - url: '../login/login', + url: '../login/index', }) }, //返回到更多功能 goGCLB: function () { wx.redirectTo({ - url: '../../pages/gengduogongneng/gengduogongneng' + url: '../../pages/gengduogongneng/index' }) } }) \ No newline at end of file diff --git a/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.wxml b/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.wxml index aacb0b4..3de7ddb 100644 --- a/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.wxml +++ b/miniprogram/pageage/xiangmuhuanjing/xiangmuhuanjing.wxml @@ -1,4 +1,4 @@ - + + - + 新增 diff --git a/miniprogram/pages/Construction-Log/index.wxss b/miniprogram/pages/Construction-Log/index.wxss index b35ac0f..3084e74 100644 --- a/miniprogram/pages/Construction-Log/index.wxss +++ b/miniprogram/pages/Construction-Log/index.wxss @@ -11,7 +11,7 @@ line-height: 70rpx; padding-left: 50rpx; font-size: 34rpx; - background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/menu/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; color: #fff; } .logList{ diff --git a/miniprogram/pages/Highlight-photos/index.wxml b/miniprogram/pages/Highlight-photos/index.wxml index d6102c8..fd539cc 100644 --- a/miniprogram/pages/Highlight-photos/index.wxml +++ b/miniprogram/pages/Highlight-photos/index.wxml @@ -24,7 +24,7 @@ - + @@ -45,7 +45,7 @@ - - - {{item.text}} - + + + {{item.text}} + - - 取消 - - 确认 - - - + + 取消 + + 确认 + + + \ No newline at end of file diff --git a/miniprogram/pages/components/project-select/index.wxss b/miniprogram/pages/components/project-select/index.wxss index 76d5ce2..54fb579 100644 --- a/miniprogram/pages/components/project-select/index.wxss +++ b/miniprogram/pages/components/project-select/index.wxss @@ -1,49 +1,54 @@ /* pages/components/project-select/index.wxss */ -.video_add{ - padding: 20rpx 30rpx; - } - .video_address{ - background:#30343f; - padding:0 20rpx; - border-radius:50rpx; - font-size: 28rpx; - } - .video_address_min{ - background:url("http://fileimg.makalu.cc/CORE_B1C818B4CF2C44FE9D96624589329EBC.png") no-repeat left/40rpx; - height: 80rpx; - line-height: 80rpx; - padding-left: 50rpx; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - word-break: break-all; - } - - - .option_list_title{ - display: flex; - justify-content: space-between; - align-items: center; - padding: 20rpx; - color: #06d4f8; - } - .option_list_title_btn{ - color: #1989fa; - font-size: 30rpx; - } - - .popup_style{ - background: #232a44 !important; - } -.time_select_style{ - background: none !important; +.video_add { + padding: 20rpx 30rpx; } -.time_active_style{ - color: #ffffff !important; +.video_address { + background: #30343f; + padding: 0 20rpx; + border-radius: 50rpx; + font-size: 28rpx; } -.time_list_style{ - background: none !important; - color: #546696 !important; + +.video_address_min { + background: url("https://szgcwx.jhncidg.com/staticFiles/img/menu/CORE_B1C818B4CF2C44FE9D96624589329EBC.png") no-repeat left/40rpx; + height: 80rpx; + line-height: 80rpx; + padding-left: 50rpx; + white-space: nowrap; + text-overflow: ellipsis; + overflow: hidden; + word-break: break-all; +} + + +.option_list_title { + display: flex; + justify-content: space-between; + align-items: center; + padding: 20rpx; + color: #06d4f8; +} + +.option_list_title_btn { + color: #1989fa; + font-size: 30rpx; +} + +.popup_style { + background: #232a44 !important; +} + +.time_select_style { + background: none !important; +} + +.time_active_style { + color: #ffffff !important; +} + +.time_list_style { + background: none !important; + color: #546696 !important; } \ No newline at end of file diff --git a/miniprogram/pages/components/pz-screen-training-index/index.wxss b/miniprogram/pages/components/pz-screen-training-index/index.wxss index 2e6189a..649f4bc 100644 --- a/miniprogram/pages/components/pz-screen-training-index/index.wxss +++ b/miniprogram/pages/components/pz-screen-training-index/index.wxss @@ -3,7 +3,7 @@ padding-bottom: 30rpx; } .pz_screen{ - background: url("http://fileimg.makalu.cc/WEB_8F23E43145C9406D89C8415E48C6139A.png") no-repeat left/25rpx 25rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_8F23E43145C9406D89C8415E48C6139A.png") no-repeat left/25rpx 25rpx; padding-left: 35rpx; color: #788fd2; font-size: 26rpx; @@ -19,7 +19,7 @@ overflow: hidden; white-space:nowrap; text-overflow:ellipsis; - background: url("http://fileimg.makalu.cc/WEB_C8096DD21F86451B8D14820056066CFA.png") no-repeat right/30rpx 30rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_C8096DD21F86451B8D14820056066CFA.png") no-repeat right/30rpx 30rpx; } .celect_frame_min.active{ color: #7a8ac9; diff --git a/miniprogram/pages/components/pz-screen-training/index.wxss b/miniprogram/pages/components/pz-screen-training/index.wxss index fde3c3c..38bb402 100644 --- a/miniprogram/pages/components/pz-screen-training/index.wxss +++ b/miniprogram/pages/components/pz-screen-training/index.wxss @@ -3,7 +3,7 @@ padding-bottom: 30rpx; } .pz_screen{ - background: url("http://fileimg.makalu.cc/WEB_8F23E43145C9406D89C8415E48C6139A.png") no-repeat left/25rpx 25rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_8F23E43145C9406D89C8415E48C6139A.png") no-repeat left/25rpx 25rpx; padding-left: 35rpx; color: #788fd2; font-size: 26rpx; @@ -19,7 +19,7 @@ overflow: hidden; white-space:nowrap; text-overflow:ellipsis; - background: url("http://fileimg.makalu.cc/WEB_C8096DD21F86451B8D14820056066CFA.png") no-repeat right/30rpx 30rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_C8096DD21F86451B8D14820056066CFA.png") no-repeat right/30rpx 30rpx; } .celect_frame_min.active{ color: #7a8ac9; diff --git a/miniprogram/pages/components/pz-screen/index.wxss b/miniprogram/pages/components/pz-screen/index.wxss index fde3c3c..38bb402 100644 --- a/miniprogram/pages/components/pz-screen/index.wxss +++ b/miniprogram/pages/components/pz-screen/index.wxss @@ -3,7 +3,7 @@ padding-bottom: 30rpx; } .pz_screen{ - background: url("http://fileimg.makalu.cc/WEB_8F23E43145C9406D89C8415E48C6139A.png") no-repeat left/25rpx 25rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_8F23E43145C9406D89C8415E48C6139A.png") no-repeat left/25rpx 25rpx; padding-left: 35rpx; color: #788fd2; font-size: 26rpx; @@ -19,7 +19,7 @@ overflow: hidden; white-space:nowrap; text-overflow:ellipsis; - background: url("http://fileimg.makalu.cc/WEB_C8096DD21F86451B8D14820056066CFA.png") no-repeat right/30rpx 30rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_C8096DD21F86451B8D14820056066CFA.png") no-repeat right/30rpx 30rpx; } .celect_frame_min.active{ color: #7a8ac9; diff --git a/miniprogram/pages/components/user-infos/index.js b/miniprogram/pages/components/user-infos/index.js new file mode 100644 index 0000000..81de267 --- /dev/null +++ b/miniprogram/pages/components/user-infos/index.js @@ -0,0 +1,167 @@ +import { + removeToken +} from '../../../utils/auth' +const app = getApp() +Component({ + /**数据监听 */ + observers: {}, + /** + * 组件的初始数据 + */ + data: { + show: false, + userData: {}, + resPas: false, + oldPsw: '', + newPsw: '', + password: '', + showOldPass: true, + showNewPass: true, + showPassWord: true, + }, + + created() { + let that = this; + //获取缓存数据 + wx.getStorage({ + key: 'userinfo', + success: function (res) { + that.setData({ + userData: res.data, + loginName: res.data.loginName, + }) + } + }) + }, + /** + * 组件的方法列表 + */ + methods: { + showPopup() { + this.setData({ + show: true + }); + }, + + /** + * 关闭用户详情 + */ + closePopup() { + this.setData({ + show: false + }); + }, + + //修改密码 + resPassword: function () { + this.setData({ + resPas: true + }); + }, + + /** + * 修改密码返回 + */ + closeResPas: function () { + this.setData({ + resPas: false + }); + }, + + //退出登录 + loginOut: function () { + removeToken(); + wx.clearStorageSync(); + wx.setStorageSync('isReload', "1") + wx.redirectTo({ + url: '../login/index', + }) + }, + + seeTap1() { + debugger + let that = this; + that.setData({ + // 切换图标 + showOldPass: !that.data.showOldPass + }) + }, + + seeTap2() { + let that = this; + that.setData({ + // 切换图标 + showNewPass: !that.data.showNewPass + }) + }, + + seeTap3() { + let that = this; + that.setData({ + // 切换图标 + showPassWord: !that.data.showPassWord + }) + if (that.data.newPsw != '' && that.data.newPsw != that.data.password) { + app.toast("两次密码输入不一致！"); + } + }, + + /** + * 添加预警信息 + */ + submit: function () { + var that = this; + if (that.data.oldPsw == '') { + app.toast("请输入旧密码！"); + return; + } + if (that.data.password == '') { + app.toast("请确认新密码！"); + return; + } + if (that.data.newPsw != '' && that.data.newPsw != that.data.password) { + app.toast("两次密码输入不一致！"); + return; + } + if (that.data.oldPsw.length < 6) { + app.toast("请输入旧密码长度 [6-20]位字符！"); + return; + } + if (that.data.newPsw.length < 6) { + app.toast("请输入新密码长度 [6-20]位字符！"); + return; + } + if (that.data.password.length < 6) { + app.toast("请输入确认密码长度 [6-20]位字符！"); + return; + } + wx.request({ + header: { + 'content-type': 'application/x-www-form-urlencoded' + }, + url: app.globalData.reqUrl + '/wechat/updatePassword', + data: { + loginName: that.data.loginName, + oldPsw: that.data.oldPsw, + newPsw: that.data.newPsw, + password: that.data.password + }, + method: "POST", + success: function (res) { + if (res.data && res.data.data == "200") { + removeToken(); + wx.clearStorageSync(); + wx.setStorageSync('isReload', "1"); + app.toast("密码修改成功！"); + wx.redirectTo({ + url: '../login/index', + }); + } else { + app.toast(res.data.info); + return; + } + } + }) + }, + } +}) \ No newline at end of file diff --git a/miniprogram/pages/components/user-infos/index.json b/miniprogram/pages/components/user-infos/index.json new file mode 100644 index 0000000..0fb4abc --- /dev/null +++ b/miniprogram/pages/components/user-infos/index.json @@ -0,0 +1,8 @@ +{ + "usingComponents": { + "van-row": "@vant/weapp/row", + "van-col": "@vant/weapp/col", + "van-popup": "@vant/weapp/popup" + }, + "navigationStyle":"custom" +} \ No newline at end of file diff --git a/miniprogram/pages/components/user-infos/index.wxml b/miniprogram/pages/components/user-infos/index.wxml new file mode 100644 index 0000000..3c7f4e8 --- /dev/null +++ b/miniprogram/pages/components/user-infos/index.wxml @@ -0,0 +1,75 @@ + + + + + + + + + {{userData.deptName}} + + + + + + + + + {{userData.nickName}} + {{userData.loginName}} + + + + + + + 修改密码 + + + + + + + 退出登录 + + + + + + + + + + + + + + 旧密码 + + + + + + + + 新密码 + + + + + + + + 确认密码 + + + + + + + + 取消 + 修改密码 + + + \ No newline at end of file diff --git a/miniprogram/pages/components/user-infos/index.wxss b/miniprogram/pages/components/user-infos/index.wxss new file mode 100644 index 0000000..f1c7d2b --- /dev/null +++ b/miniprogram/pages/components/user-infos/index.wxss @@ -0,0 +1,192 @@ +.header_img { + padding-left: 30rpx; + padding-top: 10rpx; +} + +.header_img image { + width: 30rpx; + height: 30rpx; +} + +/* 左侧菜单 */ +.left_max { + padding-top: 180rpx; +} + +.left_head { + width: 140rpx; + height: 140rpx; + margin: auto; + background: #2b345b; + border-radius: 50%; +} + +.left_head image { + width: 140rpx; + height: 140rpx; + border-radius: 50%; +} + +.left_info { + font-size: 28rpx; + padding-top: 10rpx; +} + +.left_info_name { + padding: 10rpx; +} + +.left_info_dept { + text-align: center; + margin-bottom: 40rpx; +} + +.left_manage_max { + padding: 50rpx 0; +} + +.left_manage_min { + padding: 0 5%; + margin-top: 40rpx; +} + +.left_manage { + padding: 20rpx 20rpx 15rpx; + background: #2b345b; + border-radius: 100rpx; + font-size: 28rpx; + text-align: center; +} + +.left_manage:active { + background: #232a4a; +} + +.left_pro { + position: relative; + top: -10rpx; + padding-left: 20rpx; +} + +.left_icon { + width: 40rpx; + height: 40rpx; + float: left; +} + +.left_flaot { + width: 40rpx; + height: 40rpx; + float: right; +} + +.left_password { + text-align: center; + padding-bottom: 5rpx; +} + +.left_sign { + text-align: center; + padding-bottom: 5rpx; + color: #F56C6C; +} + +.left_begin { + text-align: center; + padding-bottom: 5rpx; + color: #faf8ff; +} + +.left_manage2 { + float: left; + width: 50%; + margin-bottom: 35rpx; + color: #ffffff; +} + +.password-icon { + width: 40rpx; + height: 40rpx; + position: absolute; + right: 60rpx; + margin-top: -60rpx; + z-index: 999; +} + +.bg_bg { + text-align: center; + margin-top: 80rpx; + } + + .bg_bg image { + width: 320rpx; + height: 320rpx; + } + +.inspect_input_fill_in { + height: 90rpx; + background: #212737; + border-radius: 10rpx; + padding: 0 30rpx; +} + +.problem_submit_to { + padding: 40rpx; + display: flex; + align-items: center; + justify-content: space-around; +} + +.problem_submit_to_btn { + padding: 20rpx 0; + width: 220rpx; + text-align: center; + border-radius: 10rpx; + background: #3e4148; +} + +.problem_submit_to_btn:active { + background: #292d35; +} + +.problem_submit_to_save { + background: #513ea7; +} + +.problem_submit_to_save:active { + background: #372a70; +} + +.inspect_info { + padding: 30rpx; + margin-bottom: 30rpx; +} + +.inspect_info_list { + padding: 10rpx 0; +} + +.inspect_info_title { + padding: 10rpx 0; + color: #83a5ef +} + +.inspect_info_type { + padding: 20rpx 0; + display: flex; + justify-content: space-around; +} + +.inspect_info_type view { + width: 30%; + padding: 18rpx 0; + background: #262c3c; + text-align: center; + border-radius: 10rpx; + color: #6a77a3; +} + +.inspect_info_type .active { + color: #ffffff; + background: #576691; +} \ No newline at end of file diff --git a/miniprogram/pages/components/voucher-many-select/index.wxml b/miniprogram/pages/components/voucher-many-select/index.wxml index a228d82..8b3abd1 100644 --- a/miniprogram/pages/components/voucher-many-select/index.wxml +++ b/miniprogram/pages/components/voucher-many-select/index.wxml @@ -8,7 +8,7 @@ - + diff --git a/miniprogram/pages/components/voucher-select/index.wxml b/miniprogram/pages/components/voucher-select/index.wxml index 2a5ed28..de9df5b 100644 --- a/miniprogram/pages/components/voucher-select/index.wxml +++ b/miniprogram/pages/components/voucher-select/index.wxml @@ -5,7 +5,7 @@ - + diff --git a/miniprogram/pages/components/voucher-selected/index.wxml b/miniprogram/pages/components/voucher-selected/index.wxml index 5ac2153..55fe87d 100644 --- a/miniprogram/pages/components/voucher-selected/index.wxml +++ b/miniprogram/pages/components/voucher-selected/index.wxml @@ -2,7 +2,7 @@ - + diff --git a/miniprogram/pages/components/voucher-selects/index.wxml b/miniprogram/pages/components/voucher-selects/index.wxml index 13a2952..3d7c885 100644 --- a/miniprogram/pages/components/voucher-selects/index.wxml +++ b/miniprogram/pages/components/voucher-selects/index.wxml @@ -5,7 +5,7 @@ - + diff --git a/miniprogram/pages/construction/index.wxss b/miniprogram/pages/construction/index.wxss index 08c3dc5..d0c9a93 100644 --- a/miniprogram/pages/construction/index.wxss +++ b/miniprogram/pages/construction/index.wxss @@ -41,7 +41,7 @@ padding-left: 50rpx; margin-left: 20rpx; font-size: 34rpx; - background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/menu/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; border-bottom: 1px solid #313446; color: #fff; } diff --git a/miniprogram/pages/gengduogongneng/gengduogongneng.js b/miniprogram/pages/gengduogongneng/index.js similarity index 85% rename from miniprogram/pages/gengduogongneng/gengduogongneng.js rename to miniprogram/pages/gengduogongneng/index.js index bcdd83b..b5572b3 100644 --- a/miniprogram/pages/gengduogongneng/gengduogongneng.js +++ b/miniprogram/pages/gengduogongneng/index.js @@ -1,4 +1,4 @@ -// pages/gengduogongneng/gengduogongneng.js +// pages/gengduogongneng/index.js const app = getApp() Page({ @@ -7,12 +7,9 @@ Page({ */ data: { active:4, - show: false, projectId:'', projectName:'' , loginName:'', - nickName:'', - deptName:'', remark:'', roleId:'', roleName:'', @@ -39,14 +36,6 @@ Page({ }) }, - showPopup() { - this.setData({ show: true }); - }, - - onClose() { - this.setData({ show: false }); - }, - /** * 生命周期函数--监听页面加载 */ @@ -61,8 +50,6 @@ Page({ roleName:res.data.roleName, remark:res.data.remark, loginName:res.data.loginName, - nickName:res.data.nickName, - deptName:res.data.deptName, projectId:app.globalData.projectId, projectName:app.globalData.projectName, initData:{text:app.globalData.projectName,id:app.globalData.projectId} @@ -144,7 +131,7 @@ Page({ //跳转到项目概况页面 XMGK:function(){ wx.redirectTo({ - url: '../xiangmugaikuang/xiangmugaikuang' + url: '../xiangmugaikuang/index' }) }, @@ -168,34 +155,13 @@ Page({ url:'../../pageage/project_schedule/list/index' }) }, - - //退出登录 - TCDL:function(){ - wx.clearStorageSync(); - wx.setStorageSync('isReload', "1") - wx.redirectTo({ - url: '../login/login', - }) - }, - - //修改密码 - XGMM:function(){ - wx.setStorageSync('nav-menu', "gd"); - wx.redirectTo({ - url: '../updatePassword/updatePassword' - }) - }, //返回到工程列表页面 goGCLB:function(){ wx.redirectTo({ - url: '../xiangmugaikuang/xiangmugaikuang' + url: '../xiangmugaikuang/index' }) }, - - onClosePopup() { - this.setData({ show: false }); - }, //查询当前登录人的代办任务 awaitTask(minRoleId,deptId,loginName,userId) { diff --git a/miniprogram/pages/gengduogongneng/gengduogongneng.json b/miniprogram/pages/gengduogongneng/index.json similarity index 100% rename from miniprogram/pages/gengduogongneng/gengduogongneng.json rename to miniprogram/pages/gengduogongneng/index.json diff --git a/miniprogram/pages/gengduogongneng/gengduogongneng.wxml b/miniprogram/pages/gengduogongneng/index.wxml similarity index 92% rename from miniprogram/pages/gengduogongneng/gengduogongneng.wxml rename to miniprogram/pages/gengduogongneng/index.wxml index 19294aa..6825052 100644 --- a/miniprogram/pages/gengduogongneng/gengduogongneng.wxml +++ b/miniprogram/pages/gengduogongneng/index.wxml @@ -1,9 +1,9 @@ - + - + @@ -68,7 +68,7 @@ + @@ -6,7 +6,7 @@ - + {{title}} diff --git a/miniprogram/pages/gongchengliebiao/gongchengliebiao.wxss b/miniprogram/pages/gongchengliebiao/index.wxss similarity index 82% rename from miniprogram/pages/gongchengliebiao/gongchengliebiao.wxss rename to miniprogram/pages/gongchengliebiao/index.wxss index c8f2473..6f32c4e 100644 --- a/miniprogram/pages/gongchengliebiao/gongchengliebiao.wxss +++ b/miniprogram/pages/gongchengliebiao/index.wxss @@ -1,4 +1,4 @@ -/* pages/gongchengliebiao/gongchengliebiao.wxss */ +/* pages/gongchengliebiao/index.wxss */ .list_max{ padding: 0 30rpx; margin: 30rpx 0 10rpx; @@ -72,34 +72,34 @@ .list_right_address{ padding: 20rpx 0 20rpx 35rpx; color:#8ca4ee; - background: url("http://fileimg.makalu.cc/CORE_B1C818B4CF2C44FE9D96624589329EBC.png") no-repeat left/35rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/menu/CORE_B1C818B4CF2C44FE9D96624589329EBC.png") no-repeat left/35rpx; } .list_right_info{ padding: 10rpx 0; font-size: 22rpx; } .list_warning{ - background: url("http://fileimg.makalu.cc/CORE_632B884CD4084C4F8E556AB742809723.png") no-repeat left/30rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/CORE_632B884CD4084C4F8E556AB742809723.png") no-repeat left/30rpx; padding-left: 35rpx; } .list_video{ - background: url("http://fileimg.makalu.cc/CORE_970838B4C6F54BC7B33BB9F198D50130.png") no-repeat left/30rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/CORE_970838B4C6F54BC7B33BB9F198D50130.png") no-repeat left/30rpx; padding-left: 35rpx; } .list_dust{ - background: url("http://fileimg.makalu.cc/62bfb39a8e5944f99a14c02922ffb80e.png") no-repeat left/30rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/62bfb39a8e5944f99a14c02922ffb80e.png") no-repeat left/30rpx; padding-left: 35rpx; } .list_warning.active{ - background: url("http://fileimg.makalu.cc/CORE_ACFA3598B4C943EB836848A6977C4189.png") no-repeat left/30rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/CORE_ACFA3598B4C943EB836848A6977C4189.png") no-repeat left/30rpx; padding-left: 35rpx; } .list_video.active{ - background: url("http://fileimg.makalu.cc/CORE_48D684509A314D55BD3B61EFFB77EF07.png") no-repeat left/30rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/CORE_48D684509A314D55BD3B61EFFB77EF07.png") no-repeat left/30rpx; padding-left: 35rpx; } .list_dust.active{ - background: url("http://fileimg.makalu.cc/66036a52100146f5a36b0019849e8de0.png") no-repeat left/30rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/66036a52100146f5a36b0019849e8de0.png") no-repeat left/30rpx; padding-left: 35rpx; } .sel_max{ @@ -137,7 +137,7 @@ color: #8ca4ee; font-size: 28rpx; padding: 20rpx 0 20rpx 50rpx; - background: url("http://fileimg.makalu.cc/CORE_1F1F3A2778334D3EAC1226DDCEBD48D0.png") no-repeat left/40rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/CORE_1F1F3A2778334D3EAC1226DDCEBD48D0.png") no-repeat left/40rpx; } .map_list_info{ background: #232a44; diff --git a/miniprogram/pages/login/login.js b/miniprogram/pages/login/index.js similarity index 98% rename from miniprogram/pages/login/login.js rename to miniprogram/pages/login/index.js index b6ab980..9aaa282 100644 --- a/miniprogram/pages/login/login.js +++ b/miniprogram/pages/login/index.js @@ -134,7 +134,7 @@ Page({ app.globalData.value2 = rd.projectInfo.shiName + '/' + rd.projectInfo.quName; app.globalData.value3 = rd.projectInfo.logCompanyName; wx.redirectTo({ - url: '../xiangmugaikuang/xiangmugaikuang', + url: '../xiangmugaikuang/index', }) } else { //跳转页面 @@ -226,7 +226,7 @@ Page({ app.globalData.value2 = rd.projectInfo.shiName + '/' + rd.projectInfo.quName; app.globalData.value3 = rd.projectInfo.logCompanyName; wx.redirectTo({ - url: '../xiangmugaikuang/xiangmugaikuang', + url: '../xiangmugaikuang/index', }) } else { //跳转页面 diff --git a/miniprogram/pages/login/login.json b/miniprogram/pages/login/index.json similarity index 100% rename from miniprogram/pages/login/login.json rename to miniprogram/pages/login/index.json diff --git a/miniprogram/pages/login/login.wxml b/miniprogram/pages/login/index.wxml similarity index 90% rename from miniprogram/pages/login/login.wxml rename to miniprogram/pages/login/index.wxml index f8f0656..cee36c0 100644 --- a/miniprogram/pages/login/login.wxml +++ b/miniprogram/pages/login/index.wxml @@ -1,12 +1,11 @@ - + diff --git a/miniprogram/pages/project_approve/approveMaterialSeal/index.wxml b/miniprogram/pages/project_approve/approveMaterialSeal/index.wxml index c5f1a9f..f4397dc 100644 --- a/miniprogram/pages/project_approve/approveMaterialSeal/index.wxml +++ b/miniprogram/pages/project_approve/approveMaterialSeal/index.wxml @@ -101,7 +101,7 @@ - + 下载附件 @@ -116,7 +116,7 @@ - + 下载附件 diff --git a/miniprogram/pages/project_approve/index.js b/miniprogram/pages/project_approve/index.js index 7702f81..a7f30ce 100644 --- a/miniprogram/pages/project_approve/index.js +++ b/miniprogram/pages/project_approve/index.js @@ -134,7 +134,7 @@ Page({ returnToPage: function () { /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ wx.redirectTo({ - url: '../gengduogongneng/gengduogongneng', + url: '../gengduogongneng/index', }) }, diff --git a/miniprogram/pages/project_flowable/await/index.js b/miniprogram/pages/project_flowable/await/index.js index ff0beae..0fed09e 100644 --- a/miniprogram/pages/project_flowable/await/index.js +++ b/miniprogram/pages/project_flowable/await/index.js @@ -200,7 +200,7 @@ Page({ returnToPage: function () { /*关闭当前页面，跳转到应用内的某个页面。但是不允许跳转到 tabbar 页面*/ wx.redirectTo({ - url: '../../gengduogongneng/gengduogongneng', + url: '../../gengduogongneng/index', }) }, diff --git a/miniprogram/pages/project_flowable/await/index.wxml b/miniprogram/pages/project_flowable/await/index.wxml index 8a519c6..0730f14 100644 --- a/miniprogram/pages/project_flowable/await/index.wxml +++ b/miniprogram/pages/project_flowable/await/index.wxml @@ -32,19 +32,19 @@ - + 发起审批 - + 我发起的 - + 办理完成 diff --git a/miniprogram/pages/quality_manage/index.js b/miniprogram/pages/quality_manage/index.js index 1ee55f1..7ad9bd5 100644 --- a/miniprogram/pages/quality_manage/index.js +++ b/miniprogram/pages/quality_manage/index.js @@ -2,97 +2,105 @@ const app = getApp() Page({ - /** - * 页面的初始数据 - */ - data: { - active:2, - initData: {}, - projectData:{}, - projectId: '', - projectName: '', - loginName:"", - nickName:"", - deptId:"", - deptName:"", - measureStatistics:[{ name: "其它", value: 0, prop: 0}], - securityCheck: { - routineRectificationRate: 0, //常规整改率 - routineProblemTotal: 0,//常规问题总数 - routineCheckNumber: 0,//常规检查次数 - specialRectificationRate: 0, //专项整改率 - specialProblemTotal: 0,//专项问题总数 - specialCheckNumber: 0,//专项检查次数 - }, - checkDetectionData:{ - type1Value:0, - type1PassRate:100, - type2Value:0, - type2PassRate:100, - type3Value:0, - type3PassRate:100, - type4Value:0, - type4PassRate:100, - }, - //举牌验收 - checkValue:0, - checkPassRate:100, - materialSealStatistics:[{ name: "其它", value: 0, prop: 0}], - todoDb:0, - approveDb:0, - aq:0, - zl:0, - qyfsDb:0, - scslDb:0, - jpysDb:0, - clfyDb:0, + /** + * 页面的初始数据 + */ + data: { + active: 2, + initData: {}, + projectData: {}, + projectId: '', + projectName: '', + loginName: "", + deptId: "", + measureStatistics: [{ + name: "其它", + value: 0, + prop: 0 + }], + securityCheck: { + routineRectificationRate: 0, //常规整改率 + routineProblemTotal: 0, //常规问题总数 + routineCheckNumber: 0, //常规检查次数 + specialRectificationRate: 0, //专项整改率 + specialProblemTotal: 0, //专项问题总数 + specialCheckNumber: 0, //专项检查次数 }, + checkDetectionData: { + type1Value: 0, + type1PassRate: 100, + type2Value: 0, + type2PassRate: 100, + type3Value: 0, + type3PassRate: 100, + type4Value: 0, + type4PassRate: 100, + }, + //举牌验收 + checkValue: 0, + checkPassRate: 100, + materialSealStatistics: [{ + name: "其它", + value: 0, + prop: 0 + }], + todoDb: 0, + approveDb: 0, + aq: 0, + zl: 0, + qyfsDb: 0, + scslDb: 0, + jpysDb: 0, + clfyDb: 0, + }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - let that = this; - //获取缓存数据 - wx.getStorage({ - key: 'userinfo', - success:res=>{ - that.setData({ - loginName:res.data.loginName, - nickName:res.data.nickName, - projectId:app.globalData.projectId, - projectNameArgs:app.globalData.projectName, - initData:{text:app.globalData.projectName,id:app.globalData.projectId} - }) - that.selectMenuList(res.data.loginName); - that.initPage(app.globalData.projectId); - that.awaitTask(res.data.minRoleId,res.data.deptId,res.data.loginName,res.data.userId); + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + let that = this; + //获取缓存数据 + wx.getStorage({ + key: 'userinfo', + success: res => { + that.setData({ + loginName: res.data.loginName, + projectId: app.globalData.projectId, + projectNameArgs: app.globalData.projectName, + initData: { + text: app.globalData.projectName, + id: app.globalData.projectId } }) - }, + that.selectMenuList(res.data.loginName); + that.initPage(app.globalData.projectId); + that.awaitTask(res.data.minRoleId, res.data.deptId, res.data.loginName, res.data.userId); + } + }) + }, - selectMenuList:function(loginName){ - var that = this; - wx.request({ - url: app.globalData.reqUrl+'/wechat/selectRoleMenuList', - data:{ - username:loginName, - type:"zl" - }, - method:"get", - success:function(res){ - res=res.data; - if(res.code =='200'){ - that.setData({ - menuList:res.data - }) - } + selectMenuList: function (loginName) { + var that = this; + wx.request({ + url: app.globalData.reqUrl + '/wechat/selectRoleMenuList', + data: { + username: loginName, + type: "zl" + }, + method: "get", + success: function (res) { + res = res.data; + if (res.code == '200') { + that.setData({ + menuList: res.data + }) } - }) - }, + } + }) + }, //初始化页面 - initPage(projectId){ + initPage(projectId) { this.getMeasureData(projectId); this.getQualityCheck(projectId); this.getCheckDetectionData(projectId); @@ -106,18 +114,24 @@ Page({ getMeasureData(projectId) { wx.request({ url: app.globalData.reqUrl + '/wechat/projectMeasure/selectGroupCountByProjectId', - data:{projectId:projectId}, - method:"get", + data: { + projectId: projectId + }, + method: "get", success: res => { res = res.data; - if(res.code == 200 && res.data){ - let sum=0; - res.data.forEach((it,idx)=>{ - sum+=it.total; + if (res.code == 200 && res.data) { + let sum = 0; + res.data.forEach((it, idx) => { + sum += it.total; }); - let measureStatistics=[]; - res.data.forEach((it,idx)=>{ - measureStatistics.push({ name: it.measureTypeName, value: it.total, prop: (it.total / sum * 100).toFixed(2)}); + let measureStatistics = []; + res.data.forEach((it, idx) => { + measureStatistics.push({ + name: it.measureTypeName, + value: it.total, + prop: (it.total / sum * 100).toFixed(2) + }); }); //数据绑定 this.setData({ @@ -128,26 +142,29 @@ Page({ }) }, - /** + /** * 获取质量检查数据 */ getQualityCheck(projectId) { wx.request({ url: app.globalData.reqUrl + '/wechat/projectProblemmodify/selectGroupCountByProjectId', - data:{projectId:projectId,infoType:"1"}, - method:"get", + data: { + projectId: projectId, + infoType: "1" + }, + method: "get", success: res => { res = res.data; - if(res.code == 200){ + if (res.code == 200) { //数据绑定 - res.data.forEach((it,idx)=>{ - if(it.problemType=="1"){ + res.data.forEach((it, idx) => { + if (it.problemType == "1") { this.setData({ "securityCheck.routineRectificationRate": (it.comTotal / it.total * 100).toFixed(2), "securityCheck.routineProblemTotal": it.comTotal, "securityCheck.routineCheckNumber": it.total }) - }else{ + } else { this.setData({ "securityCheck.specialRectificationRate": (it.comTotal / it.total * 100).toFixed(2), "securityCheck.specialProblemTotal": it.comTotal, @@ -161,35 +178,37 @@ Page({ }, //取样复试数据 - getCheckDetectionData(projectId){ + getCheckDetectionData(projectId) { wx.request({ url: app.globalData.reqUrl + '/wechat/projectDetection/selectGroupCountByProjectId', - data:{projectId:projectId}, - method:"get", + data: { + projectId: projectId + }, + method: "get", success: res => { res = res.data; - if(res.code == 200 && res.data){ + if (res.code == 200 && res.data) { //数据绑定 - res.data.forEach((it,idx)=>{ - if(!it.passTotal){ + res.data.forEach((it, idx) => { + if (!it.passTotal) { it.passTotal = 0; } - if(it.checkType=="1"){ + if (it.checkType == "1") { this.setData({ "checkDetectionData.type1Value": it.total, "checkDetectionData.type1PassRate": (it.passTotal / it.total * 100).toFixed(2) }); - }else if(it.checkType=="2"){ + } else if (it.checkType == "2") { this.setData({ "checkDetectionData.type2Value": it.total, "checkDetectionData.type2PassRate": (it.passTotal / it.total * 100).toFixed(2) }); - }else if(it.checkType=="3"){ + } else if (it.checkType == "3") { this.setData({ "checkDetectionData.type3Value": it.total, "checkDetectionData.type3PassRate": (it.passTotal / it.total * 100).toFixed(2) }); - }else{ + } else { this.setData({ "checkDetectionData.type4Value": it.total, "checkDetectionData.type4PassRate": (it.passTotal / it.total * 100).toFixed(2) @@ -207,33 +226,43 @@ Page({ getMaterialSealData(projectId) { wx.request({ url: app.globalData.reqUrl + '/wechat/projectMaterialSeal/selectGroupCountByProjectId', - data:{projectId:projectId}, - method:"get", + data: { + projectId: projectId + }, + method: "get", success: res => { res = res.data; - if(res.code == 200 && res.data){ - let sum=0; - let otherSum=0; - let flag=true; - res.data.forEach((it,idx)=>{ - sum+=it.total; - if(idx>4 && res.data.length>6){ - otherSum+=it.total; + if (res.code == 200 && res.data) { + let sum = 0; + let otherSum = 0; + let flag = true; + res.data.forEach((it, idx) => { + sum += it.total; + if (idx > 4 && res.data.length > 6) { + otherSum += it.total; } }); - let materialSealStatistics=[]; - res.data.forEach((it,idx)=>{ - if(flag){ + let materialSealStatistics = []; + res.data.forEach((it, idx) => { + if (flag) { let typeName = it.type; - if(typeName.length>6){ + if (typeName.length > 6) { //字符串截取 - typeName = typeName.substring(typeName.length-7,typeName.length); + typeName = typeName.substring(typeName.length - 7, typeName.length); } - materialSealStatistics.push({ name: typeName, value: it.total, prop: (it.total / sum * 100).toFixed(2)}); - if(idx>3 && res.data.length>6){ + materialSealStatistics.push({ + name: typeName, + value: it.total, + prop: (it.total / sum * 100).toFixed(2) + }); + if (idx > 3 && res.data.length > 6) { //防止变形，这里统计剩余所有 - materialSealStatistics.push({ name: "其它部位", value: otherSum, prop: (otherSum / sum * 100).toFixed(2)}); - flag=false; + materialSealStatistics.push({ + name: "其它部位", + value: otherSum, + prop: (otherSum / sum * 100).toFixed(2) + }); + flag = false; } } }); @@ -252,16 +281,18 @@ Page({ getCheckingData(projectId) { wx.request({ url: app.globalData.reqUrl + '/wechat/projectchecking/findStatisticsByProjectId', - data:{projectId:projectId}, - method:"get", + data: { + projectId: projectId + }, + method: "get", success: res => { res = res.data; - if(res.code == 200 && res.data){ - res.data.forEach((it,idx)=>{ + if (res.code == 200 && res.data) { + res.data.forEach((it, idx) => { //数据绑定 this.setData({ - checkValue:it.total, - checkPassRate:(it.pass / it.total * 100).toFixed(2), + checkValue: it.total, + checkPassRate: (it.pass / it.total * 100).toFixed(2), }) }); } @@ -269,212 +300,195 @@ Page({ }) }, - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { - }, + }, - /** - * 生命周期函数--监听页面显示 - */ - onShow() { + /** + * 生命周期函数--监听页面显示 + */ + onShow() { - }, + }, - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { - }, + }, - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { - }, + }, - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { - }, + }, - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { - }, + }, - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { - }, + }, - //项目切换 返回值 - onProjectSelect(e) { - let projectId = e.detail.id; - let projectName = e.detail.text; - app.globalData.projectId = projectId; - app.globalData.projectName = projectName; - this.setData({ - projectId: projectId, - projectName: projectName, - }) - this.onLoad() - }, + //项目切换 返回值 + onProjectSelect(e) { + let projectId = e.detail.id; + let projectName = e.detail.text; + app.globalData.projectId = projectId; + app.globalData.projectName = projectName; + this.setData({ + projectId: projectId, + projectName: projectName, + }) + this.onLoad() + }, - goMenu:function(event){ - wx.setStorageSync('nav-menu', "zl"); - wx.redirectTo({ - url: event.currentTarget.dataset.url - }) - }, + goMenu: function (event) { + wx.setStorageSync('nav-menu', "zl"); + wx.redirectTo({ + url: event.currentTarget.dataset.url + }) + }, - /** - * 实测实量页面 - */ - goSCSL: function () { - wx.setStorageSync('nav-menu', "zl"); - wx.redirectTo({ - url: '../../pageage/project_measure/list/index' - }) - }, + /** + * 实测实量页面 + */ + goSCSL: function () { + wx.setStorageSync('nav-menu', "zl"); + wx.redirectTo({ + url: '../../pageage/project_measure/list/index' + }) + }, - /** - * 质量隐患排查 - */ - goYHPC: function () { - wx.setStorageSync('nav-menu', "zl"); - wx.redirectTo({ - url: '../../pageage/project_problemmodify/quality/list/index' - }) - }, + /** + * 质量隐患排查 + */ + goYHPC: function () { + wx.setStorageSync('nav-menu', "zl"); + wx.redirectTo({ + url: '../../pageage/project_problemmodify/quality/list/index' + }) + }, - /** - * 取样复试 - */ - goQYFS: function () { - wx.setStorageSync('nav-menu', "zl"); - wx.redirectTo({ - url: '../../pageage/project_checkDetection/list/index' - }) - }, + /** + * 取样复试 + */ + goQYFS: function () { + wx.setStorageSync('nav-menu', "zl"); + wx.redirectTo({ + url: '../../pageage/project_checkDetection/list/index' + }) + }, - /** - * 材料封样 - */ - goCLFY: function () { - wx.setStorageSync('nav-menu', "zl"); - wx.redirectTo({ - url: '../../pageage/project_materialSeal/list/index' - }) - }, + /** + * 材料封样 + */ + goCLFY: function () { + wx.setStorageSync('nav-menu', "zl"); + wx.redirectTo({ + url: '../../pageage/project_materialSeal/list/index' + }) + }, - /** - * 举牌验收 - */ - goJPYS: function () { - wx.setStorageSync('nav-menu', "zl"); - wx.redirectTo({ - url: '../../pageage/project_checking/list/index' - }) - }, + /** + * 举牌验收 + */ + goJPYS: function () { + wx.setStorageSync('nav-menu', "zl"); + wx.redirectTo({ + url: '../../pageage/project_checking/list/index' + }) + }, - // 底部导航 - onChange(event) { + // 底部导航 + onChange(event) { // event.detail 的值为当前选中项的索引 - this.setData({ active: event.detail }); - }, - - /** - * 项目概况页面 - */ - XMGK: function () { - wx.redirectTo({ - url: '../xiangmugaikuang/xiangmugaikuang' - }) - }, - //跳转到安全管理 - AQGL:function(){ - wx.redirectTo({ - url:'../safety_manage/index' - }) - }, - //跳转到进度管理 - JDGL:function(){ - //app.toast("敬请期待！"); - wx.redirectTo({ - url:'../../pageage/project_schedule/list/index' - }) - }, - /** - * 更多功能 - */ - GDGN: function () { - wx.redirectTo({ - url: '../gengduogongneng/gengduogongneng' - }) - }, - //退出登录 - TCDL:function(){ - wx.clearStorageSync(); - wx.setStorageSync('isReload', "1") - wx.redirectTo({ - url: '../login/login', - }) - }, - //修改密码 - XGMM:function(){ - wx.setStorageSync('nav-menu', "zl"); - wx.redirectTo({ - url: '../updatePassword/updatePassword' - }) - }, - - showPopup() { - this.setData({ show: true }); - }, - onClosePopup() { - this.setData({ show: false }); - }, - - //查询当前登录人的代办任务 - awaitTask(minRoleId,deptId,loginName,userId) { + this.setData({ + active: event.detail + }); + }, + + /** + * 项目概况页面 + */ + XMGK: function () { + wx.redirectTo({ + url: '../xiangmugaikuang/index' + }) + }, + + //跳转到安全管理 + AQGL: function () { + wx.redirectTo({ + url: '../safety_manage/index' + }) + }, + + //跳转到进度管理 + JDGL: function () { + //app.toast("敬请期待！"); + wx.redirectTo({ + url: '../../pageage/project_schedule/list/index' + }) + }, + + /** + * 更多功能 + */ + GDGN: function () { + wx.redirectTo({ + url: '../gengduogongneng/index' + }) + }, + + //查询当前登录人的代办任务 + awaitTask(minRoleId, deptId, loginName, userId) { let param = { - "businessKey":app.globalData.projectId, - "nowRole":minRoleId, - "nowDept":deptId, - "nowUserName":loginName, - "nowUser":userId, - "activeName":"await" + "businessKey": app.globalData.projectId, + "nowRole": minRoleId, + "nowDept": deptId, + "nowUserName": loginName, + "nowUser": userId, + "activeName": "await" } var that = this; wx.request({ url: app.globalData.reqUrl + '/wechat/flowTask/myAwaitFlowTaskListCount', - data:param, + data: param, method: "post", success: function (res) { res = res.data; - if(res.code=="200"){ + if (res.code == "200") { that.setData({ - todoDb:res.data.todo, - approveDb:res.data.approve+res.data.zlCount, - aq:res.data.aqCount, - zl:res.data.zlCount, - qyfsDb:res.data.approveQYFS, - scslDb:res.data.approveSCSL, - jpysDb:res.data.approveJPYS, - clfyDb:res.data.approveCLFY + todoDb: res.data.todo, + approveDb: res.data.approve + res.data.zlCount, + aq: res.data.aqCount, + zl: res.data.zlCount, + qyfsDb: res.data.approveQYFS, + scslDb: res.data.approveSCSL, + jpysDb: res.data.approveJPYS, + clfyDb: res.data.approveCLFY }) - console.log(that.data) + console.log(that.data) } } }) diff --git a/miniprogram/pages/quality_manage/index.wxml b/miniprogram/pages/quality_manage/index.wxml index d38ef90..98bb818 100644 --- a/miniprogram/pages/quality_manage/index.wxml +++ b/miniprogram/pages/quality_manage/index.wxml @@ -3,7 +3,7 @@ - + @@ -17,39 +17,6 @@ - - - - - - {{deptName}} - - - - - - - {{nickName}} - {{loginName}} - - - - - - - 修改密码 - - - - - - - 退出登录 - - - - - @@ -143,7 +110,7 @@ - + @@ -160,7 +127,7 @@ - + @@ -196,7 +163,7 @@ - + @@ -213,7 +180,7 @@ - + @@ -249,7 +216,7 @@ - + @@ -266,7 +233,7 @@ - + @@ -302,7 +269,7 @@ - + @@ -319,7 +286,7 @@ - + diff --git a/miniprogram/pages/quality_manage/index.wxss b/miniprogram/pages/quality_manage/index.wxss index afbe2d9..d378634 100644 --- a/miniprogram/pages/quality_manage/index.wxss +++ b/miniprogram/pages/quality_manage/index.wxss @@ -23,7 +23,7 @@ padding-left: 50rpx; margin-left: 20rpx; font-size: 34rpx; - background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/menu/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; } /* 内容部分 */ .gangjin{ @@ -38,7 +38,7 @@ padding-left: 40rpx; margin-top: 40rpx; font-size: 26rpx; - background: url("http://fileimg.makalu.cc/WEB_F6B0554C215E496195EA7D6FCE2C0B8E.png") no-repeat left/35rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_F6B0554C215E496195EA7D6FCE2C0B8E.png") no-repeat left/35rpx; } .wanjieNum-over-bottom{ display: flex; @@ -64,7 +64,7 @@ align-items: center; width: 40%; height: 100rpx; - background: url("http://fileimg.makalu.cc/WEB_20BAE0F4F7E14D048A818A10223B0BE1.gif") no-repeat center/100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_20BAE0F4F7E14D048A818A10223B0BE1.gif") no-repeat center/100%; padding: 14rpx 0; } .wanjieNum-over-bottom-top-box-ImgBY{ @@ -73,7 +73,7 @@ align-items: center; width: 40%; height: 100rpx; - background: url("http://fileimg.makalu.cc/WEB_EBD7748CB73A4D2D8BD74617F84528DE.png") no-repeat center/100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_EBD7748CB73A4D2D8BD74617F84528DE.png") no-repeat center/100%; padding: 14rpx 0; } .wanjieNum-over-bottom-top-box-Imgs{ @@ -82,7 +82,7 @@ align-items: center; width: 40%; height: 100rpx; - background: url("http://fileimg.makalu.cc/WEB_FBB7B92F89A748CCA88C2D059D67CDCD.gif") no-repeat center/100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_FBB7B92F89A748CCA88C2D059D67CDCD.gif") no-repeat center/100%; padding: 14rpx 0; } .wanjieNum-over-bottom-top-box-ImgPC{ @@ -91,7 +91,7 @@ align-items: center; width: 40%; height: 100rpx; - background: url("http://fileimg.makalu.cc/WEB_E219D45248B942248FE6561F24B536A9.png") no-repeat center/100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_E219D45248B942248FE6561F24B536A9.png") no-repeat center/100%; padding: 14rpx 0; } .wanjieNum-over-bottom-top-box-ImgPS{ @@ -100,7 +100,7 @@ align-items: center; width: 40%; height: 100rpx; - background: url("http://fileimg.makalu.cc/WEB_C8E00800A80E4D41B579855E50A57F3E.png") no-repeat center/100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_C8E00800A80E4D41B579855E50A57F3E.png") no-repeat center/100%; padding: 14rpx 0; } .wanjieNum-over-bottom-top-box-Img-small{ diff --git a/miniprogram/pages/renyuanguanli/renyuanguanli.js b/miniprogram/pages/renyuanguanli/renyuanguanli.js index 52f3134..328ff49 100644 --- a/miniprogram/pages/renyuanguanli/renyuanguanli.js +++ b/miniprogram/pages/renyuanguanli/renyuanguanli.js @@ -512,7 +512,7 @@ Page({ //跳转到项目概况页面 XMGK:function(){ wx.redirectTo({ - url: '../xiangmugaikuang/xiangmugaikuang' + url: '../xiangmugaikuang/index' }) }, @@ -533,7 +533,7 @@ Page({ //跳转到更多更能 GDGN:function(event){ wx.redirectTo({ - url: '../gengduogongneng/gengduogongneng', + url: '../gengduogongneng/index', }) }, @@ -556,14 +556,14 @@ Page({ wx.clearStorageSync(); wx.setStorageSync('isReload', "1") wx.redirectTo({ - url: '../login/login', + url: '../login/index', }) }, //返回到工程列表页面 goGCLB:function(){ wx.redirectTo({ - url: '../gongchengliebiao/gongchengliebiao' + url: '../gongchengliebiao/index' }) }, diff --git a/miniprogram/pages/renyuanguanli/renyuanguanli.wxml b/miniprogram/pages/renyuanguanli/renyuanguanli.wxml index f2bb423..824caa2 100644 --- a/miniprogram/pages/renyuanguanli/renyuanguanli.wxml +++ b/miniprogram/pages/renyuanguanli/renyuanguanli.wxml @@ -23,7 +23,7 @@ - + diff --git a/miniprogram/pages/renyuanguanli/renyuanguanli.wxss b/miniprogram/pages/renyuanguanli/renyuanguanli.wxss index 9ca29c5..5b8c0da 100644 --- a/miniprogram/pages/renyuanguanli/renyuanguanli.wxss +++ b/miniprogram/pages/renyuanguanli/renyuanguanli.wxss @@ -13,7 +13,7 @@ height: 40rpx; line-height: 40rpx; padding-left: 40rpx; - background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/menu/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; } .eharts_head{ text-align: center; @@ -38,7 +38,7 @@ .hj_float{ float: right; padding: 5rpx 50rpx 5rpx 20rpx; - background: #2e355f url("http://fileimg.makalu.cc/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png") no-repeat right/35rpx; + background: #2e355f url("https://szgcwx.jhncidg.com/staticFiles/img/CORE_5F23F4664AAE44A0BD72BE4BB4C66083.png") no-repeat right/35rpx; border-radius: 40rpx; } @@ -142,10 +142,10 @@ height: 25rpx; } .ranking_green{ - background: url("http://fileimg.makalu.cc/CORE_56270CFFB87746E1968AF87C8D704B26.png") no-repeat left/100% 100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/CORE_56270CFFB87746E1968AF87C8D704B26.png") no-repeat left/100% 100%; } .ranking_red{ - background: url("http://fileimg.makalu.cc/CORE_3A01CFC1FDA540B6A29F8A9750A258B0.png") no-repeat left/100% 100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/CORE_3A01CFC1FDA540B6A29F8A9750A258B0.png") no-repeat left/100% 100%; } .battery{ width:85%; diff --git a/miniprogram/pages/safety_manage/index.js b/miniprogram/pages/safety_manage/index.js index 7effe5c..f53a205 100644 --- a/miniprogram/pages/safety_manage/index.js +++ b/miniprogram/pages/safety_manage/index.js @@ -7,39 +7,68 @@ Page({ * 页面的初始数据 */ data: { - active:1, - loginName:"", - nickName:"", - deptId:"", - deptName:"", + active: 1, + loginName: "", + deptId: "", projectName: '', projectId: '', //教育培训 - videoSurvey: [ - { name: '应急演练', value: 0, prop: 0 }, - { name: '专项培训', value: 0, prop: 0 } + videoSurvey: [{ + name: '应急演练', + value: 0, + prop: 0 + }, + { + name: '专项培训', + value: 0, + prop: 0 + } ], - trainList:[], - trainTotal:0, - emergencyDrillList:[], - emergencyDrillTotal:0, + trainList: [], + trainTotal: 0, + emergencyDrillList: [], + emergencyDrillTotal: 0, //特种作业人员 - specialStatistics:[{name:'其它', value: 0, prop: 0 }], - insuranceStatistics:[{name:'安责险', value: 0, prop: 0 },{name:'一切险', value: 0, prop: 0 }], - deptWorksStatistics:[{name:'劳务人员', value: 0, prop: 0 },{name:'监理人员', value: 0, prop: 0 },{name:'总包人员', value: 0, prop: 0 }], + specialStatistics: [{ + name: '其它', + value: 0, + prop: 0 + }], + insuranceStatistics: [{ + name: '安责险', + value: 0, + prop: 0 + }, { + name: '一切险', + value: 0, + prop: 0 + }], + deptWorksStatistics: [{ + name: '劳务人员', + value: 0, + prop: 0 + }, { + name: '监理人员', + value: 0, + prop: 0 + }, { + name: '总包人员', + value: 0, + prop: 0 + }], securityCheck: { routineRectificationRate: 0, //常规整改率 - routineProblemTotal: 0,//常规问题总数 - routineCheckNumber: 0,//常规检查次数 + routineProblemTotal: 0, //常规问题总数 + routineCheckNumber: 0, //常规检查次数 specialRectificationRate: 0, //专项整改率 - specialProblemTotal: 0,//专项问题总数 - specialCheckNumber: 0,//专项检查次数 + specialProblemTotal: 0, //专项问题总数 + specialCheckNumber: 0, //专项检查次数 }, - menuList:[], - request:app.globalData.reqUrl, - todoDb:0, - approveDb:0, - aq:0, + menuList: [], + request: app.globalData.reqUrl, + todoDb: 0, + approveDb: 0, + aq: 0, }, //项目切换 返回值 @@ -67,16 +96,17 @@ Page({ console.log(res.data); that.setData({ loginName: res.data.loginName, - nickName: res.data.nickName, deptId: res.data.deptId, - deptName:res.data.deptName, projectName: app.globalData.projectName, projectId: app.globalData.projectId, - initData: { text: app.globalData.projectName, id: app.globalData.projectId } + initData: { + text: app.globalData.projectName, + id: app.globalData.projectId + } }) that.selectMenuList(res.data.loginName); that.initPage(app.globalData.projectId); - that.awaitTask(res.data.minRoleId,res.data.deptId,res.data.loginName,res.data.userId); + that.awaitTask(res.data.minRoleId, res.data.deptId, res.data.loginName, res.data.userId); } }) }, @@ -85,30 +115,30 @@ Page({ * 初始化项目安全管理 */ initPage(projectId) { - this.getTrainList(projectId,0); + this.getTrainList(projectId, 0); this.getSecurityCheck(projectId); this.getSpecial(projectId); this.getDeptWorks(projectId); this.getPojectInsurance(projectId); //this.getTraining(projectId); - this.getTrainList(projectId,1); + this.getTrainList(projectId, 1); }, - selectMenuList:function(loginName){ + selectMenuList: function (loginName) { var that = this; wx.request({ - url: app.globalData.reqUrl+'/wechat/selectRoleMenuList', - data:{ - username:loginName, - type:"aq" + url: app.globalData.reqUrl + '/wechat/selectRoleMenuList', + data: { + username: loginName, + type: "aq" }, - method:"get", - success:function(res){ - res=res.data; - if(res.code =='200'){ - that.setData({ - menuList:res.data - }) + method: "get", + success: function (res) { + res = res.data; + if (res.code == '200') { + that.setData({ + menuList: res.data + }) } } }) @@ -120,18 +150,24 @@ Page({ getTraining(projectId) { wx.request({ url: app.globalData.reqUrl + '/wechat/projectTrain/selectGroupCountByProjectId', - data:{projectId:projectId}, - method:"get", + data: { + projectId: projectId + }, + method: "get", success: res => { res = res.data; - if(res.code == 200){ - let sum=0; - res.data.forEach((it,idx)=>{ - sum+=it.total; + if (res.code == 200) { + let sum = 0; + res.data.forEach((it, idx) => { + sum += it.total; }); - let videoSurvey=[]; - res.data.forEach((it,idx)=>{ - videoSurvey.push({ name: it.typeName, value: it.total, prop: (it.total / sum * 100).toFixed(2)}); + let videoSurvey = []; + res.data.forEach((it, idx) => { + videoSurvey.push({ + name: it.typeName, + value: it.total, + prop: (it.total / sum * 100).toFixed(2) + }); }); //数据绑定 this.setData({ @@ -148,27 +184,37 @@ Page({ getSpecial(projectId) { wx.request({ url: app.globalData.reqUrl + '/wechat/projectSpecial/selectGroupCountByProjectId', - data:{projectId:projectId}, - method:"get", + data: { + projectId: projectId + }, + method: "get", success: res => { res = res.data; - if(res.code == 200 && res.data){ - let sum=0; - let otherSum=0; - let flag=true; - res.data.forEach((it,idx)=>{ - sum+=it.total; - if(idx>4 && res.data.length>6){ - otherSum+=it.total; + if (res.code == 200 && res.data) { + let sum = 0; + let otherSum = 0; + let flag = true; + res.data.forEach((it, idx) => { + sum += it.total; + if (idx > 4 && res.data.length > 6) { + otherSum += it.total; } }); - let specialStatistics=[]; - res.data.forEach((it,idx)=>{ - if(flag){ - specialStatistics.push({ name: it.typeName, value: it.total, prop: (it.total / sum * 100).toFixed(2)}); - if(idx>3 && res.data.length>6){ - specialStatistics.push({ name: "其它工种", value: otherSum, prop: (otherSum / sum * 100).toFixed(2)}); - flag=false; + let specialStatistics = []; + res.data.forEach((it, idx) => { + if (flag) { + specialStatistics.push({ + name: it.typeName, + value: it.total, + prop: (it.total / sum * 100).toFixed(2) + }); + if (idx > 3 && res.data.length > 6) { + specialStatistics.push({ + name: "其它工种", + value: otherSum, + prop: (otherSum / sum * 100).toFixed(2) + }); + flag = false; } } }); @@ -184,27 +230,31 @@ Page({ /** * 专项培训&&应急演练 */ - getTrainList(projectId,type){ + getTrainList(projectId, type) { let that = this; wx.request({ url: app.globalData.reqUrl + '/wechat/projectTrain/list', - data:{projectId:projectId,trainType:type,deptId:0}, - method:"get", + data: { + projectId: projectId, + trainType: type, + deptId: 0 + }, + method: "get", success: res => { res = res.data; - if(res.code == 200){ - if(type=="1"){ - //数据绑定 - this.setData({ - emergencyDrillList: res.data, - emergencyDrillTotal: res.data.length - }) - }else{ - //数据绑定 - this.setData({ - trainList: res.data, - trainTotal: res.data.length - }) + if (res.code == 200) { + if (type == "1") { + //数据绑定 + this.setData({ + emergencyDrillList: res.data, + emergencyDrillTotal: res.data.length + }) + } else { + //数据绑定 + this.setData({ + trainList: res.data, + trainTotal: res.data.length + }) } } } @@ -217,42 +267,68 @@ Page({ getDeptWorks(projectId) { wx.request({ url: app.globalData.reqUrl + '/wechat/projectDeptWroks/findSumByProjectId', - data:{projectId:projectId}, - method:"get", + data: { + projectId: projectId + }, + method: "get", success: res => { res = res.data; - if(res.code == 200){ - if(res.data){ - let sum=0; - let deptWorksStatistics=[]; - if(res.data.contractorPersonnel){ - sum+=res.data.contractorPersonnel; + if (res.code == 200) { + if (res.data) { + let sum = 0; + let deptWorksStatistics = []; + if (res.data.contractorPersonnel) { + sum += res.data.contractorPersonnel; } - if(res.data.servicePersonnel){ - sum+=res.data.servicePersonnel; + if (res.data.servicePersonnel) { + sum += res.data.servicePersonnel; } - if(res.data.supervisorPersonnel){ - sum+=res.data.supervisorPersonnel; + if (res.data.supervisorPersonnel) { + sum += res.data.supervisorPersonnel; } - if(res.data.servicePersonnel){ - deptWorksStatistics.push({ name: "劳务人员", value: res.data.servicePersonnel, prop: (res.data.servicePersonnel / sum * 100).toFixed(2)}); - }else{ - deptWorksStatistics.push({ name: "劳务人员", value: 0, prop: (0 / sum * 100).toFixed(2)}); + if (res.data.servicePersonnel) { + deptWorksStatistics.push({ + name: "劳务人员", + value: res.data.servicePersonnel, + prop: (res.data.servicePersonnel / sum * 100).toFixed(2) + }); + } else { + deptWorksStatistics.push({ + name: "劳务人员", + value: 0, + prop: (0 / sum * 100).toFixed(2) + }); } - if(res.data.supervisorPersonnel){ - deptWorksStatistics.push({ name: "监理人员", value: res.data.supervisorPersonnel, prop: (res.data.supervisorPersonnel / sum * 100).toFixed(2)}); - }else{ - deptWorksStatistics.push({ name: "监理人员", value: 0, prop: (0 / sum * 100).toFixed(2)}); + if (res.data.supervisorPersonnel) { + deptWorksStatistics.push({ + name: "监理人员", + value: res.data.supervisorPersonnel, + prop: (res.data.supervisorPersonnel / sum * 100).toFixed(2) + }); + } else { + deptWorksStatistics.push({ + name: "监理人员", + value: 0, + prop: (0 / sum * 100).toFixed(2) + }); } - if(res.data.contractorPersonnel){ - deptWorksStatistics.push({ name: "总包人员", value: res.data.contractorPersonnel, prop: (res.data.contractorPersonnel / sum * 100).toFixed(2)}); - }else{ - deptWorksStatistics.push({ name: "总包人员", value: 0, prop: (0 / sum * 100).toFixed(2)}); + if (res.data.contractorPersonnel) { + deptWorksStatistics.push({ + name: "总包人员", + value: res.data.contractorPersonnel, + prop: (res.data.contractorPersonnel / sum * 100).toFixed(2) + }); + } else { + deptWorksStatistics.push({ + name: "总包人员", + value: 0, + prop: (0 / sum * 100).toFixed(2) + }); } //数据绑定 - this.setData({ - deptWorksStatistics - }) + this.setData({ + deptWorksStatistics + }) } } } @@ -262,31 +338,53 @@ Page({ /** * 获取项目保险数据 */ - getPojectInsurance(projectId){ + getPojectInsurance(projectId) { wx.request({ url: app.globalData.reqUrl + '/wechat/projectInsurance/selectGroupCountByProjectId', - data:{projectId:projectId}, - method:"get", + data: { + projectId: projectId + }, + method: "get", success: res => { res = res.data; - if(res.code == 200 && res.data){ - let sum=0; - res.data.forEach((it,idx)=>{ - sum+=it.total; + if (res.code == 200 && res.data) { + let sum = 0; + res.data.forEach((it, idx) => { + sum += it.total; }); - let insuranceStatistics=[]; - if(res.data.length==2){ - res.data.forEach((it,idx)=>{ - insuranceStatistics.push({ name: it.insuranceTypeName, value: it.total, prop: (it.total / sum * 100).toFixed(2)}); + let insuranceStatistics = []; + if (res.data.length == 2) { + res.data.forEach((it, idx) => { + insuranceStatistics.push({ + name: it.insuranceTypeName, + value: it.total, + prop: (it.total / sum * 100).toFixed(2) + }); }); - }else{ - res.data.forEach((it,idx)=>{ - if(it.insuranceType=="1"){ - insuranceStatistics.push({ name: it.insuranceTypeName, value: it.total, prop: (it.total / sum * 100).toFixed(2)}); - insuranceStatistics.push({ name: "安责险", value: 0, prop:0}); - }else{ - insuranceStatistics.push({ name: it.insuranceTypeName, value: it.total, prop: (it.total / sum * 100).toFixed(2)}); - insuranceStatistics.push({ name: "一切险", value: 0, prop: 0}); + } else { + res.data.forEach((it, idx) => { + if (it.insuranceType == "1") { + insuranceStatistics.push({ + name: it.insuranceTypeName, + value: it.total, + prop: (it.total / sum * 100).toFixed(2) + }); + insuranceStatistics.push({ + name: "安责险", + value: 0, + prop: 0 + }); + } else { + insuranceStatistics.push({ + name: it.insuranceTypeName, + value: it.total, + prop: (it.total / sum * 100).toFixed(2) + }); + insuranceStatistics.push({ + name: "一切险", + value: 0, + prop: 0 + }); } }); } @@ -305,20 +403,23 @@ Page({ getSecurityCheck(projectId) { wx.request({ url: app.globalData.reqUrl + '/wechat/projectProblemmodify/selectGroupCountByProjectId', - data:{projectId:projectId,infoType:"0"}, - method:"get", + data: { + projectId: projectId, + infoType: "0" + }, + method: "get", success: res => { res = res.data; - if(res.code == 200){ + if (res.code == 200) { //数据绑定 - res.data.forEach((it,idx)=>{ - if(it.problemType=="1"){ + res.data.forEach((it, idx) => { + if (it.problemType == "1") { this.setData({ "securityCheck.routineRectificationRate": (it.comTotal / it.total * 100).toFixed(2), "securityCheck.routineProblemTotal": it.comTotal, "securityCheck.routineCheckNumber": it.total }) - }else{ + } else { this.setData({ "securityCheck.specialRectificationRate": (it.comTotal / it.total * 100).toFixed(2), "securityCheck.specialProblemTotal": it.comTotal, @@ -376,28 +477,28 @@ Page({ }) }, - onClosePopup() { - this.setData({ show: false }); - }, - /****************************底部导航********************************/ - showPopup() { - this.setData({ show: true }); - }, + onClickShow() { - this.setData({ loadShow: true }); + this.setData({ + loadShow: true + }); }, onClickHide() { - this.setData({ loadShow: false }); - }, - - // 底部导航 - onChange(event) { - // event.detail 的值为当前选中项的索引 - this.setData({ active: event.detail }); - }, + this.setData({ + loadShow: false + }); + }, - goMenu:function(event){ + // 底部导航 + onChange(event) { + // event.detail 的值为当前选中项的索引 + this.setData({ + active: event.detail + }); + }, + + goMenu: function (event) { wx.setStorageSync('nav-menu', "aq"); wx.redirectTo({ url: event.currentTarget.dataset.url @@ -409,71 +510,56 @@ Page({ */ XMGK: function () { wx.redirectTo({ - url: '../xiangmugaikuang/xiangmugaikuang' + url: '../xiangmugaikuang/index' }) }, //跳转到质量管理 - ZLGL:function(){ + ZLGL: function () { wx.redirectTo({ - url:'../quality_manage/index' - }) + url: '../quality_manage/index' + }) }, //跳转到进度管理 - JDGL:function(){ + JDGL: function () { //app.toast("敬请期待！"); wx.redirectTo({ - url:'../../pageage/project_schedule/list/index' - }) + url: '../../pageage/project_schedule/list/index' + }) }, /** * 更多功能 */ GDGN: function () { wx.redirectTo({ - url: '../gengduogongneng/gengduogongneng' + url: '../gengduogongneng/index' }) }, - //退出登录 - TCDL:function(){ - wx.clearStorageSync(); - wx.setStorageSync('isReload', "1") - wx.redirectTo({ - url: '../login/login', - }) - }, - //修改密码 - XGMM:function(){ - wx.setStorageSync('nav-menu', "aq"); - wx.redirectTo({ - url: '../updatePassword/updatePassword' - }) - }, - //查询当前登录人的代办任务 - awaitTask(minRoleId,deptId,loginName,userId) { - let param = { - "businessKey":app.globalData.projectId, - "nowRole":minRoleId, - "nowDept":deptId, - "nowUserName":loginName, - "nowUser":userId, - "activeName":"await" - } - var that = this; - wx.request({ - url: app.globalData.reqUrl + '/wechat/flowTask/myAwaitFlowTaskListCount', - data:param, - method: "post", - success: function (res) { - res = res.data; - if(res.code=="200"){ - that.setData({ - todoDb:res.data.todo, - approveDb:res.data.approve+res.data.zlCount, - aq:res.data.aqCount - }) - } + //查询当前登录人的代办任务 + awaitTask(minRoleId, deptId, loginName, userId) { + let param = { + "businessKey": app.globalData.projectId, + "nowRole": minRoleId, + "nowDept": deptId, + "nowUserName": loginName, + "nowUser": userId, + "activeName": "await" + } + var that = this; + wx.request({ + url: app.globalData.reqUrl + '/wechat/flowTask/myAwaitFlowTaskListCount', + data: param, + method: "post", + success: function (res) { + res = res.data; + if (res.code == "200") { + that.setData({ + todoDb: res.data.todo, + approveDb: res.data.approve + res.data.zlCount, + aq: res.data.aqCount + }) } - }) - }, -}) + } + }) + }, +}) \ No newline at end of file diff --git a/miniprogram/pages/safety_manage/index.wxml b/miniprogram/pages/safety_manage/index.wxml index 0e7d06d..7c5e490 100644 --- a/miniprogram/pages/safety_manage/index.wxml +++ b/miniprogram/pages/safety_manage/index.wxml @@ -3,7 +3,7 @@ - + @@ -17,39 +17,6 @@ - - - - - - {{deptName}} - - - - - - - {{nickName}} - {{loginName}} - - - - - - - 修改密码 - - - - - - - 退出登录 - - - - - diff --git a/miniprogram/pages/safety_manage/index.wxss b/miniprogram/pages/safety_manage/index.wxss index ead22de..c937d46 100644 --- a/miniprogram/pages/safety_manage/index.wxss +++ b/miniprogram/pages/safety_manage/index.wxss @@ -30,7 +30,7 @@ align-items: center; width: 80%; height: 100rpx; - background: url("http://fileimg.makalu.cc/WEB_20BAE0F4F7E14D048A818A10223B0BE1.gif") no-repeat center/100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_20BAE0F4F7E14D048A818A10223B0BE1.gif") no-repeat center/100%; padding: 14rpx 0; } .wanjieNum-over-bottom-top-box-ImgBY{ @@ -39,7 +39,7 @@ align-items: center; width: 40%; height: 100rpx; - background: url("http://fileimg.makalu.cc/WEB_EBD7748CB73A4D2D8BD74617F84528DE.png") no-repeat center/100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_EBD7748CB73A4D2D8BD74617F84528DE.png") no-repeat center/100%; padding: 14rpx 0; } .wanjieNum-over-bottom-top-box-Imgs{ @@ -48,7 +48,7 @@ align-items: center; width: 40%; height: 100rpx; - background: url("http://fileimg.makalu.cc/WEB_FBB7B92F89A748CCA88C2D059D67CDCD.gif") no-repeat center/100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_FBB7B92F89A748CCA88C2D059D67CDCD.gif") no-repeat center/100%; padding: 14rpx 0; } .wanjieNum-over-bottom-top-box-ImgPC{ @@ -57,7 +57,7 @@ align-items: center; width: 40%; height: 100rpx; - background: url("http://fileimg.makalu.cc/WEB_E219D45248B942248FE6561F24B536A9.png") no-repeat center/100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_E219D45248B942248FE6561F24B536A9.png") no-repeat center/100%; padding: 14rpx 0; } .wanjieNum-over-bottom-top-box-ImgPS{ @@ -66,7 +66,7 @@ align-items: center; width: 50%; height: 100rpx; - background: url("http://fileimg.makalu.cc/WEB_C8E00800A80E4D41B579855E50A57F3E.png") no-repeat center/100%; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/WEB_C8E00800A80E4D41B579855E50A57F3E.png") no-repeat center/100%; padding: 14rpx 0; } .wanjieNum-over-bottom-top-box-Img-small{ diff --git a/miniprogram/pages/updatePassword/updatePassword.js b/miniprogram/pages/updatePassword/updatePassword.js deleted file mode 100644 index f613928..0000000 --- a/miniprogram/pages/updatePassword/updatePassword.js +++ /dev/null @@ -1,156 +0,0 @@ -const app = getApp() -Page({ - /** - * 页面的初始数据 - */ - data: { - loginName:null, - oldPsw:'', - newPsw:'', - password:'', - showOldPass:true, - showNewPass:true, - showPassWord:true, - //数据加载参数 - show:false, - }, - - onClickShow() { - this.setData({ show: true }); - }, - - onClickHide() { - this.setData({ show: false }); - }, - - seeTap1:function(){ - let that = this; -    this.setData({ -      // 切换图标 - showOldPass:!that.data.showOldPass -    }) -  }, - - seeTap2:function(){ - let that = this; -     this.setData({ -       // 切换图标 -       showNewPass:!that.data.showNewPass -     }) -   }, - - seeTap3:function(){ - let that = this; -     this.setData({ -       // 切换图标 -       showPassWord:!that.data.showPassWord -     }) - if(this.data.newPsw!='' && this.data.newPsw!=this.data.password){ - app.toast("两次密码输入不一致！"); - } -   }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad: function (options) { - this.onClickShow(); - var that = this; - //获取缓存数据 - wx.getStorage({ - key: 'userinfo', - success:function(res){ - that.onClickHide(); - that.setData({ - loginName:res.data.loginName, - }) - if(that.data.loginName == null || that.data.loginName == ""){ - app.toast("数据异常！！"); - wx.redirectTo({ - url: '../updatePassword/updatePassword' - }) - } - } - }) - }, - /** - * 添加预警信息 - */ - submit:function(){ - var that = this; - if(that.data.oldPsw == ''){ - app.toast("请输入旧密码！"); - return; - } - if(that.data.password == ''){ - app.toast("请确认新密码！"); - return; - } - if(that.data.newPsw!='' && that.data.newPsw!=that.data.password){ - app.toast("两次密码输入不一致！"); - return; - } - if(that.data.oldPsw.length<6){ - app.toast("请输入旧密码长度 [6-20]位字符！"); - return; - } - if(that.data.newPsw.length<6){ - app.toast("请输入新密码长度 [6-20]位字符！"); - return; - } - if(that.data.password.length<6){ - app.toast("请输入确认密码长度 [6-20]位字符！"); - return; - } - that.onClickShow(); - wx.request({ - header: { - 'content-type': 'application/x-www-form-urlencoded' - }, - url:app.globalData.reqUrl+'/wechat/updatePassword', - data:{ - loginName:that.data.loginName, - oldPsw:that.data.oldPsw, - newPsw:that.data.newPsw, - password:that.data.password - }, - method:"POST", - success:function(res){ - that.onClickHide(); - if(res.data && res.data.data=="200"){ - wx.clearStorageSync(); - wx.setStorageSync('isReload', "1"); - app.toast("密码修改成功！"); - wx.redirectTo({ - url: '../login/login', - }); - }else{ - app.toast(res.data.info); - return; - } - } - }) - }, - - //返回到项目概况页面 - goGCLB:function(){ - let nav = wx.getStorageSync('nav-menu'); - if(nav=="xm"){ - wx.redirectTo({ - url: '../xiangmugaikuang/xiangmugaikuang' - }) - }else if(nav=="gd"){ - wx.redirectTo({ - url: '../gengduogongneng/gengduogongneng' - }) - }else if(nav=="aq"){ - wx.redirectTo({ - url: '../safety_manage/index' - }) - } - }, - //修改密码 - QRXG:function(){ - this.submit(); - } -}) \ No newline at end of file diff --git a/miniprogram/pages/updatePassword/updatePassword.json b/miniprogram/pages/updatePassword/updatePassword.json deleted file mode 100644 index c59cb98..0000000 --- a/miniprogram/pages/updatePassword/updatePassword.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "usingComponents": { - "van-row": "@vant/weapp/row", - "van-col": "@vant/weapp/col", - "van-action-sheet": "@vant/weapp/action-sheet", - "van-popup": "@vant/weapp/popup", - "van-button": "@vant/weapp/button", - "van-picker": "@vant/weapp/picker/index", - "van-area": "@vant/weapp/area/index", - "mkl-multi-select": "/components/@mkl/multi-select/index" , - "van-overlay": "@vant/weapp/overlay/index" - }, - "navigationStyle":"custom" -} \ No newline at end of file diff --git a/miniprogram/pages/updatePassword/updatePassword.wxml b/miniprogram/pages/updatePassword/updatePassword.wxml deleted file mode 100644 index d73d41f..0000000 --- a/miniprogram/pages/updatePassword/updatePassword.wxml +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - 返回 - - - - 修改密码 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 确认修改 - - - - - - - - 数据加载中！请稍后... - - - diff --git a/miniprogram/pages/updatePassword/updatePassword.wxss b/miniprogram/pages/updatePassword/updatePassword.wxss deleted file mode 100644 index e69de29..0000000 diff --git a/miniprogram/pages/winter-training/index.wxml b/miniprogram/pages/winter-training/index.wxml index 2c9f4b0..4ef9ae3 100644 --- a/miniprogram/pages/winter-training/index.wxml +++ b/miniprogram/pages/winter-training/index.wxml @@ -6,7 +6,7 @@ - + diff --git a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js b/miniprogram/pages/xiangmugaikuang/index.js similarity index 96% rename from miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js rename to miniprogram/pages/xiangmugaikuang/index.js index 309eb50..02112e0 100644 --- a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.js +++ b/miniprogram/pages/xiangmugaikuang/index.js @@ -317,18 +317,6 @@ Page({ this.onLoad(); }, - showPopup() { - this.setData({ - show: true - }); - }, - - onClosePopup() { - this.setData({ - show: false - }); - }, - // 手风琴 onChange1(event) { this.setData({ @@ -655,6 +643,7 @@ Page({ url: '../quality_manage/index' }) }, + //跳转到进度管理 JDGL2: function () { //app.toast("敬请期待！"); @@ -666,26 +655,10 @@ Page({ //跳转到更多功能 GDGN: function () { wx.redirectTo({ - url: '../gengduogongneng/gengduogongneng' - }) - }, - - //退出登录 - TCDL: function () { - wx.clearStorageSync(); - wx.setStorageSync('isReload', "1") - wx.redirectTo({ - url: '../login/login', - }) - }, - - //修改密码 - XGMM: function () { - wx.setStorageSync('nav-menu', "gd"); - wx.redirectTo({ - url: '../updatePassword/updatePassword' + url: '../gengduogongneng/index' }) }, + //返回到地图页面 GOMAP: function () { wx.redirectTo({ @@ -696,7 +669,7 @@ Page({ //返回到工程列表页面 goGCLB: function () { wx.redirectTo({ - url: '../gongchengliebiao/gongchengliebiao' + url: '../gongchengliebiao/index' }) }, diff --git a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.json b/miniprogram/pages/xiangmugaikuang/index.json similarity index 91% rename from miniprogram/pages/xiangmugaikuang/xiangmugaikuang.json rename to miniprogram/pages/xiangmugaikuang/index.json index 09f8c29..366e729 100644 --- a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.json +++ b/miniprogram/pages/xiangmugaikuang/index.json @@ -11,7 +11,7 @@ "van-collapse-item": "@vant/weapp/collapse-item", "ec-canvas": "../../ec-canvas/ec-canvas", "van-notice-bar": "@vant/weapp/notice-bar", - "van-overlay": "@vant/weapp/overlay/index" + "van-overlay": "@vant/weapp/overlay/index" }, "navigationStyle":"custom" } \ No newline at end of file diff --git a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxml b/miniprogram/pages/xiangmugaikuang/index.wxml similarity index 81% rename from miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxml rename to miniprogram/pages/xiangmugaikuang/index.wxml index c702c19..efc01c1 100644 --- a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxml +++ b/miniprogram/pages/xiangmugaikuang/index.wxml @@ -1,9 +1,9 @@ - + - + @@ -18,46 +18,12 @@ - - - - - - {{deptName}} - - - - - - - {{nickName}} - {{loginName}} - - - - - - - 修改密码 - - - - - - - 退出登录 - - - - - - - - - + + + - diff --git a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxss b/miniprogram/pages/xiangmugaikuang/index.wxss similarity index 90% rename from miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxss rename to miniprogram/pages/xiangmugaikuang/index.wxss index f837607..c20b0d5 100644 --- a/miniprogram/pages/xiangmugaikuang/xiangmugaikuang.wxss +++ b/miniprogram/pages/xiangmugaikuang/index.wxss @@ -1,4 +1,4 @@ -/* pages/xiangmugaikuang/xiangmugaikuang.wxss */ +/* pages/xiangmugaikuang/index.wxss */ /* 有赞原码修改 */ .van-collapse.van-hairline--top-bottom:after{ @@ -66,7 +66,7 @@ height: 40rpx; line-height: 40rpx; padding-left: 40rpx; - background: url("http://fileimg.makalu.cc/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; + background: url("https://szgcwx.jhncidg.com/staticFiles/img/menu/CORE_52887EE6A33042408E11C2174974ABA1.png") no-repeat left/35rpx; } .eharts_head{ text-align: center; @@ -134,6 +134,10 @@ padding: 6rpx 0; color: #ce9433; } +.official{ + margin-left: 30rpx; + margin-right: 30rpx; +} diff --git a/miniprogram/utils/request.js b/miniprogram/utils/request.js index c73b56e..b5ad51d 100644 --- a/miniprogram/utils/request.js +++ b/miniprogram/utils/request.js @@ -11,7 +11,7 @@ function doRequest(url, method = 'GET', data, header = {}) { if (config.noSecuritys.indexOf(url) == -1 && !getToken()) { removeToken(); wx.redirectTo({ - url: '../login/login', + url: '../login/index', }); } wx.showLoading({ @@ -35,7 +35,7 @@ function doRequest(url, method = 'GET', data, header = {}) { if (code === 401) { removeToken(); wx.redirectTo({ - url: '../login/login', + url: '../login/index', }); } else if (code === 500 || code === 403) { app.toast(res.data.msg); @@ -62,7 +62,7 @@ export function syncFileUpload(file) { if (!getToken()) { removeToken(); wx.redirectTo({ - url: '../login/login', + url: '../login/index', }); } wx.showLoading({ @@ -86,7 +86,7 @@ export function syncFileUpload(file) { if (code === 401) { removeToken(); wx.redirectTo({ - url: '../login/login', + url: '../login/index', }); } else if (code === 500 || code === 403) { app.toast(res.data.msg); diff --git a/project.config.json b/project.config.json index 8738cf7..6165786 100644 --- a/project.config.json +++ b/project.config.json @@ -54,20 +54,20 @@ "query": "" }, { - "name": "pages/gongchengliebiao/gongchengliebiao", - "pathName": "pages/gongchengliebiao/gongchengliebiao", + "name": "pages/gongchengliebiao/index", + "pathName": "pages/gongchengliebiao/index", "query": "", "scene": null }, { - "name": "pages/gengduogongneng/gengduogongneng", - "pathName": "pages/gengduogongneng/gengduogongneng", + "name": "pages/gengduogongneng/index", + "pathName": "pages/gengduogongneng/index", "query": "", "scene": null }, { - "name": "pages/login/login", - "pathName": "pages/login/login", + "name": "pages/login/index", + "pathName": "pages/login/index", "query": "", "scene": null }, @@ -84,14 +84,14 @@ "scene": null }, { - "name": "pages/gengduogongneng/gengduogongneng", - "pathName": "pages/gengduogongneng/gengduogongneng", + "name": "pages/gengduogongneng/index", + "pathName": "pages/gengduogongneng/index", "query": "", "scene": null }, { - "name": "pages/xiangmugaikuang/xiangmugaikuang", - "pathName": "pages/xiangmugaikuang/xiangmugaikuang", + "name": "pages/xiangmugaikuang/index", + "pathName": "pages/xiangmugaikuang/index", "query": "", "scene": null }, @@ -108,14 +108,14 @@ "scene": null }, { - "name": "pages/gengduogongneng/gengduogongneng", - "pathName": "pages/gengduogongneng/gengduogongneng", + "name": "pages/gengduogongneng/index", + "pathName": "pages/gengduogongneng/index", "query": "", "scene": null }, { - "name": "pages/xiangmugaikuang/xiangmugaikuang", - "pathName": "pages/xiangmugaikuang/xiangmugaikuang", + "name": "pages/xiangmugaikuang/index", + "pathName": "pages/xiangmugaikuang/index", "query": "projectId=2&projectName=山西四建月亮湾Ⅱ湾住宅小区建设项目", "scene": null }, @@ -132,8 +132,8 @@ "scene": null }, { - "name": "pages/xiangmugaikuang/xiangmugaikuang", - "pathName": "pages/xiangmugaikuang/xiangmugaikuang", + "name": "pages/xiangmugaikuang/index", + "pathName": "pages/xiangmugaikuang/index", "query": "projectId=2&projectName=山西四建月亮湾Ⅱ湾住宅小区建设项目", "scene": null },