diff --git a/src/icons/svg/well-common.svg b/src/icons/svg/well-common.svg new file mode 100644 index 0000000..2b8c12d --- /dev/null +++ b/src/icons/svg/well-common.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/icons/svg/well-common.svg b/src/icons/svg/well-common.svg new file mode 100644 index 0000000..2b8c12d --- /dev/null +++ b/src/icons/svg/well-common.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue index 07ff6bf..b44ac7e 100644 --- a/src/views/overview/overview.vue +++ b/src/views/overview/overview.vue @@ -190,6 +190,7 @@ '6': 'well-heat', '7': 'well-sewage' }, // 井类型图标字典 + otherIcon: 'well-common', center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心 zoom: 12, // 地图缩放比例 markers: [], // 井列表标注marker @@ -372,7 +373,7 @@ wellType: well.wellType, deptid: well.deptid, bfzt: well.bfzt, - icon: this.icons[well.wellType], + icon: this.icons[well.wellType] ? this.icons[well.wellType] : this.otherIcon, visible: true, wellStatus: 'alarm' }) @@ -396,7 +397,7 @@ wellType: well.wellType, deptid: well.deptid, bfzt: well.bfzt, - icon: this.icons[well.wellType], + icon: this.icons[well.wellType] ? this.icons[well.wellType] : this.otherIcon, visible: true, wellStatus: 'normal' }) diff --git a/src/icons/svg/well-common.svg b/src/icons/svg/well-common.svg new file mode 100644 index 0000000..2b8c12d --- /dev/null +++ b/src/icons/svg/well-common.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/views/overview/overview.vue b/src/views/overview/overview.vue index 07ff6bf..b44ac7e 100644 --- a/src/views/overview/overview.vue +++ b/src/views/overview/overview.vue @@ -190,6 +190,7 @@ '6': 'well-heat', '7': 'well-sewage' }, // 井类型图标字典 + otherIcon: 'well-common', center: [this.$store.getters.lng, this.$store.getters.lat], // 地图中心 zoom: 12, // 地图缩放比例 markers: [], // 井列表标注marker @@ -372,7 +373,7 @@ wellType: well.wellType, deptid: well.deptid, bfzt: well.bfzt, - icon: this.icons[well.wellType], + icon: this.icons[well.wellType] ? this.icons[well.wellType] : this.otherIcon, visible: true, wellStatus: 'alarm' }) @@ -396,7 +397,7 @@ wellType: well.wellType, deptid: well.deptid, bfzt: well.bfzt, - icon: this.icons[well.wellType], + icon: this.icons[well.wellType] ? this.icons[well.wellType] : this.otherIcon, visible: true, wellStatus: 'normal' }) diff --git a/src/views/system/user/editUser.vue b/src/views/system/user/editUser.vue index f86360f..27bb14a 100644 --- a/src/views/system/user/editUser.vue +++ b/src/views/system/user/editUser.vue @@ -4,7 +4,7 @@ - + @@ -33,6 +33,7 @@ value-format="yyyy-MM-dd" placeholder="选择日期" style="width:100%" + autocomplete="off" /> @@ -40,12 +41,12 @@ - + - + @@ -60,7 +61,7 @@ - + @@ -185,7 +186,8 @@ message: '请输入正确的手机号', trigger: ['blur', 'change'] }] }, // 前端校验规则 - roleName: '' + roleName: '', + deptShow: true } }, computed: {