diff --git a/manifest.json b/manifest.json index a86662d..afca07b 100644 --- a/manifest.json +++ b/manifest.json @@ -27,6 +27,7 @@ "distribute" : { /* 应用发布信息 */ "android" : { + "packagename" : "com.gunshi.xytSk-App", /* android打包配置 */ "permissions" : [ "", diff --git a/pages/aqjc/index.vue b/pages/aqjc/index.vue index 86f66eb..3be5778 100644 --- a/pages/aqjc/index.vue +++ b/pages/aqjc/index.vue @@ -16,11 +16,11 @@ 开始时间 - {{stm}} + {{stm}} 结束时间 - {{etm}} + {{etm}} 搜索 @@ -34,7 +34,7 @@ - - + diff --git a/pages/aqjc/jcsjTable.vue b/pages/aqjc/jcsjTable.vue index b112041..902c1d4 100644 --- a/pages/aqjc/jcsjTable.vue +++ b/pages/aqjc/jcsjTable.vue @@ -11,8 +11,8 @@
{{ index + 1 }} - {{ item.tm }} - {{ item.rz }} + {{ item.tm }} + {{ item.rz }} {{item[col.key] }} diff --git a/pages/hdDetail/jcsj/jcsj.vue b/pages/hdDetail/jcsj/jcsj.vue index 71eacbc..9c91d98 100644 --- a/pages/hdDetail/jcsj/jcsj.vue +++ b/pages/hdDetail/jcsj/jcsj.vue @@ -3,11 +3,11 @@ 开始时间 - {{stm}} + {{stm}} 结束时间 - {{etm}} + {{etm}} 搜索 diff --git a/pages/homeIndex/index.vue b/pages/homeIndex/index.vue index f49a47f..a3fac46 100644 --- a/pages/homeIndex/index.vue +++ b/pages/homeIndex/index.vue @@ -333,7 +333,7 @@ .navIcon { position: relative; - width: 84px; + width: 80px; height: 50px; } diff --git a/pages/messageList/index.vue b/pages/messageList/index.vue index 6ee0630..a8818f1 100644 --- a/pages/messageList/index.vue +++ b/pages/messageList/index.vue @@ -12,11 +12,11 @@ 开始时间 - {{startTime}} + {{startTime}} 结束时间 - {{endTime}} + {{endTime}} 搜索 diff --git a/pages/mypage/compents/wtcl/index.vue b/pages/mypage/compents/wtcl/index.vue index c1f1f83..d984de1 100644 --- a/pages/mypage/compents/wtcl/index.vue +++ b/pages/mypage/compents/wtcl/index.vue @@ -11,11 +11,11 @@ 开始时间 - {{startTime}} + {{startTime}} 结束时间 - {{endTime}} + {{endTime}} 搜索 diff --git a/pages/mypage/compents/wxyh/index.vue b/pages/mypage/compents/wxyh/index.vue index b474225..efd3374 100644 --- a/pages/mypage/compents/wxyh/index.vue +++ b/pages/mypage/compents/wxyh/index.vue @@ -9,11 +9,11 @@ 开始时间 - {{startTime}} + {{startTime}} 结束时间 - {{endTime}} + {{endTime}} 搜索 diff --git a/pages/mypage/compents/xcrw/index.vue b/pages/mypage/compents/xcrw/index.vue index 75de26a..5ba96f6 100644 --- a/pages/mypage/compents/xcrw/index.vue +++ b/pages/mypage/compents/xcrw/index.vue @@ -9,11 +9,11 @@ 开始时间 - {{stm}} + {{stm}} 结束时间 - {{etm}} + {{etm}} 搜索 diff --git a/pages/rainDetail/jcsj/jcsj.vue b/pages/rainDetail/jcsj/jcsj.vue index e94d4ed..f3383de 100644 --- a/pages/rainDetail/jcsj/jcsj.vue +++ b/pages/rainDetail/jcsj/jcsj.vue @@ -3,11 +3,11 @@ 开始时间 - {{stm}} + {{stm}} 结束时间 - {{etm}} + {{etm}} 搜索 diff --git a/pages/skDetail/jcsj/jcsj.vue b/pages/skDetail/jcsj/jcsj.vue index 06d7087..516c11b 100644 --- a/pages/skDetail/jcsj/jcsj.vue +++ b/pages/skDetail/jcsj/jcsj.vue @@ -3,11 +3,11 @@ 开始时间 - {{stm}} + {{stm}} 结束时间 - {{etm}} + {{etm}} 搜索 diff --git a/pages/skDetail/zrtx/card.vue b/pages/skDetail/zrtx/card.vue index 7a1e407..3d4d6da 100644 --- a/pages/skDetail/zrtx/card.vue +++ b/pages/skDetail/zrtx/card.vue @@ -21,7 +21,7 @@ {{info.personName}} - {{info.orgName}} + {{info.orgName}} {{info.position}} {{info.tel}} @@ -102,7 +102,7 @@ .zrtx-box{ border: 1px solid #c1f2ce; border-radius: 2px; - padding:10px 10px 5px 10px; + padding:10px 5px 12px 5px; background-color: #ebfbef; margin-bottom: 10px; .table_div { @@ -128,7 +128,7 @@ } .table_cur tr { display: flex; - line-height: 65rpx; + // line-height: 65rpx; } .table_cur th { height: 65rpx; diff --git a/pages/skInfo/detail/basicInfo.vue b/pages/skInfo/detail/basicInfo.vue index e47c78a..1c83ff6 100644 --- a/pages/skInfo/detail/basicInfo.vue +++ b/pages/skInfo/detail/basicInfo.vue @@ -7,11 +7,11 @@ - + - {{item.name}} + {{item.name}} {{item.value||"-"}} @@ -118,27 +118,31 @@ export default { padding: 5px; margin: 5px 0; } - .project-des{ - display: flex; - flex-wrap: wrap; - border: 1px solid #f2f2f2; - background-color: #ffffff; - padding: 0 10px; - .circle-dot{ - width: 10px; - height: 10px; - border-radius: 50%; - background-color: #409eff; - margin-left: 10px; - } - .label-name{ - display: flex; - flex-direction: column; - align-items: center; - - flex:1 - } + .project-des { + display: flex; + flex-wrap: wrap; + border: 1px solid #f2f2f2; + background-color: #ffffff; + padding: 0 10px; + max-height: calc(100vh - 190px); + overflow: auto; + + .circle-dot { + width: 10px; + height: 10px; + border-radius: 50%; + background-color: #409eff; + margin-left: 10px; } + + .label-name { + display: flex; + flex-direction: column; + align-items: center; + + flex: 1 + } + } } .total-des{ margin-top: 10px; diff --git a/pages/skInfo/detail/jcxx.vue b/pages/skInfo/detail/jcxx.vue index 1c8c48a..39abb8c 100644 --- a/pages/skInfo/detail/jcxx.vue +++ b/pages/skInfo/detail/jcxx.vue @@ -16,7 +16,7 @@ 水位 - {{info.nowCap}}米 + {{info.nowCap}}万m³ 蓄水量 @@ -28,7 +28,7 @@ 坝顶高程{{info.crestElev}}米 汛限水位{{info.flLowLimLev}}米 - 总库容{{info.totCap}}米 + 总库容{{info.totCap}}万m³ @@ -55,11 +55,11 @@ 开始时间 - {{stm}} + {{stm}} 结束时间 - {{etm}} + {{etm}} 搜索 diff --git a/pages/skInfo/detail/krqx/index.vue b/pages/skInfo/detail/krqx/index.vue index c9955a2..066c03e 100644 --- a/pages/skInfo/detail/krqx/index.vue +++ b/pages/skInfo/detail/krqx/index.vue @@ -28,7 +28,9 @@ export default { async getKrData(){ try { const {data} = await uni.$http.post( - "/gunshiApp/xyt/stZvarlB/list") + "/gunshiApp/xyt/stZvarlB/list",{ + stcd:"716164061" + }) if(data.code == 200){ this.tableData = [...data.data]; diff --git a/pages/skInfo/detail/tzcs.vue b/pages/skInfo/detail/tzcs.vue index fe4f9e5..a655c48 100644 --- a/pages/skInfo/detail/tzcs.vue +++ b/pages/skInfo/detail/tzcs.vue @@ -1,6 +1,6 @@