修改云南曲靖项目

2026-01-08 14:52:01 +08:00
parent 54517c0d5f
commit 6c3037f19b
20 changed files with 47 additions and 36 deletions
--- a/src/components/echarts/MyEchartMap.vue
+++ b/src/components/echarts/MyEchartMap.vue
@@ -7,7 +7,7 @@
 </template>

 <script setup lang="ts">
-import { onBeforeUnmount, ref, watch, onMounted, defineEmits } from 'vue'
+import { onBeforeUnmount, ref, watch, onMounted,  } from 'vue'
 import * as echarts from 'echarts'
 import 'echarts-gl'
 import 'echarts-liquidfill'
@@ -19,14 +19,22 @@ const myCharts = ref()
 const showCircle = ref(false)

 const fetchConfig = async (name: string) => {
-    const res = await import(`../../assets/map/${name.replace(/市$/, "")}.json`)
-    return res.default
+    try {
+        // 处理城市名称（去掉末尾的"市"）并尝试导入对应文件
+        const res = await import(`../../assets/map/${name.replace(/市$/, '')}.json`)
+        return res.default
+    } catch (error) {
+        const chinaRes = await import(`../../assets/map/中国.json`) // 请确认中国文件的实际命名
+        return chinaRes.default
+    }
+    // const res = await import(`../../assets/map/${name.replace(/市$/, "")}.json`)
+    // return res.default
    // GetEchar(res.default)
 }
 // fetchConfig()

 const emit = defineEmits(['getRegionByRegion', 'eliminate', 'clickMap'])
