-
+
{{ v.num1 }}
-
{{ v.num2 }}
+
{{ v.num2 }}
{{ v.num3 }}
-
-
-
-
-
-
Notes on Background Response
-
-
- 更新日期：2023-03-31
- 注意事项：
- ~对用户申请进行严格审核
- ~对用户提供灾害经纬度范围进行校正
- ~如响应及时，社交媒体数据的Twitter数据直接实时获取即可
- ~数据导出时需检查是否爬取完毕
- ~如灾害发生期间没有遥感数据，在未来一段时间需及时查询更新
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -79,9 +145,15 @@ import * as echarts from 'echarts';
import { storeToRefs } from 'pinia';
import { useThemeConfig } from '/@/stores/themeConfig';
import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
-import { statistics } from '/@/api/disasterInfo/index.js';
+import {statistics} from '/@/api/disasterInfo/index.js';
// 定义变量内容
+//响应量 发起量
const homeLineRef = ref();
+//访问量和下载量
+const homeVandDRef = ref();
+//上传次数统计
+const homeUploadRef = ref();
+
const homePieRef = ref();
const homePieRef2 = ref();
const homeBarRef = ref();
@@ -90,9 +162,14 @@ const storesThemeConfig = useThemeConfig();
const { themeConfig } = storeToRefs(storesThemeConfig);
const { isTagsViewCurrenFull } = storeToRefs(storesTagsViewRoutes);
const state = reactive({
-
+ param:{
+ year:''
+ },
+ year:new Date,
global: {
homeChartOne: null,
+ homeVandD:null,
+ homeUpload:null,
homeChartTwo: null,
homeCharThree: null,
homeChartFour: null,
@@ -136,104 +213,55 @@ const state = reactive({
color3: '--el-color-danger',
},
],
- homeThree: [
- {
- icon: 'iconfont icon-yangan',
- label: '浅粉红',
- value: '2.1%OBS/M',
- iconColor: '#F72B3F',
- },
- {
- icon: 'iconfont icon-wendu',
- label: '深红(猩红)',
- value: '30℃',
- iconColor: '#91BFF8',
- },
- {
- icon: 'iconfont icon-shidu',
- label: '淡紫红',
- value: '57%RH',
- iconColor: '#88D565',
- },
- {
- icon: 'iconfont icon-shidu',
- label: '弱紫罗兰红',
- value: '107w',
- iconColor: '#88D565',
- },
- {
- icon: 'iconfont icon-zaosheng',
- label: '中紫罗兰红',
- value: '57DB',
- iconColor: '#FBD4A0',
- },
- {
- icon: 'iconfont icon-zaosheng',
- label: '紫罗兰',
- value: '57PV',
- iconColor: '#FBD4A0',
- },
- {
- icon: 'iconfont icon-zaosheng',
- label: '暗紫罗兰',
- value: '517Cpd',
- iconColor: '#FBD4A0',
- },
- {
- icon: 'iconfont icon-zaosheng',
- label: '幽灵白',
- value: '12kg',
- iconColor: '#FBD4A0',
- },
- {
- icon: 'iconfont icon-zaosheng',
- label: '海军蓝',
- value: '64fm',
- iconColor: '#FBD4A0',
- },
- ],
+ homeThree: [],
myCharts: [],
charts: {
theme: '',
bgColor: '',
color: '#303133',
},
+ countryTable:[],
+ typeTable:[]
});
-// 折线图
-const initLineChart = (xData, data) => {
- console.log(xData)
- console.log(data)
+
+// 响应量和发起量
+const initLineChart = (xData,data1, data2) => {
if (!state.global.dispose.some((b) => b === state.global.homeChartOne)) state.global.homeChartOne.dispose();
state.global.homeChartOne = markRaw(echarts.init(homeLineRef.value, state.charts.theme));
const option = {
backgroundColor: state.charts.bgColor,
title: {
- text: 'Annual user application statistics',
+ text: 'Annual user response application statistics',
x: 'left',
textStyle: { fontSize: '15', color: state.charts.color },
},
grid: { top: 70, right: 20, bottom: 30, left: 30 },
tooltip: { trigger: 'axis' },
- legend: { data: ['响应量'], right: 0 },
+ legend: { data: ['response','initiate'], right: 0 },
xAxis: {
- data: xData,
+ data: xData
},
yAxis: [
{
type: 'value',
- name: '响应量',
+ name: 'response',
splitLine: { show: true, lineStyle: { type: 'dashed', color: '#f5f5f5' } },
},
+ {
+ type: 'value',
+ name: 'initiate',
+ splitLine: { show: true, lineStyle: { type: 'dashed', color: '#f5f5f5' } },
+ }
],
series: [
{
- name: '响应量',
+ name: 'response',
type: 'line',
symbolSize: 6,
symbol: 'circle',
smooth: true,
- data: data,
+ data: data1,
lineStyle: { color: '#fe9a8b' },
itemStyle: { color: '#fe9a8b', borderColor: '#fe9a8b' },
areaStyle: {
@@ -242,12 +270,200 @@ const initLineChart = (xData, data) => {
{ offset: 1, color: '#fe9a8b03' },
]),
},
- },
+ },{
+ name: 'initiate',
+ type: 'line',
+ symbolSize: 6,
+ symbol: 'circle',
+ smooth: true,
+ data: data2,
+ lineStyle: { color: '#44c05b' },
+ itemStyle: { color: '#44c05b', borderColor: '#44c05b' },
+ areaStyle: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ { offset: 0, color: '#44c05b' },
+ { offset: 1, color: '#44c05b' },
+ ]),
+ },
+ }
],
};
state.global.homeChartOne.setOption(option);
state.myCharts.push(state.global.homeChartOne);
};
+// 访问量 和下载次数
+const initLineVandDChart = (xData,data1, data2) => {
+ if (!state.global.dispose.some((b) => b === state.global.homeVandD)) state.global.homeVandD.dispose();
+ state.global.homeVandD = markRaw(echarts.init(homeVandDRef.value, state.charts.theme));
+ const option = {
+ backgroundColor: state.charts.bgColor,
+ title: {
+ text: 'Annual disaster type visits and downloads statistics',
+ x: 'left',
+ textStyle: { fontSize: '15', color: state.charts.color },
+ },
+ grid: { top: 70, right: 20, bottom: 30, left: 30 },
+ tooltip: { trigger: 'axis' },
+ legend: { data: ['visit','download'], right: 0 },
+ xAxis: {
+ data: xData,
+ },
+ yAxis: [
+ {
+ type: 'value',
+ name: 'visit',
+ splitLine: { show: true, lineStyle: { type: 'dashed', color: '#f5f5f5' } },
+ },
+ {
+ type: 'value',
+ name: 'download',
+ splitLine: { show: true, lineStyle: { type: 'dashed', color: '#f5f5f5' } },
+ }
+ ],
+ series: [
+ {
+ name: 'visit',
+ type: 'line',
+ symbolSize: 6,
+ symbol: 'circle',
+ smooth: true,
+ data: data2,
+ lineStyle: { color: '#3d91e7' },
+ itemStyle: { color: '#3d91e7', borderColor: '#3d91e7' },
+ areaStyle: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ { offset: 0, color: '#3d91e7' },
+ { offset: 1, color: '#3d91e7' },
+ ]),
+ },
+ },{
+ name: 'download',
+ type: 'line',
+ symbolSize: 6,
+ symbol: 'circle',
+ smooth: true,
+ data: data1,
+ lineStyle: { color: '#e78d3d' },
+ itemStyle: { color: '#e78d3d', borderColor: '#e78d3d' },
+ areaStyle: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ { offset: 0, color: '#e78d3d' },
+ { offset: 1, color: '#e78d3d' },
+ ]),
+ },
+ }
+ ],
+ };
+ state.global.homeVandD.setOption(option);
+ state.myCharts.push(state.global.homeVandD);
+};
+
+// Chief 管理
+const initChiefChart = (xData,yData) => {
+ if (!state.global.dispose.some((b) => b === state.global.homeUpload)) state.global.homeUpload.dispose();
+ state.global.homeUpload = echarts.init(homeUploadRef.value, state.charts.theme);
+ const option = {
+ backgroundColor: state.charts.bgColor,
+ title: {
+ text: 'Annual Chief Management Statistics TOP10',
+ x: 'left',
+ textStyle: { fontSize: '15', color: state.charts.color },
+ },
+ //tooltip: { trigger: 'item', formatter: '{c}' },
+ tooltip: {
+ show:true
+ // trigger: 'axis',
+ // axisPointer: {
+ // type: 'shadow'
+ // },
+ // formatter: '{c}'
+ },
+ legend: { data: ['chief'], right: 0 },
+ grid: { top: 70, right: 80, bottom: 30, left: 80 },
+ xAxis: [
+ {
+ type: 'category',
+ data: xData
+ },
+ ],
+ yAxis: [
+ {
+ type:'value'
+ }
+ ],
+ series: [
+ {
+ name: 'chief',
+ type: 'bar',
+ barWidth: 30,
+ itemStyle: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ { offset: 0, color: '#fe9a8bb3' },
+ { offset: 1, color: '#fe9a8b03' },
+ ]),
+ //柱状图圆角
+ borderRadius: [30, 30, 0, 0],
+ },
+ data: yData
+ }
+ ],
+ };
+ state.global.homeUpload.setOption(option);
+ state.myCharts.push(state.global.homeUpload);
+};
+// administrators 管理
+const initAdministratorsChart = (xData,yData) => {
+ if (!state.global.dispose.some((b) => b === state.global.homeCharThree)) state.global.homeCharThree.dispose();
+ state.global.homeCharThree = echarts.init(homeBarRef.value, state.charts.theme);
+ const option = {
+ backgroundColor: state.charts.bgColor,
+ title: {
+ text: 'Annual Administrators Management Statistics TOP10',
+ x: 'left',
+ textStyle: { fontSize: '15', color: state.charts.color },
+ },
+ tooltip: { trigger: 'item', formatter: '{c}' },
+ legend: { data: ['administrators'], right: 0 },
+ grid: { top: 70, right: 80, bottom: 30, left: 80 },
+ xAxis: [
+ {
+ type: 'category',
+ data: xData,
+ boundaryGap: true,
+ axisTick: { show: false },
+ },
+ ],
+ yAxis: [
+ {
+ nameLocation: 'middle',
+ nameTextStyle: { padding: [50, 4, 5, 6] },
+ splitLine: { show: false },
+ axisLine: { show: false },
+ axisTick: { show: false },
+ axisLabel: { color: state.charts.color, formatter: '{value} ' },
+ },
+ ],
+ series: [
+ {
+ name: 'administrators',
+ type: 'bar',
+ barWidth: 30,
+ yAxisIndex: 0,
+ itemStyle: {
+ color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ { offset: 0, color: 'rgba(108,80,243,0.3)' },
+ { offset: 1, color: 'rgba(108,80,243,0)' },
+ ]),
+ //柱状图圆角
+ borderRadius: [30, 30, 0, 0],
+ },
+ data: yData,
+ },
+ ],
+ };
+ state.global.homeCharThree.setOption(option);
+ state.myCharts.push(state.global.homeCharThree);
+};
//homePieRef 灾害发生区域占比 饼图
const initPieChart = (data) => {
if (!state.global.dispose.some((b) => b === state.global.homeChartTwo)) state.global.homeChartTwo.dispose();
@@ -262,7 +478,7 @@ const initPieChart = (data) => {
const option = {
backgroundColor: state.charts.bgColor,
title: {
- text: 'Proportion of Disaster Occurred Areas',
+ text: 'Proportion of Disaster Occurred Areas TOP15',
x: 'left',
textStyle: { fontSize: '15', color: state.charts.color },
},
@@ -330,7 +546,6 @@ const initPieChart = (data) => {
};
//homePieRef2 灾害类型占比 饼图
const initPieChart2 = (data) => {
- console.log("pie2", data)
if (!state.global.dispose.some((b) => b === state.global.homeChartFour)) state.global.homeChartFour.dispose();
state.global.homeChartFour = markRaw(echarts.init(homePieRef2.value, state.charts.theme));
// var getname = ['房屋及结构物', '专用设备', '通用设备', '文物和陈列品', '图书、档案'];
@@ -365,36 +580,6 @@ const initPieChart2 = (data) => {
},
],
},
- // legend: {
- // type: 'scroll',
- // orient: 'vertical',
- // right: '0%',
- // left: '65%',
- // top: 'center',
- // itemWidth: 14,
- // itemHeight: 14,
- // data: getname,
- // textStyle: {
- // rich: {
- // name: {
- // fontSize: 14,
- // fontWeight: 400,
- // width: 200,
- // height: 35,
- // padding: [0, 0, 0, 60],
- // color: state.charts.color,
- // },
- // rate: {
- // fontSize: 15,
- // fontWeight: 500,
- // height: 35,
- // width: 40,
- // padding: [0, 0, 0, 30],
- // color: state.charts.color,
- // },
- // },
- // },
- // },
series: [
{
type: 'pie',
@@ -409,59 +594,6 @@ const initPieChart2 = (data) => {
state.global.homeChartFour.setOption(option);
state.myCharts.push(state.global.homeChartFour);
};
-// 柱状图
-const initBarChart = (xData, yData) => {
- if (!state.global.dispose.some((b) => b === state.global.homeCharThree)) state.global.homeCharThree.dispose();
- state.global.homeCharThree = echarts.init(homeBarRef.value, state.charts.theme);
- const option = {
- backgroundColor: state.charts.bgColor,
- title: {
- text: 'Disaster response monthly distribution change',
- x: 'left',
- textStyle: { fontSize: '15', color: state.charts.color },
- },
- tooltip: { trigger: 'item', formatter: '{c}' },
- legend: { data: ['申请量'], top: 0 },
- grid: { top: 70, right: 80, bottom: 30, left: 80 },
- xAxis: [
- {
- type: 'category',
- data: xData,
- boundaryGap: true,
- axisTick: { show: false },
- },
- ],
- yAxis: [
- {
- nameLocation: 'middle',
- nameTextStyle: { padding: [50, 4, 5, 6] },
- splitLine: { show: false },
- axisLine: { show: false },
- axisTick: { show: false },
- axisLabel: { color: state.charts.color, formatter: '{value} ' },
- },
- ],
- series: [
- {
- name: '申请量',
- type: 'bar',
- barWidth: 30,
- yAxisIndex: 0,
- itemStyle: {
- color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
- { offset: 0, color: 'rgba(108,80,243,0.3)' },
- { offset: 1, color: 'rgba(108,80,243,0)' },
- ]),
- //柱状图圆角
- borderRadius: [30, 30, 0, 0],
- },
- data: yData,
- },
- ],
- };
- state.global.homeCharThree.setOption(option);
- state.myCharts.push(state.global.homeCharThree);
-};
// 批量设置 echarts resize
const initEchartsResizeFun = () => {
nextTick(() => {
@@ -483,47 +615,63 @@ const setHeadData = (data) => {
state.homeOne[3].num1 = data.downloadCount
}
/**
- * 设置发生区域灾害占比
- * @param data
- */
-const setDisasterArea = (data) => {
- let arr = [];
- for (let [k, v] of Object.entries(data)) {
- arr.push({ name: k, value: v });
- }
- initPieChart(arr);
-}
-/**
- * 设置灾害响应月份分布量
+ * 设置响应量和发起量
* @param data
*/
-const setResponseDisaster = (data) => {
+const setLineChart = (data) => {
let xData = [];
- let yData = [];
- data.forEach(item => {
- for (let [k, v] of Object.entries(item)) {
- xData.push(k);
- yData.push(v.value);
- }
+ //let yData = [];
+ let data1 = [];//initiate
+ let data2 = [];//response
+ data.forEach(item=>{
+ xData.push(item.key)
+ data1.push(item.initiate)
+ data2.push(item.response)
})
- initLineChart(xData, yData);
+ // 响应量和发起量
+ initLineChart(xData,data1,data2);
}
/**
- * 设置灾害申请月份分布量
+ * 设置访问量 和下载次数
* @param data
*/
-const setApplyDisaster = (data) => {
+ const setLineVandDChart = (data) => {
+ let xData = [];
+ let data1 = [];
+ let data2 = [];
+ data.forEach(item=>{
+ xData.push(item.dict_value)
+ data1.push(item.download)
+ data2.push(item.visit)
+ })
+ //访问量 和下载次数
+ initLineVandDChart(xData,data1, data2)
+}
+/**
+ * 管理员管理量
+ * @param data
+ */
+const setAdministratorsChart = (data) => {
let xData = [];
let yData = [];
- data.forEach(item => {
- for (let [k, v] of Object.entries(item)) {
- xData.push(k);
- yData.push(v.value);
- }
+ data.forEach(item=>{
+ xData.push(item.name)
+ yData.push(item.val)
})
- setTimeout(() => {
- initBarChart(xData, yData);
- }, 700);
+ initAdministratorsChart(xData,yData);
+}
+/**
+ * 管理员管理量
+ * @param data
+ */
+ const setChiefChart = (data) => {
+ let xData = [];
+ let yData = [];
+ data.forEach(item=>{
+ xData.push(item.name)
+ yData.push(item.val)
+ })
+ initChiefChart(xData,yData);
}
/**
* 设置灾种数量占比
@@ -531,20 +679,46 @@ const setApplyDisaster = (data) => {
*/
const setDisasterType = (data) => {
let arr = [];
- for (let [k, v] of Object.entries(data)) {
- arr.push({ name: k, value: v });
- }
+ data.forEach(item=>{
+ arr.push({ name: item.name, value: item.val});
+ })
+ // for(let [k , v] of Object.entries(data)){
+ // arr.push({ name: k, value: v});
+
+ // }
+ state.typeTable = arr
initPieChart2(arr)
}
+
+/**
+ * 设置发生区域灾害占比 Proportion of Disaster Occurred Areas TOP15
+ * @param data
+ */
+ const setDisasterArea = (data) => {
+ let arr = [];
+ for(let [k , v] of Object.entries(data)){
+ arr.push({ name: k, value: v});
+ }
+ state.countryTable = arr
+ initPieChart(arr);
+}
//获取控制台数据
const getDashBoradData = () => {
- statistics().then(res => {
+ state.param.year = state.year.getFullYear()
+ statistics(state.param.year).then(res=>{
console.log(res);
+ //第一栏
setHeadData(res.header);
- setDisasterArea(res.country);
- setResponseDisaster(res.responseMonth);
- setApplyDisaster(res.applyMonth);
+ //第二栏
+ setLineChart(res.line)
+ setLineVandDChart(res.vandd);
+ //第三栏
+ setAdministratorsChart(res.admin)
+ setChiefChart(res.chief)
+ //第四栏
setDisasterType(res.disasterNum);
+ //第5栏
+ setDisasterArea(res.country);
})
}
// 批量设置 echarts resize
@@ -575,18 +749,18 @@ watch(
state.charts.theme = isIsDark ? 'dark' : '';
state.charts.bgColor = isIsDark ? 'transparent' : '';
state.charts.color = isIsDark ? '#dadada' : '#303133';
- setTimeout(() => {
- //initLineChart();
- }, 500);
- setTimeout(() => {
- //initPieChart();
- }, 700);
- setTimeout(() => {
- //initPieChart2();
- }, 700);
- setTimeout(() => {
- initBarChart();
- }, 1000);
+ // setTimeout(() => {
+ // //initLineChart();
+ // }, 500);
+ // setTimeout(() => {
+ // //initPieChart();
+ // }, 700);
+ // setTimeout(() => {
+ // //initPieChart2();
+ // }, 700);
+ // setTimeout(() => {
+ // initBarChart();
+ // }, 1000);
});
},
{
@@ -598,103 +772,94 @@ watch(
From c587d3218a1165354fac86efb541b2d856e7b6c5 Mon Sep 17 00:00:00 2001
From: qqGroup0 <253114712@qq.com>
Date: Tue, 25 Apr 2023 10:14:11 +0800
Subject: [PATCH 38/51] =?UTF-8?q?zqq:=E9=81=A5=E6=84=9F=E5=BD=B1=E5=83=8F?=
=?UTF-8?q?=E9=A1=B5=E7=BB=98=E5=88=B6=E7=9F=A9=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Map.vue | 83 +++++++++++++++++++++++++-----------------
1 file changed, 50 insertions(+), 33 deletions(-)
diff --git a/src/components/Map.vue b/src/components/Map.vue
index 6c4740c..69608f1 100644
--- a/src/components/Map.vue
+++ b/src/components/Map.vue
@@ -11,8 +11,8 @@ import L from 'leaflet'
import 'leaflet/dist/leaflet.css'
import 'leaflet-draw/dist/leaflet.draw'
import 'leaflet-draw/dist/leaflet.draw.css'
-import '@geoman-io/leaflet-geoman-free';
-import '@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css';
+import '@geoman-io/leaflet-geoman-free';
+import '@geoman-io/leaflet-geoman-free/dist/leaflet-geoman.css';
import 'Leaflet-ImageOverlay-Rotated'
import { useVariableStore } from '/@/stores/index.ts'
import * as omnivore from '@mapbox/leaflet-omnivore'
@@ -21,6 +21,8 @@ const map = ref()
let homeMap = null
let featureLayerG_area = null
let featureLayerG_point = null
+let layerRectangle = null
+
onMounted(() => {
homeMap = L.map(map.value, {
@@ -42,7 +44,7 @@ onMounted(() => {
tileSize: 256,
zoomOffset: 1,
}).addTo(homeMap)
-
+
featureLayerG_area = L.layerGroup().addTo(homeMap)
featureLayerG_point = L.layerGroup().addTo(homeMap)
@@ -58,32 +60,32 @@ const mapOperations = {
wktParseToMap: (res) => {
let layer = omnivore.wkt.parse(res)
layer.addTo(featureLayerG_point)
-
- let attr=Object.values(layer._layers)
-
+
+ let attr = Object.values(layer._layers)
+
// 判断审核的数据类型，如果是点则直接flyTo
- if(attr[0].feature.geometry.type.indexOf('Polygon')==-1){
- homeMap.flyTo([attr[0].feature.geometry.coordinates[1],attr[0].feature.geometry.coordinates[0]],3)
+ if (attr[0].feature.geometry.type.indexOf('Polygon') == -1) {
+ homeMap.flyTo([attr[0].feature.geometry.coordinates[1], attr[0].feature.geometry.coordinates[0]], 3)
}
- // 判断审核的数据类型，如果是面则计算中心点 然后再fly
- else{
- let polygons=[];
- for(let i=0;i
turf.centroid(polygon));
// console.log(centers)
- let features=[]
- for(let i=0;i{
+ homeMap.pm.enableDraw('Polygon', { snappable: false });
+ let polygon = null;
+ homeMap.on("pm:create", (e) => {
featureLayerG_area.clearLayers()
e.layer.setStyle({
color: '#FF0080',
opacity: 1,
})
- e.layer.addTo(featureLayerG_area)
- polygon=e.layer
- })
+ e.layer.addTo(featureLayerG_area)
+ polygon = e.layer
+ })
// featureLayerG_area.clearLayers()
// variableStore.layerGroupPoly=null;
return polygon
},
clearPolygon: () => {
// console.log('1-2')
-
+
featureLayerG_area.clearLayers()
variableStore.layerGroupPoly = null
homeMap.pm.disableDraw();
@@ -326,7 +328,7 @@ const mapOperations = {
// featureLayerG_point.clearLayers()
},
drawCreated: () => {
-
+
// homeMap.on('draw:created', function (elll) {
// featureLayerG_area.clearLayers()
// variableStore.layerGroupPoly = null
@@ -342,14 +344,14 @@ const mapOperations = {
// })
// variableStore.layerGroupPoly =
// variableStore.layerGroupPoly.join('\n')
-
+
// })
},
Edit: () => {
homeMap.pm.enableGlobalEditMode({
allowSelfIntersection: false,
})
- if(featureLayerG_area.getLayers().length==1){
+ if (featureLayerG_area.getLayers().length == 1) {
featureLayerG_area.eachLayer(function (layer) {
layer.on('pm:edit', (e) => {
let features = featureLayerG_area.toGeoJSON().features
@@ -360,7 +362,7 @@ const mapOperations = {
});
});
}
- else if(featureLayerG_point.getLayers().length==1){
+ else if (featureLayerG_point.getLayers().length == 1) {
featureLayerG_point.eachLayer(function (layer) {
layer.on('pm:edit', (e) => {
let features = featureLayerG_point.toGeoJSON().features
@@ -371,12 +373,27 @@ const mapOperations = {
});
});
}
- else{
+ else {
console.log('error')
}
-
-
},
+ drawRectangle: () => {
+ if (layerRectangle != null) {
+ homeMap.removeLayer(layerRectangle)
+ layerRectangle = null
+ }
+ homeMap.pm.enableDraw('Rectangle', {
+ snappable: true,
+ snapDistance: 20,
+ });
+ homeMap.on('pm:create', (e) => {
+ L.PM.reInitLayer(e.layer);
+ layerRectangle = e.layer
+ });
+ },
+ deleteRectangle: () => {
+ homeMap.removeLayer(layerRectangle)
+ }
}
//omnivore.wkt.parse('POINT(-80 0)').addTo(homeMap);
From df9f19e6ab1d3676cd33cb082df4e059a3ca5258 Mon Sep 17 00:00:00 2001
From: glj
Date: Tue, 25 Apr 2023 10:58:09 +0800
Subject: [PATCH 39/51] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dataService/multimediaData/index.vue | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/views/dataService/multimediaData/index.vue b/src/views/dataService/multimediaData/index.vue
index 4bc323b..0c4354e 100644
--- a/src/views/dataService/multimediaData/index.vue
+++ b/src/views/dataService/multimediaData/index.vue
@@ -6,7 +6,7 @@
-
+
@@ -15,7 +15,7 @@
-
+
start
@@ -272,6 +272,10 @@ const getDisasterData = () => {
}
getList(param).then(res => {
state.disasterData.data = res.records;
+ state.disasterData.data.forEach(item=>{
+ let date = item.disasterTime.slice(0,10);
+ item.disasterTime = date;
+ })
state.disasterData.total = res.total;
state.disasterData.loading = false;
})
From b370c7cc0128000f320703d0153041072ac53772 Mon Sep 17 00:00:00 2001
From: glj
Date: Tue, 25 Apr 2023 15:31:37 +0800
Subject: [PATCH 40/51] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dataService/otherData/index.vue | 6 +++++-
src/views/dataService/pictureInfo/index.vue | 6 +++++-
src/views/dataService/visualData/index.vue | 6 +++++-
src/views/responseManagement/dataUpload/index.vue | 6 +++++-
4 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/src/views/dataService/otherData/index.vue b/src/views/dataService/otherData/index.vue
index a25a857..d324a51 100644
--- a/src/views/dataService/otherData/index.vue
+++ b/src/views/dataService/otherData/index.vue
@@ -6,7 +6,7 @@
-
+
@@ -166,6 +166,10 @@ const getDisasterData = () => {
state.disasterData.loading = true;
getDisasterPage(state.disasterData.param.pageNum, state.disasterData.param.pageSize, {}).then(res => {
state.disasterData.data = res.records;
+ state.disasterData.data.forEach(item=>{
+ let date = item.disasterTime.slice(0,10);
+ item.disasterTime = date;
+ })
state.disasterData.total = res.total;
state.disasterData.loading = false;
})
diff --git a/src/views/dataService/pictureInfo/index.vue b/src/views/dataService/pictureInfo/index.vue
index 7ea3e5f..39b678e 100644
--- a/src/views/dataService/pictureInfo/index.vue
+++ b/src/views/dataService/pictureInfo/index.vue
@@ -6,7 +6,7 @@
-
+
@@ -198,6 +198,10 @@ const getDisasterData = () => {
state.disasterData.loading = true;
getDisasterPage(state.disasterData.param.pageNum, state.disasterData.param.pageSize, {}).then((res) => {
state.disasterData.data = res.records;
+ state.disasterData.data.forEach(item=>{
+ let date = item.disasterTime.slice(0,10);
+ item.disasterTime = date;
+ })
state.disasterData.total = res.total;
state.disasterData.loading = false;
});
diff --git a/src/views/dataService/visualData/index.vue b/src/views/dataService/visualData/index.vue
index dd4eafd..f1ab4e6 100644
--- a/src/views/dataService/visualData/index.vue
+++ b/src/views/dataService/visualData/index.vue
@@ -6,7 +6,7 @@
-
+
@@ -212,6 +212,10 @@ const getDisasterData = () => {
state.disasterData.loading = true;
getDisasterPage(state.disasterData.param.pageNum, state.disasterData.param.pageSize, {}).then(res => {
state.disasterData.data = res.records;
+ state.disasterData.data.forEach(item=>{
+ let date = item.disasterTime.slice(0,10);
+ item.disasterTime = date;
+ })
state.disasterData.total = res.total;
state.disasterData.loading = false;
})
diff --git a/src/views/responseManagement/dataUpload/index.vue b/src/views/responseManagement/dataUpload/index.vue
index 2137be6..299fb65 100644
--- a/src/views/responseManagement/dataUpload/index.vue
+++ b/src/views/responseManagement/dataUpload/index.vue
@@ -6,7 +6,7 @@
-
+
@@ -159,6 +159,10 @@ const getDisasterData = () => {
state.disasterData.loading = true;
getDisasterPage(state.disasterData.param.pageNum, state.disasterData.param.pageSize, {}).then(res => {
state.disasterData.data = res.records;
+ state.disasterData.data.forEach(item=>{
+ let date = item.disasterTime.slice(0,10);
+ item.disasterTime = date;
+ })
state.disasterData.total = res.total;
state.disasterData.loading = false;
})
From 06be21e909e2bd681e5604810968cfd31e3aff4c Mon Sep 17 00:00:00 2001
From: liyuchen <791867849@qq.com>
Date: Tue, 25 Apr 2023 16:15:15 +0800
Subject: [PATCH 41/51] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=A1=A8=E6=A0=BC?=
=?UTF-8?q?=E7=BB=84=E4=BB=B6-liyuchen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/form/index.vue | 13 ---
src/components/table/DisasterTable.vue | 120 +++++++++++++++++++++++++
2 files changed, 120 insertions(+), 13 deletions(-)
delete mode 100644 src/components/form/index.vue
create mode 100644 src/components/table/DisasterTable.vue
diff --git a/src/components/form/index.vue b/src/components/form/index.vue
deleted file mode 100644
index c0547b1..0000000
--- a/src/components/form/index.vue
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/components/table/DisasterTable.vue b/src/components/table/DisasterTable.vue
new file mode 100644
index 0000000..17e5fd7
--- /dev/null
+++ b/src/components/table/DisasterTable.vue
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+ Search
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
From f30a3ff7dcfb2ed40d7489c987cd220e4c393aac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=97=8B?= <723607471@qq.com>
Date: Tue, 25 Apr 2023 17:21:21 +0800
Subject: [PATCH 42/51] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Map.vue | 15 ++++++++++++-
src/utils/request.js | 2 +-
.../responseManagement/userResponse/index.vue | 21 ++++++++++++-------
3 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/src/components/Map.vue b/src/components/Map.vue
index 69608f1..0751013 100644
--- a/src/components/Map.vue
+++ b/src/components/Map.vue
@@ -59,6 +59,10 @@ onMounted(() => {
const mapOperations = {
wktParseToMap: (res) => {
let layer = omnivore.wkt.parse(res)
+ if(featureLayerG_area.getLayers().length != 0||featureLayerG_point.getLayers().length != 0){
+
+ return;
+ }
layer.addTo(featureLayerG_point)
let attr = Object.values(layer._layers)
@@ -66,9 +70,12 @@ const mapOperations = {
// 判断审核的数据类型，如果是点则直接flyTo
if (attr[0].feature.geometry.type.indexOf('Polygon') == -1) {
homeMap.flyTo([attr[0].feature.geometry.coordinates[1], attr[0].feature.geometry.coordinates[0]], 3)
+ variableStore.layerGroupPoint=res;
+ return {'layer':layer,'location':[attr[0].feature.geometry.coordinates[1],attr[0].feature.geometry.coordinates[0]]}
}
// 判断审核的数据类型，如果是面则计算中心点 然后再fly
else {
+ variableStore.layerGroupPoly=res;
let polygons = [];
for (let i = 0; i < attr[0].feature.geometry.coordinates.length; i++) {
console.log(attr[0].feature.geometry.coordinates[i])
@@ -83,8 +90,9 @@ const mapOperations = {
let final_center = turf.center(turf.featureCollection(features))
// console.log(final_center)
homeMap.flyTo([final_center.geometry.coordinates[1], final_center.geometry.coordinates[0]], 3)
+ return {'layer':layer,'location':null}
}
- return layer
+ // return layer
},
/** 添加点标注
@@ -313,6 +321,11 @@ const mapOperations = {
})
e.layer.addTo(featureLayerG_area)
polygon = e.layer
+ let features = featureLayerG_area.toGeoJSON().features
+ variableStore.layerGroupPoly = features.map(function (feature) {
+ return WKT.convert(feature.geometry)
+ })
+ variableStore.layerGroupPoly = variableStore.layerGroupPoly.join('\n')
})
// featureLayerG_area.clearLayers()
// variableStore.layerGroupPoly=null;
diff --git a/src/utils/request.js b/src/utils/request.js
index 23898cb..68714cd 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -4,7 +4,7 @@ import qs from 'qs';
import { Session } from '/@/utils/storage';
// export const moduleName = 'zqq-biz-vordm';
-export const moduleName = 'biz-vordm';
+export const moduleName = 'glj-biz-vordm';
export const crawlModule = 'vordm-crawl';
// 配置新建一个 axios 实例
const service = axios.create({
diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue
index c44ee4d..d23c27d 100644
--- a/src/views/responseManagement/userResponse/index.vue
+++ b/src/views/responseManagement/userResponse/index.vue
@@ -111,7 +111,7 @@
-
+
Point
Area
@@ -238,7 +238,10 @@ const onOpenEditRole = (type, row) => {
if(state.wktPoint_Poly){
mapRef.value.mapOperations.removeLayer(state.wktPoint_Poly)
}
- state.wktPoint_Poly= mapRef.value.mapOperations.wktParseToMap(row.geometry)
+ let wkt=mapRef.value.mapOperations.wktParseToMap(row.geometry)
+ state.wktPoint_Poly= wkt.layer
+ console.log(wkt.location)
+ changelatlon(wkt.location[0],wkt.location[1]);
// mapRef.value.mapOperations.on("click", (res)=>{
// mapRef.value.mapOperations.clearPolygon()
// mapRef.value.mapOperations.removeLayer( state.wktPoint_Poly)
@@ -251,7 +254,7 @@ const mapEvents = (ev)=>{
if(ev == '1'){
// mapRef.value.mapOperations.clearPolygon()
mapRef.value.mapOperations.on("click", mapClick)
- mapRef.value.mapOperations.on("mousemove", changelatlon)
+ // mapRef.value.mapOperations.on("mousemove", changelatlon)
mapRef.value.mapOperations.clearPolygon()
}else if(ev == '2'){
@@ -275,8 +278,8 @@ const ClearSubmit = () => {
}
const mapClick=(res)=>{
mapRef.value.mapOperations.removeLayer( state.wktPoint_Poly )
- changelatlon(res);
- state.wktPoint_Poly=mapRef.value.mapOperations.addInteractMarker(res.latlng.lat.toFixed(3),res.latlng.lng.toFixed(3))
+ changelatlon(res.latlng.lat.toFixed(3),res.latlng.lng.toFixed(3));
+ mapRef.value.mapOperations.addInteractMarker(res.latlng.lat.toFixed(3),res.latlng.lng.toFixed(3))
// console.log(state.wktPoint_Poly)
}
const reviews = (index) => {
@@ -307,10 +310,12 @@ const onHandleCurrentChange = (val) => {
state.tableData.param.pageNum = val;
getTableData();
};
-const changelatlon = (e) => {
+const changelatlon = (lat,lon) => {
//深拷贝e
- state.dislat = e.latlng.lat.toFixed(3);
- state.dislon= e.latlng.lng.toFixed(3);
+ // state.dislat = e.latlng.lat.toFixed(3);
+ // state.dislon= e.latlng.lng.toFixed(3);
+ state.dislat = lat;
+ state.dislon= lon;
// if (state.lon < 0) {
// state.lon = state.lon + 360;
// }
From 4611558cffd6e77f47fff5594ce4228dbd72a1a0 Mon Sep 17 00:00:00 2001
From: yyhouc <792163605@qq.com>
Date: Tue, 25 Apr 2023 17:29:46 +0800
Subject: [PATCH 43/51] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
package-lock.json | 46 ++--
src/api/crawl/index.js | 19 +-
src/utils/request.js | 2 +-
.../components/searchCondition.vue | 217 ++++++++++--------
.../responseManagement/userResponse/index.vue | 10 +-
5 files changed, 156 insertions(+), 138 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index bff5248..e30a322 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -342,11 +342,6 @@
"fastq": "^1.6.0"
}
},
- "@popperjs/core": {
- "version": "npm:@sxzz/popperjs-es@2.11.7",
- "resolved": "https://registry.npmmirror.com/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
- "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
- },
"@rollup/pluginutils": {
"version": "4.2.1",
"resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-4.2.1.tgz",
@@ -2005,7 +2000,7 @@
},
"clone": {
"version": "2.1.2",
- "resolved": "https://registry.npmmirror.com/clone/-/clone-2.1.2.tgz",
+ "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
"integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w=="
},
"color-convert": {
@@ -2202,7 +2197,7 @@
},
"deep-equal": {
"version": "1.1.1",
- "resolved": "https://registry.npmmirror.com/deep-equal/-/deep-equal-1.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
"integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
"requires": {
"is-arguments": "^1.0.4",
@@ -2215,7 +2210,7 @@
"dependencies": {
"object-keys": {
"version": "1.1.1",
- "resolved": "https://registry.npmmirror.com/object-keys/-/object-keys-1.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
}
}
@@ -2228,7 +2223,7 @@
},
"define-properties": {
"version": "1.2.0",
- "resolved": "https://registry.npmmirror.com/define-properties/-/define-properties-1.2.0.tgz",
+ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz",
"integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==",
"requires": {
"has-property-descriptors": "^1.0.0",
@@ -2237,7 +2232,7 @@
"dependencies": {
"object-keys": {
"version": "1.1.1",
- "resolved": "https://registry.npmmirror.com/object-keys/-/object-keys-1.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
"integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
}
}
@@ -2331,6 +2326,13 @@
"lodash-unified": "^1.0.2",
"memoize-one": "^6.0.0",
"normalize-wheel-es": "^1.2.0"
+ },
+ "dependencies": {
+ "@popperjs/core": {
+ "version": "npm:@sxzz/popperjs-es@2.11.7",
+ "resolved": "https://registry.npmjs.org/@sxzz/popperjs-es/-/popperjs-es-2.11.7.tgz",
+ "integrity": "sha512-Ccy0NlLkzr0Ex2FKvh2X+OyERHXJ88XJ1MXtsI9y9fGexlaXaVTPzBCRBwIxFkORuOb+uBqeu+RqnpgYTEZRUQ=="
+ }
}
},
"esbuild": {
@@ -2538,12 +2540,12 @@
},
"eventemitter3": {
"version": "2.0.3",
- "resolved": "https://registry.npmmirror.com/eventemitter3/-/eventemitter3-2.0.3.tgz",
+ "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-2.0.3.tgz",
"integrity": "sha512-jLN68Dx5kyFHaePoXWPsCGW5qdyZQtLYHkxkg02/Mz6g0kYpDx4FyP6XfArhQdlOC4b8Mv+EMxPo/8La7Tzghg=="
},
"extend": {
"version": "3.0.2",
- "resolved": "https://registry.npmmirror.com/extend/-/extend-3.0.2.tgz",
+ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
},
"falafel": {
@@ -2575,7 +2577,7 @@
},
"fast-diff": {
"version": "1.1.2",
- "resolved": "https://registry.npmmirror.com/fast-diff/-/fast-diff-1.1.2.tgz",
+ "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.1.2.tgz",
"integrity": "sha512-KaJUt+M9t1qaIteSvjc6P3RbMdXsNhK61GRftR6SNxqmhthcd9MGIi4T+o0jD8LUSpSnSKXE20nLtJ3fOHxQig=="
},
"fast-json-stable-stringify": {
@@ -2688,7 +2690,7 @@
},
"functions-have-names": {
"version": "1.2.3",
- "resolved": "https://registry.npmmirror.com/functions-have-names/-/functions-have-names-1.2.3.tgz",
+ "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
"integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
},
"geojson-equality": {
@@ -2796,7 +2798,7 @@
},
"has-property-descriptors": {
"version": "1.0.0",
- "resolved": "https://registry.npmmirror.com/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
"integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
"requires": {
"get-intrinsic": "^1.1.1"
@@ -2809,7 +2811,7 @@
},
"has-tostringtag": {
"version": "1.0.0",
- "resolved": "https://registry.npmmirror.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
+ "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
"integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
"requires": {
"has-symbols": "^1.0.2"
@@ -2865,7 +2867,7 @@
},
"is-arguments": {
"version": "1.1.1",
- "resolved": "https://registry.npmmirror.com/is-arguments/-/is-arguments-1.1.1.tgz",
+ "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
"integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
"requires": {
"call-bind": "^1.0.2",
@@ -2891,7 +2893,7 @@
},
"is-date-object": {
"version": "1.0.5",
- "resolved": "https://registry.npmmirror.com/is-date-object/-/is-date-object-1.0.5.tgz",
+ "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
"integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
"requires": {
"has-tostringtag": "^1.0.0"
@@ -2935,7 +2937,7 @@
},
"is-regex": {
"version": "1.1.4",
- "resolved": "https://registry.npmmirror.com/is-regex/-/is-regex-1.1.4.tgz",
+ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
"integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
"requires": {
"call-bind": "^1.0.2",
@@ -3176,7 +3178,7 @@
},
"object-is": {
"version": "1.1.5",
- "resolved": "https://registry.npmmirror.com/object-is/-/object-is-1.1.5.tgz",
+ "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
"integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
"requires": {
"call-bind": "^1.0.2",
@@ -3247,7 +3249,7 @@
},
"parchment": {
"version": "1.1.4",
- "resolved": "https://registry.npmmirror.com/parchment/-/parchment-1.1.4.tgz",
+ "resolved": "https://registry.npmjs.org/parchment/-/parchment-1.1.4.tgz",
"integrity": "sha512-J5FBQt/pM2inLzg4hEWmzQx/8h8D0CiDxaG3vyp9rKrQRSDgBlhjdP5jQGgosEajXPSQouXGHOmVdgo7QmJuOg=="
},
"parent-module": {
@@ -3394,7 +3396,7 @@
},
"quill": {
"version": "1.3.7",
- "resolved": "https://registry.npmmirror.com/quill/-/quill-1.3.7.tgz",
+ "resolved": "https://registry.npmjs.org/quill/-/quill-1.3.7.tgz",
"integrity": "sha512-hG/DVzh/TiknWtE6QmWAF/pxoZKYxfe3J/d/+ShUWkDvvkZQVTPeVmUJVu1uE6DDooC4fWTiCLh84ul89oNz5g==",
"requires": {
"clone": "^2.1.1",
diff --git a/src/api/crawl/index.js b/src/api/crawl/index.js
index 08df2f7..a341df3 100644
--- a/src/api/crawl/index.js
+++ b/src/api/crawl/index.js
@@ -24,7 +24,7 @@ export const news = (disaster_id, keywords, page, isBaidu, id) => {
},
});
};
-export const rs = (stime, etime, disaster_id, ranges, type = 1) => {
+export const rs = (stime, etime, disaster_id, ranges, type = 1,id) => {
let method = 'sentinel';
if (type == 1) {
method = 'sentinel';
@@ -33,15 +33,22 @@ export const rs = (stime, etime, disaster_id, ranges, type = 1) => {
} else {
method = 'searchone';
}
-
+ let data = {
+ stime,
+ etime,
+ disaster_id,
+ id,
+ }
+ if(type != 1 && type != 2){
+ data['geo'] = ranges
+ }else{
+ data['ranges']=ranges
+ }
return request({
url: '/api/' + crawlModule + '/rs/' + method,
method: 'post',
data: {
- stime,
- etime,
- disaster_id,
- ranges,
+
},
});
};
diff --git a/src/utils/request.js b/src/utils/request.js
index 1e18ec7..432d50e 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -4,7 +4,7 @@ import qs from 'qs';
import { Session } from '/@/utils/storage';
// export const moduleName = 'zqq-biz-vordm';
-export const moduleName = 'biz-vordm';
+export const moduleName = 'yyhouc-biz-vordm';
export const crawlModule = "vordm-crawl";
// 配置新建一个 axios 实例
const service = axios.create({
diff --git a/src/views/dataService/remoteSensingData/components/searchCondition.vue b/src/views/dataService/remoteSensingData/components/searchCondition.vue
index 406ad6e..74182d0 100644
--- a/src/views/dataService/remoteSensingData/components/searchCondition.vue
+++ b/src/views/dataService/remoteSensingData/components/searchCondition.vue
@@ -134,6 +134,7 @@ import Map from "/@/components/Map.vue";
import { ref, reactive, watch } from 'vue';
import { rs, submit } from '/@/api/crawl/index';
import { useUserInfo } from '/@/stores/userInfo';
+import { ElMessage } from "element-plus";
const userInfo = useUserInfo();
// 初始化数据
@@ -184,82 +185,82 @@ const state = reactive({
// }
// ]
},
- {
- value: '国产系列卫星',
- label: '国产系列卫星',
- children: [
- {
- value: 'GF - 1',
- label: 'GF - 1',
- },
- {
- value: 'GF - 2',
- label: 'GF - 2',
- },
- {
- value: 'GF - 3',
- label: 'GF - 3',
- },
- {
- value: 'GF - 4',
- label: 'GF - 4',
- },
- {
- value: 'GF - 6',
- label: 'GF - 6',
- },
- {
- value: 'ZY - 3',
- label: 'ZY - 3',
- },
- {
- value: 'ZY - 302',
- label: 'ZY - 302',
- },
- {
- value: 'ZY - 02C',
- label: 'ZY - 02C',
- },
- ],
- },
- {
- value: '欧比特珠海一号系列卫星',
- label: '欧比特珠海一号系列卫星',
- children: [
- {
- value: 'OVS - 2A',
- label: 'OVS - 2A',
- },
- {
- value: 'OVS - 3A',
- label: 'OVS - 3A',
- },
- {
- value: 'OVS - 1A',
- label: 'OVS - 1A',
- },
- {
- value: 'OVS - 1B',
- label: 'OVS - 1B',
- },
- {
- value: 'OHS - 2A',
- label: 'OHS - 2A',
- },
- {
- value: 'OHS - 2B',
- label: 'OHS - 2B',
- },
- {
- value: 'OHS - 2C',
- label: 'OHS - 2C',
- },
- {
- value: 'OHS - 2D',
- label: 'OHS - 2D',
- },
- ],
- }
+ // {
+ // value: '国产系列卫星',
+ // label: '国产系列卫星',
+ // children: [
+ // {
+ // value: 'GF - 1',
+ // label: 'GF - 1',
+ // },
+ // {
+ // value: 'GF - 2',
+ // label: 'GF - 2',
+ // },
+ // {
+ // value: 'GF - 3',
+ // label: 'GF - 3',
+ // },
+ // {
+ // value: 'GF - 4',
+ // label: 'GF - 4',
+ // },
+ // {
+ // value: 'GF - 6',
+ // label: 'GF - 6',
+ // },
+ // {
+ // value: 'ZY - 3',
+ // label: 'ZY - 3',
+ // },
+ // {
+ // value: 'ZY - 302',
+ // label: 'ZY - 302',
+ // },
+ // {
+ // value: 'ZY - 02C',
+ // label: 'ZY - 02C',
+ // },
+ // ],
+ // },
+ // {
+ // value: '欧比特珠海一号系列卫星',
+ // label: '欧比特珠海一号系列卫星',
+ // children: [
+ // {
+ // value: 'OVS - 2A',
+ // label: 'OVS - 2A',
+ // },
+ // {
+ // value: 'OVS - 3A',
+ // label: 'OVS - 3A',
+ // },
+ // {
+ // value: 'OVS - 1A',
+ // label: 'OVS - 1A',
+ // },
+ // {
+ // value: 'OVS - 1B',
+ // label: 'OVS - 1B',
+ // },
+ // {
+ // value: 'OHS - 2A',
+ // label: 'OHS - 2A',
+ // },
+ // {
+ // value: 'OHS - 2B',
+ // label: 'OHS - 2B',
+ // },
+ // {
+ // value: 'OHS - 2C',
+ // label: 'OHS - 2C',
+ // },
+ // {
+ // value: 'OHS - 2D',
+ // label: 'OHS - 2D',
+ // },
+ // ],
+ // }
],
shortcuts: [
{
@@ -399,6 +400,20 @@ const editCoordinate = () => {
// 开始爬虫
const startCrawl = () => {
+ if(!state.startTime){
+ ElMessage.error("Please select the search start time")
+ return;
+ }
+ if(!state.endTime){
+ ElMessage.error("Please select the search end time")
+ return;
+ }
+ if(state.coordinateList.length==0||!state.coordinateList[0].Lat||!state.coordinateList[0].Lng||!state.coordinateList[1].Lat ||!state.coordinateList[1].Lng){
+ ElMessage.error("Please draw the area on the map")
+ return;
+ }
+
+
var ranges = state.coordinateList[0].Lat + ' ' + state.coordinateList[0].Lng + ',' + state.coordinateList[1].Lat + ' ' + state.coordinateList[1].Lng
var type = null
if (state.satelliteSelected[0] == 'landsat') {
@@ -413,36 +428,38 @@ const startCrawl = () => {
var param = {
"stime": state.startTime,
"etime": state.endTime,
- "disaster_id": state.selectID * 1,
+ "disaster_id": state.selectID,
"ranges": ranges,
"id": id
}
console.log(param);
- submit(
- {
- type: type,
- manageId: userInfo.userInfos.id,
- status: 0,
- disasterId: state.selectID,
- id: (id ? id : null)
- }
- ).then(ret => {
- if (ret == 1042) {
- ElMessage.error("error")
- } else {
+ // submit(
+ // {
+ // type: type,
+ // startDate:state.startTime,
+ // endDate:state.endTime,
+ // manageId: userInfo.userInfos.id,
+ // status: 0,
+ // disasterId: state.selectID,
+ // id: (id ? id : null)
+ // }
+ // ).then(ret => {
+ // if (ret == 1042) {
+ // ElMessage.error("error")
+ // } else {
+
+ // rs(stime, etime, disaster_id, ranges, type = 1).then(res => {
+ // console.log(res);
+ // // getData();
+ // ElMessage({
+ // message: 'Success, Start crawling.',
+ // type: 'success',
+ // })
+ // })
- rs(param).then(res => {
- console.log(res);
- // getData();
- ElMessage({
- message: 'Success, Start crawling.',
- type: 'success',
- })
- })
-
- }
- })
+ // }
+ // })
}
// 清空搜索条件
diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue
index 9539538..da035c6 100644
--- a/src/views/responseManagement/userResponse/index.vue
+++ b/src/views/responseManagement/userResponse/index.vue
@@ -190,15 +190,7 @@
style="height:35px;">
- <<<<<<< HEAD
-
-
- =======
-
- >>>>>>> zqq
+
Date: Tue, 25 Apr 2023 18:30:08 +0800
Subject: [PATCH 44/51] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/data/otherData.js | 15 +-
.../otherData/component/upload.vue | 9 +-
src/views/dataService/otherData/index.vue | 31 +-
.../pictureInfo/component/upload.vue | 82 ++--
src/views/dataService/pictureInfo/index.vue | 14 +-
.../responseManagement/userResponse/index.vue | 393 ++++++++++--------
.../systemManagement/administrator/index.vue | 24 +-
7 files changed, 307 insertions(+), 261 deletions(-)
diff --git a/src/api/data/otherData.js b/src/api/data/otherData.js
index 6e6c838..ba7cd2e 100644
--- a/src/api/data/otherData.js
+++ b/src/api/data/otherData.js
@@ -81,4 +81,17 @@ export const deleteData = (id) => {
id
}
});
-};
\ No newline at end of file
+};
+
+/**
+ * 修改实体数据
+ * @param data
+ * @returns {Promise>}
+ */
+export const updateEntityData = (data) => {
+ return request({
+ url: '/api/' + moduleName + '/ui/EntityData/updateEntityData',
+ method: 'post',
+ data: data
+ });
+};
diff --git a/src/views/dataService/otherData/component/upload.vue b/src/views/dataService/otherData/component/upload.vue
index 64d6cad..29c6afa 100644
--- a/src/views/dataService/otherData/component/upload.vue
+++ b/src/views/dataService/otherData/component/upload.vue
@@ -1,6 +1,6 @@
-
-
+
+
@@ -15,6 +15,10 @@
+
+
+
@@ -149,6 +153,7 @@ const onSubmit = () => {
state.dataForm.append('remark', state.ruleForm.remark);
state.dataForm.append('disasterId', state.disasterId);
state.dataForm.append('visualFlag', state.ruleForm.visualFlag);
+ state.dataForm.append('title', state.ruleForm.title);
for (let [a, b] of state.dataForm.entries()) {
console.log(a, b, '--------------');
}
diff --git a/src/views/dataService/otherData/index.vue b/src/views/dataService/otherData/index.vue
index d324a51..ff8d2fd 100644
--- a/src/views/dataService/otherData/index.vue
+++ b/src/views/dataService/otherData/index.vue
@@ -6,7 +6,7 @@
-
+
@@ -50,8 +50,14 @@
-
+
+
+
+ NO
+ YES
+
+
@@ -63,6 +69,7 @@
Delete
+ Publish
@@ -84,7 +91,7 @@
import en from 'element-plus/dist/locale/en.mjs'
import type { TabsPaneContext } from 'element-plus';
import Upload from './component/upload.vue';
-import { getOtherDataPage, getDisasterPage, deleteData } from '/@/api/data/otherData.js'
+import { getOtherDataPage, getDisasterPage, deleteData, updateEntityData } from '/@/api/data/otherData.js'
const activeName = ref('first');
//复制内容
@@ -166,8 +173,8 @@ const getDisasterData = () => {
state.disasterData.loading = true;
getDisasterPage(state.disasterData.param.pageNum, state.disasterData.param.pageSize, {}).then(res => {
state.disasterData.data = res.records;
- state.disasterData.data.forEach(item=>{
- let date = item.disasterTime.slice(0,10);
+ state.disasterData.data.forEach(item => {
+ let date = item.disasterTime.slice(0, 10);
item.disasterTime = date;
})
state.disasterData.total = res.total;
@@ -180,7 +187,7 @@ const getTableData = () => {
state.tableData.loading = true;
getOtherDataPage(state.tableData.param.pageNum, state.tableData.param.pageSize, { "disasterId": state.disasterId, "type": state.searchName, "isDeleted": 0 }).then(res => {
console.log(res);
-
+
state.tableData.data = res.records;
state.tableData.total = res.total;
})
@@ -237,6 +244,17 @@ const del = (row) => {
})
.catch(() => { });
};
+
+
+
+// 删除其他数据
+const pub = (row) => {
+ console.log(row, "发布信息");
+ updateEntityData().then(da => {
+
+ })
+};
+
// 分页改变
const onHandleDisasterSizeChange = (val) => {
state.disasterData.param.pageSize = val;
@@ -280,6 +298,7 @@ onMounted(() => {
}
}
}
+
.mt15 {
display: flex;
justify-content: end;
diff --git a/src/views/dataService/pictureInfo/component/upload.vue b/src/views/dataService/pictureInfo/component/upload.vue
index 3a7a01a..4c55a6e 100644
--- a/src/views/dataService/pictureInfo/component/upload.vue
+++ b/src/views/dataService/pictureInfo/component/upload.vue
@@ -2,17 +2,8 @@
-
+
Drop file here or
click to upload
@@ -24,69 +15,67 @@
+
+
+
-
-
+
+
-
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/views/dataService/pictureInfo/index.vue b/src/views/dataService/pictureInfo/index.vue
index 39b678e..d82d1b4 100644
--- a/src/views/dataService/pictureInfo/index.vue
+++ b/src/views/dataService/pictureInfo/index.vue
@@ -65,16 +65,6 @@
-
Edit
@@ -146,9 +136,7 @@ const handleSelectionChange = (val) => {
};
//格式化图片名称
const formatName = (name) => {
- if (name) {
- return name.substr(0, name.indexOf('.'));
- }
+
return name;
};
const auditData = (row) => {
diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue
index c44ee4d..1429c9d 100644
--- a/src/views/responseManagement/userResponse/index.vue
+++ b/src/views/responseManagement/userResponse/index.vue
@@ -1,45 +1,45 @@
-
-
-
-
-
-
-
-
-
-
- {{ getValue(scope.row.disasterType) }}
-
-
-
-
-
+
+ {{ getValue(scope.row.disasterType) }}
+
+
+
+
+
-
-
-
- {{ dateFormat(scope.row.disasterTime) }}
-
-
-
-
-
- Awaiting approval
- Rejected
-
-
-
-
- Approve
-
-
+
+
+
+ {{ dateFormat(scope.row.disasterTime) }}
+
+
+
+
+
+ Awaiting approval
+ Rejected
+
+
+
+
+ Approve
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ getValue(scope.row.disasterType) }}
-
-
-
-
-
+
+
+
+
+
+ {{ getValue(scope.row.disasterType) }}
+
+
+
+
+
@@ -86,72 +86,78 @@
-
-
-
+
-
- Approved
- Rejected
-
-
+
+
+
-
-
- Allocate
-
-
-
-
-
-
-
-
-
-
- Point
- Area
- Edit
- Clear
-
-
- Latitude：
-
- Longitude：
-
-
-
-
-
-
-
-
-
-
-
+
+ Approved
+ Rejected
+ Complete response
+
+
+
+
+
+ Allocation
+ Response ended
+
+
+
+
+
+
+
+
+
+
+ Point
+ Area
+ Edit
+ Clear
+
+
+ Latitude：
+
+
+ Longitude：
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -113,6 +111,10 @@ const getTableData = () => {
state.tableData.loading = true;
getAdminManagerPage(state.tableData.param.pageNum, state.tableData.param.pageSize, { "managerName": state.searchName,"status": state.status}).then(res => {
state.tableData.data = res.records;
+ state.tableData.data.forEach(item => {
+ let date = item.disasterTime.slice(0, 10);
+ item.disasterTime = date;
+ })
state.tableData.total = res.total;
})
From 9a9ed7fb6bf8cffb9946c97ba5fb63a68591f44a Mon Sep 17 00:00:00 2001
From: why <986973311@qq.com>
Date: Wed, 26 Apr 2023 10:47:46 +0800
Subject: [PATCH 45/51] =?UTF-8?q?=E6=94=B9=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/home/index.vue | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/views/home/index.vue b/src/views/home/index.vue
index 69f8071..b5ec45f 100644
--- a/src/views/home/index.vue
+++ b/src/views/home/index.vue
@@ -277,12 +277,12 @@ const initLineChart = (xData,data1, data2) => {
symbol: 'circle',
smooth: true,
data: data2,
- lineStyle: { color: '#44c05b' },
- itemStyle: { color: '#44c05b', borderColor: '#44c05b' },
+ lineStyle: { color: 'rgba(145,204,117,1)' },
+ itemStyle: { color: 'rgba(145,204,117,1)', borderColor: 'rgba(145,204,117,1)' },
areaStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
- { offset: 0, color: '#44c05b' },
- { offset: 1, color: '#44c05b' },
+ { offset: 0, color: 'rgba(145,204,117,1)' },
+ { offset: 1, color: 'rgba(145,204,117,0)' },
]),
},
}
@@ -328,12 +328,12 @@ const initLineVandDChart = (xData,data1, data2) => {
symbol: 'circle',
smooth: true,
data: data2,
- lineStyle: { color: '#3d91e7' },
- itemStyle: { color: '#3d91e7', borderColor: '#3d91e7' },
+ lineStyle: { color: 'rgba(84,112,198,1)' },
+ itemStyle: { color: 'rgba(84,112,198,1)', borderColor: 'rgba(84,112,198,1)' },
areaStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
- { offset: 0, color: '#3d91e7' },
- { offset: 1, color: '#3d91e7' },
+ { offset: 0, color: 'rgba(84,112,198,1)' },
+ { offset: 1, color: 'rgba(84,112,198,0)' },
]),
},
},{
@@ -343,12 +343,12 @@ const initLineVandDChart = (xData,data1, data2) => {
symbol: 'circle',
smooth: true,
data: data1,
- lineStyle: { color: '#e78d3d' },
- itemStyle: { color: '#e78d3d', borderColor: '#e78d3d' },
+ lineStyle: { color: 'rgba(250,200,88,1)' },
+ itemStyle: { color: 'rgba(250,200,88,1)', borderColor: 'rgba(250,200,88,1)' },
areaStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
- { offset: 0, color: '#e78d3d' },
- { offset: 1, color: '#e78d3d' },
+ { offset: 0, color: 'rgba(250,200,88,1)' },
+ { offset: 1, color: 'rgba(250,200,88,0)' },
]),
},
}
@@ -398,8 +398,8 @@ const initChiefChart = (xData,yData) => {
barWidth: 30,
itemStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
- { offset: 0, color: '#fe9a8bb3' },
- { offset: 1, color: '#fe9a8b03' },
+ { offset: 0, color: 'rgba(238,102,102,1)' },
+ { offset: 1, color: 'rgba(238,102,102,0)' },
]),
//柱状图圆角
borderRadius: [30, 30, 0, 0],
@@ -451,8 +451,8 @@ const initAdministratorsChart = (xData,yData) => {
yAxisIndex: 0,
itemStyle: {
color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
- { offset: 0, color: 'rgba(108,80,243,0.3)' },
- { offset: 1, color: 'rgba(108,80,243,0)' },
+ { offset: 0, color: 'rgba(115,192,222,1)' },
+ { offset: 1, color: 'rgba(115,192,222,0)' },
]),
//柱状图圆角
borderRadius: [30, 30, 0, 0],
From 0c7d010c538930ae16156e0991f6c405cd8636a6 Mon Sep 17 00:00:00 2001
From: glj
Date: Wed, 26 Apr 2023 11:40:07 +0800
Subject: [PATCH 46/51] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/table/DisasterTable.vue | 54 ++++++++++---------
src/utils/request.js | 2 +-
.../dataService/multimediaData/index.vue | 3 +-
src/views/dataService/otherData/index.vue | 25 +++------
src/views/dataService/pictureInfo/index.vue | 27 +++-------
src/views/dataService/visualData/index.vue | 19 ++-----
6 files changed, 51 insertions(+), 79 deletions(-)
diff --git a/src/components/table/DisasterTable.vue b/src/components/table/DisasterTable.vue
index 17e5fd7..da2e2b6 100644
--- a/src/components/table/DisasterTable.vue
+++ b/src/components/table/DisasterTable.vue
@@ -1,13 +1,12 @@
-
-
+
+
-
+
@@ -16,25 +15,24 @@
-
+ highlight-current-row @row-click="tableClick">
+
-
+
-
diff --git a/src/views/dataService/visualData/index.vue b/src/views/dataService/visualData/index.vue
index eafd692..e87802f 100644
--- a/src/views/dataService/visualData/index.vue
+++ b/src/views/dataService/visualData/index.vue
@@ -18,7 +18,10 @@
search
-->
-
+
+ Generate
+
+
@@ -32,7 +35,7 @@
-
+
@@ -53,7 +56,7 @@
:total="state.tableData.total">
-
+
@@ -105,6 +108,8 @@ const editWordCloudsRef = ref();
import { defineAsyncComponent, reactive, onMounted, ref } from 'vue';
import { ElMessageBox, ElMessage } from 'element-plus';
import disasterTable from "/@/components/table/DisasterTable.vue";
+import { ta } from 'element-plus/es/locale';
+import { landsat } from '/@/api/crawl/index.js'
// 引入组件
const RoleDialog = defineAsyncComponent(() => import('/@/views/system/role/dialog.vue'));
const auditRef = ref();
@@ -112,6 +117,7 @@ const uploadRef = ref();
// 定义变量内容
const roleDialogRef = ref();
const state = reactive({
+ nameNew:false,
multipleWord: [],
multipleHotspot: [],
tabVal: 'first',
@@ -145,7 +151,13 @@ const handleSelectionChange = (val) => {
const handleSelectionHotspotChange = (val) => {
state.multipleHotspot = val
}
+
const handleClick = (tab) => {
+ if (tab=="second") {
+ state.nameNew = true;
+ }else{
+ state.nameNew = false;
+ }
state.tabVal = tab;
state.tableData = {
data: [],
@@ -236,6 +248,14 @@ const uploadData = () => {
}
state.tabVal == 'first' ? wordCloudsRef.value.openDialog(state.disasterId) : hotspotRef.value.openDialog(state.disasterId);
};
+//获取图文信息
+const generateData =()=>{
+ landsat(state.disasterId,10,).then(da=>{
+ console.log(da);
+
+ })
+}
+
// 打开修改热点弹窗
const editHotspot = (row) => {
editHotspotRef.value.openDialog(row);
From 355cd9d3aa7bb3cd472a3d83deb7f888f06def42 Mon Sep 17 00:00:00 2001
From: glj
Date: Wed, 26 Apr 2023 14:34:20 +0800
Subject: [PATCH 48/51] =?UTF-8?q?glj-=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/dataService/otherData/index.vue | 548 ++++++++----------
src/views/dataService/visualData/index.vue | 2 +-
.../responseManagement/userResponse/index.vue | 406 +++++++------
3 files changed, 455 insertions(+), 501 deletions(-)
diff --git a/src/views/dataService/otherData/index.vue b/src/views/dataService/otherData/index.vue
index c4a9229..770274f 100644
--- a/src/views/dataService/otherData/index.vue
+++ b/src/views/dataService/otherData/index.vue
@@ -1,368 +1,298 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Search
+
+
+
+
+
+ Add
+
+
+
+
+
+ Delete
+
+
+
+
+
+
- {{ getValue(scope.row.disasterType) }}
+ NO
+ YES
-
-
+
+
-
- {{ dateFormat(scope.row.disasterTime) }}
-
-
-
-
-
- Awaiting approval
- Rejected
+ {{ formatSizeUnits(scope.row.size) }}
+
- Approve
+ Delete
+ Publish
-
-
-
-
-
-
-
-
-
-
- {{ getValue(scope.row.disasterType) }}
-
-
-
-
-
-
-
-
- {{ dateFormat(scope.row.disasterTime) }}
-
-
-
-
-
-
-
-
-
-
-
-
- Approved
- Rejected
- Complete response
-
-
-
-
-
- Allocation
- Response ended
-
-
-
-
-
-
-
-
+
+
-
-
diff --git a/src/views/dataService/visualData/index.vue b/src/views/dataService/visualData/index.vue
index e87802f..fc3f4db 100644
--- a/src/views/dataService/visualData/index.vue
+++ b/src/views/dataService/visualData/index.vue
@@ -250,7 +250,7 @@ const uploadData = () => {
};
//获取图文信息
const generateData =()=>{
- landsat(state.disasterId,10,).then(da=>{
+ landsat(state.disasterId).then(da=>{
console.log(da);
})
diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue
index 11c9194..915594b 100644
--- a/src/views/responseManagement/userResponse/index.vue
+++ b/src/views/responseManagement/userResponse/index.vue
@@ -1,45 +1,45 @@
-
-
-
-
-
-
-
-
-
-
- {{ getValue(scope.row.disasterType) }}
-
-
-
-
-
+
+ {{ getValue(scope.row.disasterType) }}
+
+
+
+
+
-
-
-
- {{ dateFormat(scope.row.disasterTime) }}
-
-
-
-
-
- Awaiting approval
- Rejected
-
-
-
-
- Approve
-
-
+
+
+
+ {{ dateFormat(scope.row.disasterTime) }}
+
+
+
+
+
+ Awaiting approval
+ Rejected
+
+
+
+
+ Approve
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ getValue(scope.row.disasterType) }}
-
-
-
-
-
+
+
+
+
+
+ {{ getValue(scope.row.disasterType) }}
+
+
+
+
+
@@ -86,71 +86,78 @@
-
-
-
+
-
- Approved
- Rejected
-
-
-
-
- Allocate
-
-
-
-
-
-
-
-
-
-
- Point
- Area
- Edit
- Clear
-
-
- Latitude：
-
- Longitude：
-
-
-
-
-
-
+
+
+
-
-
-
-
-
+
+
+ Approved
+ Rejected
+ Complete response
+
+
+
+
+
+ Allocation
+ Response ended
+
+
+
+
+
+
+
+
+
+
+ Point
+ Area
+ Edit
+ Clear
+
+
+ Latitude：
+
+
+ Longitude：
+
+
+
+
+
+
+
+
+
+
+
+
-
From 8c733b9f627ceeb6f03acabb79ff9c36412d7db8 Mon Sep 17 00:00:00 2001
From: yyhouc <792163605@qq.com>
Date: Wed, 26 Apr 2023 14:35:42 +0800
Subject: [PATCH 49/51] =?UTF-8?q?=E5=85=A8=E5=B1=80=E8=8B=B1=E6=96=87?=
=?UTF-8?q?=E8=AE=BE=E7=BD=AE=EF=BC=8C=E5=A4=A7=E9=83=A8=E5=88=86=E6=A0=B7?=
=?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/App.vue | 3 +-
.../dataService/multimediaData/index.vue | 16 ++++----
.../components/retrievalCondition.vue | 10 ++---
.../components/searchCondition.vue | 1 +
.../responseManagement/contact/index.vue | 24 ++++++------
src/views/responseManagement/tool/index.vue | 8 ++--
.../responseManagement/userResponse/index.vue | 2 +-
src/views/system/dic/dialog.vue | 36 +++++++++---------
src/views/system/dic/index.vue | 37 ++++++++++---------
9 files changed, 72 insertions(+), 65 deletions(-)
diff --git a/src/App.vue b/src/App.vue
index 35b6908..d273707 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
-
+
@@ -11,6 +11,7 @@
import { defineAsyncComponent, computed, ref, onBeforeMount, onMounted, onUnmounted, nextTick, watch } from 'vue';
import { useRoute } from 'vue-router';
import zhCn from 'element-plus/es/locale/lang/zh-cn';
+import en from 'element-plus/dist/locale/en.mjs'
import { storeToRefs } from 'pinia';
import { useTagsViewRoutes } from '/@/stores/tagsViewRoutes';
import { useThemeConfig } from '/@/stores/themeConfig';
diff --git a/src/views/dataService/multimediaData/index.vue b/src/views/dataService/multimediaData/index.vue
index 0c4354e..5c28cc6 100644
--- a/src/views/dataService/multimediaData/index.vue
+++ b/src/views/dataService/multimediaData/index.vue
@@ -3,8 +3,8 @@
-
-
+
@@ -23,7 +23,7 @@
@@ -31,7 +31,7 @@
+
-
+
- goto link
+ Read more
@@ -105,7 +105,7 @@
diff --git a/src/views/dataService/remoteSensingData/components/retrievalCondition.vue b/src/views/dataService/remoteSensingData/components/retrievalCondition.vue
index 22c7877..7b6daac 100644
--- a/src/views/dataService/remoteSensingData/components/retrievalCondition.vue
+++ b/src/views/dataService/remoteSensingData/components/retrievalCondition.vue
@@ -2,7 +2,7 @@
-
+
Disaster Info
@@ -16,8 +16,8 @@
-
@@ -25,7 +25,7 @@
-
+
diff --git a/src/views/dataService/remoteSensingData/components/searchCondition.vue b/src/views/dataService/remoteSensingData/components/searchCondition.vue
index 65c9313..44ec40f 100644
--- a/src/views/dataService/remoteSensingData/components/searchCondition.vue
+++ b/src/views/dataService/remoteSensingData/components/searchCondition.vue
@@ -486,6 +486,7 @@ watch(
const setData = (row) => {
state.data = row;
state.selectID = row.disasterId
+ console.log(row);
map.value.mapOperations.wktParseToMap(row.geometry)
console.log(row)
}
diff --git a/src/views/responseManagement/contact/index.vue b/src/views/responseManagement/contact/index.vue
index 665aa36..e73fd94 100644
--- a/src/views/responseManagement/contact/index.vue
+++ b/src/views/responseManagement/contact/index.vue
@@ -81,8 +81,8 @@
@@ -174,25 +174,27 @@ const onOpenEdit = (row) => {
};
const send = () => {
- state.email.email = "792163605@qq.com"
+ // state.email.email = "792163605@qq.com"
emailSend(state.email).then(res => {
- ElMessage.success('发送成功');
+ ElMessage.success('send success');
state.dialogVisible = false;
})
};
// 删除用户
const onRowDel = (row) => {
- ElMessageBox.confirm(`此操作将永久此参数：“${row.name}”，是否继续?`, '提示', {
- confirmButtonText: '确认',
- cancelButtonText: '取消',
+ ElMessageBox.confirm(
+ `This operation will permanently delete the contact “${row.userName}”. Do you want to continue?`
+ , 'Tips', {
+ confirmButtonText: 'Yes',
+ cancelButtonText: 'Cancel',
type: 'warning',
})
.then(() => {
- remove(row.id).then(res => {
- ElMessage.success('删除成功');
- initTableData();
- })
+ // remove(row.id).then(res => {
+ // ElMessage.success('删除成功');
+ // initTableData();
+ // })
})
.catch(() => { });
};
diff --git a/src/views/responseManagement/tool/index.vue b/src/views/responseManagement/tool/index.vue
index 563d286..91a96c9 100644
--- a/src/views/responseManagement/tool/index.vue
+++ b/src/views/responseManagement/tool/index.vue
@@ -135,14 +135,14 @@ const onOpenEdit = (row) => {
};
// 删除用户
const onRowDel = (row) => {
- ElMessageBox.confirm(`此操作将永久此参数：“${row.name}”，是否继续?`, '提示', {
- confirmButtonText: '确认',
- cancelButtonText: '取消',
+ ElMessageBox.confirm(`After rejecting the tool for “${row.toolName}” this data will be deleted.`, 'Tips', {
+ confirmButtonText: 'Yes',
+ cancelButtonText: 'cancel',
type: 'warning',
})
.then(() => {
remove(row.id).then(res => {
- ElMessage.success('删除成功');
+ ElMessage.success('delete success');
initTableData();
})
})
diff --git a/src/views/responseManagement/userResponse/index.vue b/src/views/responseManagement/userResponse/index.vue
index 11c9194..3923038 100644
--- a/src/views/responseManagement/userResponse/index.vue
+++ b/src/views/responseManagement/userResponse/index.vue
@@ -299,7 +299,7 @@ const reviews = (index) => {
//时间格式化
state.edit.disasterTime = useDateFormat(state.edit.disasterTime, 'YYYY-MM-DD').value + " 00:00:00";
review(state.edit).then((res) => {
- ElMessage.success('操作成功');
+ ElMessage.success('success');
state.dialogVisible = false;
getTableData();
});
diff --git a/src/views/system/dic/dialog.vue b/src/views/system/dic/dialog.vue
index 32e814f..67497c6 100644
--- a/src/views/system/dic/dialog.vue
+++ b/src/views/system/dic/dialog.vue
@@ -8,24 +8,24 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
+
@@ -37,28 +37,28 @@
- 字典名
+ Dictionary Name
-
+
-
-
+
+
-
-
+
+
@@ -103,11 +103,11 @@ const openDialog = (type, row) => {
state.ruleForm.children=[{ dictValue: '', dictKey: '' }];
}
state.ruleForm.status = row.isSealed === 0;
- state.dialog.title = '修改字典';
- state.dialog.submitTxt = '修 改';
+ state.dialog.title = 'Edit';
+ state.dialog.submitTxt = 'Edit';
} else {
- state.dialog.title = '新增字典';
- state.dialog.submitTxt = '新 增';
+ state.dialog.title = 'Add';
+ state.dialog.submitTxt = 'Add';
if (!state.ruleForm.children || state.ruleForm.children.length === 0) {
state.ruleForm.children=[{ dictValue: '', dictKey: '' }];
}
diff --git a/src/views/system/dic/index.vue b/src/views/system/dic/index.vue
index bb50efc..1c7be99 100644
--- a/src/views/system/dic/index.vue
+++ b/src/views/system/dic/index.vue
@@ -2,35 +2,35 @@
-
+
- 查询
+ search
- 新增字典
+ add
-
-
-
-
+
+
+
+
- 启用
- 禁用
+ Enable
+ Disabled
-
-
+
+
- 修改
- 删除
+ Edit
+ Remove
@@ -71,6 +71,9 @@ const state = reactive({
pageSize: 10,
},
},
+ query:{
+ dictValue:""
+ }
});
// 初始化表格数据
@@ -91,14 +94,14 @@ const onOpenEditDic = (type, row) => {
};
// 删除字典
const onRowDel = (row) => {
- ElMessageBox.confirm(`此操作将永久删除字典名称：“${row.dicName}”，是否继续?`, '提示', {
- confirmButtonText: '确认',
- cancelButtonText: '取消',
+ ElMessageBox.confirm(`This operation will permanently delete the dictionary named “${row.dicName}” Do you want to continue?`, 'Tips', {
+ confirmButtonText: 'Yes',
+ cancelButtonText: 'Cancel',
type: 'warning',
}).then(() => {
remove(row.id).then(() => {
getTableData();
- ElMessage.success('删除成功');
+ ElMessage.success('Delete Success');
});
}).catch(() => {});
};
From f9e7e648159508342aabd348482809a305ff332f Mon Sep 17 00:00:00 2001
From: yyhouc <792163605@qq.com>
Date: Wed, 26 Apr 2023 15:14:44 +0800
Subject: [PATCH 50/51] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5?=
=?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/request.js | 2 +-
src/views/dataService/otherData/index.vue | 4 ++--
src/views/dataService/pictureInfo/index.vue | 4 ++--
src/views/dataService/visualData/index.vue | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/utils/request.js b/src/utils/request.js
index 6a1826d..a30c035 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -4,7 +4,7 @@ import qs from 'qs';
import { Session } from '/@/utils/storage';
// export const moduleName = 'zqq-biz-vordm';
-export const moduleName = 'biz-vordm';
+export const moduleName = 'yyhouc-biz-vordm';
export const crawlModule = 'vordm-crawl';
const service = axios.create({
//baseURL: import.meta.env.VITE_API_URL,
diff --git a/src/views/dataService/otherData/index.vue b/src/views/dataService/otherData/index.vue
index 770274f..928db41 100644
--- a/src/views/dataService/otherData/index.vue
+++ b/src/views/dataService/otherData/index.vue
@@ -3,12 +3,12 @@
-
+
-
+
diff --git a/src/views/dataService/pictureInfo/index.vue b/src/views/dataService/pictureInfo/index.vue
index 0f7a368..83a582e 100644
--- a/src/views/dataService/pictureInfo/index.vue
+++ b/src/views/dataService/pictureInfo/index.vue
@@ -3,12 +3,12 @@
-