From 4584d3fd623357956c92aa5871a296dd2ab547f6 Mon Sep 17 00:00:00 2001 From: dingtalk_umvbsp Date: Mon, 5 Feb 2024 15:21:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A1=E5=9B=AD=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages.js | 1 + pages/home/index.vue | 2 + pages/patrolGarden/abnoReport.vue | 33 ++++ pages/patrolGarden/app.vue | 75 ++++++++ pages/patrolGarden/detail.vue | 166 ++++++++++++++++++ pages/patrolGarden/info.vue | 120 +++++++++++++ pages/patrolGarden/record.vue | 131 ++++++++++++++ router/patrolGarden.js | 55 ++++++ static/patrolGarden/inventory.svg | 1 + static/patrolGarden/point.png | Bin 0 -> 7036 bytes static/patrolGarden/procure.svg | 1 + static/patrolGarden/tour.svg | 1 + uni.scss | 14 +- .../d-form/components/d-form/d-form.vue | 59 ++++--- 14 files changed, 630 insertions(+), 29 deletions(-) create mode 100644 pages/patrolGarden/abnoReport.vue create mode 100644 pages/patrolGarden/app.vue create mode 100644 pages/patrolGarden/detail.vue create mode 100644 pages/patrolGarden/info.vue create mode 100644 pages/patrolGarden/record.vue create mode 100644 router/patrolGarden.js create mode 100644 static/patrolGarden/inventory.svg create mode 100644 static/patrolGarden/point.png create mode 100644 static/patrolGarden/procure.svg create mode 100644 static/patrolGarden/tour.svg diff --git a/pages.js b/pages.js index 7bf1229..46095dc 100644 --- a/pages.js +++ b/pages.js @@ -9,6 +9,7 @@ module.exports = hot((pagesJson)=>{ ...require("./router/massif.js"), ...require('./router/purchase.js'), ...require('./router/stock.js'), + ...require('./router/patrolGarden.js'), ], tabBar:{ color:"#999", diff --git a/pages/home/index.vue b/pages/home/index.vue index b70ec52..a89d498 100644 --- a/pages/home/index.vue +++ b/pages/home/index.vue @@ -286,6 +286,8 @@ + 巡园记录 + diff --git a/pages/patrolGarden/abnoReport.vue b/pages/patrolGarden/abnoReport.vue new file mode 100644 index 0000000..bea2c9f --- /dev/null +++ b/pages/patrolGarden/abnoReport.vue @@ -0,0 +1,33 @@ + + + \ No newline at end of file diff --git a/pages/patrolGarden/app.vue b/pages/patrolGarden/app.vue new file mode 100644 index 0000000..6d57ef5 --- /dev/null +++ b/pages/patrolGarden/app.vue @@ -0,0 +1,75 @@ + + + \ No newline at end of file diff --git a/pages/patrolGarden/detail.vue b/pages/patrolGarden/detail.vue new file mode 100644 index 0000000..6aefe48 --- /dev/null +++ b/pages/patrolGarden/detail.vue @@ -0,0 +1,166 @@ + + + \ No newline at end of file diff --git a/pages/patrolGarden/info.vue b/pages/patrolGarden/info.vue new file mode 100644 index 0000000..22c1684 --- /dev/null +++ b/pages/patrolGarden/info.vue @@ -0,0 +1,120 @@ + + + \ No newline at end of file diff --git a/pages/patrolGarden/record.vue b/pages/patrolGarden/record.vue new file mode 100644 index 0000000..1e98728 --- /dev/null +++ b/pages/patrolGarden/record.vue @@ -0,0 +1,131 @@ + + + \ No newline at end of file diff --git a/router/patrolGarden.js b/router/patrolGarden.js new file mode 100644 index 0000000..6aef537 --- /dev/null +++ b/router/patrolGarden.js @@ -0,0 +1,55 @@ +module.exports=[ + { + path:"pages/patrolGarden/record", + style:{ + navigationBarTitleText:"巡园记录", + "app-plus":{ + titleNView:false + } + } + }, + { + path:"pages/patrolGarden/detail", + style:{ + navigationBarTitleText:"巡园详情", + navigationBarBackgroundColor:"#10C176", + navigationBarTextStyle:"white", + "app-plus":{ + "titleNView":true + } + } + }, + { + path:"pages/patrolGarden/info", + style:{ + navigationBarTitleText:"巡园信息", + navigationBarBackgroundColor:"#10C176", + navigationBarTextStyle:"white", + "app-plus":{ + "titleNView":true + } + } + }, + { + path:"pages/patrolGarden/app", + style:{ + navigationBarTitleText:"巡园应用", + navigationBarBackgroundColor:"#10C176", + navigationBarTextStyle:"white", + "app-plus":{ + "titleNView":true + } + } + }, + { + path:"pages/patrolGarden/abnoReport", + style:{ + navigationBarTitleText:"异常上报", + navigationBarBackgroundColor:"#10C176", + navigationBarTextStyle:"white", + "app-plus":{ + "titleNView":true + } + } + }, +] \ No newline at end of file diff --git a/static/patrolGarden/inventory.svg b/static/patrolGarden/inventory.svg new file mode 100644 index 0000000..d24ed3f --- /dev/null +++ b/static/patrolGarden/inventory.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/patrolGarden/point.png b/static/patrolGarden/point.png new file mode 100644 index 0000000000000000000000000000000000000000..289dac338f365cd10587949cc133aa6e4328d420 GIT binary patch literal 7036 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%0DjmF2Stnu)=)fd?e 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 Y@sGwUV)Ggn^f(QmrmU^hpkN*TKR-lPVgLXD literal 0 HcmV?d00001 diff --git a/static/patrolGarden/procure.svg b/static/patrolGarden/procure.svg new file mode 100644 index 0000000..23f7806 --- /dev/null +++ b/static/patrolGarden/procure.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/static/patrolGarden/tour.svg b/static/patrolGarden/tour.svg new file mode 100644 index 0000000..78fb280 --- /dev/null +++ b/static/patrolGarden/tour.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/uni.scss b/uni.scss index 7b67f09..c93d1d5 100644 --- a/uni.scss +++ b/uni.scss @@ -88,9 +88,9 @@ $uni-font-size-paragraph:15px; .card{ background:#fff; - border-radius: 12px; - margin:15px; - padding:15px; + border-radius: 16rpx; + margin:30rpx; + padding:30rpx; box-shadow: 0 3px 6px 1px rgba(0,0,0,0.1); &>.title{ color:#333; @@ -117,7 +117,13 @@ view{ overflow: hidden; white-space: nowrap; } - +.doubleLine{ + word-break: break-all; + overflow: hidden; + display: -webkit-box; + -webkit-line-clamp: var(--n,2); + -webkit-box-orient: vertical; +} // .u-navbar{ // height:calc(var(--status-bar-height) + 44px); // margin-bottom:15px; diff --git a/uni_modules/d-form/components/d-form/d-form.vue b/uni_modules/d-form/components/d-form/d-form.vue index b413533..8de466e 100644 --- a/uni_modules/d-form/components/d-form/d-form.vue +++ b/uni_modules/d-form/components/d-form/d-form.vue @@ -20,13 +20,13 @@ margin-left:30rpx; } } - .map,.u-input,textarea{ + .u-input,textarea{ background:#F7F7F7; margin-top:14rpx; border-radius: 24rpx; width:100%; } - .map,.navigate{ + .navigate{ height:80rpx; display:flex; align-items: center; @@ -39,6 +39,12 @@ color:#999; } } + map{ + margin-top:10rpx; + border-radius: 10rpx; + width:100%; + height:320rpx; + } textarea{ height:auto; min-height:160rpx; @@ -263,26 +269,6 @@ } } } - .amap{ - position:fixed; - top:0; - left:0; - width:100%; - height:100%; - z-index: -1; - background:rgba(0, 0, 0, 0.4); - &.show{ - z-index: 100; - map{ - top:0; - } - } - map{ - top:100%; - width:100%; - height:100%; - } - } .select-tab-input{ position:absolute; bottom:0; @@ -313,7 +299,8 @@ - {{value.length>0?Object.values(value[0]).join():"选择经纬度"}} + + {{pickerContent}} {{value||placeholder||`请选择${labelName}`}} @@ -393,9 +380,9 @@ - + @@ -535,6 +522,8 @@ import {computeArea} from '@/common/utils' pickerChangeVal:null, dictCodeList:[], + points:[], + amap:null, } }, watch:{ @@ -598,6 +587,23 @@ import {computeArea} from '@/common/utils' this.getDictCode() } }, + mounted(){ + if(this.type=='map'){ + this.amap=uni.createMapContext("amap",this).$getAppMap() + this.amap.onclick=e=>{ + this.points=[{ + id:1, + title:"sss", + latitude: e.latitude, + longitude:e.longitude, + iconPath:"/static/patrolGarden/point.png", + width:10, + height:10, + }] + this.$emit('position',e) + } + } + }, methods:{ async getDictCode(){ var res=await request("/common/api/dict/queryDictItemByDictCode",{ @@ -682,6 +688,9 @@ import {computeArea} from '@/common/utils' this.$emit("input",this.filter(e)) } }, + tapMap(e){ + console.log(e,'----e-----') + }, openMap(){ // uni.navigateTo({url:"/plantPages/massif/mapEditor"})