diff --git a/src/api/notice.js b/src/api/notice.js
index 3eaed4f..24d262b 100644
--- a/src/api/notice.js
+++ b/src/api/notice.js
@@ -7,4 +7,14 @@ export function noticeList(query) {
method: 'get',
params: query
})
-}
\ No newline at end of file
+}
+
+// 通知导出
+export function exportNotice(query) {
+ return request({
+ url: '/system/notice/export',
+ method: 'post',
+ data: query,
+ responseType: 'blob'
+ })
+}
diff --git a/src/views/index.vue b/src/views/index.vue
index 559b9ce..62459c4 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -52,7 +52,7 @@
-
- {{ notice.noticeContent }}
+ {{ notice.noticeTitle }}
diff --git a/src/views/mediaMap/index.vue b/src/views/mediaMap/index.vue
index 9ce7a22..13bc03c 100644
--- a/src/views/mediaMap/index.vue
+++ b/src/views/mediaMap/index.vue
@@ -562,9 +562,7 @@ const calculateDistance = (point1, point2) => {
const lng1 = point1.lng;
const lat1 = point1.lat;
const lng2 = point2.lng;
- const lat2 = point2.lat;
-
- console.log('sdfadsf', point1.lng, point2)
+ const lat2 = point2.lat;
const radLat1 = lat1 * Math.PI / 180.0;
const radLat2 = lat2 * Math.PI / 180.0;
@@ -677,36 +675,43 @@ const addCustomControls = (AMap) => {
// 工具箱测距按钮
const toolRangingBtn = document.createElement('div');
toolRangingBtn.className = 'map-control-btn map-ranging';
- toolRangingBtn.onclick = startRuler;
+ toolRangingBtn.setAttribute('title', '测距');
+ toolRangingBtn.onclick = startRuler;
// 工具箱测面积按钮
const toolMeasureAreaBtn = document.createElement('div');
toolMeasureAreaBtn.className = 'map-control-btn map-measureAreaBtn';
+ toolMeasureAreaBtn.setAttribute('title', '测面积');
toolMeasureAreaBtn.onclick = startMeasureArea;
// 工具箱添加点按钮
const toolPointBtn = document.createElement('div');
toolPointBtn.className = 'map-control-btn map-addPointBtn';
+ toolPointBtn.setAttribute('title', '绘制点');
toolPointBtn.onclick = startDrawMarker;
// 工具箱添加折线按钮
const toolLineBtn = document.createElement('div');
toolLineBtn.className = 'map-control-btn map-addLineBtn';
+ toolLineBtn.setAttribute('title', '绘制折线');
toolLineBtn.onclick = startDrawPolyline;
// 工具箱添加圆按钮
const toolCircleBtn = document.createElement('div');
toolCircleBtn.className = 'map-control-btn map-addCircleBtn';
+ toolCircleBtn.setAttribute('title', '绘制圆');
toolCircleBtn.onclick = startDrawCircle;
// 工具箱添加矩形按钮
const toolRactBtn = document.createElement('div');
toolRactBtn.className = 'map-control-btn map-addRactBtn';
+ toolRactBtn.setAttribute('title', '绘制矩形');
toolRactBtn.onclick = startDrawRectangle;
// 工具箱清除按钮
const toolClearAllBtn = document.createElement('div');
toolClearAllBtn.className = 'map-control-btn map-clearAllBtn';
+ toolClearAllBtn.setAttribute('title', '清除');
toolClearAllBtn.onclick = clearAll;
controlContainer.appendChild(toggle2D3DBtn);
diff --git a/src/views/mediaTool/noticeList.vue b/src/views/mediaTool/noticeList.vue
index eb54369..c79ab87 100644
--- a/src/views/mediaTool/noticeList.vue
+++ b/src/views/mediaTool/noticeList.vue
@@ -9,8 +9,8 @@
-
-
+
@@ -22,30 +22,33 @@
-
+
{{ scope.$index + 1 }}
-
-
-
-
+
+
+ 供应商
+ 媒体库
+
+
+
+
{{ parseTime(scope.row.createTime) }}
- 去处理
+ 去处理
-
+
@@ -55,8 +58,7 @@