From d7d1ef08f112f0a289f205b5fcf5af764aaf36cf Mon Sep 17 00:00:00 2001 From: "3321822538@qq.com" <3321822538@qq.com> Date: Wed, 5 Jun 2024 09:24:17 +0800 Subject: [PATCH] aaa --- pages/ditu/index.vue | 115 +++++-- pages/fengxiang/index.vue | 82 +++-- pagesFengXiang/pages/addfengxiang/index.vue | 313 ++++++++++-------- .../pages/fengxiang-yujin/index.vue | 4 +- .../pages/fengxiangDetail/index.vue | 4 +- 5 files changed, 321 insertions(+), 197 deletions(-) diff --git a/pages/ditu/index.vue b/pages/ditu/index.vue index c2b0699..8128fd5 100644 --- a/pages/ditu/index.vue +++ b/pages/ditu/index.vue @@ -23,20 +23,20 @@ fengchangNumber: 0, fengxiangNumber: 0, listData: [], - latitude: '27.105794', - longitude: '120.256882', + latitude: '', + longitude: '', isMap: false, zoomSize: 15, fclist: [], markers: [ - // { - // latitude:27.105794, - // longitude:120.256882, - // width: 20, - // height: 30, - // id: 0, - // iconPath: '../../static/dwicon.png', - // } + { + // latitude:27.105794, + // longitude:120.256882, + // width: 20, + // height: 30, + // id: 0, + // iconPath: '../../static/aa1.png', + } ], } }, @@ -62,11 +62,30 @@ width: 25, height: 25, id: item.id, - iconPath: '../../static/蜂场.png ', + iconPath: '../../static/蜂场.png', label: { content: item.name, - textAlign:'center', - fontSize:14 + fontSize:14, + anchorX: (() => { + if (item.name.length <= 2) { + return -12 + } else if (item.name.length <= 3) { + return -20 + } else if (item.name.length <= 4) { + return -25 + } else if (item.name.length <= 5) { + return -30 + } else if (item.name.length <= 6) { + return -35 + } else if (item.name.length <= 8) { + return -40 + } else if (item.name.length <= + 10) { + return -45 + } else { + return -item.name.length * 5 + } + })(), }, }) }) @@ -91,7 +110,26 @@ iconPath: '../../static/a11.png', label: { content: item.name, - textAlign:'center' + anchorX: (() => { + if (item.name.length <= 2) { + return -12 + } else if (item.name.length <= 3) { + return -20 + } else if (item.name.length <= 4) { + return -25 + } else if (item.name.length <= 5) { + return -30 + } else if (item.name.length <= 6) { + return -35 + } else if (item.name.length <= 8) { + return -40 + } else if (item.name.length <= + 10) { + return -45 + } else { + return -item.name.length * 5 + } + })(), } }) } else { @@ -104,7 +142,26 @@ iconPath: '../../static/a22.png', label: { content: item.name, - textAlign:'center' + anchorX: (() => { + if (item.name.length <= 2) { + return -12 + } else if (item.name.length <= 3) { + return -20 + } else if (item.name.length <= 4) { + return -25 + } else if (item.name.length <= 5) { + return -30 + } else if (item.name.length <= 6) { + return -35 + } else if (item.name.length <= 8) { + return -40 + } else if (item.name.length <= + 10) { + return -45 + } else { + return -item.name.length * 5 + } + })(), } }) } @@ -125,12 +182,32 @@ this.markers.push({ latitude, longitude, - width: 20, - height: 30, + width: 1, + height: 1, id: 0, + iconPath:'', customCallout: { - anchorY: -5, - anchorX: 5, + // anchorY: -5, + anchorX: (() => { + if (item.name.length <= 2) { + return -12 + } else if (item.name.length <= 3) { + return -20 + } else if (item.name.length <= 4) { + return -25 + } else if (item.name.length <= 5) { + return -30 + } else if (item.name.length <= 6) { + return -35 + } else if (item.name.length <= 8) { + return -40 + } else if (item.name.length <= + 10) { + return -45 + } else { + return -item.name.length * 5 + } + })(), display: 'BYCLICK' } }) diff --git a/pages/fengxiang/index.vue b/pages/fengxiang/index.vue index 3d65d85..552f41a 100644 --- a/pages/fengxiang/index.vue +++ b/pages/fengxiang/index.vue @@ -40,24 +40,24 @@ - {{item.name}} + {{item.name}} - {{item.status_text}} + {{item.status_text}} - - - - - - @@ -145,12 +145,12 @@ 箱内 - {{item.temperature_in_box}} + {{item.temperature_in_box.substring(0, 3) < -40 || item.temperature_in_box.substring(0, 3) > 100 ? '--' : item.temperature_in_box}} 箱内 - {{item.humidity_in_box}} + {{item.temperature_in_box.substring(0, 3) < -40 || item.temperature_in_box.substring(0, 3) > 100? '--' : item.humidity_in_box}} @@ -166,12 +166,12 @@ 箱外 - {{item.temperature_out_box}} + {{item.temperature_out_box.substring(0, 3) < -40 || item.temperature_out_box.substring(0, 3) > 100 ? '--' : item.temperature_in_box}} 箱外 - {{item.humidity_out_box}} + {{item.temperature_out_box.substring(0, 3) < -40 || item.temperature_out_box.substring(0, 3) > 100 ? '--' :item.humidity_out_box}} @@ -187,9 +187,9 @@ 加热 - + :color="'#3a942b'" style="transform:scale(0.5)"/> @@ -760,6 +760,13 @@ }, // 跳转详情页 + detilsq(item) { + console.log(item); + // this.HiddenClick(item) + uni.navigateTo({ + url: `/pagesFengXiang/pages/fengxiangDetail/index?id=${item.id}` + }) + }, detils(item) { console.log(item); this.HiddenClick(item) @@ -767,9 +774,14 @@ url: `/pagesFengXiang/pages/fengxiangDetail/index?id=${item.id}` }) }, + addyujings(item) { + // this.HiddenClick(item) + uni.navigateTo({ + url: '/pagesFengXiang/pages/index?id=' + item.id + '&qrcode=' + item.qrcode + }) + }, addyujing(item) { this.HiddenClick(item) - console.log(item); uni.navigateTo({ url: '/pagesFengXiang/pages/index?id=' + item.id + '&qrcode=' + item.qrcode }) @@ -801,7 +813,7 @@ /deep/ .u-popup__content { width: 750rpx; } - + .shuaxin { width: 32rpx; height: 32rpx; @@ -1052,11 +1064,11 @@ } .flex-taxt2 { - margin-top: 10rpx; + margin-top: 20rpx; } .flex-taxt3 { - margin-top: 14rpx; + margin-top: 20rpx; } .padding-box { @@ -1099,14 +1111,14 @@ } .page { - height: 100%; - width: 100%; + // height: 100%; + // width: 100%; // position: absolute; background-color: #f7f7f7; width: 100%; overflow-y: auto; - overflow-x: hidden; - height: 100%; + overflow-x: hidden; + height: 100vh; } .font_2 { @@ -1265,18 +1277,27 @@ } .image_15 { - width: 31rpx; + width: 28rpx; height: 32rpx; + vertical-align: middle; + padding-bottom: 6rpx; + box-sizing: border-box; } .image_16 { - width: 22rpx; + width: 20rpx; height: 32rpx; + vertical-align: middle; + padding-bottom: 5rpx; + box-sizing: border-box; } .image_17 { - width: 23rpx; + width: 21rpx; height: 32rpx; + vertical-align: middle; + padding-bottom: 6rpx; + box-sizing: border-box; } .font_5 { @@ -1329,8 +1350,11 @@ } .image_19 { - width: 24rpx; + width: 22rpx; height: 32rpx; + vertical-align: middle; + padding-bottom: 6rpx; + box-sizing: border-box; } .image_20 { @@ -1343,6 +1367,7 @@ border-radius: 16rpx; width: 65rpx; height: 35rpx; + vertical-align: top; } .view_5 { @@ -1356,8 +1381,9 @@ } .image_21 { - width: 28rpx; - height: 28rpx; + width: 26rpx; + height: 26rpx; + vertical-align: middle; } .text_15 { diff --git a/pagesFengXiang/pages/addfengxiang/index.vue b/pagesFengXiang/pages/addfengxiang/index.vue index 05f03ab..b5116d4 100644 --- a/pagesFengXiang/pages/addfengxiang/index.vue +++ b/pagesFengXiang/pages/addfengxiang/index.vue @@ -1,171 +1,192 @@ \ No newline at end of file diff --git a/pagesFengXiang/pages/fengxiang-yujin/index.vue b/pagesFengXiang/pages/fengxiang-yujin/index.vue index 94b9581..b96f81a 100644 --- a/pagesFengXiang/pages/fengxiang-yujin/index.vue +++ b/pagesFengXiang/pages/fengxiang-yujin/index.vue @@ -66,9 +66,9 @@ - + diff --git a/pagesFengXiang/pages/fengxiangDetail/index.vue b/pagesFengXiang/pages/fengxiangDetail/index.vue index 8ce2f56..586b84f 100644 --- a/pagesFengXiang/pages/fengxiangDetail/index.vue +++ b/pagesFengXiang/pages/fengxiangDetail/index.vue @@ -11,7 +11,7 @@ {{listdata.name}} + :id="listdata.status_text == '在线' ? 'text-wrapper-bgc1' : 'text-wrapper-bgc2'"> {{listdata.status_text}} @@ -35,7 +35,7 @@ {{listdata.qrcode}} - 丨 {{listdata.create_time}}更新 + 丨 {{listdata.update_time}}更新 丨 {{listdata.address}}