diff --git a/src/components/echarts/MyEchartMap.vue b/src/components/echarts/MyEchartMap.vue index ba2c2b6..aac3d59 100644 --- a/src/components/echarts/MyEchartMap.vue +++ b/src/components/echarts/MyEchartMap.vue @@ -10,7 +10,7 @@ import { onBeforeUnmount, ref, watch, onMounted, defineEmits } from 'vue' import * as echarts from 'echarts4' import { useDictData } from '@/stores/dictData' -const dictData = useDictData() +const dictData = useDictData() const props = defineProps(['options']) const myCharts = ref() const showCircle = ref(false) @@ -56,6 +56,7 @@ const GetEchar = async (name: string) => { backgroundColor: 'rgba(0,0,0,0.35)', ...(props.options.tooltip || null) }, + legend: { orient: 'vertical', left: 26, @@ -65,6 +66,7 @@ const GetEchar = async (name: string) => { ...(props.options.legend || null) }, + color: [ ...(props.options.color || ''), '#07CCCA ', @@ -78,6 +80,7 @@ const GetEchar = async (name: string) => { '#66FFCC', '#B3B3B3' ], + geo: { map: name, zoom: 1.2, @@ -144,7 +147,9 @@ const GetEchar = async (name: string) => { }, ...props.options.options } - + if (props.options.visualMap) { + option.visualMap = props.options.visualMap + } myCharts.value.setOption(option) window.addEventListener('resize', resizeHandler) @@ -165,8 +170,6 @@ const MapReturn = (name: string) => { let flag = true for (let i = 0; i < area.length; i++) { if (area[i].name == name) { - console.log(11111) - list = area[i] flag = false emit('getRegionByRegion', list) diff --git a/src/components/table/header/index.vue b/src/components/table/header/index.vue index 0dae3c9..11a46ba 100644 --- a/src/components/table/header/index.vue +++ b/src/components/table/header/index.vue @@ -16,7 +16,7 @@ :label-width="90" > - + @@ -49,6 +49,7 @@ const tableStore = inject('tableStore') as TableStore const tableHeader = ref() const datePickerRef = ref() const dictData = useDictData() +const areaRef = ref() interface Props { datePicker?: boolean area?: boolean @@ -114,9 +115,6 @@ const onComSearch = async () => { tableStore.table.params.endTime = datePickerRef.value.timeValue[1] tableStore.table.params.timeFlag = datePickerRef.value.timeFlag } - if (props.area) { - tableStore.table.params.deptIndex = dictData.state.area[0].id - } await tableStore.onTableAction('search', {}) } @@ -127,7 +125,7 @@ const dateChange = () => { // tableStore.table.params.searchBeginTime = date.value[0] // tableStore.table.params.searchEndTime = date.value[1] } -defineExpose({ onComSearch }) +defineExpose({ onComSearch, areaRef }) diff --git a/src/views/pms/Event-boot/Region/transientassessment.vue b/src/views/pms/Event-boot/Region/transientassessment.vue new file mode 100644 index 0000000..cfa08f6 --- /dev/null +++ b/src/views/pms/Event-boot/Region/transientassessment.vue @@ -0,0 +1,397 @@ + + + diff --git a/src/views/comptroller/list.vue b/src/views/pms/comptroller/list.vue similarity index 100% rename from src/views/comptroller/list.vue rename to src/views/pms/comptroller/list.vue diff --git a/src/views/voltage/sags/operationsManagement/index.vue b/src/views/pms/voltage/sags/operationsManagement/index.vue similarity index 100% rename from src/views/voltage/sags/operationsManagement/index.vue rename to src/views/pms/voltage/sags/operationsManagement/index.vue diff --git a/src/views/voltage/sags/operationsManagement/point.vue b/src/views/pms/voltage/sags/operationsManagement/point.vue similarity index 100% rename from src/views/voltage/sags/operationsManagement/point.vue rename to src/views/pms/voltage/sags/operationsManagement/point.vue diff --git a/src/views/voltage/sags/operationsManagement/statistics.vue b/src/views/pms/voltage/sags/operationsManagement/statistics.vue similarity index 100% rename from src/views/voltage/sags/operationsManagement/statistics.vue rename to src/views/pms/voltage/sags/operationsManagement/statistics.vue