diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue index 62477c9..58a4a29 100644 --- a/src/views/overview/overviewAmap.vue +++ b/src/views/overview/overviewAmap.vue @@ -10,7 +10,7 @@ -
+
{{ index+1 }} @@ -70,9 +70,11 @@ wellOffset: [-8, -16], // 井偏移量 massMarkerUrl: './static/overview/icon-location-small.png', massMarkerSize: [15, 15], - massMarkerOffset: [8, 8], + massMarkerOffset: [8, 15], + massMarkerWindowOffset: [0, -15], searchResultSize: [24, 30], searchResultOffset: [-12, -30], + searchResultWindowOffset: [0, -30], searchResultIcon: require('@/assets/overview/pure-position-icon.png'), // 报警图标 showAlarm: true, // 是否显示报警 toolShow: false, // 工具栏是否显示 @@ -243,7 +245,7 @@ // 点击搜索结果项居中,弹窗 searchItemClick(marker) { this.center = marker.lnglat - this.openInfoWindow(marker.id, marker.lnglat, this.searchResultOffset[1]) + this.openInfoWindow(marker.id, marker.lnglat, this.searchResultWindowOffset) }, // 过滤海量点,给markers赋visible值 filterMassMarker(listQuery, showMessage = false) { @@ -342,7 +344,7 @@ }, // 初始化海量点,并不复制 initMassMarker() { - const { map, massMarkerUrl, massMarkerSize, massMarkerOffset } = this + const { map, massMarkerUrl, massMarkerSize, massMarkerOffset, massMarkerWindowOffset } = this this.firstAmount = false // 海量点样式 const style = { url: massMarkerUrl, anchor: toPixel(massMarkerOffset), size: toSize(massMarkerSize) } @@ -357,7 +359,7 @@ this.massMarks.setMap(map) // 点击弹窗 this.massMarks.on('click', e => { - this.openInfoWindow(e.data.id, e.data.lnglat, -massMarkerOffset[1]) + this.openInfoWindow(e.data.id, e.data.lnglat, massMarkerWindowOffset) }) console.log('初始化海量点完毕') }, @@ -561,7 +563,7 @@ * @param coordinates 弹窗位置: [经度,纬度] * @param offsetY 弹窗Y轴偏移,为负值 */ - openInfoWindow(wellId, coordinates, offsetY) { + openInfoWindow(wellId, coordinates, offset) { this.clearInfoWindow() // 首先获取井详情 getWellInfo(wellId).then(response => { @@ -574,7 +576,7 @@ const wellWindow = new WellInfo().$mount() const infoWindow = new window.AMap.InfoWindow({ content: wellWindow.$el, // 显示内容 - offset: [8, offsetY], // 偏移 + offset: offset, // 偏移 autoMove: true // 是否自动调整窗体到视野内 }) infoWindow.open(this.map, new toLngLat(coordinates)) diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue index 62477c9..58a4a29 100644 --- a/src/views/overview/overviewAmap.vue +++ b/src/views/overview/overviewAmap.vue @@ -10,7 +10,7 @@ -
+
{{ index+1 }} @@ -70,9 +70,11 @@ wellOffset: [-8, -16], // 井偏移量 massMarkerUrl: './static/overview/icon-location-small.png', massMarkerSize: [15, 15], - massMarkerOffset: [8, 8], + massMarkerOffset: [8, 15], + massMarkerWindowOffset: [0, -15], searchResultSize: [24, 30], searchResultOffset: [-12, -30], + searchResultWindowOffset: [0, -30], searchResultIcon: require('@/assets/overview/pure-position-icon.png'), // 报警图标 showAlarm: true, // 是否显示报警 toolShow: false, // 工具栏是否显示 @@ -243,7 +245,7 @@ // 点击搜索结果项居中,弹窗 searchItemClick(marker) { this.center = marker.lnglat - this.openInfoWindow(marker.id, marker.lnglat, this.searchResultOffset[1]) + this.openInfoWindow(marker.id, marker.lnglat, this.searchResultWindowOffset) }, // 过滤海量点,给markers赋visible值 filterMassMarker(listQuery, showMessage = false) { @@ -342,7 +344,7 @@ }, // 初始化海量点,并不复制 initMassMarker() { - const { map, massMarkerUrl, massMarkerSize, massMarkerOffset } = this + const { map, massMarkerUrl, massMarkerSize, massMarkerOffset, massMarkerWindowOffset } = this this.firstAmount = false // 海量点样式 const style = { url: massMarkerUrl, anchor: toPixel(massMarkerOffset), size: toSize(massMarkerSize) } @@ -357,7 +359,7 @@ this.massMarks.setMap(map) // 点击弹窗 this.massMarks.on('click', e => { - this.openInfoWindow(e.data.id, e.data.lnglat, -massMarkerOffset[1]) + this.openInfoWindow(e.data.id, e.data.lnglat, massMarkerWindowOffset) }) console.log('初始化海量点完毕') }, @@ -561,7 +563,7 @@ * @param coordinates 弹窗位置: [经度,纬度] * @param offsetY 弹窗Y轴偏移,为负值 */ - openInfoWindow(wellId, coordinates, offsetY) { + openInfoWindow(wellId, coordinates, offset) { this.clearInfoWindow() // 首先获取井详情 getWellInfo(wellId).then(response => { @@ -574,7 +576,7 @@ const wellWindow = new WellInfo().$mount() const infoWindow = new window.AMap.InfoWindow({ content: wellWindow.$el, // 显示内容 - offset: [8, offsetY], // 偏移 + offset: offset, // 偏移 autoMove: true // 是否自动调整窗体到视野内 }) infoWindow.open(this.map, new toLngLat(coordinates)) diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue index 2b75380..9190c91 100644 --- a/src/views/system/area/listArea.vue +++ b/src/views/system/area/listArea.vue @@ -88,7 +88,7 @@ }, computed: { 'showOperate': function() { // 判断是否显示操作列,如果编辑和删除的权限都没有则不显示操作列 - return this.hasPerm('/area/update') || this.hasPerm('/area/delete') + return this.hasPerm('/sys/area/update') || this.hasPerm('/sys/area/delete') } }, created() { diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue index 62477c9..58a4a29 100644 --- a/src/views/overview/overviewAmap.vue +++ b/src/views/overview/overviewAmap.vue @@ -10,7 +10,7 @@ -
+
{{ index+1 }} @@ -70,9 +70,11 @@ wellOffset: [-8, -16], // 井偏移量 massMarkerUrl: './static/overview/icon-location-small.png', massMarkerSize: [15, 15], - massMarkerOffset: [8, 8], + massMarkerOffset: [8, 15], + massMarkerWindowOffset: [0, -15], searchResultSize: [24, 30], searchResultOffset: [-12, -30], + searchResultWindowOffset: [0, -30], searchResultIcon: require('@/assets/overview/pure-position-icon.png'), // 报警图标 showAlarm: true, // 是否显示报警 toolShow: false, // 工具栏是否显示 @@ -243,7 +245,7 @@ // 点击搜索结果项居中,弹窗 searchItemClick(marker) { this.center = marker.lnglat - this.openInfoWindow(marker.id, marker.lnglat, this.searchResultOffset[1]) + this.openInfoWindow(marker.id, marker.lnglat, this.searchResultWindowOffset) }, // 过滤海量点,给markers赋visible值 filterMassMarker(listQuery, showMessage = false) { @@ -342,7 +344,7 @@ }, // 初始化海量点,并不复制 initMassMarker() { - const { map, massMarkerUrl, massMarkerSize, massMarkerOffset } = this + const { map, massMarkerUrl, massMarkerSize, massMarkerOffset, massMarkerWindowOffset } = this this.firstAmount = false // 海量点样式 const style = { url: massMarkerUrl, anchor: toPixel(massMarkerOffset), size: toSize(massMarkerSize) } @@ -357,7 +359,7 @@ this.massMarks.setMap(map) // 点击弹窗 this.massMarks.on('click', e => { - this.openInfoWindow(e.data.id, e.data.lnglat, -massMarkerOffset[1]) + this.openInfoWindow(e.data.id, e.data.lnglat, massMarkerWindowOffset) }) console.log('初始化海量点完毕') }, @@ -561,7 +563,7 @@ * @param coordinates 弹窗位置: [经度,纬度] * @param offsetY 弹窗Y轴偏移,为负值 */ - openInfoWindow(wellId, coordinates, offsetY) { + openInfoWindow(wellId, coordinates, offset) { this.clearInfoWindow() // 首先获取井详情 getWellInfo(wellId).then(response => { @@ -574,7 +576,7 @@ const wellWindow = new WellInfo().$mount() const infoWindow = new window.AMap.InfoWindow({ content: wellWindow.$el, // 显示内容 - offset: [8, offsetY], // 偏移 + offset: offset, // 偏移 autoMove: true // 是否自动调整窗体到视野内 }) infoWindow.open(this.map, new toLngLat(coordinates)) diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue index 2b75380..9190c91 100644 --- a/src/views/system/area/listArea.vue +++ b/src/views/system/area/listArea.vue @@ -88,7 +88,7 @@ }, computed: { 'showOperate': function() { // 判断是否显示操作列,如果编辑和删除的权限都没有则不显示操作列 - return this.hasPerm('/area/update') || this.hasPerm('/area/delete') + return this.hasPerm('/sys/area/update') || this.hasPerm('/sys/area/delete') } }, created() { diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue index aebe0a7..63d9bde 100644 --- a/src/views/system/dept/editDept.vue +++ b/src/views/system/dept/editDept.vue @@ -118,7 +118,7 @@ this.dialogStatus = dialogStatus this.dialogFormVisible = true this.btnLoading = false - this.$refs.deptSelect.fetchPcode() + // this.$refs.deptSelect.fetchPcode() if (dialogStatus === 'create') { // 如果是新增,清除验证 this.resetForm() this.$nextTick(() => { @@ -177,7 +177,7 @@ this.resetForm() this.$nextTick(() => { this.$refs['dataForm'].clearValidate() - this.$refs.deptSelect.fetchPcode() + // this.$refs.deptSelect.fetchPcode() }) }).catch(() => { this.$emit('watchChild') diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue index 62477c9..58a4a29 100644 --- a/src/views/overview/overviewAmap.vue +++ b/src/views/overview/overviewAmap.vue @@ -10,7 +10,7 @@ -
+
{{ index+1 }} @@ -70,9 +70,11 @@ wellOffset: [-8, -16], // 井偏移量 massMarkerUrl: './static/overview/icon-location-small.png', massMarkerSize: [15, 15], - massMarkerOffset: [8, 8], + massMarkerOffset: [8, 15], + massMarkerWindowOffset: [0, -15], searchResultSize: [24, 30], searchResultOffset: [-12, -30], + searchResultWindowOffset: [0, -30], searchResultIcon: require('@/assets/overview/pure-position-icon.png'), // 报警图标 showAlarm: true, // 是否显示报警 toolShow: false, // 工具栏是否显示 @@ -243,7 +245,7 @@ // 点击搜索结果项居中,弹窗 searchItemClick(marker) { this.center = marker.lnglat - this.openInfoWindow(marker.id, marker.lnglat, this.searchResultOffset[1]) + this.openInfoWindow(marker.id, marker.lnglat, this.searchResultWindowOffset) }, // 过滤海量点,给markers赋visible值 filterMassMarker(listQuery, showMessage = false) { @@ -342,7 +344,7 @@ }, // 初始化海量点,并不复制 initMassMarker() { - const { map, massMarkerUrl, massMarkerSize, massMarkerOffset } = this + const { map, massMarkerUrl, massMarkerSize, massMarkerOffset, massMarkerWindowOffset } = this this.firstAmount = false // 海量点样式 const style = { url: massMarkerUrl, anchor: toPixel(massMarkerOffset), size: toSize(massMarkerSize) } @@ -357,7 +359,7 @@ this.massMarks.setMap(map) // 点击弹窗 this.massMarks.on('click', e => { - this.openInfoWindow(e.data.id, e.data.lnglat, -massMarkerOffset[1]) + this.openInfoWindow(e.data.id, e.data.lnglat, massMarkerWindowOffset) }) console.log('初始化海量点完毕') }, @@ -561,7 +563,7 @@ * @param coordinates 弹窗位置: [经度,纬度] * @param offsetY 弹窗Y轴偏移,为负值 */ - openInfoWindow(wellId, coordinates, offsetY) { + openInfoWindow(wellId, coordinates, offset) { this.clearInfoWindow() // 首先获取井详情 getWellInfo(wellId).then(response => { @@ -574,7 +576,7 @@ const wellWindow = new WellInfo().$mount() const infoWindow = new window.AMap.InfoWindow({ content: wellWindow.$el, // 显示内容 - offset: [8, offsetY], // 偏移 + offset: offset, // 偏移 autoMove: true // 是否自动调整窗体到视野内 }) infoWindow.open(this.map, new toLngLat(coordinates)) diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue index 2b75380..9190c91 100644 --- a/src/views/system/area/listArea.vue +++ b/src/views/system/area/listArea.vue @@ -88,7 +88,7 @@ }, computed: { 'showOperate': function() { // 判断是否显示操作列,如果编辑和删除的权限都没有则不显示操作列 - return this.hasPerm('/area/update') || this.hasPerm('/area/delete') + return this.hasPerm('/sys/area/update') || this.hasPerm('/sys/area/delete') } }, created() { diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue index aebe0a7..63d9bde 100644 --- a/src/views/system/dept/editDept.vue +++ b/src/views/system/dept/editDept.vue @@ -118,7 +118,7 @@ this.dialogStatus = dialogStatus this.dialogFormVisible = true this.btnLoading = false - this.$refs.deptSelect.fetchPcode() + // this.$refs.deptSelect.fetchPcode() if (dialogStatus === 'create') { // 如果是新增,清除验证 this.resetForm() this.$nextTick(() => { @@ -177,7 +177,7 @@ this.resetForm() this.$nextTick(() => { this.$refs['dataForm'].clearValidate() - this.$refs.deptSelect.fetchPcode() + // this.$refs.deptSelect.fetchPcode() }) }).catch(() => { this.$emit('watchChild') diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue index 6be2015..6eb218e 100644 --- a/src/views/system/dept/listDept.vue +++ b/src/views/system/dept/listDept.vue @@ -82,7 +82,6 @@ edit(row) { this.dialogStatus = 'update' this.dialogFormVisible = true - console.log('row:' + row) this.$refs.editdept.initDialog(this.dialogStatus, row) }, // 删除 diff --git a/src/views/overview/overviewAmap.vue b/src/views/overview/overviewAmap.vue index 62477c9..58a4a29 100644 --- a/src/views/overview/overviewAmap.vue +++ b/src/views/overview/overviewAmap.vue @@ -10,7 +10,7 @@ -
+
{{ index+1 }} @@ -70,9 +70,11 @@ wellOffset: [-8, -16], // 井偏移量 massMarkerUrl: './static/overview/icon-location-small.png', massMarkerSize: [15, 15], - massMarkerOffset: [8, 8], + massMarkerOffset: [8, 15], + massMarkerWindowOffset: [0, -15], searchResultSize: [24, 30], searchResultOffset: [-12, -30], + searchResultWindowOffset: [0, -30], searchResultIcon: require('@/assets/overview/pure-position-icon.png'), // 报警图标 showAlarm: true, // 是否显示报警 toolShow: false, // 工具栏是否显示 @@ -243,7 +245,7 @@ // 点击搜索结果项居中,弹窗 searchItemClick(marker) { this.center = marker.lnglat - this.openInfoWindow(marker.id, marker.lnglat, this.searchResultOffset[1]) + this.openInfoWindow(marker.id, marker.lnglat, this.searchResultWindowOffset) }, // 过滤海量点,给markers赋visible值 filterMassMarker(listQuery, showMessage = false) { @@ -342,7 +344,7 @@ }, // 初始化海量点,并不复制 initMassMarker() { - const { map, massMarkerUrl, massMarkerSize, massMarkerOffset } = this + const { map, massMarkerUrl, massMarkerSize, massMarkerOffset, massMarkerWindowOffset } = this this.firstAmount = false // 海量点样式 const style = { url: massMarkerUrl, anchor: toPixel(massMarkerOffset), size: toSize(massMarkerSize) } @@ -357,7 +359,7 @@ this.massMarks.setMap(map) // 点击弹窗 this.massMarks.on('click', e => { - this.openInfoWindow(e.data.id, e.data.lnglat, -massMarkerOffset[1]) + this.openInfoWindow(e.data.id, e.data.lnglat, massMarkerWindowOffset) }) console.log('初始化海量点完毕') }, @@ -561,7 +563,7 @@ * @param coordinates 弹窗位置: [经度,纬度] * @param offsetY 弹窗Y轴偏移,为负值 */ - openInfoWindow(wellId, coordinates, offsetY) { + openInfoWindow(wellId, coordinates, offset) { this.clearInfoWindow() // 首先获取井详情 getWellInfo(wellId).then(response => { @@ -574,7 +576,7 @@ const wellWindow = new WellInfo().$mount() const infoWindow = new window.AMap.InfoWindow({ content: wellWindow.$el, // 显示内容 - offset: [8, offsetY], // 偏移 + offset: offset, // 偏移 autoMove: true // 是否自动调整窗体到视野内 }) infoWindow.open(this.map, new toLngLat(coordinates)) diff --git a/src/views/system/area/listArea.vue b/src/views/system/area/listArea.vue index 2b75380..9190c91 100644 --- a/src/views/system/area/listArea.vue +++ b/src/views/system/area/listArea.vue @@ -88,7 +88,7 @@ }, computed: { 'showOperate': function() { // 判断是否显示操作列,如果编辑和删除的权限都没有则不显示操作列 - return this.hasPerm('/area/update') || this.hasPerm('/area/delete') + return this.hasPerm('/sys/area/update') || this.hasPerm('/sys/area/delete') } }, created() { diff --git a/src/views/system/dept/editDept.vue b/src/views/system/dept/editDept.vue index aebe0a7..63d9bde 100644 --- a/src/views/system/dept/editDept.vue +++ b/src/views/system/dept/editDept.vue @@ -118,7 +118,7 @@ this.dialogStatus = dialogStatus this.dialogFormVisible = true this.btnLoading = false - this.$refs.deptSelect.fetchPcode() + // this.$refs.deptSelect.fetchPcode() if (dialogStatus === 'create') { // 如果是新增,清除验证 this.resetForm() this.$nextTick(() => { @@ -177,7 +177,7 @@ this.resetForm() this.$nextTick(() => { this.$refs['dataForm'].clearValidate() - this.$refs.deptSelect.fetchPcode() + // this.$refs.deptSelect.fetchPcode() }) }).catch(() => { this.$emit('watchChild') diff --git a/src/views/system/dept/listDept.vue b/src/views/system/dept/listDept.vue index 6be2015..6eb218e 100644 --- a/src/views/system/dept/listDept.vue +++ b/src/views/system/dept/listDept.vue @@ -82,7 +82,6 @@ edit(row) { this.dialogStatus = 'update' this.dialogFormVisible = true - console.log('row:' + row) this.$refs.editdept.initDialog(this.dialogStatus, row) }, // 删除 diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue index 83e0adb..4aaeace 100644 --- a/src/views/wellManage/editWell.vue +++ b/src/views/wellManage/editWell.vue @@ -75,7 +75,7 @@
- +
@@ -553,11 +553,14 @@ } - +