diff --git a/pages/investigation/task.vue b/pages/investigation/task.vue
index 0111a71..36d676d 100644
--- a/pages/investigation/task.vue
+++ b/pages/investigation/task.vue
@@ -222,17 +222,25 @@
暂无数据
-
+
+ 事故分布
+
+
+
重点排查
-
+
{{ item.name }}
-
+
+
@@ -244,15 +252,15 @@
-
+
{{ indexData + 1 }}.
{{ itemData.length > 0 ? itemData[0].nname : '' }}
+ activeColor="#2663BF" :name="item.id" @click="showInvestigationTag2(item)"
+ style="padding: 8px 12px;">
-
+
@@ -329,8 +337,8 @@
{{ item.hdTermName||item.dangerProblem }}
-
+
[]);
+ const array = Array.from({
+ length: this.investigationSelectList.length
+ }, (_, i) => []);
let nidname = this.investigationSelectList.length > 0 ? this.investigationSelectList[0].name : ''
let nx = 0
this.troubleshootingData.map(r => {
this.investigationSelectList.map(m => {
- if(r.nid == m.nid) {
+ if (r.nid == m.nid) {
r.nname = m.name
- if(r.nname == nidname){
+ if (r.nname == nidname) {
array[nx].push(r)
} else {
nidname = r.nname
@@ -778,6 +794,70 @@
}
},
methods: {
+ // 确认授权后，获取用户位置
+ getLocationInfo() {
+ uni.getLocation({
+ type: "wgs84",
+ success: (res) => {
+ console.log(res);
+ const coord = wgs84LL2gcjLL2(res.longitude, res.latitude);
+ this.longitude = coord[0]; //118.787575;
+ this.latitude = coord[1]; //32.05024;
+ // this.longitude = 120.38771;
+ // this.latitude = 36.110146;
+
+ },
+ });
+ },
+ getSystemInfo() {
+ // #ifdef APP-PLUS
+ // 在 App 端执行的代码
+ // 获取系统信息
+ uni.getSystemInfo({
+ success: function (res) {
+ // 判断运行环境是否为 App
+ // if (res.platform === 'android' || res.platform === 'ios') {
+ // 在 App 端执行获取定位信息的逻辑
+ uni.getLocation({
+ success: function (locationRes) {
+ console.log('已获取定位信息', locationRes);
+ // 在这里处理定位成功的逻辑
+ },
+ fail: function (error) {
+ console.error('获取定位信息失败', error);
+ if (error.errMsg.indexOf('auth deny') !== -1) {
+ // 用户拒绝授权定位权限，可以引导用户打开权限设置页面
+ uni.showModal({
+ title: '提示',
+ content: '请授权使用您的定位服务',
+ confirmText: '去授权',
+ success: function (modalRes) {
+ if (modalRes.confirm) {
+ uni.openSetting({
+ success: (settingRes) => {
+ console.log('openSetting success', settingRes.authSetting);
+ // 在这里可以处理打开设置页面后的逻辑
+ this.getLocationInfo();
+ },
+ fail: (settingError) => {
+ console.log('openSetting fail', settingError);
+ // 打开设置页面失败的处理逻辑
+ }
+ });
+ }
+ }
+ });
+ }
+ }
+ });
+ // } else {
+ // console.log('当前不在 App 环境中');
+ // // 在非 App 环境中的处理逻辑
+ // }
+ }
+ });
+ // #endif
+ },
showInvestigationTag(v) {
console.log(v)
this.showInvestigation2 = true;
@@ -1389,19 +1469,19 @@
}
},
bottomButtonTwo() {
- if(!this.formData.roadType){
+ if (!this.formData.roadType) {
return this.$.toast("请输入道路类型");
}
- if(!this.formData.roadWidth){
+ if (!this.formData.roadWidth) {
return this.$.toast("请输入道路宽度");
}
- if(!this.formData.laneCount){
+ if (!this.formData.laneCount) {
return this.$.toast("请输入车道数");
}
- if(!this.formData.designSpeed){
+ if (!this.formData.designSpeed) {
return this.$.toast("请输入设计时速");
}
- if(!this.formData.limitSpeed){
+ if (!this.formData.limitSpeed) {
return this.$.toast("请输入限速");
}
this.isEdit = false;
@@ -1658,14 +1738,14 @@
onLongPressZD(item) {
this.nidZD = item.nid
},
- delZD(){
+ delZD() {
this.troubleshootingData = this.troubleshootingData.filter(r => {
- if(r.nid != this.nidZD){
+ if (r.nid != this.nidZD) {
return r
}
})
this.investigationSelectList = this.investigationSelectList.filter(r => {
- if(r.nid != this.nidZD){
+ if (r.nid != this.nidZD) {
return r
}
})
@@ -1674,9 +1754,9 @@
onLongPressYH(item) {
this.nidYH = item.nid
},
- delYH(){
+ delYH() {
this.hiddenDangerList = this.hiddenDangerList.filter(r => {
- if(r.nid != this.nidYH){
+ if (r.nid != this.nidYH) {
return r
}
})
@@ -2029,7 +2109,7 @@
.label-box2 {
height: 100rpx;
-
+
}