Merge branch 'feature/v8.0/8.0.3' into test

罗广辉

2025-12-01 bead6572eaaa4778118884d5161179fd3231e66d

Merge branch 'feature/v8.0/8.0.3' into test

 src/views/device/addDevice.vue

@@ -288,9 +288,9 @@
                            },
                        ],
                    },
                    
                    
                    




                ],
            },
@@ -393,7 +393,7 @@
                console.error('获取行政区划数据失败:', error);
                return [];
            }
        },  
        },
        findNodeById(tree, id) {
            if (tree.id === id) {
                return tree;
@@ -411,11 +411,11 @@
            try {
                const response = await this.getFullAreaCode(areaCode);
                const codes = response.split(',');
                

                // 获取区域树数据
                const xzqhData = await this.getRegionTreeList(codes[0]);
                if (!xzqhData) return '/';
                

                const names = [];
                for (const code of codes) {
                    const node = this.findNodeById(xzqhData, code);
@@ -434,7 +434,7 @@
        copyInfo (row, index) {
          const ipAddress = import.meta.env.VITE_APP_DEVICE_IP
          let params = `
            host: tcp://${ipAddress}
            网关地址: tcp://${ipAddress}
            账号：drone
            密码：drone@123
            组织id：${row.bing_id}
@@ -610,7 +610,7 @@
            this.onLoad(this.page, this.query)
        },
        onLoad (page, params = {}) {
            

            const { releaseTimeRange } = this.query
            let values = {
                ...params,
@@ -629,7 +629,7 @@
            if (values.area_code) {
                values['area_code'] = values.area_code.split(',').pop()
            }
            

            this.loading = true
            getList(page.currentPage, page.pageSize, values).then(async res => {
                const data = res.data.data
@@ -649,7 +649,7 @@
                this.loading = false
                this.selectionClear()
            })
            

        },
        treeLoad (tree, treeNode, resolve) {
            var params = {

 src/views/wel/components/proportionStatic.vue

@@ -132,7 +132,7 @@
const echartsRef = ref(null);
let { chart } = useEchartsResize(echartsRef);
const initChart = val => {
  let totalNum = val.reduce((sum, item) => sum + item.num, 0);
  let totalNum = val[0].num //val.reduce((sum, item) => sum + item.num, 0);
  const data = {
    total: {
      title: '总计',