-onMounted(() => { })
+onMounted(() => {})

 const GetEchar = async (name: string) => {
    let chartDom = document.getElementById('chartMap')
--- a/src/views/LN/newEnergy/newEnergyAnalysis/index.vue
+++ b/src/views/LN/newEnergy/newEnergyAnalysis/index.vue
@@ -301,7 +301,7 @@ const options1 = [
 const height = mainHeight(20)
 const heightB = mainHeight(448)
 const heightA = mainHeight(180)
-const size = ref(23)
+const size = ref(19)
 const TableHeaderRef = ref()
 const detailRef = ref()
 const dotList: any = ref({})
--- a/src/views/LN/newEnergy/newEnergyAnalysis/test.vue
+++ b/src/views/LN/newEnergy/newEnergyAnalysis/test.vue
@@ -321,7 +321,7 @@ const options1 = [
 ]
 const height = mainHeight(20)
 const heightB = mainHeight(445)
-const size = ref(23)
+const size = ref(19)
 const TableHeaderRef = ref()
 const detailRef = ref()
 const dotList: any = ref({})
--- a/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
+++ b/src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue
@@ -205,7 +205,7 @@ const props = defineProps(['rowList'])
 const harmonic = harmonicOptions.filter(item => item.value < 26)
 const currentLod = ref(false)
 const monitoringPoint = useMonitoringPoint()
-const size = ref(23)
+const size = ref(19)
 const dictData = useDictData()
 const datePickerRef = ref()
 const height = mainHeight(80).height
--- a/src/views/pqs/business/terminal/deviceter/index.vue
+++ b/src/views/pqs/business/terminal/deviceter/index.vue
@@ -1694,7 +1694,7 @@ import { useDictData } from '@/stores/dictData'
 import { ref, reactive, onMounted } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { getYwZtSubstation } from '@/api/device-boot/device'
-const size = ref(23)
+const size = ref(19)
 const TerminalRef = ref()
 const pageHeight = mainHeight(20)
 const Height = mainHeight(100)
--- a/src/views/pqs/database/algorithm/list.vue
+++ b/src/views/pqs/database/algorithm/list.vue
@@ -134,7 +134,7 @@ defineOptions({
 const monitoringPoint = useMonitoringPoint()
 const height = mainHeight(20)
 const heightTab = mainHeight(82)
-const size = ref(23)
+const size = ref(19)
 const addTreeRef = ref()
 const editorRef = ref()
 const dialogVisible = ref(false)
--- a/src/views/pqs/database/algorithm/overview.vue
+++ b/src/views/pqs/database/algorithm/overview.vue
@@ -26,7 +26,7 @@ defineOptions({
 })
 const emits = defineEmits(['algorithm'])
 const height = mainHeight(20)
-const size = ref(23)
+const size = ref(19)

 const popupEditFlag = ref(false)

--- a/src/views/pqs/database/standard/index.vue
+++ b/src/views/pqs/database/standard/index.vue
@@ -64,7 +64,7 @@ defineOptions({
 const excelOptions = ref({})
 const monitoringPoint = useMonitoringPoint()
 const height = mainHeight(20)
-const size = ref(23)
+const size = ref(19)
 const treeRef = ref()
 const addTreeRef = ref()
 const url = ref('')
--- a/src/views/pqs/harmonicMonitoring/area/powerAssessment/index.vue
+++ b/src/views/pqs/harmonicMonitoring/area/powerAssessment/index.vue
@@ -1,6 +1,6 @@
 <template>
    <div class="default-main">
-        <TableHeader datePicker ref="header">
+        <TableHeader area datePicker ref="header">
            <template v-slot:select>
                <el-form-item label="电网标志">
                    <el-select v-model="tableStore.table.params.powerFlag" placeholder="请选择电网标志">
@@ -139,7 +139,7 @@ import { ref, onMounted, provide } from 'vue'
 import { mainHeight } from '@/utils/layout'
 import * as echarts from 'echarts/core'
 defineOptions({
-    name: 'harmonic-boot/qydetailedAnalysis/pollutionqy'
+    name: 'harmonic-boot/area/powerAssessment'
 })
 const dictData = useDictData()
 const echartList = ref({})
--- a/src/views/pqs/harmonicMonitoring/detailed/division/components/compute.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/division/components/compute.vue
@@ -194,7 +194,7 @@ const dotList: any = ref({})
 const height = mainHeight(20)
 const heightB = mainHeight(70)
 const harmonic = harmonicOptions.slice(1)
-const size = ref(23)
+const size = ref(19)
 const showTabs = ref(false)
 const loadDataOptions: any = ref([])
 const form: any = reactive({
--- a/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/detailed/regionalStatistics/index.vue
@@ -136,7 +136,7 @@ const tableStore = new TableStore({
            children: [
                {
                    field: 'frequencyMonitorNumber',
-                    title: '超标点数(天/点)',
+                    title: '超标点数(个)',
                    minWidth: '140px',
                    formatter: (row: any) => {
                        return row.cellValue == -1 ? '/' : row.cellValue
@@ -165,7 +165,7 @@ const tableStore = new TableStore({
            children: [
                {
                    field: 'voltageMonitorNumber',
-                    title: '超标点数(天/点)',
+                    title: '超标点数(个)',
                    minWidth: '140px',
                    formatter: (row: any) => {
                        return row.cellValue == -1 ? '/' : row.cellValue
@@ -194,7 +194,7 @@ const tableStore = new TableStore({
            children: [
                {
                    field: 'harmonicVoltageMonitorNumber',
-                    title: '超标点数(天/点)',
+                    title: '超标点数(个)',
                    minWidth: '140px',
                    formatter: (row: any) => {
                        return row.cellValue == -1 ? '/' : row.cellValue
@@ -223,7 +223,7 @@ const tableStore = new TableStore({
            children: [
                {
                    field: 'harmonicCurrentMonitorNumber',
-                    title: '超标点数(天/点)',
+                    title: '超标点数(个)',
                    minWidth: '140px',
                    formatter: (row: any) => {
                        return row.cellValue == -1 ? '/' : row.cellValue
@@ -252,7 +252,7 @@ const tableStore = new TableStore({
            children: [
                {
                    field: 'threePhaseVoltageMonitorNumber',
-                    title: '超标点数(天/点)',
+                    title: '超标点数(个)',
                    minWidth: '140px',
                    formatter: (row: any) => {
                        return row.cellValue == -1 ? '/' : row.cellValue
@@ -281,7 +281,7 @@ const tableStore = new TableStore({
            children: [
                {
                    field: 'flickerMonitorNumber',
-                    title: '超标点数(天/点)',
+                    title: '超标点数(个)',
                    minWidth: '140px',
                    formatter: (row: any) => {
                        return row.cellValue == -1 ? '/' : row.cellValue
@@ -310,7 +310,7 @@ const tableStore = new TableStore({
            children: [
                {
                    field: 'negativeMonitorNumber',
-                    title: '超标点数(天/点)',
+                    title: '超标点数(个)',
                    minWidth: '140px',
                    formatter: (row: any) => {
                        return row.cellValue == -1 ? '/' : row.cellValue
@@ -339,7 +339,7 @@ const tableStore = new TableStore({
            children: [
                {
                    field: 'interHarmonicMonitorNumber',
-                    title: '超标点数(天/点)',
+                    title: '超标点数(个)',
                    minWidth: '140px',
                    formatter: (row: any) => {
                        return row.cellValue == -1 ? '/' : row.cellValue
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/index.vue
@@ -15,7 +15,7 @@
                ></PointTree>
            </pane>
            <pane>
-                <div style="position: relative; height: 100%">
+                <div style="position: relative; height: 100%;width: 100%;">
                    <el-tabs
                        v-model="activeName"
                        type="border-card"
@@ -85,7 +85,7 @@ defineOptions({
 const route = useRoute()
 const monitoringPoint = useMonitoringPoint()
 const pointTree = ref()
-const size = ref(23)
+const size = ref(19)
 const isReload = ref(false)
 const height = mainHeight(40)
 const activeName = ref('2')
--- a/src/views/pqs/harmonicMonitoring/monitoringPoint/online/statisticalReport/index.vue
+++ b/src/views/pqs/harmonicMonitoring/monitoringPoint/online/statisticalReport/index.vue
@@ -61,7 +61,7 @@ defineOptions({
 const monitoringPoint = useMonitoringPoint()
 const showTree = ref(false)
 const height = mainHeight(20)
-const size = ref(23)
+const size = ref(19)
 const dictData = useDictData()
 const TableHeaderRef = ref()
 const dotList: any = ref({})
--- a/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
+++ b/src/views/pqs/harmonicMonitoring/reportForms/statistics/index.vue
@@ -72,7 +72,7 @@ defineOptions({
 const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
 const showTree = ref(false)
 const height = mainHeight(20)
-const size = ref(23)
+const size = ref(19)
 const dictData = useDictData()
 const TableHeaderRef = ref()
 const dotList: any = ref({})
--- a/src/views/pqs/harmonicMonitoring/reportForms/word/index.vue
+++ b/src/views/pqs/harmonicMonitoring/reportForms/word/index.vue
@@ -77,7 +77,7 @@ defineOptions({
    // name: 'harmonic-boot/report/word'
 })
 const height = mainHeight(20)
-const size = ref(23)
+const size = ref(19)
 const dictData = useDictData()
 const TableHeaderRef = ref()
 const dotList: any = ref({})
--- a/src/views/pqs/runManage/assessment/components/assess/index.vue
+++ b/src/views/pqs/runManage/assessment/components/assess/index.vue
@@ -81,7 +81,7 @@ defineOptions({
 const collapseName = ref([1, 2])
 const height = mainHeight(80)
 const collapseHeight = mainHeight(125)
-const size = ref(23)
+const size = ref(19)
 const dotList: any = ref({})
 const infoLoading = ref(false)
 const outcomeLoading = ref(false)
--- a/src/views/pqs/voltageSags/Region/thermodynamicDiagram/index.vue
+++ b/src/views/pqs/voltageSags/Region/thermodynamicDiagram/index.vue
@@ -126,7 +126,7 @@ const map = (res: any) => {
            show: true,
            color: ['#A52a2a', '#DAA520'],
            min: 0,
-            max: maxNum,
+            max: maxNum||100,
            textStyle: {
                color: '#000',
                fontSize: 12
--- a/src/views/pqs/voltageSags/monitoringPoint/online/index_JB.vue
+++ b/src/views/pqs/voltageSags/monitoringPoint/online/index_JB.vue
@@ -63,7 +63,7 @@ defineOptions({

 const monitoringPoint = useMonitoringPoint()
 const pointTree = ref()
-const size = ref(23)
+const size = ref(19)
 const isReload = ref(false)
 const height = mainHeight(40)
 const activeName = ref('3')
--- a/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue
+++ b/src/views/pqs/voltageSags/report/monitoringPointReport/index.vue
@@ -145,7 +145,7 @@ defineOptions({
 })
 const monitoringPoint = useMonitoringPoint()
 const height = mainHeight(20)
-const size = ref(23)
+const size = ref(19)
 const value = ref('')
 const TableHeaderRef = ref()
 const dotList: any = ref({
--- a/src/views/system/auth/role/index.vue
+++ b/src/views/system/auth/role/index.vue
@@ -13,7 +13,7 @@
            show-checkbox
            width="350px"
            :data="menuTree"
-            :checkStrictly="false"
+            :checkStrictly="checkStrictly"
            @checkChange="checkChange"
        ></Tree>
        <el-empty style="width: 350px; padding-top: 300px; box-sizing: border-box" description="请选择角色" v-else />
@@ -141,15 +141,18 @@ const currentChange = (data: any) => {
    menuListId.value = data.row.id
    getFunctionsByRoleIndex({ id: data.row.id }).then((res: any) => {
        treeRef.value.treeRef.setCheckedKeys(res.data.map((item: any) => item.id))
+        setTimeout(() => {
+            checkStrictly.value = false
+        }, 100)
    })
 }

 const timeout = ref<NodeJS.Timeout>()
 const checkChange = (data: any) => {
-    // if (checkStrictly.value) {
-    //     checkStrictly.value = false
-    //     return
-    // }
+    if (checkStrictly.value) {
+        checkStrictly.value = false
+        return
+    }

    updateRoleMenu({
        id: menuListId.value,