Merge branch 'master' of http://192.168.1.22:3000/Web/admin-sjzx

# Conflicts:
#	src/views/pqs/voltageSags/monitoringPoint/online/navigation/index.vue

.env.hainan

@@ -0,0 +1,5 @@
+NODE_ENV = hainan
+VITE_NAME="hainan"
+# 电网一张图 地图图层
+VITE_NARIMAP=null
+VITE_NRGISCOMMON=null

.env.qujing

@@ -0,0 +1,6 @@
+# 云南曲靖
+NODE_ENV = qujing
+VITE_NAME="qujing"
+# 电网一张图 地图图层
+VITE_NARIMAP=null
+VITE_NRGISCOMMON=null

package.json

@@ -6,9 +6,13 @@
   "scripts": {
     "dev": "vite --mode dev",
     "dev:jibei": "vite --mode jibei",
+    "dev:hainan": "vite --mode hainan",
+    "dev:qujing": "vite --mode qujing",
     "dev:removeMode": "vite --mode removeMode",
     "build": "vite build --mode dev",
     "build:jibei": "vite build --mode jibei",
+    "build:hainan": "vite build --mode hainan",
+    "build:qujing": "vite build --mode qujing",
     "build:removeMode": "vite build --mode removeMode",
     "preview": "vite preview"
   },
@@ -19,7 +23,7 @@
     "@form-create/element-ui": "^3.1.24",
     "@fortawesome/fontawesome-free": "^6.5.1",
     "@kjgl77/datav-vue3": "^1.7.4",
-    "@vue-office/docx": "^1.6.2",
+    "@vue-office/docx": "^1.6.3",
     "@vue-office/excel": "^1.7.8",
     "@vue-office/pdf": "^2.0.2",
     "@vueuse/core": "^10.7.0",

src/api/device-boot/Business.ts

@@ -134,6 +134,22 @@ export function selectUserList(data: any) {
         data
     })
 }
+//获取用户
+export function selectUserAssessMentList(data: any) {
+    return createAxios({
+        url: '/supervision-boot/userReport/selectUserAssessMentList',
+        method: 'post',
+        data
+    })
+}
+//绑定用户
+export function bindAssessmentId(data: any) {
+    return createAxios({
+        url: '/supervision-boot/userReport/bindAssessmentId',
+        method: 'get',
+        params: data
+    })
+}
 //查询列表
 export function getStatusManageList(data: any) {
     return createAxios({

src/api/device-boot/line.ts

@@ -1,32 +1,47 @@
-import request from '@/utils/request'
-
-import { DEVICE_BOOT } from '@/utils/constantRequest'
-
-const MAPPING_PATH = DEVICE_BOOT + '/line'
-
-/**
- * 查询终端详细信息
- */
-export const getDeviceDetailData = (id: string) => {
-    return request({
-        url: MAPPING_PATH + '/getDeviceDetailData?id=' + id,
-        method: 'POST'
-    })
-}
-
-/**
- * 查询监测点详细信息
- */
-export const getLineDetailData = (id: string) => {
-    return request({
-        url: MAPPING_PATH + '/getLineDetailData?id=' + id,
-        method: 'POST'
-    })
-}
-
-export const getSubstationSelect = () => {
-    return request({
-        url: 'device-boot/substation/getSubstationSelect',
-        method: 'get'
-    })
-}
+import request from '@/utils/request'
+
+import { DEVICE_BOOT } from '@/utils/constantRequest'
+
+const MAPPING_PATH = DEVICE_BOOT + '/line'
+
+/**
+ * 查询终端详细信息
+ */
+export const getDeviceDetailData = (id: string) => {
+    return request({
+        url: MAPPING_PATH + '/getDeviceDetailData?id=' + id,
+        method: 'POST'
+    })
+}
+
+/**
+ * 查询监测点详细信息
+ */
+export const getLineDetailData = (id: string) => {
+    return request({
+        url: MAPPING_PATH + '/getLineDetailData?id=' + id,
+        method: 'POST'
+    })
+}
+
+export const getSubstationSelect = () => {
+    return request({
+        url: 'device-boot/substation/getSubstationSelect',
+        method: 'get'
+    })
+}
+// 查询变电站详情
+export const getSubstationSelectLine = (id: string) => {
+    return request({
+        url: '/device-boot/line/getSubstationData',
+        method: 'post',
+        data: [id]
+    })
+}
+// 查询监测点
+export const getLineOverLimitData = (id: string) => {
+    return request({
+        url: '/device-boot/line/getLineOverLimitData?id=' + id,
+        method: 'post'
+    })
+}

src/api/device-boot/panorama.ts

@@ -165,3 +165,20 @@ export function getSupervisionDetailsData(data: any) {
 export function getSupervisionCityDetailsData(data: any) {
     return request({ url: '/supervision-boot/gridDiagram/getSupervisionCityDetailsData', method: 'post', data })
 }
+
+//区域污染值统计
+export function getAreaPollution(data: any) {
+    return request({ url: '/harmonic-boot/PollutionSubstation/getAreaPollution', method: 'post', data })
+} 
+//场站级评估
+export function downPollutionSubCalc(data: any) {
+    return request({ url: '/harmonic-boot/PollutionSubstation/downPollutionSubCalc', method: 'post', data })
+} 
+//监测点评价
+export function limitTableDetail(data: any) {
+    return request({ url: '/device-boot/dataVerify/limitTableDetail', method: 'post', data })
+} 
+//重要及敏感用户详情
+export function downPollutionSensitiveUser(data: any) {
+    return request({ url: '/harmonic-boot/PollutionSubstation/downPollutionSensitiveUser', method: 'post', data })
+} 

src/api/harmonic-boot/cockpit/cockpit.ts

@@ -0,0 +1,119 @@
+import request from '@/utils/request'
+
+// 主要监测点列表查询>>分页
+export function mainLineList(data: any) {
+    return request({
+        url: '/harmonic-boot/mainLine/list',
+        method: 'post',
+        data: data
+    })
+}
+// 主要监测点指标越限详情
+export function statLimitRateDetails(data: any) {
+    return request({
+        url: '/harmonic-boot/mainLine/statLimitRateDetails',
+        method: 'post',
+        data: data
+    })
+}
+
+// 查询监测点列表=全部>>不分页
+export function cslineList(data: any) {
+    return request({
+        url: '/cs-device-boot/csline/list',
+        method: 'post',
+        data: data
+    })
+}
+
+// 监测点详情 趋势图数据
+export function trendData(data: any) {
+    return request({
+        url: '/cs-device-boot/csGroup/trendData',
+        method: 'post',
+        data: data
+    })
+}
+
+// 每日越限占比统计
+export function totalLimitStatisticsDetails(data: any) {
+    return request({
+        url: '/harmonic-boot/totalLimitStatistics/details',
+        method: 'post',
+        data: data
+    })
+}
+
+// 总体指标越限统计列表
+export function totalLimitStatisticsList(data: any) {
+    return request({
+        url: '/harmonic-boot/totalLimitStatistics/list',
+        method: 'post',
+        data: data
+    })
+}
+
+// 总体指标越限统计数据
+export function totalLimitStatisticsData(data: any) {
+    return request({
+        url: '/harmonic-boot/totalLimitStatistics/data',
+        method: 'post',
+        data: data
+    })
+}
+
+// 指标越限程度数据
+export function limitExtentData(data: any) {
+    return request({
+        url: '/harmonic-boot/limitRateDetailD/limitExtentData',
+        method: 'post',
+        data: data
+    })
+}
+// 指标日趋势图数据
+export function limitExtentDayData(data: any) {
+    return request({
+        url: '/harmonic-boot/limitRateDetailD/limitExtentDayData',
+        method: 'post',
+        data: data
+    })
+}
+
+// 指标越限明细日历数据
+export function limitCalendarData(data: any) {
+    return request({
+        url: '/harmonic-boot/limitRateDetailD/limitCalendarData',
+        method: 'post',
+        data: data
+    })
+}
+
+//指标拟合图数据
+export function fittingData(data: any) {
+    return request({
+        url: '/cs-device-boot/csGroup/fittingData',
+        method: 'post',
+        data: data
+    })
+}
+
+//指标越限时间概率分布
+export function limitTimeProbabilityData(data: any) {
+    return request({
+        url: '/harmonic-boot/limitRateDetailD/limitTimeProbabilityData',
+        method: 'post',
+        data: data
+    })
+}
+
+//指标越限程度概率分布
+export function limitProbabilityData(data: any) {
+    return request({
+        url: '/harmonic-boot/limitRateDetailD/limitProbabilityData',
+        method: 'post',
+        data: data
+    })
+}
+
+
+

src/api/process-boot/interference.ts

@@ -6,7 +6,7 @@ export function getUndocumentednonlinearData() {
         method: 'get'
     })
 }
-//获取入网评估报告审核数据
+//获取系统接入方案审核数据
 export function getReportreviewData() {
     return createAxios({
         url: '/Process-supervision/Reportreview/getReportreview',

src/api/process-boot/reportForms.ts

@@ -1,10 +1,18 @@
-import createAxios from '@/utils/request'
-
-export function exportModel(data: any) {
-    return createAxios({
-        url: '/harmonic-boot/exportmodel/exportModel',
-        method: 'post',
-        data: data,
-        responseType: 'blob'
-    })
-}
+import createAxios from '@/utils/request'
+
+export function exportModel(data: any) {
+    return createAxios({
+        url: '/harmonic-boot/exportmodel/exportModel',
+        method: 'post',
+        data: data,
+        responseType: 'blob'
+    })
+}
+export function areaHarmonicReport(data: any) {
+    return createAxios({
+        url: '/harmonic-boot/areaHarmonicReport/areaHarmonicReport',
+        method: 'post',
+        data: data,
+        responseType: 'blob'
+    })
+}

src/api/system-boot/csstatisticalset.ts

@@ -1,70 +1,87 @@
-import createAxios from '@/utils/request'
-// 查询指标
-export const queryStatistical = (id: string) => {
-    let form = new FormData()
-    form.append('id', id)
-    return createAxios({
-        url: '/system-boot/csstatisticalset/queryStatistical',
-        method: 'post',
-        headers: {
-            'Content-Type': 'application/x-www-form-urlencoded'
-        },
-        data: form
-    })
-}
-
-// 绑定指标
-export const addStatistical = (params: any) => {
-    return createAxios({
-        url: '/system-boot/csstatisticalset/addStatistical',
-        method: 'post',
-        data: params
-    })
-}
-// 新增驾驶舱页面
-export const addDashboard = (data: any) => {
-    return createAxios({
-        url: '/system-boot/dashboard/addDashboard',
-        method: 'post',
-        data: data
-    })
-}
-// 修改驾驶舱页面
-export const updateDashboard = (data: any) => {
-    return createAxios({
-        url: '/system-boot/dashboard/updateDashboard',
-        method: 'post',
-        data: data
-    })
-}
-// 删除驾驶舱页面
-export const deleteDashboard = (params: any) => {
-    return createAxios({
-        url: '/system-boot/dashboard/deleteDashboard',
-        method: 'post',
-        params
-    })
-}
-// 激活的驾驶舱页面
-export const activatePage = (params: any) => {
-    return createAxios({
-        url: '/system-boot/dashboard/activatePage',
-        method: 'post',
-        params
-    })
-}
-// 查询激活的驾驶舱页面
-export const queryActivatePage = () => {
-    return createAxios({
-        url: '/system-boot/dashboard/queryActivatePage',
-        method: 'post'
-    })
-}
-// 更具id 查询驾驶舱页面
-export const queryById = (params: any) => {
-    return createAxios({
-        url: '/system-boot/dashboard/queryById',
-        method: 'post',
-        params
-    })
-}
+import createAxios from '@/utils/request'
+// 查询指标
+export const queryStatistical = (id:string) => {
+    let form = new FormData()
+    form.append('id', id)
+    return createAxios({
+        url: '/system-boot/csstatisticalset/queryStatistical',
+        method: 'post',
+        headers: {
+            'Content-Type': 'application/x-www-form-urlencoded'
+        },
+        data: form
+    })
+}
+
+// 绑定指标
+export const addStatistical = (params:any) => {
+    return createAxios({
+        url: '/system-boot/csstatisticalset/addStatistical',
+        method: 'post',
+        data: params
+    })
+}
+
+// 新增驾驶舱页面
+export const addDashboard = (data: any) => {
+    return createAxios({
+        url: '/system-boot/dashboard/addDashboard',
+        method: 'post',
+        data: data
+    })
+}
+// 修改驾驶舱页面
+export const updateDashboard = (data: any) => {
+    return createAxios({
+        url: '/system-boot/dashboard/updateDashboard',
+        method: 'post',
+        data: data
+    })
+}
+// 删除驾驶舱页面
+export const deleteDashboard = (params: any) => {
+    return createAxios({
+        url: '/system-boot/dashboard/deleteDashboard',
+        method: 'post',
+        params
+    })
+}
+// 激活的驾驶舱页面
+export const activatePage = (params: any) => {
+    return createAxios({
+        url: '/system-boot/dashboard/activatePage',
+        method: 'post',
+        params
+    })
+}
+// 查询激活的驾驶舱页面
+export const queryActivatePage = () => {
+    return createAxios({
+        url: '/system-boot/dashboard/queryActivatePage',
+        method: 'post'
+    })
+}
+// 更具id 查询驾驶舱页面
+export const queryById = (params: any) => {
+    return createAxios({
+        url: '/system-boot/dashboard/queryById',
+        method: 'post',
+        params
+    })
+}
+// 更具id 查询驾驶舱页面
+export const queryByPagePath = (params: any) => {
+    return createAxios({
+        url: '/system-boot/dashboard/queryByPagePath',
+        method: 'post',
+        params
+    })
+}
+// 根据用户id查询用户驾驶舱
+export const getDashboardPageByUserId = (params: any) => {
+    return createAxios({
+        url: '/system-boot/dashboard/getDashboardPageByUserId',
+        method: 'post',
+        params
+    })
+}

src/api/system-boot/file.ts

@@ -1,5 +1,5 @@
 import createAxios from '@/utils/request'
-
+import { ElMessage } from 'element-plus'
 const SYSTEM_PREFIX = '/system-boot'
 
 /**
@@ -7,8 +7,20 @@ const SYSTEM_PREFIX = '/system-boot'
  * @param file
  */
 export const uploadFile = (file: any, path: string) => {
+    const regex = /\[|\]/g
+    // 替换规则：[ 换成 (，] 换成 )
+
+    const newFile = new File(
+        [file], // 原文件的二进制内容
+        file.name.replace(regex, match => (match === '[' ? '(' : ')')), // 新的文件名
+        {
+            type: file.type, // 复用原文件的MIME类型
+            lastModified: file.lastModified // 复用最后修改时间
+        }
+    )
+
     let form = new FormData()
-    form.append('file', file)
+    form.append('file', newFile)
     form.append('path', path)
     return createAxios({
         url: SYSTEM_PREFIX + '/file/upload',
@@ -17,6 +29,11 @@ export const uploadFile = (file: any, path: string) => {
             'Content-Type': 'multipart/form-data'
         },
         data: form
+    }).then(res => {
+        if (res.code == `A0000`) {
+            ElMessage.success('上传成功!')
+            return res
+        }
     })
 }
 
@@ -50,7 +67,7 @@ export const downloadFile = (filePath: any) => {
 /**
  * 获取文件的短期url展示
  */
-export const getFileUrl = (params:any) => {
+export const getFileUrl = (params: any) => {
     let form = new FormData()
     // form.append('filePath', filePath)
     return createAxios({

src/assets/font/demo_index.html

@@ -54,6 +54,54 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe782;</span>
+                <div class="name">253_ipower</div>
+                <div class="code-name">&amp;#xe782;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe665;</span>
+                <div class="name">电压</div>
+                <div class="code-name">&amp;#xe665;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe758;</span>
+                <div class="name">三相电压幅值不平衡</div>
+                <div class="code-name">&amp;#xe758;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe61e;</span>
+                <div class="name">电压总谐波畸变率</div>
+                <div class="code-name">&amp;#xe61e;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe612;</span>
+                <div class="name">闪变</div>
+                <div class="code-name">&amp;#xe612;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe65d;</span>
+                <div class="name">停运事件管理</div>
+                <div class="code-name">&amp;#xe65d;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe604;</span>
+                <div class="name">在运设备</div>
+                <div class="code-name">&amp;#xe604;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe666;</span>
+                <div class="name">异常类_14非智能表在运异常</div>
+                <div class="code-name">&amp;#xe666;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe82f;</span>
                 <div class="name">综合评价</div>
@@ -234,9 +282,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1744179175277') format('woff2'),
-       url('iconfont.woff?t=1744179175277') format('woff'),
-       url('iconfont.ttf?t=1744179175277') format('truetype');
+  src: url('iconfont.woff2?t=1765612648830') format('woff2'),
+       url('iconfont.woff?t=1765612648830') format('woff'),
+       url('iconfont.ttf?t=1765612648830') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -262,6 +310,78 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-a-253_ipower"></span>
+            <div class="name">
+              253_ipower
+            </div>
+            <div class="code-name">.icon-a-253_ipower
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-dianya"></span>
+            <div class="name">
+              电压
+            </div>
+            <div class="code-name">.icon-dianya
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-sanxiangdianyafuzhibupingheng"></span>
+            <div class="name">
+              三相电压幅值不平衡
+            </div>
+            <div class="code-name">.icon-sanxiangdianyafuzhibupingheng
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-dianyazongxiebojibianshuai"></span>
+            <div class="name">
+              电压总谐波畸变率
+            </div>
+            <div class="code-name">.icon-dianyazongxiebojibianshuai
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-shanbian"></span>
+            <div class="name">
+              闪变
+            </div>
+            <div class="code-name">.icon-shanbian
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-tingyunshijianguanli"></span>
+            <div class="name">
+              停运事件管理
+            </div>
+            <div class="code-name">.icon-tingyunshijianguanli
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-zaiyunshebei"></span>
+            <div class="name">
+              在运设备
+            </div>
+            <div class="code-name">.icon-zaiyunshebei
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-yichanglei_14feizhinengbiaozaiyunyichang"></span>
+            <div class="name">
+              异常类_14非智能表在运异常
+            </div>
+            <div class="code-name">.icon-yichanglei_14feizhinengbiaozaiyunyichang
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-zonghepingjia1"></span>
             <div class="name">
@@ -532,6 +652,70 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-a-253_ipower"></use>
+                </svg>
+                <div class="name">253_ipower</div>
+                <div class="code-name">#icon-a-253_ipower</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-dianya"></use>
+                </svg>
+                <div class="name">电压</div>
+                <div class="code-name">#icon-dianya</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-sanxiangdianyafuzhibupingheng"></use>
+                </svg>
+                <div class="name">三相电压幅值不平衡</div>
+                <div class="code-name">#icon-sanxiangdianyafuzhibupingheng</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-dianyazongxiebojibianshuai"></use>
+                </svg>
+                <div class="name">电压总谐波畸变率</div>
+                <div class="code-name">#icon-dianyazongxiebojibianshuai</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-shanbian"></use>
+                </svg>
+                <div class="name">闪变</div>
+                <div class="code-name">#icon-shanbian</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-tingyunshijianguanli"></use>
+                </svg>
+                <div class="name">停运事件管理</div>
+                <div class="code-name">#icon-tingyunshijianguanli</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-zaiyunshebei"></use>
+                </svg>
+                <div class="name">在运设备</div>
+                <div class="code-name">#icon-zaiyunshebei</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-yichanglei_14feizhinengbiaozaiyunyichang"></use>
+                </svg>
+                <div class="name">异常类_14非智能表在运异常</div>
+                <div class="code-name">#icon-yichanglei_14feizhinengbiaozaiyunyichang</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-zonghepingjia1"></use>

src/assets/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3482754 */
-  src: url('iconfont.woff2?t=1744179175277') format('woff2'),
-       url('iconfont.woff?t=1744179175277') format('woff'),
-       url('iconfont.ttf?t=1744179175277') format('truetype');
+  src: url('iconfont.woff2?t=1765612648830') format('woff2'),
+       url('iconfont.woff?t=1765612648830') format('woff'),
+       url('iconfont.ttf?t=1765612648830') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,38 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-a-253_ipower:before {
+  content: "\e782";
+}
+
+.icon-dianya:before {
+  content: "\e665";
+}
+
+.icon-sanxiangdianyafuzhibupingheng:before {
+  content: "\e758";
+}
+
+.icon-dianyazongxiebojibianshuai:before {
+  content: "\e61e";
+}
+
+.icon-shanbian:before {
+  content: "\e612";
+}
+
+.icon-tingyunshijianguanli:before {
+  content: "\e65d";
+}
+
+.icon-zaiyunshebei:before {
+  content: "\e604";
+}
+
+.icon-yichanglei_14feizhinengbiaozaiyunyichang:before {
+  content: "\e666";
+}
+
 .icon-zonghepingjia1:before {
   content: "\e82f";
 }

src/assets/font/iconfont.json

@@ -5,6 +5,62 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "33424624",
+      "name": "253_ipower",
+      "font_class": "a-253_ipower",
+      "unicode": "e782",
+      "unicode_decimal": 59266
+    },
+    {
+      "icon_id": "12331657",
+      "name": "电压",
+      "font_class": "dianya",
+      "unicode": "e665",
+      "unicode_decimal": 58981
+    },
+    {
+      "icon_id": "33073330",
+      "name": "三相电压幅值不平衡",
+      "font_class": "sanxiangdianyafuzhibupingheng",
+      "unicode": "e758",
+      "unicode_decimal": 59224
+    },
+    {
+      "icon_id": "37400988",
+      "name": "电压总谐波畸变率",
+      "font_class": "dianyazongxiebojibianshuai",
+      "unicode": "e61e",
+      "unicode_decimal": 58910
+    },
+    {
+      "icon_id": "43700638",
+      "name": "闪变",
+      "font_class": "shanbian",
+      "unicode": "e612",
+      "unicode_decimal": 58898
+    },
+    {
+      "icon_id": "25458995",
+      "name": "停运事件管理",
+      "font_class": "tingyunshijianguanli",
+      "unicode": "e65d",
+      "unicode_decimal": 58973
+    },
+    {
+      "icon_id": "35341056",
+      "name": "在运设备",
+      "font_class": "zaiyunshebei",
+      "unicode": "e604",
+      "unicode_decimal": 58884
+    },
+    {
+      "icon_id": "22630860",
+      "name": "异常类_14非智能表在运异常",
+      "font_class": "yichanglei_14feizhinengbiaozaiyunyichang",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
     {
       "icon_id": "32402696",
       "name": "综合评价",

src/assets/img/view.vue

@@ -0,0 +1,295 @@
+<template>
+    <div class="default-main">
+        <!-- <div class=" layoutHeader">
+            <div class="title">{{title}}</div>
+            <back-component />
+        </div> -->
+        <TableHeader :showSearch="false">
+            <template v-slot:select>
+                <el-form-item label="统计时间">
+                    <DatePicker ref="datePickerRef" :nextFlag="false" :theCurrentTime="true"></DatePicker>
+                </el-form-item>
+            </template>
+            <template v-slot:operation>
+                <back-component />
+            </template>
+        </TableHeader>
+        <GridLayout
+            v-model:layout="layout"
+            :row-height="rowHeight"
+            :is-resizable="false"
+            :is-draggable="false"
+            :responsive="false"
+            :vertical-compact="false"
+            prevent-collision
+            :col-num="12"
+        >
+            <template #item="{ item }">
+                <div class="box">
+                    <div class="title">
+                        <div style="display: flex; align-items: center">
+                            <Icon class="HelpFilled" :name="item.icon" />
+                            {{ item.name }}
+                        </div>
+                        <!-- <FullScreen class="HelpFilled" style="cursor: pointer" @click="zoom(item)" /> -->
+                        <img :src="flag ? img : img1" style="cursor: pointer; height: 16px" @click="zoom(item)" />
+                    </div>
+                    <div>
+                        <component
+                            :is="item.component"
+                            v-if="item.component"
+                            class="pd10"
+                            :key="key"
+                            :timeValue="datePickerRef.timeValue"
+                            :height="rowHeight * item.h - seRowHeight(item.h) + 'px'"
+                            :width="rowWidth * item.w - 30 + 'px'"
+                            :timeKey="item.timeKey"
+                        />
+                        <div v-else class="pd10">组件加载失败...</div>
+                    </div>
+                </div>
+            </template>
+        </GridLayout>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted, markRaw, onUnmounted, defineAsyncComponent, type Component } from 'vue'
+import { GridLayout } from 'grid-layout-plus'
+import { useDebounceFn } from '@vueuse/core'
+import { useRouter } from 'vue-router'
+import TableHeader from '@/components/table/header/index.vue'
+import DatePicker from '@/components/form/datePicker/index.vue'
+import BackComponent from '@/components/icon/back/index.vue'
+import { queryById } from '@/api/system-boot/csstatisticalset'
+import { HelpFilled, FullScreen } from '@element-plus/icons-vue'
+import { useRoute } from 'vue-router'
+// defineOptions({
+//     name: 'cockpit/view'
+// })
+const { query } = useRoute()
+// 定义类型
+interface LayoutItem {
+    x: number
+    y: number
+    w: number
+    h: number
+    i: string | number
+    name: string
+    path: string
+    component?: Component | string
+    loading?: boolean
+    error?: any
+}
+const datePickerRef = ref()
+const title = ref('')
+const key = ref(0)
+const img = new URL(`@/assets/img/amplify.png`, import.meta.url)
+const img1 = new URL(`@/assets/img/reduce.png`, import.meta.url)
+// 响应式数据
+const rowHeight = ref(0)
+const rowWidth = ref(0)
+const layout: any = ref<LayoutItem[]>([
+    // {
+    //     x: 4,
+    //     y: 0,
+    //     w: 4,
+    //     h: 2,
+    //     i: '1',
+    //     name: '',
+    //     path: '/src/views/pqs/runManage/assessment/components/uese/index.vue'
+    // },
+])
+const layoutCopy = ref<LayoutItem[]>([])
+const flag = ref(true)
+// 组件映射
+const componentMap = reactive(new Map<string, Component | string>())
+
+// 获取主内容区域高度
+const getMainHeight = () => {
+    const elMain = document.querySelector('.el-main')
+    return (elMain?.offsetHeight || 0) - 70
+}
+// 获取主内容区域高度
+const getMainWidth = () => {
+    const elMain = document.querySelector('.el-main')
+    return (elMain?.offsetWidth || 0) - 20
+}
+
+// 初始化行高
+const initRowHeight = () => {
+    rowHeight.value = Math.max(0, (getMainHeight() - 72) / 6)
+    rowWidth.value = Math.max(0, getMainWidth() / 12)
+}
+
+// 动态注册组件
+const registerComponent = (path: string): Component | string | null => {
+    if (!path) return null
+
+    const cacheKey = path
+
+    // 使用缓存的组件
+    if (componentMap.has(cacheKey)) {
+        return componentMap.get(cacheKey)!
+    }
+
+    try {
+        // 动态导入组件
+        const modules = import.meta.glob('@/**/*.vue')
+        if (!modules[path]) {
+            console.error(`组件加载失败: ${path}`)
+            return null
+        }
+
+        const AsyncComponent = defineAsyncComponent({
+            loader: modules[path],
+            loadingComponent: () => h('div', '加载中...'),
+            errorComponent: ({ error }) => h('div', `加载错误: ${error.message}`),
+            delay: 200,
+            timeout: 10000
+        })
+
+        // 保存到映射中
+        componentMap.set(cacheKey, markRaw(AsyncComponent))
+        return AsyncComponent
+    } catch (error) {
+        console.error('注册组件失败:', error)
+        return null
+    }
+}
+// 缩放
+const zoom = (value: any) => {
+    if (flag.value) {
+        layout.value = [{ ...value, x: 0, y: 0, w: 12, h: 6 }]
+    } else {
+        layout.value = layoutCopy.value.map((item, index) => ({
+            ...item,
+            i: item.i || index, // 确保有唯一标识
+            component: registerComponent(item.path)
+        }))
+    }
+    flag.value = !flag.value
+    key.value += 1
+}
+// 获取布局数据
+const fetchLayoutData = async () => {
+    try {
+        const { data } = await queryById({ id: query.id })
+        title.value = data.pageName + '_预览'
+        const parsedLayout = JSON.parse(data.containerConfig || '[]') as LayoutItem[]
+        // 处理布局数据
+        layout.value = parsedLayout.map((item, index) => ({
+            ...item,
+            i: item.i || index, // 确保有唯一标识
+            component: registerComponent(item.path)
+        }))
+        layoutCopy.value = JSON.parse(JSON.stringify(layout.value))
+    } catch (error) {
+        console.error('获取布局数据失败:', error)
+        // 可以添加错误提示逻辑
+    }
+}
+// 计算组件高度
+const seRowHeight = (value: any) => {
+    if (value == 6) return 0
+    if (value == 5) return 12
+    if (value == 4) return 20
+    if (value == 3) return 30
+    if (value == 2) return 40
+    if (value == 1) return 50
+    return 0
+}
+
+// 窗口大小变化处理 - 使用防抖
+const handleResize = useDebounceFn(() => {
+    initRowHeight()
+    key.value += 1
+}, 200)
+
+// 生命周期钩子
+onMounted(() => {
+    initRowHeight()
+    fetchLayoutData()
+
+    // 添加窗口大小变化监听器
+    window.addEventListener('resize', handleResize)
+})
+
+onUnmounted(() => {
+    // 移除监听器防止内存泄漏
+    window.removeEventListener('resize', handleResize)
+})
+</script>
+
+<style lang="scss" scoped>
+.vgl-layout {
+    background-color: #f8f9fa;
+    border-radius: 4px;
+    overflow: hidden;
+}
+
+:deep(.vgl-item:not(.vgl-item--placeholder)) {
+    background-color: #ffffff;
+    border-radius: 4px;
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12);
+    transition: all 0.3s ease;
+}
+
+:deep(.vgl-item:hover:not(.vgl-item--placeholder)) {
+    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.12);
+}
+
+:deep(.vgl-item--static) {
+    background-color: #f0f2f5;
+}
+
+.text {
+    position: absolute;
+    inset: 0;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    font-size: 16px;
+    color: #606266;
+}
+
+:deep(.vgl-item) {
+    overflow: hidden;
+}
+
+.box {
+    overflow: hidden;
+
+    .title {
+        border-bottom: 1px solid #000;
+        font-size: 14px;
+        height: 30px;
+        font-weight: 600;
+        padding: 0px 10px;
+        color: #fff;
+        background-color: var(--el-color-primary);
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+    }
+
+    .HelpFilled {
+        height: 16px;
+        width: 16px;
+        color: #fff !important;
+        margin-right: 5px;
+    }
+}
+
+.layoutHeader {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    padding: 10px 20px;
+    font-size: 16px;
+
+    .title {
+        font-weight: 600;
+    }
+}
+</style>

src/components/FormCreate/src/utils/index.ts

@@ -23,7 +23,7 @@ export function upper(str) {
 }
 
 export function makeOptionsRule(t, to, userOptions) {
-  console.log(userOptions[0])
+  //console.log(userOptions[0])
   const options = [
     { label: t('props.optionsType.struct'), value: 0 },
     { label: t('props.optionsType.json'), value: 1 },

src/components/PreviewFile/index.vue

@@ -1,11 +1,19 @@
 <template>
     <div style="overflow: auto; height: 100vh">
-        <vue-office-docx v-if="url.includes('.doc') || url.includes('.docx')" :src="url" />
-        <vue-office-excel v-if="url.includes('.xls') || url.includes('.xlsx')" :src="url" :options="excelOptions" />
+        <vue-office-docx v-if="urlKey.includes('.doc') || urlKey.includes('.docx')" :src="url" />
+        <vue-office-excel
+            v-if="urlKey.includes('.xls') || urlKey.includes('.xlsx')"
+            :src="url"
+            :options="excelOptions"
+        />
         <!-- <vue-office-pdf v-if="url.includes('.pdf')" :src="url" /> -->
-        <iframe v-if="url.includes('.pdf')" :src="url" style="width: 100%; height: 99%"></iframe>
-        <img v-if="url.includes('.png') || url.includes('.jpg') || url.includes('.gif') || url.includes('.bmp')"
-            :src="url" />
+        <iframe v-if="urlKey.includes('.pdf')||urlKey.includes('.txt')" :src="url" style="width: 100%; height: 99%"></iframe>
+        <img
+            v-if="
+                urlKey.includes('.png') || urlKey.includes('.jpg') || urlKey.includes('.gif') || urlKey.includes('.bmp')
+            "
+            :src="url"
+        />
     </div>
 </template>
 <script lang="ts" setup>
@@ -18,15 +26,34 @@ import VueOfficeDocx from '@vue-office/docx'
 import VueOfficeExcel from '@vue-office/excel'
 //引入VueOfficePdf组件
 import VueOfficePdf from '@vue-office/pdf'
-const { push, options, currentRoute } = useRouter()
-// const url = 'http://192.168.1.22:9009/excelreport' + currentRoute.value.href?.split('?')[1]
+import { downloadFile } from '@/api/system-boot/file'
+import { previewFile } from '@/utils/fileDownLoad'
+
+const { push, options, currentRoute } = useRouter()
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+// const url = 'http://192.168.1.22:9009/excelreport' + currentRoute.value.href?.split('?')[1]
+const url = ref('')
+const excelOptions = ref({})
+const urlKey = currentRoute.value?.href?.split('?')[1]
+
+if (VITE_FLAG) {
+    url.value = '/api-docx/excelreport' + currentRoute.value?.href?.split('?')[1]
+    excelOptions.value = ref({
+        xls: currentRoute.value.href?.split('?')[1].split('.')[1] == 'xls' ? true : false
+    })
+} else {
+    setTimeout(async () => {
+        const previewUrl = await previewFile(currentRoute.value?.href?.split('?')[1])
+        url.value = previewUrl
+        excelOptions.value = ref({
+            xls: currentRoute.value.href?.split('?')[1].split('.')[1] == 'xls' ? true : false
+        })
+    }, 0)
+ }
 
-const url = '/api-docx/excelreport' + currentRoute.value?.href?.split('?')[1]
-console.log("🚀 ~ url:", url)
-const excelOptions = ref({
-    xls: currentRoute.value.href?.split('?')[1].split('.')[1] == 'xls' ? true : false
-})
 onMounted(() => {
+    // 从路由参数获取文件路径
+
     console.log()
 })
 </script>

src/components/baInput/components/remoteSelect.vue

@@ -1,310 +1,310 @@
-<template>
-    <div class="w100">
-        <!-- el-select 的远程下拉只在有搜索词时，才会加载数据（显示出 option 列表） -->
-        <!-- 使用 el-popover 在无数据/无搜索词时，显示一个无数据的提醒 -->
-        <el-popover
-            width="100%"
-            placement="bottom"
-            popper-class="remote-select-popper"
-            :visible="state.focusStatus && !state.loading && !state.keyword && !state.options.length"
-            :teleported="false"
-            :content="$t('utils.No data')"
-        >
-            <template #reference>
-                <el-select
-                    ref="selectRef"
-                    class="w100"
-                    @focus="onFocus"
-                    @blur="onBlur"
-                    :loading="state.loading || state.accidentBlur"
-                    :filterable="true"
-                    :remote="true"
-                    clearable
-                    remote-show-suffix
-                    :remote-method="onLogKeyword"
-                    v-model="state.value"
-                    @change="onChangeSelect"
-                    :multiple="multiple"
-                    :key="state.selectKey"
-                    @clear="onClear"
-                    @visible-change="onVisibleChange"
-                    v-bind="$attrs"
-                >
-                    <el-option
-                        class="remote-select-option"
-                        v-for="item in state.options"
-                        :label="item[field]"
-                        :value="item[state.primaryKey].toString()"
-                        :key="item[state.primaryKey]"
-                    >
-                        <el-tooltip placement="right" effect="light" v-if="!isEmpty(tooltipParams)">
-                            <template #content>
-                                <p v-for="(tooltipParam, key) in tooltipParams" :key="key">{{ key }}: {{ item[tooltipParam] }}</p>
-                            </template>
-                            <div>{{ item[field] }}</div>
-                        </el-tooltip>
-                    </el-option>
-                    <el-pagination
-                        v-if="state.total"
-                        :currentPage="state.currentPage"
-                        :page-size="state.pageSize"
-                        class="select-pagination"
-                        layout="->, prev, next"
-                        :total="state.total"
-                        @current-change="onSelectCurrentPageChange"
-                    />
-                </el-select>
-            </template>
-        </el-popover>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { reactive, watch, onMounted, onUnmounted, ref, nextTick, getCurrentInstance, toRaw } from 'vue'
-import { getSelectData } from '@/api/common'
-import { uuid } from '@/utils/random'
-import type { ElSelect } from 'element-plus'
-import { isEmpty } from 'lodash-es'
-import { getArrayKey } from '@/utils/common'
-
-const selectRef = ref<InstanceType<typeof ElSelect> | undefined>()
-type ElSelectProps = Partial<InstanceType<typeof ElSelect>['$props']>
-type valType = string | number | string[] | number[]
-
-interface Props extends /* @vue-ignore */ ElSelectProps {
-    pk?: string
-    field?: string
-    params?: anyObj
-    multiple?: boolean
-    remoteUrl: string
-    modelValue: valType
-    labelFormatter?: (optionData: anyObj, optionKey: string) => string
-    tooltipParams?: anyObj
-}
-const props = withDefaults(defineProps<Props>(), {
-    pk: 'id',
-    field: 'name',
-    params: () => {
-        return {}
-    },
-    remoteUrl: '',
-    modelValue: '',
-    multiple: false,
-    tooltipParams: () => {
-        return {}
-    },
-})
-
-const state: {
-    // 主表字段名(不带表别名)
-    primaryKey: string
-    options: anyObj[]
-    loading: boolean
-    total: number
-    currentPage: number
-    pageSize: number
-    params: anyObj
-    keyword: string
-    value: valType
-    selectKey: string
-    initializeData: boolean
-    accidentBlur: boolean
-    focusStatus: boolean
-} = reactive({
-    primaryKey: props.pk,
-    options: [],
-    loading: false,
-    total: 0,
-    currentPage: 1,
-    pageSize: 10,
-    params: props.params,
-    keyword: '',
-    value: props.modelValue ? props.modelValue : '',
-    selectKey: uuid(),
-    initializeData: false,
-    accidentBlur: false,
-    focusStatus: false,
-})
-
-let io: null | IntersectionObserver = null
-const instance = getCurrentInstance()
-
-const emits = defineEmits<{
-    (e: 'update:modelValue', value: valType): void
-    (e: 'row', value: any): void
-}>()
-
-const onChangeSelect = (val: valType) => {
-    emits('update:modelValue', val)
-    if (typeof instance?.vnode.props?.onRow == 'function') {
-        let pkArr = props.pk.split('.')
-        let pk = pkArr[pkArr.length - 1]
-        if (typeof val == 'number' || typeof val == 'string') {
-            const dataKey = getArrayKey(state.options, pk, val.toString())
-            emits('row', dataKey ? toRaw(state.options[dataKey]) : {})
-        } else {
-            const valueArr = []
-            for (const key in val) {
-                let dataKey = getArrayKey(state.options, pk, val[key].toString())
-                if (dataKey) valueArr.push(toRaw(state.options[dataKey]))
-            }
-            emits('row', valueArr)
-        }
-    }
-}
-
-const onVisibleChange = (val: boolean) => {
-    // 保持面板状态和焦点状态一致
-    if (!val) {
-        nextTick(() => {
-            selectRef.value?.blur()
-        })
-    }
-}
-
-const onFocus = () => {
-    state.focusStatus = true
-    if (selectRef.value?.query != state.keyword) {
-        state.keyword = ''
-        state.initializeData = false
-        // el-select 自动清理搜索词会产生意外的脱焦
-        state.accidentBlur = true
-    }
-    if (!state.initializeData) {
-        getData()
-    }
-}
-
-const onBlur = () => {
-    state.focusStatus = false
-}
-
-const onClear = () => {
-    state.keyword = ''
-    state.initializeData = false
-}
-
-const onLogKeyword = (q: string) => {
-    if (state.keyword != q) {
-        state.keyword = q
-        getData()
-    }
-}
-
-const getData = (initValue: valType = '') => {
-    state.loading = true
-    state.params.page = state.currentPage
-    state.params.initKey = props.pk
-    state.params.initValue = initValue
-    getSelectData(props.remoteUrl, state.keyword, state.params)
-        .then((res) => {
-            let initializeData = true
-            let opts = res.data.options ? res.data.options : res.data.list
-            if (typeof props.labelFormatter == 'function') {
-                for (const key in opts) {
-                    opts[key][props.field] = props.labelFormatter(opts[key], key)
-                }
-            }
-            state.options = opts
-            state.total = res.data.total ?? 0
-            if (initValue) {
-                // 重新渲染组件,确保在赋值前,opts已加载到-兼容 modelValue 更新
-                state.selectKey = uuid()
-                initializeData = false
-            }
-            state.loading = false
-            state.initializeData = initializeData
-            if (state.accidentBlur) {
-                nextTick(() => {
-                    const inputEl = selectRef.value?.$el.querySelector('.el-select__tags .el-select__input')
-                    inputEl && inputEl.focus()
-                    state.accidentBlur = false
-                })
-            }
-        })
-        .catch(() => {
-            state.loading = false
-        })
-}
-
-const onSelectCurrentPageChange = (val: number) => {
-    state.currentPage = val
-    getData()
-}
-
-const initDefaultValue = () => {
-    if (state.value) {
-        // number[]转string[]确保默认值能够选中
-        if (typeof state.value === 'object') {
-            for (const key in state.value as string[]) {
-                state.value[key] = state.value[key].toString()
-            }
-        } else if (typeof state.value === 'number') {
-            state.value = state.value.toString()
-        }
-        getData(state.value)
-    }
-}
-
-onMounted(() => {
-    if (props.pk.indexOf('.') > 0) {
-        let pk = props.pk.split('.')
-        state.primaryKey = pk[1] ? pk[1] : pk[0]
-    }
-    initDefaultValue()
-
-    setTimeout(() => {
-        if (window?.IntersectionObserver) {
-            io = new IntersectionObserver((entries) => {
-                for (const key in entries) {
-                    if (!entries[key].isIntersecting) selectRef.value?.blur()
-                }
-            })
-            if (selectRef.value?.$el instanceof Element) {
-                io.observe(selectRef.value.$el)
-            }
-        }
-    }, 500)
-})
-
-onUnmounted(() => {
-    io?.disconnect()
-})
-
-watch(
-    () => props.modelValue,
-    (newVal) => {
-        if (String(state.value) != String(newVal)) {
-            state.value = newVal ? newVal : ''
-            initDefaultValue()
-        }
-    }
-)
-
-const getSelectRef = () => {
-    return selectRef.value
-}
-
-const focus = () => {
-    selectRef.value?.focus()
-}
-
-const blur = () => {
-    selectRef.value?.blur()
-}
-
-defineExpose({
-    blur,
-    focus,
-    getSelectRef,
-})
-</script>
-
-<style scoped lang="scss">
-:deep(.remote-select-popper) {
-    text-align: center;
-}
-.remote-select-option {
-    white-space: pre;
-}
-</style>
+<template>
+    <div class="w100">
+        <!-- el-select 的远程下拉只在有搜索词时，才会加载数据（显示出 option 列表） -->
+        <!-- 使用 el-popover 在无数据/无搜索词时，显示一个无数据的提醒 -->
+        <el-popover
+            width="100%"
+            placement="bottom"
+            popper-class="remote-select-popper"
+            :visible="state.focusStatus && !state.loading && !state.keyword && !state.options.length"
+            :teleported="false"
+            :content="$t('utils.No data')"
+        >
+            <template #reference>
+                <el-select
+                    ref="selectRef"
+                    class="w100"
+                    @focus="onFocus"
+                    @blur="onBlur"
+                    :loading="state.loading || state.accidentBlur"
+                    :filterable="true"
+                    :remote="true"
+                    clearable
+                    remote-show-suffix
+                    :remote-method="onLogKeyword"
+                    v-model="state.value"
+                    @change="onChangeSelect"
+                    :multiple="multiple"
+                    :key="state.selectKey"
+                    @clear="onClear"
+                    @visible-change="onVisibleChange"
+                    v-bind="$attrs"
+                >
+                    <el-option
+                        class="remote-select-option"
+                        v-for="item in state.options"
+                        :label="item[field]"
+                        :value="item[state.primaryKey].toString()"
+                        :key="item[state.primaryKey]"
+                    >
+                        <el-tooltip placement="right" effect="light" v-if="!isEmpty(tooltipParams)">
+                            <template #content>
+                                <p v-for="(tooltipParam, key) in tooltipParams" :key="key">{{ key }}: {{ item[tooltipParam] }}</p>
+                            </template>
+                            <div>{{ item[field] }}</div>
+                        </el-tooltip>
+                    </el-option>
+                    <el-pagination
+                        v-if="state.total"
+                        :currentPage="state.currentPage"
+                        :page-size="state.pageSize"
+                        class="select-pagination"
+                        layout="->, prev, next"
+                        :total="state.total"
+                        @current-change="onSelectCurrentPageChange"
+                    />
+                </el-select>
+            </template>
+        </el-popover>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { reactive, watch, onMounted, onUnmounted, ref, nextTick, getCurrentInstance, toRaw } from 'vue'
+// import { getSelectData } from '@/api/common'
+import { uuid } from '@/utils/random'
+import type { ElSelect } from 'element-plus'
+import { isEmpty } from 'lodash-es'
+// import { getArrayKey } from '@/utils/common'
+
+const selectRef = ref<InstanceType<typeof ElSelect> | undefined>()
+type ElSelectProps = Partial<InstanceType<typeof ElSelect>['$props']>
+type valType = string | number | string[] | number[]
+
+interface Props extends /* @vue-ignore */ ElSelectProps {
+    pk?: string
+    field?: string
+    params?: anyObj
+    multiple?: boolean
+    remoteUrl: string
+    modelValue: valType
+    labelFormatter?: (optionData: anyObj, optionKey: string) => string
+    tooltipParams?: anyObj
+}
+const props = withDefaults(defineProps<Props>(), {
+    pk: 'id',
+    field: 'name',
+    params: () => {
+        return {}
+    },
+    remoteUrl: '',
+    modelValue: '',
+    multiple: false,
+    tooltipParams: () => {
+        return {}
+    },
+})
+
+const state: {
+    // 主表字段名(不带表别名)
+    primaryKey: string
+    options: anyObj[]
+    loading: boolean
+    total: number
+    currentPage: number
+    pageSize: number
+    params: anyObj
+    keyword: string
+    value: valType
+    selectKey: string
+    initializeData: boolean
+    accidentBlur: boolean
+    focusStatus: boolean
+} = reactive({
+    primaryKey: props.pk,
+    options: [],
+    loading: false,
+    total: 0,
+    currentPage: 1,
+    pageSize: 10,
+    params: props.params,
+    keyword: '',
+    value: props.modelValue ? props.modelValue : '',
+    selectKey: uuid(),
+    initializeData: false,
+    accidentBlur: false,
+    focusStatus: false,
+})
+
+let io: null | IntersectionObserver = null
+const instance = getCurrentInstance()
+
+const emits = defineEmits<{
+    (e: 'update:modelValue', value: valType): void
+    (e: 'row', value: any): void
+}>()
+
+const onChangeSelect = (val: valType) => {
+    emits('update:modelValue', val)
+    if (typeof instance?.vnode.props?.onRow == 'function') {
+        let pkArr = props.pk.split('.')
+        let pk = pkArr[pkArr.length - 1]
+        if (typeof val == 'number' || typeof val == 'string') {
+            // const dataKey = getArrayKey(state.options, pk, val.toString())
+            // emits('row', dataKey ? toRaw(state.options[dataKey]) : {})
+        } else {
+            // const valueArr = []
+            // for (const key in val) {
+                // let dataKey = getArrayKey(state.options, pk, val[key].toString())
+                // if (dataKey) valueArr.push(toRaw(state.options[dataKey]))
+            // }
+            // emits('row', valueArr)
+        }
+    }
+}
+
+const onVisibleChange = (val: boolean) => {
+    // 保持面板状态和焦点状态一致
+    if (!val) {
+        nextTick(() => {
+            selectRef.value?.blur()
+        })
+    }
+}
+
+const onFocus = () => {
+    state.focusStatus = true
+    if (selectRef.value?.query != state.keyword) {
+        state.keyword = ''
+        state.initializeData = false
+        // el-select 自动清理搜索词会产生意外的脱焦
+        state.accidentBlur = true
+    }
+    if (!state.initializeData) {
+        getData()
+    }
+}
+
+const onBlur = () => {
+    state.focusStatus = false
+}
+
+const onClear = () => {
+    state.keyword = ''
+    state.initializeData = false
+}
+
+const onLogKeyword = (q: string) => {
+    if (state.keyword != q) {
+        state.keyword = q
+        getData()
+    }
+}
+
+const getData = (initValue: valType = '') => {
+    state.loading = true
+    state.params.page = state.currentPage
+    state.params.initKey = props.pk
+    state.params.initValue = initValue
+    // getSelectData(props.remoteUrl, state.keyword, state.params)
+    //     .then((res) => {
+    //         let initializeData = true
+    //         let opts = res.data.options ? res.data.options : res.data.list
+    //         if (typeof props.labelFormatter == 'function') {
+    //             for (const key in opts) {
+    //                 opts[key][props.field] = props.labelFormatter(opts[key], key)
+    //             }
+    //         }
+    //         state.options = opts
+    //         state.total = res.data.total ?? 0
+    //         if (initValue) {
+    //             // 重新渲染组件,确保在赋值前,opts已加载到-兼容 modelValue 更新
+    //             state.selectKey = uuid()
+    //             initializeData = false
+    //         }
+    //         state.loading = false
+    //         state.initializeData = initializeData
+    //         if (state.accidentBlur) {
+    //             nextTick(() => {
+    //                 const inputEl = selectRef.value?.$el.querySelector('.el-select__tags .el-select__input')
+    //                 inputEl && inputEl.focus()
+    //                 state.accidentBlur = false
+    //             })
+    //         }
+    //     })
+    //     .catch(() => {
+    //         state.loading = false
+    //     })
+}
+
+const onSelectCurrentPageChange = (val: number) => {
+    state.currentPage = val
+    getData()
+}
+
+const initDefaultValue = () => {
+    if (state.value) {
+        // number[]转string[]确保默认值能够选中
+        if (typeof state.value === 'object') {
+            for (const key in state.value as string[]) {
+                state.value[key] = state.value[key].toString()
+            }
+        } else if (typeof state.value === 'number') {
+            state.value = state.value.toString()
+        }
+        getData(state.value)
+    }
+}
+
+onMounted(() => {
+    if (props.pk.indexOf('.') > 0) {
+        let pk = props.pk.split('.')
+        state.primaryKey = pk[1] ? pk[1] : pk[0]
+    }
+    initDefaultValue()
+
+    setTimeout(() => {
+        if (window?.IntersectionObserver) {
+            io = new IntersectionObserver((entries) => {
+                for (const key in entries) {
+                    if (!entries[key].isIntersecting) selectRef.value?.blur()
+                }
+            })
+            if (selectRef.value?.$el instanceof Element) {
+                io.observe(selectRef.value.$el)
+            }
+        }
+    }, 500)
+})
+
+onUnmounted(() => {
+    io?.disconnect()
+})
+
+watch(
+    () => props.modelValue,
+    (newVal) => {
+        if (String(state.value) != String(newVal)) {
+            state.value = newVal ? newVal : ''
+            initDefaultValue()
+        }
+    }
+)
+
+const getSelectRef = () => {
+    return selectRef.value
+}
+
+const focus = () => {
+    selectRef.value?.focus()
+}
+
+const blur = () => {
+    selectRef.value?.blur()
+}
+
+defineExpose({
+    blur,
+    focus,
+    getSelectRef,
+})
+</script>
+
+<style scoped lang="scss">
+:deep(.remote-select-popper) {
+    text-align: center;
+}
+.remote-select-option {
+    white-space: pre;
+}
+</style>

src/components/baInput/index.vue

@@ -1,414 +1,414 @@
-<script lang="ts">
-import type { PropType, VNode } from 'vue'
-import type { modelValueTypes, InputAttr, InputData } from '@/components/baInput'
-import { createVNode, resolveComponent, defineComponent, computed, reactive } from 'vue'
-import { inputTypes } from '@/components/baInput'
-import Array from '@/components/baInput/components/array.vue'
-import RemoteSelect from '@/components/baInput/components/remoteSelect.vue'
-import IconSelector from '@/components/baInput/components/iconSelector.vue'
-import Editor from '@/components/baInput/components/editor.vue'
-import { getArea } from '@/api/common'
-
-export default defineComponent({
-    name: 'baInput',
-    props: {
-        // 输入框类型,支持的输入框见 inputTypes
-        type: {
-            type: String,
-            required: true,
-            validator: (value: string) => {
-                return inputTypes.includes(value)
-            },
-        },
-        // 双向绑定值
-        modelValue: {
-            type: null,
-            required: true,
-        },
-        // 输入框的附加属性
-        attr: {
-            type: Object as PropType<InputAttr>,
-            default: () => {},
-        },
-        // 额外数据,radio、checkbox的选项等数据
-        data: {
-            type: Object as PropType<InputData>,
-            default: () => {},
-        },
-    },
-    emits: ['update:modelValue'],
-    setup(props, { emit }) {
-        const onValueUpdate = (value: modelValueTypes) => {
-            emit('update:modelValue', value)
-        }
-
-        // 子级元素属性
-        let childrenAttr = props.data && props.data.childrenAttr ? props.data.childrenAttr : {}
-
-        // string number textarea password
-        const sntp = () => {
-            return () =>
-                createVNode(resolveComponent('el-input'), {
-                    type: props.type == 'string' ? 'text' : props.type,
-                    ...props.attr,
-                    modelValue: props.modelValue,
-                    'onUpdate:modelValue': onValueUpdate,
-                })
-        }
-        // radio checkbox
-        const rc = () => {
-            if (!props.data || !props.data.content) {
-                console.warn('请传递 ' + props.type + '的 content')
-            }
-            let vNode: VNode[] = []
-            for (const key in props.data.content) {
-                vNode.push(
-                    createVNode(
-                        resolveComponent('el-' + props.type),
-                        {
-                            label: key,
-                            ...childrenAttr,
-                        },
-                        () => props.data.content[key]
-                    )
-                )
-            }
-            return () => {
-                const valueComputed = computed(() => {
-                    if (props.type == 'radio') {
-                        if (props.modelValue == undefined) return ''
-                        return '' + props.modelValue
-                    } else {
-                        let modelValueArr: anyObj = []
-                        for (const key in props.modelValue) {
-                            modelValueArr[key] = '' + props.modelValue[key]
-                        }
-                        return modelValueArr
-                    }
-                })
-                return createVNode(
-                    resolveComponent('el-' + props.type + '-group'),
-                    {
-                        ...props.attr,
-                        modelValue: valueComputed.value,
-                        'onUpdate:modelValue': onValueUpdate,
-                    },
-                    () => vNode
-                )
-            }
-        }
-        // select selects
-        const select = () => {
-            let vNode: VNode[] = []
-            if (!props.data || !props.data.content) {
-                console.warn('请传递 ' + props.type + '的 content')
-            }
-            for (const key in props.data.content) {
-                vNode.push(
-                    createVNode(resolveComponent('el-option'), {
-                        key: key,
-                        label: props.data.content[key],
-                        value: key,
-                        ...childrenAttr,
-                    })
-                )
-            }
-            return () => {
-                const valueComputed = computed(() => {
-                    if (props.type == 'select') {
-                        if (props.modelValue == undefined) return ''
-                        return '' + props.modelValue
-                    } else {
-                        let modelValueArr: anyObj = []
-                        for (const key in props.modelValue) {
-                            modelValueArr[key] = '' + props.modelValue[key]
-                        }
-                        return modelValueArr
-                    }
-                })
-                return createVNode(
-                    resolveComponent('el-select'),
-                    {
-                        class: 'w100',
-                        multiple: props.type == 'select' ? false : true,
-                        clearable: true,
-                        ...props.attr,
-                        modelValue: valueComputed.value,
-                        'onUpdate:modelValue': onValueUpdate,
-                    },
-                    () => vNode
-                )
-            }
-        }
-        // datetime
-        const datetime = () => {
-            let valueFormat = 'YYYY-MM-DD HH:mm:ss'
-            switch (props.type) {
-                case 'date':
-                    valueFormat = 'YYYY-MM-DD'
-                    break
-                case 'year':
-                    valueFormat = 'YYYY'
-                    break
-            }
-            return () =>
-                createVNode(resolveComponent('el-date-picker'), {
-                    class: 'w100',
-                    type: props.type,
-                    'value-format': valueFormat,
-                    ...props.attr,
-                    modelValue: props.modelValue,
-                    'onUpdate:modelValue': onValueUpdate,
-                })
-        }
-        // remoteSelect remoteSelects
-        const remoteSelect = () => {
-            return () =>
-                createVNode(RemoteSelect, {
-                    modelValue: props.modelValue,
-                    'onUpdate:modelValue': onValueUpdate,
-                    multiple: props.type == 'remoteSelect' ? false : true,
-                    ...props.attr,
-                })
-        }
-
-        const buildFun = new Map([
-            ['string', sntp],
-            ['number', sntp],
-            ['textarea', sntp],
-            ['password', sntp],
-            ['radio', rc],
-            ['checkbox', rc],
-            [
-                'switch',
-                () => {
-                    const valueType = computed(() => typeof props.modelValue)
-                    const valueComputed = computed(() => {
-                        if (valueType.value === 'boolean') {
-                            return props.modelValue
-                        } else {
-                            let valueTmp = parseInt(props.modelValue as string)
-                            return isNaN(valueTmp) || valueTmp <= 0 ? false : true
-                        }
-                    })
-                    return () =>
-                        createVNode(resolveComponent('el-switch'), {
-                            ...props.attr,
-                            modelValue: valueComputed.value,
-                            'onUpdate:modelValue': (value: boolean) => {
-                                let newValue: boolean | string | number = value
-                                switch (valueType.value) {
-                                    case 'string':
-                                        newValue = value ? '1' : '0'
-                                        break
-                                    case 'number':
-                                        newValue = value ? 1 : 0
-                                }
-                                emit('update:modelValue', newValue)
-                            },
-                        })
-                },
-            ],
-            ['datetime', datetime],
-            [
-                'year',
-                () => {
-                    return () => {
-                        const valueComputed = computed(() => (!props.modelValue ? null : '' + props.modelValue))
-                        return createVNode(resolveComponent('el-date-picker'), {
-                            class: 'w100',
-                            type: props.type,
-                            'value-format': 'YYYY',
-                            ...props.attr,
-                            modelValue: valueComputed.value,
-                            'onUpdate:modelValue': onValueUpdate,
-                        })
-                    }
-                },
-            ],
-            ['date', datetime],
-            [
-                'time',
-                () => {
-                    const valueComputed = computed(() => {
-                        if (props.modelValue instanceof Date) {
-                            return props.modelValue
-                        } else if (!props.modelValue) {
-                            return ''
-                        } else {
-                            let date = new Date()
-                            return new Date(date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + ' ' + props.modelValue)
-                        }
-                    })
-                    return () =>
-                        createVNode(resolveComponent('el-time-picker'), {
-                            class: 'w100',
-                            clearable: true,
-                            format: 'HH:mm:ss',
-                            ...props.attr,
-                            modelValue: valueComputed.value,
-                            'onUpdate:modelValue': onValueUpdate,
-                        })
-                },
-            ],
-            ['select', select],
-            ['selects', select],
-            [
-                'array',
-                () => {
-                    return () =>
-                        createVNode(Array, {
-                            modelValue: props.modelValue,
-                            'onUpdate:modelValue': onValueUpdate,
-                            ...props.attr,
-                        })
-                },
-            ],
-            ['remoteSelect', remoteSelect],
-            ['remoteSelects', remoteSelect],
-            [
-                'city',
-                () => {
-                    type Node = { value?: number; label?: string; leaf?: boolean }
-                    let maxLevel = props.data && props.data.level ? props.data.level - 1 : 2
-                    const lastLazyValue: {
-                        value: string | number[] | unknown
-                        nodes: Node[]
-                        key: string
-                        currentRequest: any
-                    } = reactive({
-                        value: 'ready',
-                        nodes: [],
-                        key: '',
-                        currentRequest: null,
-                    })
-
-                    // 请求到的node备份-s
-                    let nodeEbak: anyObj = {}
-                    const getNodes = (level: number, key: string) => {
-                        if (nodeEbak[level] && nodeEbak[level][key]) {
-                            return nodeEbak[level][key]
-                        }
-                        return false
-                    }
-                    const setNodes = (level: number, key: string, nodes: Node[] = []) => {
-                        if (!nodeEbak[level]) {
-                            nodeEbak[level] = {}
-                        }
-                        nodeEbak[level][key] = nodes
-                    }
-                    // 请求到的node备份-e
-
-                    return () =>
-                        createVNode(resolveComponent('el-cascader'), {
-                            modelValue: props.modelValue,
-                            'onUpdate:modelValue': onValueUpdate,
-                            class: 'w100',
-                            clearable: true,
-                            props: {
-                                lazy: true,
-                                lazyLoad(node: any, resolve: any) {
-                                    // lazyLoad会频繁触发,在本地存储请求结果,供重复触发时直接读取
-                                    const { level, pathValues } = node
-                                    let key = pathValues.join(',')
-                                    key = key ? key : 'init'
-
-                                    let locaNode = getNodes(level, key)
-                                    if (locaNode) {
-                                        return resolve(locaNode)
-                                    }
-
-                                    if (lastLazyValue.key == key && lastLazyValue.value == props.modelValue) {
-                                        if (lastLazyValue.currentRequest) {
-                                            return lastLazyValue.currentRequest
-                                        }
-                                        return resolve(lastLazyValue.nodes)
-                                    }
-
-                                    let nodes: Node[] = []
-                                    lastLazyValue.key = key
-                                    lastLazyValue.value = props.modelValue
-                                    lastLazyValue.currentRequest = getArea(pathValues).then((res) => {
-                                        let toStr = false
-                                        if (props.modelValue && typeof (props.modelValue as anyObj)[0] === 'string') {
-                                            toStr = true
-                                        }
-                                        for (const key in res.data) {
-                                            if (toStr) {
-                                                res.data[key].value = res.data[key].value.toString()
-                                            }
-                                            res.data[key].leaf = level >= maxLevel
-                                            nodes.push(res.data[key])
-                                        }
-                                        lastLazyValue.nodes = nodes
-                                        lastLazyValue.currentRequest = null
-                                        setNodes(level, key, nodes)
-                                        resolve(nodes)
-                                    })
-                                },
-                            },
-                            ...props.attr,
-                        })
-                },
-            ],
-            ['image', upload],
-            ['images', upload],
-            ['file', upload],
-            ['files', upload],
-            [
-                'icon',
-                () => {
-                    return () =>
-                        createVNode(IconSelector, {
-                            modelValue: props.modelValue,
-                            'onUpdate:modelValue': onValueUpdate,
-                            ...props.attr,
-                        })
-                },
-            ],
-            [
-                'color',
-                () => {
-                    return () =>
-                        createVNode(resolveComponent('el-color-picker'), {
-                            modelValue: props.modelValue,
-                            'onUpdate:modelValue': onValueUpdate,
-                            ...props.attr,
-                        })
-                },
-            ],
-            [
-                'editor',
-                () => {
-                    return () =>
-                        createVNode(Editor, {
-                            modelValue: props.modelValue,
-                            'onUpdate:modelValue': onValueUpdate,
-                            ...props.attr,
-                        })
-                },
-            ],
-            [
-                'default',
-                () => {
-                    console.warn('暂不支持' + props.type + '的输入框类型，你可以自行在 BaInput 组件内添加逻辑')
-                },
-            ],
-        ])
-
-        let action = buildFun.get(props.type) || buildFun.get('default')
-        return action!.call(this)
-    },
-})
-</script>
-
-<style scoped lang="scss">
-.ba-upload-image :deep(.el-upload--picture-card) {
-    display: inline-flex;
-    align-items: center;
-    justify-content: center;
-}
-.ba-upload-file :deep(.el-upload-list) {
-    margin-left: -10px;
-}
-</style>
+<script lang="ts">
+import type { PropType, VNode } from 'vue'
+import type { modelValueTypes, InputAttr, InputData } from '@/components/baInput'
+import { createVNode, resolveComponent, defineComponent, computed, reactive } from 'vue'
+import { inputTypes } from '@/components/baInput'
+import Array from '@/components/baInput/components/array.vue'
+import RemoteSelect from '@/components/baInput/components/remoteSelect.vue'
+import IconSelector from '@/components/baInput/components/iconSelector.vue'
+import Editor from '@/components/baInput/components/editor.vue'
+// import { getArea } from '@/api/common'
+
+export default defineComponent({
+    name: 'baInput',
+    props: {
+        // 输入框类型,支持的输入框见 inputTypes
+        type: {
+            type: String,
+            required: true,
+            validator: (value: string) => {
+                return inputTypes.includes(value)
+            },
+        },
+        // 双向绑定值
+        modelValue: {
+            type: null,
+            required: true,
+        },
+        // 输入框的附加属性
+        attr: {
+            type: Object as PropType<InputAttr>,
+            default: () => {},
+        },
+        // 额外数据,radio、checkbox的选项等数据
+        data: {
+            type: Object as PropType<InputData>,
+            default: () => {},
+        },
+    },
+    emits: ['update:modelValue'],
+    setup(props, { emit }) {
+        const onValueUpdate = (value: modelValueTypes) => {
+            emit('update:modelValue', value)
+        }
+
+        // 子级元素属性
+        let childrenAttr = props.data && props.data.childrenAttr ? props.data.childrenAttr : {}
+
+        // string number textarea password
+        const sntp = () => {
+            return () =>
+                createVNode(resolveComponent('el-input'), {
+                    type: props.type == 'string' ? 'text' : props.type,
+                    ...props.attr,
+                    modelValue: props.modelValue,
+                    'onUpdate:modelValue': onValueUpdate,
+                })
+        }
+        // radio checkbox
+        const rc = () => {
+            if (!props.data || !props.data.content) {
+                console.warn('请传递 ' + props.type + '的 content')
+            }
+            let vNode: VNode[] = []
+            for (const key in props.data.content) {
+                vNode.push(
+                    createVNode(
+                        resolveComponent('el-' + props.type),
+                        {
+                            label: key,
+                            ...childrenAttr,
+                        },
+                        () => props.data.content[key]
+                    )
+                )
+            }
+            return () => {
+                const valueComputed = computed(() => {
+                    if (props.type == 'radio') {
+                        if (props.modelValue == undefined) return ''
+                        return '' + props.modelValue
+                    } else {
+                        let modelValueArr: anyObj = []
+                        for (const key in props.modelValue) {
+                            modelValueArr[key] = '' + props.modelValue[key]
+                        }
+                        return modelValueArr
+                    }
+                })
+                return createVNode(
+                    resolveComponent('el-' + props.type + '-group'),
+                    {
+                        ...props.attr,
+                        modelValue: valueComputed.value,
+                        'onUpdate:modelValue': onValueUpdate,
+                    },
+                    () => vNode
+                )
+            }
+        }
+        // select selects
+        const select = () => {
+            let vNode: VNode[] = []
+            if (!props.data || !props.data.content) {
+                console.warn('请传递 ' + props.type + '的 content')
+            }
+            for (const key in props.data.content) {
+                vNode.push(
+                    createVNode(resolveComponent('el-option'), {
+                        key: key,
+                        label: props.data.content[key],
+                        value: key,
+                        ...childrenAttr,
+                    })
+                )
+            }
+            return () => {
+                const valueComputed = computed(() => {
+                    if (props.type == 'select') {
+                        if (props.modelValue == undefined) return ''
+                        return '' + props.modelValue
+                    } else {
+                        let modelValueArr: anyObj = []
+                        for (const key in props.modelValue) {
+                            modelValueArr[key] = '' + props.modelValue[key]
+                        }
+                        return modelValueArr
+                    }
+                })
+                return createVNode(
+                    resolveComponent('el-select'),
+                    {
+                        class: 'w100',
+                        multiple: props.type == 'select' ? false : true,
+                        clearable: true,
+                        ...props.attr,
+                        modelValue: valueComputed.value,
+                        'onUpdate:modelValue': onValueUpdate,
+                    },
+                    () => vNode
+                )
+            }
+        }
+        // datetime
+        const datetime = () => {
+            let valueFormat = 'YYYY-MM-DD HH:mm:ss'
+            switch (props.type) {
+                case 'date':
+                    valueFormat = 'YYYY-MM-DD'
+                    break
+                case 'year':
+                    valueFormat = 'YYYY'
+                    break
+            }
+            return () =>
+                createVNode(resolveComponent('el-date-picker'), {
+                    class: 'w100',
+                    type: props.type,
+                    'value-format': valueFormat,
+                    ...props.attr,
+                    modelValue: props.modelValue,
+                    'onUpdate:modelValue': onValueUpdate,
+                })
+        }
+        // remoteSelect remoteSelects
+        const remoteSelect = () => {
+            return () =>
+                createVNode(RemoteSelect, {
+                    modelValue: props.modelValue,
+                    'onUpdate:modelValue': onValueUpdate,
+                    multiple: props.type == 'remoteSelect' ? false : true,
+                    ...props.attr,
+                })
+        }
+
+        const buildFun = new Map([
+            ['string', sntp],
+            ['number', sntp],
+            ['textarea', sntp],
+            ['password', sntp],
+            ['radio', rc],
+            ['checkbox', rc],
+            [
+                'switch',
+                () => {
+                    const valueType = computed(() => typeof props.modelValue)
+                    const valueComputed = computed(() => {
+                        if (valueType.value === 'boolean') {
+                            return props.modelValue
+                        } else {
+                            let valueTmp = parseInt(props.modelValue as string)
+                            return isNaN(valueTmp) || valueTmp <= 0 ? false : true
+                        }
+                    })
+                    return () =>
+                        createVNode(resolveComponent('el-switch'), {
+                            ...props.attr,
+                            modelValue: valueComputed.value,
+                            'onUpdate:modelValue': (value: boolean) => {
+                                let newValue: boolean | string | number = value
+                                switch (valueType.value) {
+                                    case 'string':
+                                        newValue = value ? '1' : '0'
+                                        break
+                                    case 'number':
+                                        newValue = value ? 1 : 0
+                                }
+                                emit('update:modelValue', newValue)
+                            },
+                        })
+                },
+            ],
+            ['datetime', datetime],
+            [
+                'year',
+                () => {
+                    return () => {
+                        const valueComputed = computed(() => (!props.modelValue ? null : '' + props.modelValue))
+                        return createVNode(resolveComponent('el-date-picker'), {
+                            class: 'w100',
+                            type: props.type,
+                            'value-format': 'YYYY',
+                            ...props.attr,
+                            modelValue: valueComputed.value,
+                            'onUpdate:modelValue': onValueUpdate,
+                        })
+                    }
+                },
+            ],
+            ['date', datetime],
+            [
+                'time',
+                () => {
+                    const valueComputed = computed(() => {
+                        if (props.modelValue instanceof Date) {
+                            return props.modelValue
+                        } else if (!props.modelValue) {
+                            return ''
+                        } else {
+                            let date = new Date()
+                            return new Date(date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + ' ' + props.modelValue)
+                        }
+                    })
+                    return () =>
+                        createVNode(resolveComponent('el-time-picker'), {
+                            class: 'w100',
+                            clearable: true,
+                            format: 'HH:mm:ss',
+                            ...props.attr,
+                            modelValue: valueComputed.value,
+                            'onUpdate:modelValue': onValueUpdate,
+                        })
+                },
+            ],
+            ['select', select],
+            ['selects', select],
+            [
+                'array',
+                () => {
+                    return () =>
+                        createVNode(Array, {
+                            modelValue: props.modelValue,
+                            'onUpdate:modelValue': onValueUpdate,
+                            ...props.attr,
+                        })
+                },
+            ],
+            ['remoteSelect', remoteSelect],
+            ['remoteSelects', remoteSelect],
+            [
+                'city',
+                () => {
+                    type Node = { value?: number; label?: string; leaf?: boolean }
+                    let maxLevel = props.data && props.data.level ? props.data.level - 1 : 2
+                    const lastLazyValue: {
+                        value: string | number[] | unknown
+                        nodes: Node[]
+                        key: string
+                        currentRequest: any
+                    } = reactive({
+                        value: 'ready',
+                        nodes: [],
+                        key: '',
+                        currentRequest: null,
+                    })
+
+                    // 请求到的node备份-s
+                    let nodeEbak: anyObj = {}
+                    const getNodes = (level: number, key: string) => {
+                        if (nodeEbak[level] && nodeEbak[level][key]) {
+                            return nodeEbak[level][key]
+                        }
+                        return false
+                    }
+                    const setNodes = (level: number, key: string, nodes: Node[] = []) => {
+                        if (!nodeEbak[level]) {
+                            nodeEbak[level] = {}
+                        }
+                        nodeEbak[level][key] = nodes
+                    }
+                    // 请求到的node备份-e
+
+                    return () =>
+                        createVNode(resolveComponent('el-cascader'), {
+                            modelValue: props.modelValue,
+                            'onUpdate:modelValue': onValueUpdate,
+                            class: 'w100',
+                            clearable: true,
+                            props: {
+                                lazy: true,
+                                lazyLoad(node: any, resolve: any) {
+                                    // lazyLoad会频繁触发,在本地存储请求结果,供重复触发时直接读取
+                                    const { level, pathValues } = node
+                                    let key = pathValues.join(',')
+                                    key = key ? key : 'init'
+
+                                    let locaNode = getNodes(level, key)
+                                    if (locaNode) {
+                                        return resolve(locaNode)
+                                    }
+
+                                    if (lastLazyValue.key == key && lastLazyValue.value == props.modelValue) {
+                                        if (lastLazyValue.currentRequest) {
+                                            return lastLazyValue.currentRequest
+                                        }
+                                        return resolve(lastLazyValue.nodes)
+                                    }
+
+                                    let nodes: Node[] = []
+                                    lastLazyValue.key = key
+                                    lastLazyValue.value = props.modelValue
+                                    lastLazyValue.currentRequest = getArea(pathValues).then((res) => {
+                                        let toStr = false
+                                        if (props.modelValue && typeof (props.modelValue as anyObj)[0] === 'string') {
+                                            toStr = true
+                                        }
+                                        for (const key in res.data) {
+                                            if (toStr) {
+                                                res.data[key].value = res.data[key].value.toString()
+                                            }
+                                            res.data[key].leaf = level >= maxLevel
+                                            nodes.push(res.data[key])
+                                        }
+                                        lastLazyValue.nodes = nodes
+                                        lastLazyValue.currentRequest = null
+                                        setNodes(level, key, nodes)
+                                        resolve(nodes)
+                                    })
+                                },
+                            },
+                            ...props.attr,
+                        })
+                },
+            ],
+            ['image', upload],
+            ['images', upload],
+            ['file', upload],
+            ['files', upload],
+            [
+                'icon',
+                () => {
+                    return () =>
+                        createVNode(IconSelector, {
+                            modelValue: props.modelValue,
+                            'onUpdate:modelValue': onValueUpdate,
+                            ...props.attr,
+                        })
+                },
+            ],
+            [
+                'color',
+                () => {
+                    return () =>
+                        createVNode(resolveComponent('el-color-picker'), {
+                            modelValue: props.modelValue,
+                            'onUpdate:modelValue': onValueUpdate,
+                            ...props.attr,
+                        })
+                },
+            ],
+            [
+                'editor',
+                () => {
+                    return () =>
+                        createVNode(Editor, {
+                            modelValue: props.modelValue,
+                            'onUpdate:modelValue': onValueUpdate,
+                            ...props.attr,
+                        })
+                },
+            ],
+            [
+                'default',
+                () => {
+                    console.warn('暂不支持' + props.type + '的输入框类型，你可以自行在 BaInput 组件内添加逻辑')
+                },
+            ],
+        ])
+
+        let action = buildFun.get(props.type) || buildFun.get('default')
+        return action!.call(this)
+    },
+})
+</script>
+
+<style scoped lang="scss">
+.ba-upload-image :deep(.el-upload--picture-card) {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+}
+.ba-upload-file :deep(.el-upload-list) {
+    margin-left: -10px;
+}
+</style>

src/components/bpmnProcessDesigner/package/designer/ProcessDesigner.vue

@@ -707,7 +707,7 @@ const processSave = async () => {
 //   return result.value || ' '
 // }
 onBeforeMount(() => {
-  console.log(props, 'propspropspropsprops')
+  //console.log(props, 'propspropspropsprops')
 })
 onMounted(() => {
   initBpmnModeler()

src/components/bpmnProcessDesigner/package/designer/ProcessViewer.vue

@@ -279,6 +279,27 @@ const getResultCss = (status) => {
   return ''
 }
 
+const getTaskNameItemType = (itemStatus: any) => {
+  if (itemStatus === 1) {
+    return '审批中'
+  }else if (itemStatus === 2) {
+    return '审批通过'
+  }else if (itemStatus === 3) {
+    return '审批不通过'
+  }else if (itemStatus === 4) {
+    return '已取消'
+  }else if (itemStatus === 5) {
+    return '退回'
+  } else if (itemStatus === 6) {
+    return '委派'
+  } else if (itemStatus === 7) {
+    return '审批通过中'
+  } else if (itemStatus === 0) {
+    return '待审批'
+  }
+  return ''
+}
+
 const getActivityOutgoing = (activity) => {
   // 如果有 outgoing，则直接使用它
   if (activity.outgoing && activity.outgoing.length > 0) {
@@ -316,7 +337,9 @@ const elementHover = (element) => {
   !overlays.value && (overlays.value = bpmnModeler.get('overlays'))
   // 展示信息
   // console.log(activityLists.value, 'activityLists.value')
-  // console.log(element.value, 'element.value')
+   if (element.value.type === 'bpmn:SequenceFlow') {
+    return
+  }
   const activity = activityLists.value.find((m) => m.key === element.value.id)
   // console.log(activity, 'activityactivityactivityactivity')
   if (!activity) {
@@ -330,22 +353,22 @@ const elementHover = (element) => {
     if (element.value.type === 'bpmn:StartEvent' && processInstance.value) {
       html = `<p>发起人：${processInstance.value.startUser.name}</p>
                   <p>部门：${processInstance.value.startUser.deptName}</p>
-                  <p>创建时间：${formatDate(processInstance.value.createTime)}`
+                  <p>创建时间：${formatDate(processInstance.value.startTime)}`
     } else if (element.value.type === 'bpmn:UserTask') {
       let task = taskList.value.find((m) => m.id === activity.taskId) // 找到活动对应的 taskId
       if (!task) {
         return
       }
-      let optionData = getIntDictOptions(DICT_TYPE.BPM_TASK_STATUS)
-      let dataResult = ''
-      optionData.forEach((element) => {
-        if (element.value == task.status) {
-          dataResult = element.label
-        }
-      })
+      // let optionData = getIntDictOptions(DICT_TYPE.BPM_TASK_STATUS)
+      // let dataResult = ''
+      // optionData.forEach((element) => {
+      //   if (element.value == task.status) {
+      //     dataResult = element.label
+      //   }
+      // })
       html = `<p>审批人：${task.assigneeUser.name}</p>
                   <p>部门：${task.assigneeUser.deptName}</p>
-                  <p>结果：${dataResult}</p>
+                  <p>结果：${getTaskNameItemType(task.status)}</p>
                   <p>创建时间：${formatDate(task.createTime)}</p>`
       // html = `<p>审批人：${task.assigneeUser.nickname}</p>
       //             <p>部门：${task.assigneeUser.deptName}</p>
@@ -368,20 +391,20 @@ const elementHover = (element) => {
         html += `<p>结束时间：${formatDate(activity.endTime)}</p>`
       }
     } else if (element.value.type === 'bpmn:EndEvent' && processInstance.value) {
-      let optionData = getIntDictOptions(DICT_TYPE.BPM_TASK_STATUS)
-      let dataResult = ''
-      optionData.forEach((element) => {
-        if (element.value == processInstance.value.status) {
-          dataResult = element.label
-        }
-      })
-      html = `<p>结果：${dataResult}</p>`
+      // let optionData = getIntDictOptions(DICT_TYPE.BPM_TASK_STATUS)
+      // let dataResult = ''
+      // optionData.forEach((element) => {
+      //   if (element.value == processInstance.value.status) {
+      //     dataResult = element.label
+      //   }
+      // })
+      // html = `<p>结果：${dataResult}</p>`
       // html = `<p>结果：${getIntDictOptions(
       //   DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT,
       //   processInstance.value.status
       // )}</p>`
       if (processInstance.value.endTime) {
-        html += `<p>结束时间：${formatDate(processInstance.value.endTime)}</p>`
+        html = `<p>结束时间：${formatDate(processInstance.value.endTime)}</p>`
       }
     }
     elementOverlayIds.value[element.value.id] = toRaw(overlays.value)?.add(element.value, {
@@ -660,7 +683,7 @@ watch(
 }
 
 .element-overlays {
-  width: 200px;
+  width: 250px;
   padding: 8px;
   color: #fafafa;
   background: rgb(0 0 0 / 60%);

src/components/bpmnProcessDesigner/package/palette/ProcessPalette.vue

@@ -15,7 +15,7 @@ const addTask = (event, options: any = {}) => {
   const ElementFactory = bpmnInstances().elementFactory
   const create = bpmnInstances().modeler.get('create')
 
-  console.log(ElementFactory, create)
+  //console.log(ElementFactory, create)
 
   const shape = ElementFactory.createShape(assign({ type: 'bpmn:UserTask' }, options))
 
@@ -23,8 +23,8 @@ const addTask = (event, options: any = {}) => {
     shape.businessObject.di.isExpanded = options.isExpanded
   }
 
-  console.log(event, 'event')
-  console.log(shape, 'shape')
+  //console.log(event, 'event')
+  //console.log(shape, 'shape')
   create.start(event, shape)
 }
 </script>

src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue

@@ -172,7 +172,7 @@ const unwatchBpmn = watch(
         return
       }
 
-      console.log('props.bpmnModeler 有值了！！！')
+      //console.log('props.bpmnModeler 有值了！！！')
       const w = window as any
       w.bpmnInstances = {
         modeler: props.bpmnModeler,

src/components/bpmnProcessDesigner/package/penal/flow-condition/FlowCondition.vue

@@ -179,7 +179,7 @@ onBeforeUnmount(() => {
 watch(
   () => props.businessObject,
   (val) => {
-    console.log(val, 'val')
+    //console.log(val, 'val')
     nextTick(() => {
       resetFlowCondition()
     })

src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue

@@ -1,491 +1,491 @@
-<template>
-  <div class="panel-tab__content">
-    <el-table :data="elementListenersList" size="small" border>
-      <el-table-column label="序号" width="80px" type="index" />
-      <el-table-column
-        label="事件类型"
-        min-width="80px"
-        show-overflow-tooltip
-        :formatter="(row) => listenerEventTypeObject[row.event]"
-      />
-      <el-table-column label="事件id" min-width="80px" prop="id" show-overflow-tooltip />
-      <el-table-column
-        label="监听器类型"
-        min-width="80px"
-        show-overflow-tooltip
-        :formatter="(row) => listenerTypeObject[row.listenerType]"
-      />
-      <el-table-column label="操作" width="90px">
-        <template #default="scope">
-          <el-button size="small" link @click="openListenerForm(scope.row, scope.$index)"
-            >编辑</el-button
-          >
-          <el-divider direction="vertical" />
-          <el-button
-            size="small"
-            link
-            style="color: #ff4d4f"
-            @click="removeListener(scope.row, scope.$index)"
-            >移除</el-button
-          >
-        </template>
-      </el-table-column>
-    </el-table>
-    <div class="element-drawer__button">
-      <XButton
-        size="small"
-        type="primary"
-        preIcon="ep:plus"
-        title="添加监听器"
-        @click="openListenerForm(null)"
-      />
-      <XButton
-        type="success"
-        preIcon="ep:select"
-        title="选择监听器"
-        size="small"
-        @click="openProcessListenerDialog"
-      />
-    </div>
-
-    <!-- 监听器 编辑/创建 部分 -->
-    <el-drawer
-      v-model="listenerFormModelVisible"
-      title="任务监听器"
-      :size="`${width}px`"
-      append-to-body
-      destroy-on-close
-    >
-      <el-form size="small" :model="listenerForm" label-width="96px" ref="listenerFormRef">
-        <el-form-item
-          label="事件类型"
-          prop="event"
-          :rules="{ required: true, trigger: ['blur', 'change'] }"
-        >
-          <el-select v-model="listenerForm.event">
-            <el-option
-              v-for="i in Object.keys(listenerEventTypeObject)"
-              :key="i"
-              :label="listenerEventTypeObject[i]"
-              :value="i"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          label="监听器ID"
-          prop="id"
-          :rules="{ required: true, trigger: ['blur', 'change'] }"
-        >
-          <el-input v-model="listenerForm.id" clearable />
-        </el-form-item>
-        <el-form-item
-          label="监听器类型"
-          prop="listenerType"
-          :rules="{ required: true, trigger: ['blur', 'change'] }"
-        >
-          <el-select v-model="listenerForm.listenerType">
-            <el-option
-              v-for="i in Object.keys(listenerTypeObject)"
-              :key="i"
-              :label="listenerTypeObject[i]"
-              :value="i"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          v-if="listenerForm.listenerType === 'classListener'"
-          label="Java类"
-          prop="class"
-          key="listener-class"
-          :rules="{ required: true, trigger: ['blur', 'change'] }"
-        >
-          <el-input v-model="listenerForm.class" clearable />
-        </el-form-item>
-        <el-form-item
-          v-if="listenerForm.listenerType === 'expressionListener'"
-          label="表达式"
-          prop="expression"
-          key="listener-expression"
-          :rules="{ required: true, trigger: ['blur', 'change'] }"
-        >
-          <el-input v-model="listenerForm.expression" clearable />
-        </el-form-item>
-        <el-form-item
-          v-if="listenerForm.listenerType === 'delegateExpressionListener'"
-          label="代理表达式"
-          prop="delegateExpression"
-          key="listener-delegate"
-          :rules="{ required: true, trigger: ['blur', 'change'] }"
-        >
-          <el-input v-model="listenerForm.delegateExpression" clearable />
-        </el-form-item>
-        <template v-if="listenerForm.listenerType === 'scriptListener'">
-          <el-form-item
-            label="脚本格式"
-            prop="scriptFormat"
-            key="listener-script-format"
-            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写脚本格式' }"
-          >
-            <el-input v-model="listenerForm.scriptFormat" clearable />
-          </el-form-item>
-          <el-form-item
-            label="脚本类型"
-            prop="scriptType"
-            key="listener-script-type"
-            :rules="{ required: true, trigger: ['blur', 'change'], message: '请选择脚本类型' }"
-          >
-            <el-select v-model="listenerForm.scriptType">
-              <el-option label="内联脚本" value="inlineScript" />
-              <el-option label="外部脚本" value="externalScript" />
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            v-if="listenerForm.scriptType === 'inlineScript'"
-            label="脚本内容"
-            prop="value"
-            key="listener-script"
-            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写脚本内容' }"
-          >
-            <el-input v-model="listenerForm.value" clearable />
-          </el-form-item>
-          <el-form-item
-            v-if="listenerForm.scriptType === 'externalScript'"
-            label="资源地址"
-            prop="resource"
-            key="listener-resource"
-            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写资源地址' }"
-          >
-            <el-input v-model="listenerForm.resource" clearable />
-          </el-form-item>
-        </template>
-
-        <template v-if="listenerForm.event === 'timeout'">
-          <el-form-item label="定时器类型" prop="eventDefinitionType" key="eventDefinitionType">
-            <el-select v-model="listenerForm.eventDefinitionType">
-              <el-option label="日期" value="date" />
-              <el-option label="持续时长" value="duration" />
-              <el-option label="循环" value="cycle" />
-              <el-option label="无" value="null" />
-            </el-select>
-          </el-form-item>
-          <el-form-item
-            v-if="!!listenerForm.eventDefinitionType && listenerForm.eventDefinitionType !== 'null'"
-            label="定时器"
-            prop="eventTimeDefinitions"
-            key="eventTimeDefinitions"
-            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写定时器配置' }"
-          >
-            <el-input v-model="listenerForm.eventTimeDefinitions" clearable />
-          </el-form-item>
-        </template>
-      </el-form>
-
-      <el-divider />
-      <p class="listener-filed__title">
-        <span><Icon icon="ep:menu" />注入字段：</span>
-        <el-button size="small" type="primary" @click="openListenerFieldForm(null)"
-          >添加字段</el-button
-        >
-      </p>
-      <el-table
-        :data="fieldsListOfListener"
-        size="small"
-        max-height="240"
-        fit
-        border
-        style="flex: none"
-      >
-        <el-table-column label="序号" width="80px" type="index" />
-        <el-table-column label="字段名称" min-width="100px" prop="name" />
-        <el-table-column
-          label="字段类型"
-          min-width="80px"
-          show-overflow-tooltip
-          :formatter="(row) => fieldTypeObject[row.fieldType]"
-        />
-        <el-table-column
-          label="字段值/表达式"
-          min-width="100px"
-          show-overflow-tooltip
-          :formatter="(row) => row.string || row.expression"
-        />
-        <el-table-column label="操作" width="100px">
-          <template #default="scope">
-            <el-button size="small" link @click="openListenerFieldForm(scope.row, scope.$index)"
-              >编辑</el-button
-            >
-            <el-divider direction="vertical" />
-            <el-button
-              size="small"
-              link
-              style="color: #ff4d4f"
-              @click="removeListenerField(scope.row, scope.$index)"
-              >移除</el-button
-            >
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <div class="element-drawer__button">
-        <el-button size="small" @click="listenerFormModelVisible = false">取 消</el-button>
-        <el-button size="small" type="primary" @click="saveListenerConfig">保 存</el-button>
-      </div>
-    </el-drawer>
-
-    <!-- 注入西段 编辑/创建 部分 -->
-    <el-dialog
-      title="字段配置"
-      v-model="listenerFieldFormModelVisible"
-      width="600px"
-      append-to-body
-      destroy-on-close
-    >
-      <el-form
-        :model="listenerFieldForm"
-        size="small"
-        label-width="96px"
-        ref="listenerFieldFormRef"
-        style="height: 136px"
-      >
-        <el-form-item
-          label="字段名称："
-          prop="name"
-          :rules="{ required: true, trigger: ['blur', 'change'] }"
-        >
-          <el-input v-model="listenerFieldForm.name" clearable />
-        </el-form-item>
-        <el-form-item
-          label="字段类型："
-          prop="fieldType"
-          :rules="{ required: true, trigger: ['blur', 'change'] }"
-        >
-          <el-select v-model="listenerFieldForm.fieldType">
-            <el-option
-              v-for="i in Object.keys(fieldTypeObject)"
-              :key="i"
-              :label="fieldTypeObject[i]"
-              :value="i"
-            />
-          </el-select>
-        </el-form-item>
-        <el-form-item
-          v-if="listenerFieldForm.fieldType === 'string'"
-          label="字段值："
-          prop="string"
-          key="field-string"
-          :rules="{ required: true, trigger: ['blur', 'change'] }"
-        >
-          <el-input v-model="listenerFieldForm.string" clearable />
-        </el-form-item>
-        <el-form-item
-          v-if="listenerFieldForm.fieldType === 'expression'"
-          label="表达式："
-          prop="expression"
-          key="field-expression"
-          :rules="{ required: true, trigger: ['blur', 'change'] }"
-        >
-          <el-input v-model="listenerFieldForm.expression" clearable />
-        </el-form-item>
-      </el-form>
-      <template #footer>
-        <el-button size="small" @click="listenerFieldFormModelVisible = false">取 消</el-button>
-        <el-button size="small" type="primary" @click="saveListenerFiled">确 定</el-button>
-      </template>
-    </el-dialog>
-  </div>
-
-  <!-- 选择弹窗 -->
-  <ProcessListenerDialog ref="processListenerDialogRef" @select="selectProcessListener" />
-</template>
-<script lang="ts" setup>
-import { ElMessageBox } from 'element-plus'
-import { createListenerObject, updateElementExtensions } from '../../utils'
-import {
-  initListenerForm,
-  initListenerType,
-  eventType,
-  listenerType,
-  fieldType,
-  initListenerForm2
-} from './utilSelf'
-import ProcessListenerDialog from '@/components/bpmnProcessDesigner/package/penal/listeners/ProcessListenerDialog.vue'
-
-defineOptions({ name: 'UserTaskListeners' })
-
-const props = defineProps({
-  id: String,
-  type: String
-})
-const prefix = inject('prefix')
-const width = inject('width')
-const elementListenersList = ref<any[]>([])
-const listenerEventTypeObject = ref(eventType)
-const listenerTypeObject = ref(listenerType)
-const listenerFormModelVisible = ref(false)
-const listenerForm = ref<any>({})
-const fieldTypeObject = ref(fieldType)
-const fieldsListOfListener = ref<any[]>([])
-const listenerFieldFormModelVisible = ref(false) // 监听器 注入字段表单弹窗 显示状态
-const editingListenerIndex = ref(-1) // 监听器所在下标，-1 为新增
-const editingListenerFieldIndex = ref(-1) // 字段所在下标，-1 为新增
-const listenerFieldForm = ref<any>({}) // 监听器 注入字段 详情表单
-const bpmnElement = ref()
-const bpmnElementListeners = ref()
-const otherExtensionList = ref()
-const listenerFormRef = ref()
-const listenerFieldFormRef = ref()
-const bpmnInstances = () => (window as any)?.bpmnInstances
-
-const resetListenersList = () => {
-  // console.log(
-  //   bpmnInstances().bpmnElement,
-  //   'window.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElement'
-  // )
-  bpmnElement.value = bpmnInstances().bpmnElement
-  otherExtensionList.value = []
-  bpmnElementListeners.value =
-    bpmnElement.value.businessObject?.extensionElements?.values.filter(
-      (ex) => ex.$type === `${prefix}:TaskListener`
-    ) ?? []
-  elementListenersList.value = bpmnElementListeners.value.map((listener) =>
-    initListenerType(listener)
-  )
-}
-const openListenerForm = (listener, index?) => {
-  if (listener) {
-    listenerForm.value = initListenerForm(listener)
-    editingListenerIndex.value = index
-  } else {
-    listenerForm.value = {}
-    editingListenerIndex.value = -1 // 标记为新增
-  }
-  if (listener && listener.fields) {
-    fieldsListOfListener.value = listener.fields.map((field) => ({
-      ...field,
-      fieldType: field.string ? 'string' : 'expression'
-    }))
-  } else {
-    fieldsListOfListener.value = []
-    listenerForm.value['fields'] = []
-  }
-  // 打开侧边栏并清楚验证状态
-  listenerFormModelVisible.value = true
-  nextTick(() => {
-    if (listenerFormRef.value) listenerFormRef.value.clearValidate()
-  })
-}
-// 移除监听器
-const removeListener = (listener, index?) => {
-  console.log(listener, 'listener')
-  ElMessageBox.confirm('确认移除该监听器吗？', '提示', {
-    confirmButtonText: '确 认',
-    cancelButtonText: '取 消'
-  })
-    .then(() => {
-      bpmnElementListeners.value.splice(index, 1)
-      elementListenersList.value.splice(index, 1)
-      updateElementExtensions(
-        bpmnElement.value,
-        otherExtensionList.value.concat(bpmnElementListeners.value)
-      )
-    })
-    .catch(() => console.info('操作取消'))
-}
-// 保存监听器
-const saveListenerConfig = async () => {
-  let validateStatus = await listenerFormRef.value.validate()
-  if (!validateStatus) return // 验证不通过直接返回
-  const listenerObject = createListenerObject(listenerForm.value, true, prefix)
-  if (editingListenerIndex.value === -1) {
-    bpmnElementListeners.value.push(listenerObject)
-    elementListenersList.value.push(listenerForm.value)
-  } else {
-    bpmnElementListeners.value.splice(editingListenerIndex.value, 1, listenerObject)
-    elementListenersList.value.splice(editingListenerIndex.value, 1, listenerForm.value)
-  }
-  // 保存其他配置
-  otherExtensionList.value =
-    bpmnElement.value.businessObject?.extensionElements?.values?.filter(
-      (ex) => ex.$type !== `${prefix}:TaskListener`
-    ) ?? []
-  updateElementExtensions(
-    bpmnElement.value,
-    otherExtensionList.value.concat(bpmnElementListeners.value)
-  )
-  // 4. 隐藏侧边栏
-  listenerFormModelVisible.value = false
-  listenerForm.value = {}
-}
-// 打开监听器字段编辑弹窗
-const openListenerFieldForm = (field, index?) => {
-  listenerFieldForm.value = field ? JSON.parse(JSON.stringify(field)) : {}
-  editingListenerFieldIndex.value = field ? index : -1
-  listenerFieldFormModelVisible.value = true
-  nextTick(() => {
-    if (listenerFieldFormRef.value) listenerFieldFormRef.value.clearValidate()
-  })
-}
-// 保存监听器注入字段
-const saveListenerFiled = async () => {
-  let validateStatus = await listenerFieldFormRef.value.validate()
-  if (!validateStatus) return // 验证不通过直接返回
-  if (editingListenerFieldIndex.value === -1) {
-    fieldsListOfListener.value.push(listenerFieldForm.value)
-    listenerForm.value.fields.push(listenerFieldForm.value)
-  } else {
-    fieldsListOfListener.value.splice(editingListenerFieldIndex.value, 1, listenerFieldForm.value)
-    listenerForm.value.fields.splice(editingListenerFieldIndex.value, 1, listenerFieldForm.value)
-  }
-  listenerFieldFormModelVisible.value = false
-  nextTick(() => {
-    listenerFieldForm.value = {}
-  })
-}
-// 移除监听器字段
-const removeListenerField = (field, index) => {
-  console.log(field, 'field')
-  ElMessageBox.confirm('确认移除该字段吗？', '提示', {
-    confirmButtonText: '确 认',
-    cancelButtonText: '取 消'
-  })
-    .then(() => {
-      fieldsListOfListener.value.splice(index, 1)
-      listenerForm.value.fields.splice(index, 1)
-    })
-    .catch(() => console.info('操作取消'))
-}
-
-// 打开监听器弹窗
-const processListenerDialogRef = ref()
-const openProcessListenerDialog = async () => {
-  processListenerDialogRef.value.open('task')
-}
-const selectProcessListener = (listener) => {
-  const listenerForm = initListenerForm2(listener)
-  const listenerObject = createListenerObject(listenerForm, true, prefix)
-  bpmnElementListeners.value.push(listenerObject)
-  elementListenersList.value.push(listenerForm)
-
-  // 保存其他配置
-  otherExtensionList.value =
-    bpmnElement.value.businessObject?.extensionElements?.values?.filter(
-      (ex) => ex.$type !== `${prefix}:TaskListener`
-    ) ?? []
-  updateElementExtensions(
-    bpmnElement.value,
-    otherExtensionList.value.concat(bpmnElementListeners.value)
-  )
-}
-
-watch(
-  () => props.id,
-  (val) => {
-    val &&
-      val.length &&
-      nextTick(() => {
-        resetListenersList()
-      })
-  },
-  { immediate: true }
-)
-</script>
+<template>
+  <div class="panel-tab__content">
+    <el-table :data="elementListenersList" size="small" border>
+      <el-table-column label="序号" width="80px" type="index" />
+      <el-table-column
+        label="事件类型"
+        min-width="80px"
+        show-overflow-tooltip
+        :formatter="(row) => listenerEventTypeObject[row.event]"
+      />
+      <el-table-column label="事件id" min-width="80px" prop="id" show-overflow-tooltip />
+      <el-table-column
+        label="监听器类型"
+        min-width="80px"
+        show-overflow-tooltip
+        :formatter="(row) => listenerTypeObject[row.listenerType]"
+      />
+      <el-table-column label="操作" width="90px">
+        <template #default="scope">
+          <el-button size="small" link @click="openListenerForm(scope.row, scope.$index)"
+            >编辑</el-button
+          >
+          <el-divider direction="vertical" />
+          <el-button
+            size="small"
+            link
+            style="color: #ff4d4f"
+            @click="removeListener(scope.row, scope.$index)"
+            >移除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="element-drawer__button">
+      <XButton
+        size="small"
+        type="primary"
+        preIcon="ep:plus"
+        title="添加监听器"
+        @click="openListenerForm(null)"
+      />
+      <XButton
+        type="success"
+        preIcon="ep:select"
+        title="选择监听器"
+        size="small"
+        @click="openProcessListenerDialog"
+      />
+    </div>
+
+    <!-- 监听器 编辑/创建 部分 -->
+    <el-drawer
+      v-model="listenerFormModelVisible"
+      title="任务监听器"
+      :size="`${width}px`"
+      append-to-body
+      destroy-on-close
+    >
+      <el-form size="small" :model="listenerForm" label-width="96px" ref="listenerFormRef">
+        <el-form-item
+          label="事件类型"
+          prop="event"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-select v-model="listenerForm.event">
+            <el-option
+              v-for="i in Object.keys(listenerEventTypeObject)"
+              :key="i"
+              :label="listenerEventTypeObject[i]"
+              :value="i"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          label="监听器ID"
+          prop="id"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.id" clearable />
+        </el-form-item>
+        <el-form-item
+          label="监听器类型"
+          prop="listenerType"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-select v-model="listenerForm.listenerType">
+            <el-option
+              v-for="i in Object.keys(listenerTypeObject)"
+              :key="i"
+              :label="listenerTypeObject[i]"
+              :value="i"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'classListener'"
+          label="Java类"
+          prop="class"
+          key="listener-class"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.class" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'expressionListener'"
+          label="表达式"
+          prop="expression"
+          key="listener-expression"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.expression" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerForm.listenerType === 'delegateExpressionListener'"
+          label="代理表达式"
+          prop="delegateExpression"
+          key="listener-delegate"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerForm.delegateExpression" clearable />
+        </el-form-item>
+        <template v-if="listenerForm.listenerType === 'scriptListener'">
+          <el-form-item
+            label="脚本格式"
+            prop="scriptFormat"
+            key="listener-script-format"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写脚本格式' }"
+          >
+            <el-input v-model="listenerForm.scriptFormat" clearable />
+          </el-form-item>
+          <el-form-item
+            label="脚本类型"
+            prop="scriptType"
+            key="listener-script-type"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请选择脚本类型' }"
+          >
+            <el-select v-model="listenerForm.scriptType">
+              <el-option label="内联脚本" value="inlineScript" />
+              <el-option label="外部脚本" value="externalScript" />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-if="listenerForm.scriptType === 'inlineScript'"
+            label="脚本内容"
+            prop="value"
+            key="listener-script"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写脚本内容' }"
+          >
+            <el-input v-model="listenerForm.value" clearable />
+          </el-form-item>
+          <el-form-item
+            v-if="listenerForm.scriptType === 'externalScript'"
+            label="资源地址"
+            prop="resource"
+            key="listener-resource"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写资源地址' }"
+          >
+            <el-input v-model="listenerForm.resource" clearable />
+          </el-form-item>
+        </template>
+
+        <template v-if="listenerForm.event === 'timeout'">
+          <el-form-item label="定时器类型" prop="eventDefinitionType" key="eventDefinitionType">
+            <el-select v-model="listenerForm.eventDefinitionType">
+              <el-option label="统计时间" value="date" />
+              <el-option label="持续时长" value="duration" />
+              <el-option label="循环" value="cycle" />
+              <el-option label="无" value="null" />
+            </el-select>
+          </el-form-item>
+          <el-form-item
+            v-if="!!listenerForm.eventDefinitionType && listenerForm.eventDefinitionType !== 'null'"
+            label="定时器"
+            prop="eventTimeDefinitions"
+            key="eventTimeDefinitions"
+            :rules="{ required: true, trigger: ['blur', 'change'], message: '请填写定时器配置' }"
+          >
+            <el-input v-model="listenerForm.eventTimeDefinitions" clearable />
+          </el-form-item>
+        </template>
+      </el-form>
+
+      <el-divider />
+      <p class="listener-filed__title">
+        <span><Icon icon="ep:menu" />注入字段：</span>
+        <el-button size="small" type="primary" @click="openListenerFieldForm(null)"
+          >添加字段</el-button
+        >
+      </p>
+      <el-table
+        :data="fieldsListOfListener"
+        size="small"
+        max-height="240"
+        fit
+        border
+        style="flex: none"
+      >
+        <el-table-column label="序号" width="80px" type="index" />
+        <el-table-column label="字段名称" min-width="100px" prop="name" />
+        <el-table-column
+          label="字段类型"
+          min-width="80px"
+          show-overflow-tooltip
+          :formatter="(row) => fieldTypeObject[row.fieldType]"
+        />
+        <el-table-column
+          label="字段值/表达式"
+          min-width="100px"
+          show-overflow-tooltip
+          :formatter="(row) => row.string || row.expression"
+        />
+        <el-table-column label="操作" width="100px">
+          <template #default="scope">
+            <el-button size="small" link @click="openListenerFieldForm(scope.row, scope.$index)"
+              >编辑</el-button
+            >
+            <el-divider direction="vertical" />
+            <el-button
+              size="small"
+              link
+              style="color: #ff4d4f"
+              @click="removeListenerField(scope.row, scope.$index)"
+              >移除</el-button
+            >
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <div class="element-drawer__button">
+        <el-button size="small" @click="listenerFormModelVisible = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="saveListenerConfig">保 存</el-button>
+      </div>
+    </el-drawer>
+
+    <!-- 注入西段 编辑/创建 部分 -->
+    <el-dialog
+      title="字段配置"
+      v-model="listenerFieldFormModelVisible"
+      width="600px"
+      append-to-body
+      destroy-on-close
+    >
+      <el-form
+        :model="listenerFieldForm"
+        size="small"
+        label-width="96px"
+        ref="listenerFieldFormRef"
+        style="height: 136px"
+      >
+        <el-form-item
+          label="字段名称："
+          prop="name"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerFieldForm.name" clearable />
+        </el-form-item>
+        <el-form-item
+          label="字段类型："
+          prop="fieldType"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-select v-model="listenerFieldForm.fieldType">
+            <el-option
+              v-for="i in Object.keys(fieldTypeObject)"
+              :key="i"
+              :label="fieldTypeObject[i]"
+              :value="i"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item
+          v-if="listenerFieldForm.fieldType === 'string'"
+          label="字段值："
+          prop="string"
+          key="field-string"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerFieldForm.string" clearable />
+        </el-form-item>
+        <el-form-item
+          v-if="listenerFieldForm.fieldType === 'expression'"
+          label="表达式："
+          prop="expression"
+          key="field-expression"
+          :rules="{ required: true, trigger: ['blur', 'change'] }"
+        >
+          <el-input v-model="listenerFieldForm.expression" clearable />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <el-button size="small" @click="listenerFieldFormModelVisible = false">取 消</el-button>
+        <el-button size="small" type="primary" @click="saveListenerFiled">确 定</el-button>
+      </template>
+    </el-dialog>
+  </div>
+
+  <!-- 选择弹窗 -->
+  <ProcessListenerDialog ref="processListenerDialogRef" @select="selectProcessListener" />
+</template>
+<script lang="ts" setup>
+import { ElMessageBox } from 'element-plus'
+import { createListenerObject, updateElementExtensions } from '../../utils'
+import {
+  initListenerForm,
+  initListenerType,
+  eventType,
+  listenerType,
+  fieldType,
+  initListenerForm2
+} from './utilSelf'
+import ProcessListenerDialog from '@/components/bpmnProcessDesigner/package/penal/listeners/ProcessListenerDialog.vue'
+
+defineOptions({ name: 'UserTaskListeners' })
+
+const props = defineProps({
+  id: String,
+  type: String
+})
+const prefix = inject('prefix')
+const width = inject('width')
+const elementListenersList = ref<any[]>([])
+const listenerEventTypeObject = ref(eventType)
+const listenerTypeObject = ref(listenerType)
+const listenerFormModelVisible = ref(false)
+const listenerForm = ref<any>({})
+const fieldTypeObject = ref(fieldType)
+const fieldsListOfListener = ref<any[]>([])
+const listenerFieldFormModelVisible = ref(false) // 监听器 注入字段表单弹窗 显示状态
+const editingListenerIndex = ref(-1) // 监听器所在下标，-1 为新增
+const editingListenerFieldIndex = ref(-1) // 字段所在下标，-1 为新增
+const listenerFieldForm = ref<any>({}) // 监听器 注入字段 详情表单
+const bpmnElement = ref()
+const bpmnElementListeners = ref()
+const otherExtensionList = ref()
+const listenerFormRef = ref()
+const listenerFieldFormRef = ref()
+const bpmnInstances = () => (window as any)?.bpmnInstances
+
+const resetListenersList = () => {
+  // console.log(
+  //   bpmnInstances().bpmnElement,
+  //   'window.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElementwindow.bpmnInstances.bpmnElement'
+  // )
+  bpmnElement.value = bpmnInstances().bpmnElement
+  otherExtensionList.value = []
+  bpmnElementListeners.value =
+    bpmnElement.value.businessObject?.extensionElements?.values.filter(
+      (ex) => ex.$type === `${prefix}:TaskListener`
+    ) ?? []
+  elementListenersList.value = bpmnElementListeners.value.map((listener) =>
+    initListenerType(listener)
+  )
+}
+const openListenerForm = (listener, index?) => {
+  if (listener) {
+    listenerForm.value = initListenerForm(listener)
+    editingListenerIndex.value = index
+  } else {
+    listenerForm.value = {}
+    editingListenerIndex.value = -1 // 标记为新增
+  }
+  if (listener && listener.fields) {
+    fieldsListOfListener.value = listener.fields.map((field) => ({
+      ...field,
+      fieldType: field.string ? 'string' : 'expression'
+    }))
+  } else {
+    fieldsListOfListener.value = []
+    listenerForm.value['fields'] = []
+  }
+  // 打开侧边栏并清楚验证状态
+  listenerFormModelVisible.value = true
+  nextTick(() => {
+    if (listenerFormRef.value) listenerFormRef.value.clearValidate()
+  })
+}
+// 移除监听器
+const removeListener = (listener, index?) => {
+  //console.log(listener, 'listener')
+  ElMessageBox.confirm('确认移除该监听器吗？', '提示', {
+    confirmButtonText: '确 认',
+    cancelButtonText: '取 消'
+  })
+    .then(() => {
+      bpmnElementListeners.value.splice(index, 1)
+      elementListenersList.value.splice(index, 1)
+      updateElementExtensions(
+        bpmnElement.value,
+        otherExtensionList.value.concat(bpmnElementListeners.value)
+      )
+    })
+    .catch(() => console.info('操作取消'))
+}
+// 保存监听器
+const saveListenerConfig = async () => {
+  let validateStatus = await listenerFormRef.value.validate()
+  if (!validateStatus) return // 验证不通过直接返回
+  const listenerObject = createListenerObject(listenerForm.value, true, prefix)
+  if (editingListenerIndex.value === -1) {
+    bpmnElementListeners.value.push(listenerObject)
+    elementListenersList.value.push(listenerForm.value)
+  } else {
+    bpmnElementListeners.value.splice(editingListenerIndex.value, 1, listenerObject)
+    elementListenersList.value.splice(editingListenerIndex.value, 1, listenerForm.value)
+  }
+  // 保存其他配置
+  otherExtensionList.value =
+    bpmnElement.value.businessObject?.extensionElements?.values?.filter(
+      (ex) => ex.$type !== `${prefix}:TaskListener`
+    ) ?? []
+  updateElementExtensions(
+    bpmnElement.value,
+    otherExtensionList.value.concat(bpmnElementListeners.value)
+  )
+  // 4. 隐藏侧边栏
+  listenerFormModelVisible.value = false
+  listenerForm.value = {}
+}
+// 打开监听器字段编辑弹窗
+const openListenerFieldForm = (field, index?) => {
+  listenerFieldForm.value = field ? JSON.parse(JSON.stringify(field)) : {}
+  editingListenerFieldIndex.value = field ? index : -1
+  listenerFieldFormModelVisible.value = true
+  nextTick(() => {
+    if (listenerFieldFormRef.value) listenerFieldFormRef.value.clearValidate()
+  })
+}
+// 保存监听器注入字段
+const saveListenerFiled = async () => {
+  let validateStatus = await listenerFieldFormRef.value.validate()
+  if (!validateStatus) return // 验证不通过直接返回
+  if (editingListenerFieldIndex.value === -1) {
+    fieldsListOfListener.value.push(listenerFieldForm.value)
+    listenerForm.value.fields.push(listenerFieldForm.value)
+  } else {
+    fieldsListOfListener.value.splice(editingListenerFieldIndex.value, 1, listenerFieldForm.value)
+    listenerForm.value.fields.splice(editingListenerFieldIndex.value, 1, listenerFieldForm.value)
+  }
+  listenerFieldFormModelVisible.value = false
+  nextTick(() => {
+    listenerFieldForm.value = {}
+  })
+}
+// 移除监听器字段
+const removeListenerField = (field, index) => {
+  console.log(field, 'field')
+  ElMessageBox.confirm('确认移除该字段吗？', '提示', {
+    confirmButtonText: '确 认',
+    cancelButtonText: '取 消'
+  })
+    .then(() => {
+      fieldsListOfListener.value.splice(index, 1)
+      listenerForm.value.fields.splice(index, 1)
+    })
+    .catch(() => console.info('操作取消'))
+}
+
+// 打开监听器弹窗
+const processListenerDialogRef = ref()
+const openProcessListenerDialog = async () => {
+  processListenerDialogRef.value.open('task')
+}
+const selectProcessListener = (listener) => {
+  const listenerForm = initListenerForm2(listener)
+  const listenerObject = createListenerObject(listenerForm, true, prefix)
+  bpmnElementListeners.value.push(listenerObject)
+  elementListenersList.value.push(listenerForm)
+
+  // 保存其他配置
+  otherExtensionList.value =
+    bpmnElement.value.businessObject?.extensionElements?.values?.filter(
+      (ex) => ex.$type !== `${prefix}:TaskListener`
+    ) ?? []
+  updateElementExtensions(
+    bpmnElement.value,
+    otherExtensionList.value.concat(bpmnElementListeners.value)
+  )
+}
+
+watch(
+  () => props.id,
+  (val) => {
+    val &&
+      val.length &&
+      nextTick(() => {
+        resetListenersList()
+      })
+  },
+  { immediate: true }
+)
+</script>

src/components/bpmnProcessDesigner/package/penal/listeners/utilSelf.ts

@@ -20,7 +20,7 @@ export function initListenerForm(listener) {
           self.eventDefinitionType = key.replace('time', '').toLowerCase()
         }
       }
-      console.log(k)
+      //console.log(k)
       self.eventTimeDefinitions = listener.eventDefinitions[0][k].body
     }
   }

src/components/bpmnProcessDesigner/package/penal/signal-message/SignalAndMessage.vue

@@ -68,7 +68,7 @@ const modelConfig = computed(() => {
 const bpmnInstances = () => (window as any)?.bpmnInstances
 
 const initDataList = () => {
-  console.log(window, 'window')
+  //console.log(window, 'window')
   rootElements.value = bpmnInstances().modeler.getDefinitions().rootElements
   messageIdMap.value = {}
   signalIdMap.value = {}

src/components/bpmnProcessDesigner/src/utils/xml2json.js

@@ -39,7 +39,7 @@ function xml2json(xml) {
 
 function xmlObj2json(xml) {
   const xmlObj = xmlStr2XmlObj(xml)
-  console.log(xmlObj)
+ // console.log(xmlObj)
   let jsonObj = {}
   if (xmlObj.childNodes.length > 0) {
     jsonObj = xml2json(xmlObj)

src/components/cockpit/dataCleaning/index.vue

@@ -0,0 +1,517 @@
+<template>
+    <div>
+        <!--异常数据清洗 -->
+        <TableHeader
+            :showReset="false"
+            ref="TableHeaderRef"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"
+        ></TableHeader>
+        <div
+            class="monitoringPoints"
+            :style="{
+                height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px  )`,
+                overflow: 'auto'
+            }"
+            v-loading="tableStore.table.loading"
+        >
+            <div style="flex: 1">
+                <div class="title">监测点统计</div>
+
+                <div>
+                    <div class="statistics">
+                        <div class="divBox">
+                            <span class="iconfont icon-qiyezongshu" style="color: #57bc6e"></span>
+                            <span class="divBox_title">监测点总数</span>
+                            <span class="divBox_num" style="color: #57bc6e">
+                                {{ monitoringPoints.runNum }}
+                            </span>
+                        </div>
+                        <div class="divBox mt10">
+                            <span class="iconfont icon-igw-f-warning-data" style="color: #ff6600"></span>
+                            <span class="divBox_title">异常测点数</span>
+                            <span class="divBox_num" style="color: #ff6600">
+                                {{ monitoringPoints.abnormalNum }}
+                            </span>
+                        </div>
+                    </div>
+                    <div class="echartTitle">
+                        <div class="title">异常占比</div>
+                        <div>
+                            {{
+                                isNaN((monitoringPoints.abnormalNum / monitoringPoints.runNum) * 100)
+                                    ? 0
+                                    : Math.floor((monitoringPoints.abnormalNum / monitoringPoints.runNum) * 10000) /
+                                      100
+                            }}%
+                        </div>
+                    </div>
+                    <div style="height: 30px">
+                        <MyEchart :options="percentage"></MyEchart>
+                    </div>
+                </div>
+            </div>
+            <div style="flex: 2" class="ml15">
+                <div class="title">异常指标统计</div>
+
+                <div class="mb5" style="height: 40px">
+                    <el-segmented
+                        style="height: 100%"
+                        v-model="segmented"
+                        :options="segmentedList"
+                        block
+                        @change="change"
+                    >
+                        <template #default="scope">
+                            <div>
+                                <div
+                                    class="segmentedIcon"
+                                    :style="{
+                                        backgroundColor:
+                                            scope.item.num > 0 ? '#FF9100' : scope.item.num > 99 ? '#ff0000' : '#007D7B'
+                                    }"
+                                >
+                                    {{ scope.item.num > 99 ? '99+' : scope.item.num }}
+                                </div>
+                                <div>{{ scope.item.label }}</div>
+                            </div>
+                        </template>
+                    </el-segmented>
+                </div>
+                <div class="header">
+                    <span style="width: 170px; text-align: left">指标名称</span>
+                    <span style="flex: 1">合理范围</span>
+                    <span style="width: 90px">异常测点数</span>
+                </div>
+                <div
+                    :style="{
+                        height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px - 105px )`,
+                        overflow: 'auto'
+                    }"
+                >
+                    <div v-for="o in abnormal.filter(item => item.remark == segmented)" class="abnormal mb10">
+                        <span style="width: 170px; height: 24px" class="iconDiv">
+                            <div :style="{ backgroundColor: o.ids.length > 0 ? '#FF9100' : '' }"></div>
+                            {{ o.targetName }}
+                        </span>
+                        <span style="flex: 1; text-align: center">
+                            <!-- 合理范围： -->
+                            <span style="color: #388e3c" class="text">{{ o.rangeDesc }}</span>
+                        </span>
+                        <span style="width: 90px; text-align: center">
+                            <span style="color: #388e3c" :class="` ${o.ids.length > 0 ? 'text-red' : ''}`" class="text">
+                                {{ o.ids.length }}
+                            </span>
+                        </span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, reactive, watch, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import { getTimeOfTheMonth } from '@/utils/formatTime'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRoute } from 'vue-router'
+import { useTimeCacheStore } from '@/stores/timeCache'
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
+const prop = defineProps({
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+    timeKey: { type: [String, Number] },
+    timeValue: { type: Object }
+})
+
+const headerHeight = ref(57)
+const TableHeaderRef = ref()
+const monitoringPoints = ref({
+    runNum: 0,
+    abnormalNum: 0
+})
+const segmented = ref('base')
+const percentage = ref({})
+const segmentedList = ref([
+    {
+        label: '基础指标',
+        value: 'base',
+        num: 0
+    },
+    {
+        label: '稳态指标',
+        value: 'harmonic',
+        num: 0
+    },
+    {
+        label: '暂态指标',
+        value: 'event',
+        num: 0
+    }
+])
+const abnormal: any = ref([])
+
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
+    headerHeight.value = height
+}
+
+// 计算是否全屏展示
+const fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
+
+const tableStore: any = new TableStore({
+    url: '/device-boot/dataVerify/getMonitorVerifyData',
+    method: 'POST',
+    showPage: false,
+    column: [],
+    beforeSearchFun: () => {
+        if (prop.timeValue && Array.isArray(prop.timeValue)) {
+            tableStore.table.params.searchBeginTime = prop.timeValue[0]
+            tableStore.table.params.searchEndTime = prop.timeValue[1]
+        }
+    },
+
+    loadCallback: () => {
+        segmentedList.value[0].num = 0
+        segmentedList.value[1].num = 0
+        segmentedList.value[2].num = 0
+        monitoringPoints.value.runNum = tableStore.table.data.runNum //总数
+        monitoringPoints.value.abnormalNum = tableStore.table.data.abnormalNum //异常测点数
+        abnormal.value = tableStore.table.data.targetList
+        abnormal.value.forEach(item => {
+            const { remark, ids } = item
+            if (remark === 'base') segmentedList.value[0].num += ids.length
+            else if (remark === 'harmonic') segmentedList.value[1].num += ids.length
+            else if (remark === 'event') segmentedList.value[2].num += ids.length
+        })
+
+        echart()
+    }
+})
+tableStore.table.params.deptId = dictData.state.area[0].id
+tableStore.table.params.alarmDayLimit = 5
+tableStore.table.params.warnDayLimit = 1
+tableStore.table.params.lineRunFlag = 0
+const echart = () => {
+    percentage.value = {
+        color: ['#FF9100'],
+        options: {
+            dataZoom: null,
+            toolbox: {
+                show: false
+            },
+            grid: {
+                top: '0%',
+                left: '0%',
+                right: '0%',
+                bottom: '0%'
+            },
+            tooltip: {
+                show: false
+            },
+            legend: {
+                show: false
+            },
+            yAxis: {
+                show: false,
+                data: ['']
+            },
+            xAxis: [
+                {
+                    show: false,
+                    type: 'value'
+                }
+            ],
+
+            series: [
+                {
+                    name: '异常总数',
+                    type: 'bar',
+                    barWidth: 12,
+                    data: [100],
+                    z: 0,
+                    zlevel: 0,
+                    itemStyle: {
+                        normal: {
+                            color: {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 1,
+                                y2: 0,
+                                colorStops: [
+                                    {
+                                        offset: 1,
+                                        color: '#57bc6e' // 100% 处的颜色
+                                    }
+                                ],
+                                global: false // 缺省为 false
+                            }
+                        }
+                    }
+                },
+                {
+                    name: '异常占比',
+                    type: 'bar',
+                    barWidth: 13,
+                    data: [
+                        (monitoringPoints.value.abnormalNum / monitoringPoints.value.runNum) * 100 == 0
+                            ? ''
+                            : ((monitoringPoints.value.abnormalNum / monitoringPoints.value.runNum) * 100).toFixed(2)
+                    ],
+                    z: 0,
+                    zlevel: 0,
+                    itemStyle: {
+                        normal: {
+                            color: {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 1,
+                                y2: 0,
+                                colorStops: [
+                                    {
+                                        offset: 0,
+                                        color: '#FF9100' // 0% 处的颜色
+                                    },
+                                    {
+                                        offset: 1,
+                                        color: '#FF9100' // 100% 处的颜色
+                                    }
+                                ],
+                                global: false // 缺省为 false
+                            }
+                        }
+                    }
+                },
+                {
+                    type: 'pictorialBar',
+                    itemStyle: {
+                        normal: {
+                            color: '#fff'
+                        }
+                    },
+                    symbolRepeat: 50,
+                    // symbolMargin: 300,
+                    symbol: 'rect',
+                    symbolClip: true,
+                    symbolSize: [2, 20],
+                    symbolPosition: 'start',
+                    symbolOffset: [0, 0],
+                    data: [100],
+                    z: 1,
+                    zlevel: 0
+                },
+                {
+                    name: '',
+                    type: 'bar',
+                    barGap: '-110%',
+                    data: [100],
+                    barWidth: 18,
+
+                    itemStyle: {
+                        normal: {
+                            color: 'transparent',
+                            barBorderColor: 'rgb(148,217,249)',
+                            barBorderWidth: 1
+                        }
+                    },
+                    z: 2
+                }
+            ]
+        }
+    }
+}
+const change = () => {
+    tableStore.table.loading = true
+    setTimeout(() => {
+        tableStore.table.loading = false
+    }, 500)
+}
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    tableStore.index()
+})
+watch(
+    () => prop.timeKey,
+    val => {
+        tableStore.index()
+    }
+)
+watch(
+    () => prop.timeValue,
+
+    val => {
+        tableStore.index()
+    },
+
+    {
+        deep: true
+    }
+)
+</script>
+<style lang="scss" scoped>
+     @import '@/assets/font/iconfont.css';
+.monitoringPoints {
+    display: flex;
+    .statistics {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        margin-bottom: 10px;
+        .divBox {
+            width: 100%;
+            height: 70px;
+            padding: 10px;
+            display: flex;
+
+            .iconfont {
+                font-size: 40px;
+                margin-right: 5px;
+            }
+            .divBox_title {
+                font-weight: 550;
+            }
+            .divBox_num {
+                font-size: 20px;
+                font-weight: 550;
+                margin-left: auto;
+                font-family: AlimamaDongFangDaKai;
+            }
+            align-items: center;
+            // text-align: center;
+            border-radius: 5px;
+            &:nth-child(1) {
+                background-color: #eef8f0;
+            }
+            &:nth-child(2) {
+                background-color: #fff6ed;
+            }
+            &:nth-child(3) {
+                background-color: #e5f8f6;
+            }
+        }
+    }
+}
+.detail {
+    flex: 1;
+}
+.abnormal {
+    width: 100%;
+    background-color: #f3f6f9;
+    border-radius: 5px;
+    display: flex;
+    // justify-content: space-between;
+    align-items: center;
+    padding: 5px 0px 5px 10px;
+    .iconDiv {
+        display: flex;
+        align-items: center;
+        div {
+            width: 4px;
+            height: 18px;
+            margin-right: 5px;
+            background-color: var(--el-color-primary);
+        }
+    }
+    .text {
+        font-weight: 700;
+        font-size: 16px;
+        font-family: 'Source Code Pro', monospace;
+        text-align: center;
+
+        // font-feature-settings: 'tnum';
+    }
+}
+.header {
+    display: flex;
+    text-align: center;
+
+    font-weight: 700;
+    padding: 5px;
+}
+:deep(.el-card__header) {
+    padding: 10px;
+    span {
+        font-weight: 600;
+    }
+}
+:deep(.el-card__body) {
+    padding: 10px;
+}
+.iconFont {
+    font-size: 18px;
+    display: inline-block;
+    vertical-align: middle;
+}
+.form {
+    position: relative;
+    .form_but {
+        position: absolute;
+        right: -22px;
+    }
+}
+.card-header {
+    font-size: 16px;
+}
+:deep(.table_name) {
+    color: var(--el-color-primary);
+    cursor: pointer;
+    text-underline-offset: 4px;
+}
+.echartTitle {
+    display: flex;
+    justify-content: space-between;
+
+    div:nth-child(2) {
+        font-size: 16px;
+        color: #ff6600;
+    }
+}
+.title {
+    font-size: 14px;
+    font-weight: 600;
+    padding: 0 5px 5px;
+}
+
+:deep(.el-segmented__item-selected, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+}
+:deep(.el-segmented__item, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+    position: relative;
+}
+:deep(.el-segmented) {
+    clip-path: polygon(4% 0, 100% 0, 96% 100%, 0 100%);
+}
+.text-red {
+    color: #ff9100 !important;
+}
+
+.segmentedIcon {
+    position: absolute;
+    top: 1px;
+    right: calc(50% - 44px);
+    height: 18px !important;
+    line-height: 19px;
+    padding: 0 4px;
+    font-size: 12px;
+    background: #ff9100;
+    color: #fff;
+    border-radius: 8px;
+}
+</style>

src/components/cockpit/integrity/index.vue

@@ -0,0 +1,499 @@
+<template>
+    <div>
+        <!--监测点数据完整性 -->
+        <TableHeader
+            :showReset="false"
+            ref="TableHeaderRef"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"
+        ></TableHeader>
+        <div
+            class="monitoringPoints"
+            :style="{
+                height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px  )`,
+                overflow: 'auto'
+            }"
+            v-loading="tableStore.table.loading"
+        >
+            <div style="flex: 1">
+                <div class="title">监测点统计</div>
+
+                <div>
+                    <div class="statistics">
+                        <div class="divBox">
+                            <span class="iconfont icon-qiyezongshu" style="color: #57bc6e"></span>
+                            <span class="divBox_title">监测点总数</span>
+                            <span class="divBox_num" style="color: #57bc6e">
+                                {{ monitoringPoints.runNum }}
+                            </span>
+                        </div>
+                        <div class="divBox mt10">
+                            <span class="iconfont icon-igw-f-warning-data" style="color: #ff6600"></span>
+                            <span class="divBox_title">低于90%监测点数</span>
+                            <span class="divBox_num" style="color: #57bc6e">
+                                {{ monitoringPoints.abnormalNum }}
+                            </span>
+                        </div>
+                    </div>
+                    <div class="echartTitle">
+                        <div class="title">总的数据完整性</div>
+                        <div>
+                           <div>{{ monitoringPoints.totalOnlineRate }}%</div>
+                        </div>
+                    </div>
+                    <div style="height: 30px">
+                        <MyEchart :options="percentage"></MyEchart>
+                    </div>
+                </div>
+            </div>
+            <div style="flex: 2" class="ml15">
+                <div class="title">完整性统计</div>
+
+                <div class="mb5" style="height: 40px">
+                    <el-segmented
+                        style="height: 100%"
+                        v-model="segmented"
+                        :props="props"
+                        :options="segmentedList"
+                        block
+                        @change="tableStore.index()"
+                    ></el-segmented>
+                </div>
+                <div class="header">
+                    <span style="width: 110px; text-align: left">
+                        {{
+                            segmented == 'Power_Network'
+                                ? '区域'
+                                : segmented == 'Manufacturer'
+                                ? '终端厂家'
+                                : '电网标志'
+                        }}
+                    </span>
+                    <span style="width: 90px">监测点总数</span>
+                    <span style="flex: 1">低于90%监测点数</span>
+                    <span style="width: 80px">完整性(%)</span>
+                </div>
+                <div
+                    :style="{
+                        height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px - 105px )`,
+                        overflow: 'auto'
+                    }"
+                >
+                    <div v-for="o in abnormal" class="abnormal mb10">
+                        <span style="width: 110px; height: 24px" class="iconDiv">
+                            <div :style="{ backgroundColor: o.citTotalOnlineRate < 90 ? '#FF9100' : '' }"></div>
+                            {{ o.citName }}
+                        </span>
+                        <!-- 监测点总数 -->
+                        <span style="width: 90px; color: #388e3c" class="text">
+                            {{ o.citTotalNum }}
+                        </span>
+                        <!-- 低于90%监测点数 -->
+                        <span style="flex: 1; color: #388e3c" class="text">
+                            {{ o.citBelowNum }}
+                        </span>
+                        <span
+                            style="width: 80px; color: #388e3c"
+                            :class="` ${o.citTotalOnlineRate < 90 ? 'text-red' : ''}`"
+                            class="text"
+                        >
+                            {{ o.citTotalOnlineRate }}
+                        </span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, reactive, watch, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import { getTimeOfTheMonth } from '@/utils/formatTime'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRoute } from 'vue-router'
+import { useTimeCacheStore } from '@/stores/timeCache'
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
+const prop = defineProps({
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+    timeKey: { type: [String, Number] },
+    timeValue: { type: Object }
+})
+
+const headerHeight = ref(57)
+
+const TableHeaderRef = ref()
+
+const monitoringPoints = ref({
+    runNum: 0,
+    abnormalNum: 0,
+    totalOnlineRate: 0
+})
+const segmented = ref('Power_Network')
+const percentage = ref({})
+const segmentedList = dictData.getBasicData('Statistical_Type', ['Report_Type', 'Voltage_Level', 'Load_Type'])
+const props = {
+    value: 'code',
+    label: 'name'
+}
+const abnormal: any = ref([])
+
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
+    headerHeight.value = height
+}
+
+// 计算是否全屏展示
+const fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
+
+const tableStore: any = new TableStore({
+    url: '/device-boot/LineIntegrityData/data',
+    method: 'POST',
+
+    showPage: false,
+
+    column: [],
+
+    beforeSearchFun: () => {
+        if (prop.timeValue && Array.isArray(prop.timeValue)) {
+            tableStore.table.params.searchBeginTime = prop.timeValue[0]
+            tableStore.table.params.searchEndTime = prop.timeValue[1]
+        }
+        tableStore.table.params.statisticalType = segmentedList.filter(item => item.code === segmented.value)[0]
+    },
+
+    loadCallback: () => {
+        monitoringPoints.value.runNum = tableStore.table.data.totalNum
+        monitoringPoints.value.abnormalNum = tableStore.table.data.belowNum
+        monitoringPoints.value.totalOnlineRate = tableStore.table.data.totalOnlineRate - 0
+        abnormal.value = tableStore.table.data.citDetailList.filter((k: any) => {
+            if (tableStore.table.params.statisticalType.name == '终端厂家') {
+                return k.citTotalNum != 0
+            } else {
+                return k.citName != '上送国网' && k.citName != '非上送国网'
+            }
+        })
+    }
+})
+tableStore.table.params.deptIndex = dictData.state.area[0].id
+tableStore.table.params.lineRunFlag = 0
+const echart = () => {
+    percentage.value = {
+        color: ['#FF9100'],
+        options: {
+            dataZoom: null,
+            toolbox: {
+                show: false
+            },
+            grid: {
+                top: '0%',
+                left: '0%',
+                right: '0%',
+                bottom: '0%'
+            },
+            tooltip: {
+                show: false
+            },
+            legend: {
+                show: false
+            },
+            yAxis: {
+                show: false,
+                data: ['']
+            },
+            xAxis: [
+                {
+                    show: false,
+                    type: 'value'
+                }
+            ],
+
+            series: [
+                {
+                    name: '',
+                    type: 'bar',
+                    barWidth: 12,
+                    data: [100],
+                    z: 0,
+                    zlevel: 0,
+                    itemStyle: {
+                        normal: {
+                            color: {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 1,
+                                y2: 0,
+                                colorStops: [
+                                    {
+                                        offset: 1,
+                                        color: '#FF9100' // 100% 处的颜色
+                                    }
+                                ],
+                                global: false // 缺省为 false
+                            }
+                        }
+                    }
+                },
+                {
+                    name: '',
+                    type: 'bar',
+                    barWidth: 13,
+                    data: [
+                        (monitoringPoints.value.abnormalNum / monitoringPoints.value.runNum) * 100 == 0
+                            ? ''
+                            : ((monitoringPoints.value.abnormalNum / monitoringPoints.value.runNum) * 100).toFixed(2)
+                    ],
+                    z: 0,
+                    zlevel: 0,
+                    itemStyle: {
+                        normal: {
+                            color: {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 1,
+                                y2: 0,
+                                colorStops: [
+                                    {
+                                        offset: 0,
+                                        color: '#57bc6e ' // 0% 处的颜色
+                                    },
+                                    {
+                                        offset: 1,
+                                        color: '#57bc6e' // 100% 处的颜色
+                                    }
+                                ],
+                                global: false // 缺省为 false
+                            }
+                        }
+                    }
+                },
+                {
+                    type: 'pictorialBar',
+                    itemStyle: {
+                        normal: {
+                            color: '#fff'
+                        }
+                    },
+                    symbolRepeat: 50,
+                    // symbolMargin: 300,
+                    symbol: 'rect',
+                    symbolClip: true,
+                    symbolSize: [2, 20],
+                    symbolPosition: 'start',
+                    symbolOffset: [0, 0],
+                    data: [100],
+                    z: 1,
+                    zlevel: 0
+                },
+                {
+                    name: '',
+                    type: 'bar',
+                    barGap: '-110%',
+                    data: [100],
+                    barWidth: 18,
+
+                    itemStyle: {
+                        normal: {
+                            color: 'transparent',
+                            barBorderColor: 'rgb(148,217,249)',
+                            barBorderWidth: 1
+                        }
+                    },
+                    z: 2
+                }
+            ]
+        }
+    }
+}
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    setTimeout(() => {
+        echart()
+    }, 100)
+    tableStore.index()
+})
+watch(
+    () => prop.timeKey,
+    val => {
+        tableStore.index()
+    }
+)
+watch(
+    () => prop.timeValue,
+
+    val => {
+        tableStore.index()
+    },
+
+    {
+        deep: true
+    }
+)
+</script>
+<style lang="scss" scoped>
+      @import '@/assets/font/iconfont.css';
+.monitoringPoints {
+    display: flex;
+    .statistics {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        margin-bottom: 10px;
+        .divBox {
+            width: 100%;
+            height: 70px;
+            padding: 10px;
+            display: flex;
+
+            .iconfont {
+                font-size: 40px;
+                margin-right: 5px;
+            }
+            .divBox_title {
+                font-weight: 550;
+            }
+            .divBox_num {
+                font-size: 20px;
+                font-weight: 550;
+                margin-left: auto;
+                font-family: AlimamaDongFangDaKai;
+            }
+            align-items: center;
+            // text-align: center;
+            border-radius: 5px;
+            &:nth-child(1) {
+                background-color: #eef8f0;
+            }
+            &:nth-child(2) {
+                background-color: #fff6ed;
+            }
+            &:nth-child(3) {
+                background-color: #e5f8f6;
+            }
+        }
+    }
+}
+.detail {
+    flex: 1;
+}
+.abnormal {
+    width: 100%;
+    background-color: #f3f6f9;
+    border-radius: 5px;
+    display: flex;
+    // justify-content: space-between;
+    align-items: center;
+    padding: 5px 0px 5px 10px;
+    .iconDiv {
+        display: flex;
+        align-items: center;
+        div {
+            width: 4px;
+            height: 18px;
+            margin-right: 5px;
+            background-color: var(--el-color-primary);
+        }
+    }
+    .text {
+        font-weight: 700;
+        font-size: 16px;
+        font-family: 'Source Code Pro', monospace;
+        text-align: center;
+
+        // font-feature-settings: 'tnum';
+    }
+}
+.header {
+    display: flex;
+    text-align: center;
+
+    font-weight: 700;
+    padding: 5px;
+}
+:deep(.el-card__header) {
+    padding: 10px;
+    span {
+        font-weight: 600;
+    }
+}
+:deep(.el-card__body) {
+    padding: 10px;
+}
+.iconFont {
+    font-size: 18px;
+    display: inline-block;
+    vertical-align: middle;
+}
+.form {
+    position: relative;
+    .form_but {
+        position: absolute;
+        right: -22px;
+    }
+}
+.card-header {
+    font-size: 16px;
+}
+:deep(.table_name) {
+    color: var(--el-color-primary);
+    cursor: pointer;
+    text-underline-offset: 4px;
+}
+.echartTitle {
+    display: flex;
+    justify-content: space-between;
+
+    div:nth-child(2) {
+        font-size: 16px;
+        color: #ff6600;
+    }
+}
+.title {
+    font-size: 14px;
+    font-weight: 600;
+    padding: 0 5px 5px;
+}
+
+:deep(.el-segmented__item-selected, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+}
+:deep(.el-segmented__item, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+    position: relative;
+}
+:deep(.el-segmented) {
+    clip-path: polygon(4% 0, 100% 0, 96% 100%, 0 100%);
+}
+.text-red {
+    color: #ff9100 !important;
+}
+
+.segmentedIcon {
+    position: absolute;
+    top: 1px;
+    left: 100px;
+    height: 18px !important;
+    line-height: 19px;
+    padding: 0 4px;
+    font-size: 12px;
+    background: #ff9100;
+    color: #fff;
+    border-radius: 8px;
+}
+</style>

src/components/cockpit/onlineRate/index.vue

@@ -0,0 +1,498 @@
+<template>
+    <div>
+        <!--终端在线率 -->
+        <TableHeader
+            :showReset="false"
+            ref="TableHeaderRef"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"
+        ></TableHeader>
+        <div
+            class="monitoringPoints"
+            :style="{
+                height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px  )`,
+                overflow: 'auto'
+            }"
+            v-loading="tableStore.table.loading"
+        >
+            <div style="flex: 1">
+                <div class="title">终端统计</div>
+
+                <div>
+                    <div class="statistics">
+                        <div class="divBox">
+                            <span class="iconfont icon-qiyezongshu" style="color: #57bc6e"></span>
+                            <span class="divBox_title">终端总数</span>
+                            <span class="divBox_num" style="color: #57bc6e">
+                                {{ monitoringPoints.runNum }}
+                            </span>
+                        </div>
+                        <div class="divBox mt10">
+                            <span class="iconfont icon-igw-f-warning-data" style="color: #ff6600"></span>
+                            <span class="divBox_title">低于90%终端数</span>
+                            <span class="divBox_num" style="color: #57bc6e">
+                                {{ monitoringPoints.abnormalNum }}
+                            </span>
+                        </div>
+                    </div>
+                    <div class="echartTitle">
+                        <div class="title">总的数据在线率</div>
+                        <div>{{ monitoringPoints.totalOnlineRate }}%</div>
+                    </div>
+                    <div style="height: 30px">
+                        <MyEchart :options="percentage"></MyEchart>
+                    </div>
+                </div>
+            </div>
+            <div style="flex: 2" class="ml15">
+                <div class="title">在线率统计</div>
+
+                <div class="mb5" style="height: 40px">
+                    <el-segmented
+                        style="height: 100%"
+                        v-model="segmented"
+                        :props="props"
+                        :options="segmentedList"
+                        block
+                        @change="tableStore.index()"
+                    ></el-segmented>
+                </div>
+                <div class="header">
+                    <span style="width: 110px; text-align: left">
+                        {{
+                            segmented == 'Power_Network'
+                                ? '区域'
+                                : segmented == 'Manufacturer'
+                                ? '终端厂家'
+                                : '电网标志'
+                        }}
+                    </span>
+                    <span style="width: 90px">终端总数</span>
+                    <span style="flex: 1">低于90%终端数</span>
+                    <span style="width: 80px">在线率(%)</span>
+                </div>
+                <div
+                    :style="{
+                        height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px - 105px )`,
+                        overflow: 'auto'
+                    }"
+                >
+                    <div v-for="o in abnormal" class="abnormal mb10">
+                        <span style="width: 110px; height: 24px" class="iconDiv">
+                            <div :style="{ backgroundColor: o.citTotalOnlineRate < 90 ? '#FF9100' : '' }"></div>
+                            {{ o.citName }}
+                        </span>
+                        <!-- 终端总数 -->
+                        <span style="width: 90px; color: #388e3c" class="text">
+                            {{ o.citTotalNum }}
+                        </span>
+                        <!-- 低于90%终端数 -->
+                        <span style="flex: 1; color: #388e3c" class="text">
+                            {{ o.citBelowNum }}
+                        </span>
+                        <span
+                            style="width: 80px; color: #388e3c"
+                            :class="` ${o.citTotalOnlineRate < 90 ? 'text-red' : ''}`"
+                            class="text"
+                        >
+                            {{ o.citTotalOnlineRate }}
+                        </span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, reactive, watch, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import { getTimeOfTheMonth } from '@/utils/formatTime'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRoute } from 'vue-router'
+import { useTimeCacheStore } from '@/stores/timeCache'
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
+const prop = defineProps({
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+    timeKey: { type: [String, Number] },
+    timeValue: { type: Object }
+})
+
+const headerHeight = ref(57)
+
+const TableHeaderRef = ref()
+
+const monitoringPoints = ref({
+    runNum: 0,
+    abnormalNum: 0,
+    totalOnlineRate: 0
+})
+const segmented = ref('Power_Network')
+const percentage = ref({})
+const segmentedList = dictData.getBasicData('Statistical_Type', ['Report_Type', 'Voltage_Level', 'Load_Type'])
+const props = {
+    value: 'code',
+    label: 'name'
+}
+const abnormal: any = ref([])
+
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
+    headerHeight.value = height
+}
+
+// 计算是否全屏展示
+const fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
+
+const tableStore: any = new TableStore({
+    url: '/device-boot/onLineRate/deviceOnlineRateInfo',
+    method: 'POST',
+
+    showPage: false,
+
+    column: [],
+
+    beforeSearchFun: () => {
+        if (prop.timeValue && Array.isArray(prop.timeValue)) {
+            tableStore.table.params.searchBeginTime = prop.timeValue[0]
+            tableStore.table.params.searchEndTime = prop.timeValue[1]
+        }
+        tableStore.table.params.statisticalType = segmentedList.filter(item => item.code === segmented.value)[0]
+    },
+
+    loadCallback: () => {
+        monitoringPoints.value.runNum = tableStore.table.data.totalNum
+        monitoringPoints.value.abnormalNum = tableStore.table.data.belowNum
+        monitoringPoints.value.totalOnlineRate = tableStore.table.data.totalOnlineRate - 0
+        abnormal.value = tableStore.table.data.citDetailList.filter((k: any) => {
+            if (tableStore.table.params.statisticalType.name == '终端厂家') {
+                return k.citTotalNum != 0
+            } else {
+                return k.citName != '上送国网' && k.citName != '非上送国网'
+            }
+        })
+        
+    }
+})
+tableStore.table.params.deptIndex = dictData.state.area[0].id
+tableStore.table.params.lineRunFlag = 0
+const echart = () => {
+    percentage.value = {
+        color: ['#FF9100'],
+        options: {
+            dataZoom: null,
+            toolbox: {
+                show: false
+            },
+            grid: {
+                top: '0%',
+                left: '0%',
+                right: '0%',
+                bottom: '0%'
+            },
+            tooltip: {
+                show: false
+            },
+            legend: {
+                show: false
+            },
+            yAxis: {
+                show: false,
+                data: ['']
+            },
+            xAxis: [
+                {
+                    show: false,
+                    type: 'value'
+                }
+            ],
+
+            series: [
+                {
+                    name: '',
+                    type: 'bar',
+                    barWidth: 12,
+                    data: [100],
+                    z: 0,
+                    zlevel: 0,
+                    itemStyle: {
+                        normal: {
+                            color: {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 1,
+                                y2: 0,
+                                colorStops: [
+                                    {
+                                        offset: 1,
+                                        color: '#FF9100' // 100% 处的颜色
+                                    }
+                                ],
+                                global: false // 缺省为 false
+                            }
+                        }
+                    }
+                },
+                {
+                    name: '',
+                    type: 'bar',
+                    barWidth: 13,
+                    data: [
+                        (monitoringPoints.value.abnormalNum / monitoringPoints.value.runNum) * 100 == 0
+                            ? ''
+                            : ((monitoringPoints.value.abnormalNum / monitoringPoints.value.runNum) * 100).toFixed(2)
+                    ],
+                    z: 0,
+                    zlevel: 0,
+                    itemStyle: {
+                        normal: {
+                            color: {
+                                type: 'linear',
+                                x: 0,
+                                y: 0,
+                                x2: 1,
+                                y2: 0,
+                                colorStops: [
+                                    {
+                                        offset: 0,
+                                        color: '#57bc6e' // 0% 处的颜色
+                                    },
+                                    {
+                                        offset: 1,
+                                        color: '#57bc6e' // 100% 处的颜色
+                                    }
+                                ],
+                                global: false // 缺省为 false
+                            }
+                        }
+                    }
+                },
+                {
+                    type: 'pictorialBar',
+                    itemStyle: {
+                        normal: {
+                            color: '#fff'
+                        }
+                    },
+                    symbolRepeat: 50,
+                    // symbolMargin: 300,
+                    symbol: 'rect',
+                    symbolClip: true,
+                    symbolSize: [2, 20],
+                    symbolPosition: 'start',
+                    symbolOffset: [0, 0],
+                    data: [100],
+                    z: 1,
+                    zlevel: 0
+                },
+                {
+                    name: '',
+                    type: 'bar',
+                    barGap: '-110%',
+                    data: [100],
+                    barWidth: 18,
+
+                    itemStyle: {
+                        normal: {
+                            color: 'transparent',
+                            barBorderColor: 'rgb(148,217,249)',
+                            barBorderWidth: 1
+                        }
+                    },
+                    z: 2
+                }
+            ]
+        }
+    }
+}
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    setTimeout(() => {
+        echart()
+    }, 100)
+    tableStore.index()
+})
+watch(
+    () => prop.timeKey,
+    val => {
+        tableStore.index()
+    }
+)
+watch(
+    () => prop.timeValue,
+
+    val => {
+        tableStore.index()
+    },
+
+    {
+        deep: true
+    }
+)
+</script>
+<style lang="scss" scoped>
+      @import '@/assets/font/iconfont.css';
+.monitoringPoints {
+    display: flex;
+    .statistics {
+        display: flex;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        margin-bottom: 10px;
+        .divBox {
+            width: 100%;
+            height: 70px;
+            padding: 10px;
+            display: flex;
+
+            .iconfont {
+                font-size: 40px;
+                margin-right: 5px;
+            }
+            .divBox_title {
+                font-weight: 550;
+            }
+            .divBox_num {
+                font-size: 20px;
+                font-weight: 550;
+                margin-left: auto;
+                font-family: AlimamaDongFangDaKai;
+            }
+            align-items: center;
+            // text-align: center;
+            border-radius: 5px;
+            &:nth-child(1) {
+                background-color: #eef8f0;
+            }
+            &:nth-child(2) {
+                background-color: #fff6ed;
+            }
+            &:nth-child(3) {
+                background-color: #e5f8f6;
+            }
+        }
+    }
+}
+.detail {
+    flex: 1;
+}
+.abnormal {
+    width: 100%;
+    background-color: #f3f6f9;
+    border-radius: 5px;
+    display: flex;
+    // justify-content: space-between;
+    align-items: center;
+    padding: 5px 0px 5px 10px;
+    .iconDiv {
+        display: flex;
+        align-items: center;
+        div {
+            width: 4px;
+            height: 18px;
+            margin-right: 5px;
+            background-color: var(--el-color-primary);
+        }
+    }
+    .text {
+        font-weight: 700;
+        font-size: 16px;
+        font-family: 'Source Code Pro', monospace;
+        text-align: center;
+
+        // font-feature-settings: 'tnum';
+    }
+}
+.header {
+    display: flex;
+    text-align: center;
+
+    font-weight: 700;
+    padding: 5px;
+}
+:deep(.el-card__header) {
+    padding: 10px;
+    span {
+        font-weight: 600;
+    }
+}
+:deep(.el-card__body) {
+    padding: 10px;
+}
+.iconFont {
+    font-size: 18px;
+    display: inline-block;
+    vertical-align: middle;
+}
+.form {
+    position: relative;
+    .form_but {
+        position: absolute;
+        right: -22px;
+    }
+}
+.card-header {
+    font-size: 16px;
+}
+:deep(.table_name) {
+    color: var(--el-color-primary);
+    cursor: pointer;
+    text-underline-offset: 4px;
+}
+.echartTitle {
+    display: flex;
+    justify-content: space-between;
+
+    div:nth-child(2) {
+        font-size: 16px;
+        color: #ff6600;
+    }
+}
+.title {
+    font-size: 14px;
+    font-weight: 600;
+    padding: 0 5px 5px;
+}
+
+:deep(.el-segmented__item-selected, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+}
+:deep(.el-segmented__item, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+    position: relative;
+}
+:deep(.el-segmented) {
+    clip-path: polygon(4% 0, 100% 0, 96% 100%, 0 100%);
+}
+.text-red {
+    color: #ff9100 !important;
+}
+
+.segmentedIcon {
+    position: absolute;
+    top: 1px;
+    left: 100px;
+    height: 18px !important;
+    line-height: 19px;
+    padding: 0 4px;
+    font-size: 12px;
+    background: #ff9100;
+    color: #fff;
+    border-radius: 8px;
+}
+</style>

src/components/cockpit/terminalEvaluation/index.vue

@@ -0,0 +1,476 @@
+<template>
+    <div>
+        <!--监测点数据完整性 -->
+        <TableHeader
+            :showReset="false"
+            ref="TableHeaderRef"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"
+        ></TableHeader>
+        <div
+            class="monitoringPoints"
+            :style="{
+                height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px  )`,
+                overflow: 'auto'
+            }"
+            v-loading="tableStore.table.loading"
+        >
+            <div style="flex: 1">
+                <div class="title">终端统计</div>
+                <div
+                    class="box1"
+                    :style="{
+                        height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px - 30px )`,
+                        overflow: 'auto'
+                    }"
+                >
+                    <div class="statistics">
+                        <div class="divBox div1">
+                            <span class="iconfont icon-qiyezongshu" style="color: #57bc6e"></span>
+                            <span class="divBox_title">终端总数</span>
+                            <span class="divBox_num text-style" style="color: #57bc6e">
+                                {{ statisticsList.allNum }}
+                            </span>
+                        </div>
+                        <div class="divBox div2">
+                            <span class="iconfont icon-zaiyunshebei" style="color: #67c23a"></span>
+                            <span class="divBox_title">在运终端数</span>
+                            <span class="divBox_num text-style" style="color: #67c23a">
+                                {{ statisticsList.runNum }}
+                            </span>
+                        </div>
+                    </div>
+
+                    <div class="statistics">
+                        <div class="divBox div3">
+                            <span
+                                class="iconfont icon-yichanglei_14feizhinengbiaozaiyunyichang"
+                                style="color: #ffbf00"
+                            ></span>
+                            <span class="divBox_title">调试终端数</span>
+                            <span class="divBox_num text-style" style="color: #ffbf00">
+                                {{ statisticsList.checkNum }}
+                            </span>
+                        </div>
+                        <div class="divBox div4">
+                            <span class="iconfont icon-tingyunshijianguanli" style="color: #f56c6c"></span>
+                            <span class="divBox_title">停运终端数</span>
+                            <span class="divBox_num text-style" style="color: #f56c6c">
+                                {{ statisticsList.stopRunNum }}
+                            </span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div style="flex: 2" class="ml15">
+                <div class="title">终端运行统计</div>
+
+                <div class="mb5" style="height: 40px">
+                    <el-segmented
+                        style="height: 100%"
+                        v-model="segmented"
+                        :props="props"
+                        :options="segmentedList"
+                        block
+                        @change="tableStore.index()"
+                    ></el-segmented>
+                </div>
+                <div class="header">
+                    <span style="width: 110px; text-align: left">
+                        {{
+                            segmented == 'Power_Network'
+                                ? '区域'
+                                : segmented == 'Manufacturer'
+                                ? '终端厂家'
+                                : '电网标志'
+                        }}
+                    </span>
+                    <span style="width: 90px">终端总数</span>
+                    <span style="flex: 1">完整性(%)</span>
+                    <span style="flex: 1">在线率(%)</span>
+                    <span style="flex: 1">异常率(%)</span>
+                </div>
+                <div
+                    :style="{
+                        height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px - 105px )`,
+                        overflow: 'auto'
+                    }"
+                >
+                    <div v-for="o in abnormal" class="abnormal mb10">
+                        <span style="width: 110px; height: 24px" class="iconDiv">
+                            <div :style="{ backgroundColor: o.citTotalOnlineRate < 90 ? '#FF9100' : '' }"></div>
+                            {{ o.name }}
+                        </span>
+                        <!-- 终端总数 -->
+                        <span style="width: 90px; color: #388e3c" class="text">
+                            {{ o.count }}
+                        </span>
+                        <!--  -->
+                        <sp
+                            style="flex: 1; color: #388e3c"
+                            class="text"
+                            :class="` ${o.integrity < 90 ? 'text-red' : ''}`"
+                        >
+                            {{ o.integrity }}
+                        </sp>
+                        <span
+                            style="flex: 1; color: #388e3c"
+                            :class="` ${o.online < 90 ? 'text-red' : ''}`"
+                            class="text"
+                        >
+                            {{ o.online }}
+                        </span>
+                        <span
+                            style="flex: 1; color: #388e3c"
+                            :class="` ${o.qualified > 10 ? 'text-red' : ''}`"
+                            class="text"
+                        >
+                            {{ o.qualified }}
+                        </span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, reactive, watch, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import { getTimeOfTheMonth } from '@/utils/formatTime'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRoute } from 'vue-router'
+import { useTimeCacheStore } from '@/stores/timeCache'
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
+const prop = defineProps({
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+    timeKey: { type: [String, Number] },
+    timeValue: { type: Object }
+})
+
+const headerHeight = ref(57)
+
+const TableHeaderRef = ref()
+
+const monitoringPoints = ref({
+    runNum: 0,
+    abnormalNum: 0,
+    totalOnlineRate: 0
+})
+const segmented = ref('Power_Network')
+const percentage = ref({})
+const segmentedList = dictData.getBasicData('Statistical_Type', ['Report_Type', 'Voltage_Level', 'Load_Type'])
+const props = {
+    value: 'code',
+    label: 'name'
+}
+const statisticsList: any = ref({
+    allNum: 0,
+    runNum: 0,
+    checkNum: 0,
+    stopRunNum: 0
+})
+const abnormal: any = ref([])
+
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
+    headerHeight.value = height
+}
+const totalData = ref([])
+// 计算是否全屏展示
+const fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
+
+const tableStore: any = new TableStore({
+    url: '/device-boot/deviceRunEvaluate/getRunEvaluateInfo',
+    method: 'POST',
+
+    showPage: false,
+
+    column: [],
+
+    beforeSearchFun: () => {
+        if (prop.timeValue && Array.isArray(prop.timeValue)) {
+            tableStore.table.params.searchBeginTime = prop.timeValue[0]
+            tableStore.table.params.searchEndTime = prop.timeValue[1]
+        }
+        tableStore.table.params.statisticalType = segmentedList.filter(item => item.code === segmented.value)[0]
+    },
+
+    loadCallback: () => {
+        totalData.value = Array.from(
+            tableStore.table.data
+                .map((item: any) => item.list)
+                .flat()
+                .reduce((map: any, item: any) => {
+                    if (!map.has(item.id)) {
+                        map.set(item.id, item)
+                    }
+                    return map
+                }, new Map())
+                .values()
+        )
+
+        // tableStore.table.data
+        statisticsList.value.allNum = totalData.value.length
+        statisticsList.value.runNum = totalData.value.filter(item => item.runFlag === '运行').length
+        statisticsList.value.checkNum = totalData.value.filter(item => item.runFlag === '调试').length
+        statisticsList.value.stopRunNum = totalData.value.filter(item => item.runFlag === '停运').length
+
+        abnormal.value = tableStore.table.data.filter((k: any) => {
+            if (tableStore.table.params.statisticalType.name == '终端厂家') {
+                return k.count != 0
+            } else {
+                return k.name != '上送国网' && k.name != '非上送国网'
+            }
+        })
+    }
+})
+tableStore.table.params.deptIndex = dictData.state.area[0].id
+tableStore.table.params.lineRunFlag = 0
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    tableStore.index()
+})
+watch(
+    () => prop.timeKey,
+    val => {
+        tableStore.index()
+    }
+)
+watch(
+    () => prop.timeValue,
+
+    val => {
+        tableStore.index()
+    },
+
+    {
+        deep: true
+    }
+)
+</script>
+<style lang="scss" scoped>
+      @import '@/assets/font/iconfont.css';
+.monitoringPoints {
+    display: flex;
+}
+.detail {
+    flex: 1;
+}
+.abnormal {
+    width: 100%;
+    background-color: #f3f6f9;
+    border-radius: 5px;
+    display: flex;
+    // justify-content: space-between;
+    align-items: center;
+    padding: 5px 0px 5px 10px;
+    .iconDiv {
+        display: flex;
+        align-items: center;
+        div {
+            width: 4px;
+            height: 18px;
+            margin-right: 5px;
+            background-color: var(--el-color-primary);
+        }
+    }
+    .text {
+        font-weight: 700;
+        font-size: 16px;
+        font-family: 'Source Code Pro', monospace;
+        text-align: center;
+
+        // font-feature-settings: 'tnum';
+    }
+}
+.header {
+    display: flex;
+    text-align: center;
+
+    font-weight: 700;
+    padding: 5px;
+}
+:deep(.el-card__header) {
+    padding: 10px;
+    span {
+        font-weight: 600;
+    }
+}
+:deep(.el-card__body) {
+    padding: 10px;
+}
+.iconFont {
+    font-size: 18px;
+    display: inline-block;
+    vertical-align: middle;
+}
+.form {
+    position: relative;
+    .form_but {
+        position: absolute;
+        right: -22px;
+    }
+}
+.card-header {
+    font-size: 16px;
+}
+:deep(.table_name) {
+    color: var(--el-color-primary);
+    cursor: pointer;
+    text-underline-offset: 4px;
+}
+.echartTitle {
+    display: flex;
+    justify-content: space-between;
+
+    div:nth-child(2) {
+        font-size: 16px;
+        color: #ff6600;
+    }
+}
+.title {
+    font-size: 14px;
+    font-weight: 600;
+    padding: 0 5px 5px;
+}
+
+:deep(.el-segmented__item-selected, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+}
+:deep(.el-segmented__item, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+    position: relative;
+}
+:deep(.el-segmented) {
+    clip-path: polygon(4% 0, 100% 0, 96% 100%, 0 100%);
+}
+.text-red {
+    color: #ff9100 !important;
+}
+
+.segmentedIcon {
+    position: absolute;
+    top: 1px;
+    left: 100px;
+    height: 18px !important;
+    line-height: 19px;
+    padding: 0 4px;
+    font-size: 12px;
+    background: #ff9100;
+    color: #fff;
+    border-radius: 8px;
+}
+
+.hexagon {
+    position: relative;
+    width: 100px;
+    height: 55px;
+    background-color: #19a094;
+    margin: 50px auto;
+    &::before {
+        border-bottom: 27.5px solid #19a094;
+    }
+    &::after {
+        border-top: 27.5px solid #19a094;
+    }
+}
+
+.hexagon::before,
+.hexagon::after {
+    content: '';
+    position: absolute;
+    width: 0;
+    border-left: 50px solid transparent;
+    border-right: 50px solid transparent;
+}
+
+.hexagon::before {
+    bottom: 98%;
+}
+
+.hexagon::after {
+    top: 98%;
+}
+.hexagon1 {
+    background-color: #2e8b57;
+    &::before {
+        border-bottom: 27.5px solid #2e8b57;
+    }
+    &::after {
+        border-top: 27.5px solid #2e8b57;
+    }
+}
+.hexagon2 {
+    background-color: #ffbf00;
+    &::before {
+        border-bottom: 27.5px solid #ffbf00;
+    }
+    &::after {
+        border-top: 27.5px solid #ffbf00;
+    }
+}
+.hexagon3 {
+    background-color: #a52a2a;
+    &::before {
+        border-bottom: 27.5px solid #a52a2a;
+    }
+    &::after {
+        border-top: 27.5px solid #a52a2a;
+    }
+}
+.statistics {
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: space-between;
+    .divBox {
+        width: 100%;
+        height: 70px;
+        padding: 10px;
+        display: flex;
+        margin-bottom: 10px;
+        .iconfont {
+            font-size: 40px;
+            margin-right: 5px;
+        }
+        .divBox_title {
+            font-weight: 550;
+        }
+        .divBox_num {
+            font-size: 20px;
+            font-weight: 550;
+            margin-left: auto;
+            font-family: AlimamaDongFangDaKai;
+        }
+        align-items: center;
+        // text-align: center;
+        border-radius: 5px;
+    }
+    .div1 {
+        background-color: #eef8f0;
+    }
+    .div2 {
+        background-color: #67c23a24;
+    }
+    .div3 {
+        background-color: #ffbf0024;
+    }
+    .div4 {
+        background-color: #f56c6c24;
+    }
+}
+</style>

src/components/cockpit/terminalEvaluation/index1.vue

@@ -0,0 +1,450 @@
+<template>
+    <div>
+        <!--终端运行评价 -->
+        <TableHeader
+            :showReset="false"
+            ref="TableHeaderRef"
+            @selectChange="selectChange"
+            datePicker
+            v-if="fullscreen"
+        ></TableHeader>
+        <div
+            class="monitoringPoints"
+            :style="{
+                height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px  )`,
+                overflow: 'auto'
+            }"
+            v-loading="tableStore.table.loading"
+        >
+            <div style="flex: 1">
+                <div class="title">终端统计</div>
+                <div style="height: 135px" class="box1">
+                    <div class="boxDiv hexagon">
+                        <div style="color: #fff">100</div>
+                        <div class="mt10 divBot">总数</div>
+                    </div>
+                    <div class="boxDiv hexagon hexagon1">
+                        <div style="color: #fff">50</div>
+                        <div class="mt10 divBot">在运</div>
+                    </div>
+                </div>
+                <div style="height: 135px" class="box1">
+                    <div class="boxDiv hexagon hexagon2">
+                        <div style="color: #fff">25</div>
+                        <div class="mt10 divBot">检修</div>
+                    </div>
+                    <div class="boxDiv hexagon hexagon3">
+                        <div style="color: #fff">25</div>
+                        <div class="mt10 divBot">停运</div>
+                    </div>
+                </div>
+            </div>
+            <div style="flex: 2" class="ml15">
+                <div class="title">终端运行评价</div>
+
+                <div class="mb5" style="height: 40px">
+                    <el-segmented style="height: 100%" v-model="segmented" :options="segmentedList" block>
+                        <template #default="scope">
+                            <div>
+                                <div>{{ typeof scope.item === 'object' ? scope.item.label : scope.item }}</div>
+                            </div>
+                        </template>
+                    </el-segmented>
+                </div>
+                <div class="header">
+                    <span style="width: 110px; text-align: left">
+                        {{ segmented == 0 ? '区域' : segmented == 1 ? '终端厂家' : '电网标志' }}
+                    </span>
+                    <span style="flex: 1">在运终端数</span>
+                    <span style="width: 80px">评价</span>
+                </div>
+                <div
+                    :style="{
+                        height: `calc(${prop.height} - ${headerHeight}px + ${fullscreen ? 0 : 56}px - 105px )`,
+                        overflow: 'auto'
+                    }"
+                >
+                    <div v-for="o in abnormal" class="abnormal mb10">
+                        <span style="width: 110px; height: 24px" class="iconDiv">
+                            <div :style="{ backgroundColor: o.integrity < 90 ? '#FF9100' : '' }"></div>
+                            {{ o.targetName }}
+                        </span>
+
+                        <!-- 在运终端数 -->
+                        <span style="flex: 1; color: #388e3c" class="text">
+                            {{ o.rangeDesc }}
+                        </span>
+                        <span
+                            style="width: 80px; color: #388e3c"
+                            :class="` ${o.integrity < 90 ? 'text-red' : ''}`"
+                            class="text"
+                        >
+                            {{ o.integrity }}
+                        </span>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script setup lang="ts">
+import { ref, onMounted, provide, reactive, watch, nextTick } from 'vue'
+import TableStore from '@/utils/tableStore'
+import { getTimeOfTheMonth } from '@/utils/formatTime'
+import MyEchart from '@/components/echarts/MyEchart.vue'
+import TableHeader from '@/components/table/header/index.vue'
+import { useRoute } from 'vue-router'
+import { useTimeCacheStore } from '@/stores/timeCache'
+import { useDictData } from '@/stores/dictData'
+const dictData = useDictData()
+const prop = defineProps({
+    w: { type: [String, Number] },
+    h: { type: [String, Number] },
+    width: { type: [String, Number] },
+    height: { type: [String, Number] },
+    timeKey: { type: [String, Number] },
+    timeValue: { type: Object }
+})
+
+const headerHeight = ref(57)
+
+const TableHeaderRef = ref()
+
+const monitoringPoints = ref({
+    runNum: 110,
+    abnormalNum: 10
+})
+const segmented = ref(0)
+const percentage = ref({})
+const segmentedList = ref([
+    {
+        label: '区域',
+        value: 0,
+        num: 0
+    },
+    {
+        label: '终端厂家',
+        value: 1,
+        num: 0
+    },
+    {
+        label: '电网标志',
+        value: 2,
+        num: 0
+    }
+])
+const abnormal: any = ref([
+    {
+        targetName: '唐山',
+        rangeDesc: 21,
+        length: 21,
+        integrity: '优秀'
+    },
+    {
+        targetName: '唐山',
+        rangeDesc: 21,
+        length: 21,
+        integrity: '优秀'
+    },
+    {
+        targetName: '唐山',
+        rangeDesc: 21,
+        length: 21,
+        integrity: '优秀'
+    },
+    {
+        targetName: '唐山',
+        rangeDesc: 21,
+        length: 21,
+        integrity: '优秀'
+    },
+    {
+        targetName: '唐山',
+        rangeDesc: 21,
+        length: 21,
+        integrity: '优秀'
+    },
+    {
+        targetName: '唐山',
+        rangeDesc: 21,
+        length: 21,
+        integrity: '优秀'
+    },
+    {
+        targetName: '唐山',
+        rangeDesc: 21,
+        length: 21,
+        integrity: '优秀'
+    },
+    {
+        targetName: '唐山',
+        rangeDesc: 21,
+        length: 21,
+        integrity: '优秀'
+    },
+    {
+        targetName: '唐山',
+        rangeDesc: 21,
+        length: 21,
+        integrity: 92
+    }
+])
+
+const selectChange = (showSelect: any, height: any, datePickerValue?: any) => {
+    headerHeight.value = height
+}
+
+// 计算是否全屏展示
+const fullscreen = computed(() => {
+    const w = Number(prop.w)
+    const h = Number(prop.h)
+    if (!isNaN(w) && !isNaN(h) && w === 12 && h === 6) {
+        // 执行相应逻辑
+        return true
+    } else {
+        return false
+    }
+})
+
+const value = ref(new Date())
+
+const list = ref()
+
+const tableStore: any = new TableStore({
+    url: '/device-boot/deviceRunEvaluate/getRunEvaluateInfo',
+    method: 'POST',
+
+    showPage: false,
+
+    column: [],
+
+    beforeSearchFun: () => {
+        if (prop.timeValue && Array.isArray(prop.timeValue)) {
+            tableStore.table.params.searchBeginTime = prop.timeValue[0]
+            tableStore.table.params.searchEndTime = prop.timeValue[1]
+        }
+    },
+
+    loadCallback: () => {
+        list.value = tableStore.table.data
+    }
+})
+tableStore.table.params.deptId = dictData.state.area[0].id
+provide('tableStore', tableStore)
+
+onMounted(() => {
+    tableStore.index()
+})
+watch(
+    () => prop.timeKey,
+    val => {
+        tableStore.index()
+    }
+)
+watch(
+    () => prop.timeValue,
+
+    val => {
+        tableStore.index()
+    },
+
+    {
+        deep: true
+    }
+)
+</script>
+<style lang="scss" scoped>
+.monitoringPoints {
+    display: flex;
+}
+.detail {
+    flex: 1;
+}
+.abnormal {
+    width: 100%;
+    background-color: #f3f6f9;
+    border-radius: 5px;
+    display: flex;
+    // justify-content: space-between;
+    align-items: center;
+    padding: 5px 0px 5px 10px;
+    .iconDiv {
+        display: flex;
+        align-items: center;
+        div {
+            width: 4px;
+            height: 18px;
+            margin-right: 5px;
+            background-color: var(--el-color-primary);
+        }
+    }
+    .text {
+        font-weight: 700;
+        font-size: 16px;
+        font-family: 'Source Code Pro', monospace;
+        text-align: center;
+
+        // font-feature-settings: 'tnum';
+    }
+}
+.header {
+    display: flex;
+    text-align: center;
+
+    font-weight: 700;
+    padding: 5px;
+}
+:deep(.el-card__header) {
+    padding: 10px;
+    span {
+        font-weight: 600;
+    }
+}
+:deep(.el-card__body) {
+    padding: 10px;
+}
+.iconFont {
+    font-size: 18px;
+    display: inline-block;
+    vertical-align: middle;
+}
+.form {
+    position: relative;
+    .form_but {
+        position: absolute;
+        right: -22px;
+    }
+}
+.card-header {
+    font-size: 16px;
+}
+:deep(.table_name) {
+    color: var(--el-color-primary);
+    cursor: pointer;
+    text-underline-offset: 4px;
+}
+.echartTitle {
+    display: flex;
+    justify-content: space-between;
+
+    div:nth-child(2) {
+        font-size: 16px;
+        color: #ff6600;
+    }
+}
+.title {
+    font-size: 14px;
+    font-weight: 600;
+    padding: 0 5px 5px;
+}
+
+:deep(.el-segmented__item-selected, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+}
+:deep(.el-segmented__item, ) {
+    clip-path: polygon(10% 0, 100% 0, 90% 100%, 0 100%);
+    position: relative;
+}
+:deep(.el-segmented) {
+    clip-path: polygon(4% 0, 100% 0, 96% 100%, 0 100%);
+}
+.text-red {
+    color: #ff9100 !important;
+}
+
+.segmentedIcon {
+    position: absolute;
+    top: 1px;
+    left: 100px;
+    height: 18px !important;
+    line-height: 19px;
+    padding: 0 4px;
+    font-size: 12px;
+    background: #ff9100;
+    color: #fff;
+    border-radius: 8px;
+}
+.box1 {
+    display: flex;
+    align-items: center;
+    justify-content: space-around;
+    .boxDiv {
+        // flex: 1;
+        display: flex;
+        flex-direction: column;
+        align-items: center;
+        position: relative;
+        margin: 0 5px;
+
+        div:nth-child(1) {
+            position: absolute;
+            font-size: 30px;
+            top: -10px;
+            font-weight: 700;
+        }
+        .divBot {
+            font-size: 16px;
+            position: absolute;
+            top: 20px;
+        }
+        color: #fff;
+    }
+}
+.hexagon {
+    position: relative;
+    width: 100px;
+    height: 55px;
+    background-color: #19a094;
+    margin: 50px auto;
+    &::before {
+        border-bottom: 27.5px solid #19a094;
+    }
+    &::after {
+        border-top: 27.5px solid #19a094;
+    }
+}
+
+.hexagon::before,
+.hexagon::after {
+    content: '';
+    position: absolute;
+    width: 0;
+    border-left: 50px solid transparent;
+    border-right: 50px solid transparent;
+}
+
+.hexagon::before {
+    bottom: 98%;
+}
+
+.hexagon::after {
+    top: 98%;
+}
+.hexagon1 {
+    background-color: #2e8b57;
+    &::before {
+        border-bottom: 27.5px solid #2e8b57;
+    }
+    &::after {
+        border-top: 27.5px solid #2e8b57;
+    }
+}
+.hexagon2 {
+    background-color: #ffbf00;
+    &::before {
+        border-bottom: 27.5px solid #ffbf00;
+    }
+    &::after {
+        border-top: 27.5px solid #ffbf00;
+    }
+}
+.hexagon3 {
+    background-color: #a52a2a;
+    &::before {
+        border-bottom: 27.5px solid #a52a2a;
+    }
+    &::after {
+        border-top: 27.5px solid #a52a2a;
+    }
+}
+</style>

src/components/echarts/MyEchart.vue

@@ -15,7 +15,7 @@ import { color, gradeColor3 } from './color'
 import { useConfig } from '@/stores/config'
 const config = useConfig()
 // import { nextTick } from 'process'
-const emit = defineEmits(['triggerPoint', 'group'])
+const emit = defineEmits(['triggerPoint', 'group', 'echartClick'])
 color[0] = config.layout.elementUiPrimary[0]
 const chartRef = ref<HTMLDivElement>()
 
@@ -70,6 +70,8 @@ const initChart = () => {
                     const value =
                         item.value === 3.14159 || item.value === 0.14159
                             ? '暂无数据'
+                            : item.value === 0.14158
+                            ? 0
                             : Math.round(item.value * 100) / 100 // 处理特殊值
                     tips += `<div style=" display: flex;justify-content: space-between;">
                            <span>${item.marker}
@@ -153,6 +155,8 @@ const initChart = () => {
     chart.on('click', function (params) {
         if (params.seriesName == '暂态触发点') {
             emit('triggerPoint', params.data)
+        } else {
+            emit('echartClick', params)
         }
     })
 

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')

src/components/echarts/color.ts

@@ -1,14 +1,17 @@
-export let color = [
-    '#07CCCA',
-    '#00BFF5',
-    '#FFBF00',
-    '#77DA63',
-    '#D5FF6B',
-    '#Ff6600',
-    '#FF9100',
-    '#5B6E96',
-    '#66FFCC',
-    '#B3B'
-]
-export const gradeColor3 = ['#339966', '#FFCC33', '#A52a2a']
-export const gradeColor5 = ['#00CC00', '#99CC99', '#FF9900', '#996600', '#A52a2a']
+export const color = [
+    '#07CCCA',
+    '#00BFF5',
+    '#FFBF00',
+    '#77DA63',
+    '#D5FF6B',
+    '#Ff6600',
+    '#FF9100',
+    '#5B6E96',
+    '#66FFCC',
+    '#B266FF',
+    '#FF6680',
+    '#40A0FF',
+    '#33CC99' 
+]
+export const gradeColor3 = ['#339966', '#FFCC33', '#A52a2a']
+export const gradeColor5 = ['#00CC00', '#99CC99', '#FF9900', '#996600', '#A52a2a']

src/components/echarts/shushiboxi2.vue

@@ -1,345 +0,0 @@
-<template>
-    <div>
-        <!-- <MyEChart style="height: 400px;width: 100%" v-for="item in echartsList" :options="item" /> -->
-        <div id="container0" style="height:400px;width:100%;"></div>
-        <div id="container1" style="height:400px;width:100%;"></div>
-
-
-    </div>
-
-</template>
-<script setup lang='ts'>
-import MyEChart from '@/components/echarts/MyEchart.vue'
-
-import Highcharts from 'highcharts';
-import { ref, reactive, onUnmounted } from 'vue'
-const props = defineProps({
-    wp: {
-        type: Object,
-
-    },
-    boxoList: {
-        type: Object,
-
-    },
-    value: {
-        type: Number,
-        default: 1
-    },
-
-})
-// let data = [[-100, -3.41, -3.39, -3.34, 1, 2, 3], [-99.92, -5.19, -5.23, -5.19, 4, 5, 6], [-99.84, -7.28, -7.26, -7.26, 10, 20, 30]]
-
-
-
-
-
-
-const echartsList: any = ref([])
-const SA:any = ref([])
-const SB:any = ref([])
-const SC:any = ref([])
-const info = () => {
-
-
-    let result = props.wp?.listWaveData.map(item => {
-        let A = [[item[0], item[1]], [item[0], item[4]],];
-        let B = [[item[0], item[2]], [item[0], item[5]],]; // 注意：item[7] 会是 undefined，需要确保数据长度或调整索引
-        let C = [[item[0], item[3]], [item[0], item[6]],]; // 根据要求，这里 C 的第二个和第三个子数组的第二个元素取自 subArray[4] 和 subArray[6]
-
-        // 由于 subArray[7] 在原始数据中不存在，我们可以使用 subArray[5] 的下一个有效索引 subArray[6]（对于 B 的第三个子数组的第二个元素）
-      
-
-        return { A, B, C };
-    }).reduce((acc, { A, B, C }) => {
-        acc.A[0].push(A[0]);
-        acc.A[1].push(A[1]);
-        acc.B[0].push(B[0]);
-        acc.B[1].push(B[1]);
-        acc.C[0].push(C[0]);
-        acc.C[1].push(C[1]);
-        return acc;
-    }, { A: [[],[]], B: [[],[]], C: [[],[]] });
-
-     SA.value = result.A;
-     SB.value = result.B;
-     SC.value = result.C;
-
-    console.log( SA.value );
-    console.log( SB.value );
-    console.log( SC.value);
-
-    let num = (props.wp?.waveTitle.length - 1) / 3
-
-    for (let i = 0; i < num; i++) {
-        // A.value = []
-        // B.value = []
-        // C.value = []
-        // props.wp?.listWaveData.forEach((item: any,) => {
-        //     A.value.push([item[0], item[i * 3 + 1]])
-        //     B.value.push([item[0], item[i * 3 + 2]])
-        //     C.value.push([item[0], item[i * 3 + 3]])
-        // })
-        setTimeout(() => {
-
-            // echartsList.value.push({
-            //     title: {
-            //         text: i == 0 ? '123' : '',
-            //         x: 'center',
-            //     },
-            //     tooltip: {
-            //         axisPointer: {
-            //             type: 'cross',
-            //             label: {
-            //                 color: '#fff',
-            //                 fontSize: 16
-            //             }
-            //         },
-            //         textStyle: {
-            //             color: '#fff',
-            //             fontStyle: 'normal',
-            //             opacity: 0.35,
-            //             fontSize: 14
-            //         },
-            //         backgroundColor: 'rgba(0,0,0,0.55)',
-            //         borderWidth: 0,
-            //     },
-            //     dataZoom: [
-            //         {
-            //             type: 'inside',
-            //             height: 13,
-            //             start: 0,
-            //             bottom: '20px',
-            //             end: 25
-            //         },
-            //         {
-            //             start: 0,
-            //             height: 13,
-            //             bottom: '20px',
-            //             end: 25
-            //         }
-            //     ],
-            //     xAxis: {
-
-            //         // data: data.filter(item => item.phaseType == 'A').map(item => item.time),
-            //         name: '时间',
-            //         type: 'value',
-            //         axisLine: {
-            //             show: true,
-            //             onZero: false //-----------重点
-            //         },
-            //         // splitLine: {
-            //         //     show: false,
-            //         // }
-
-            //     },
-            //     yAxis: {
-            //         type: 'value',
-            //         name: name,
-            //         // splitLine: {
-            //         //     show: false,
-            //         // }
-            //         // max: max,
-            //         // min: min
-
-            //     },
-            //     // legend: {
-            //     //     data: ['A', 'B', 'C']
-            //     //     // selectedMode: false,
-            //     // },
-            //     grid: {
-            //         top: '30px',
-            //         left: '30px'
-            //     },
-            //     color: ['#DAA520', '#2E8B57', '#A52a2a'],
-            //     series: [
-            //         {
-            //             name: 'A相',
-            //             type: 'line',
-            //             smooth: true,
-            //             symbol: 'none',
-            //             // 开启渐进式渲染
-            //             progressive: 2000,
-            //             // 渲染阈值，大于此值则启动渐进渲染
-            //             progressiveThreshold: 5000,
-            //             sampling: 'average',
-            //             data: A
-
-            //         },
-            //         {
-            //             name: 'B相',
-            //             type: 'line',
-            //             smooth: true,
-            //             symbol: 'none',
-            //             // 开启渐进式渲染
-            //             progressive: 2000,
-            //             // 渲染阈值，大于此值则启动渐进渲染
-            //             progressiveThreshold: 5000,
-            //             sampling: 'average',
-            //             data: B
-            //         },
-            //         {
-            //             name: 'C相',
-            //             type: 'line',
-            //             smooth: true,
-            //             symbol: 'none',
-            //             // 开启渐进式渲染
-            //             progressive: 2000,
-            //             // 渲染阈值，大于此值则启动渐进渲染
-            //             progressiveThreshold: 5000,
-            //             sampling: 'average',
-            //             data: C
-            //         }
-            //     ],
-            //     options: {
-            //         animation: false,
-            //         dataZoom: [{
-            //             type: 'inside',
-            //             height: 13,
-            //             start: 0,
-            //             bottom: '20px',
-            //             end: 10
-            //         },
-            //         {
-            //             start: 0,
-            //             height: 13,
-            //             bottom: '20px',
-            //             end: 10
-            //         }]
-            //     }
-            // })
-            Highcharts.chart(`container${i}`, {
-
-                chart: {
-                    zooming: {
-                        type: 'x'
-                    }
-                },
-
-                title: {
-                    text: '123',
-                    align: 'left'
-                },
-
-                subtitle: {
-                    text: 'Using the Boost module',
-                    align: 'left'
-                },
-
-                accessibility: {
-                    screenReaderSection: {
-                        beforeChartFormat: '<{headingTagName}>' +
-                            '{chartTitle}</{headingTagName}><div>{chartSubtitle}</div>' +
-                            '<div>{chartLongdesc}</div><div>{xAxisDescription}</div><div>' +
-                            '{yAxisDescription}</div>'
-                    }
-                },
-
-                tooltip: {
-
-                },
-
-                xAxis: {
-                    type: 'datetime'
-                },
-
-                series: [
-                    {
-                        name: 'A相',
-                        type: 'line',
-                        lineWidth: 0.5,
-                        data: SA.value[i]
-
-                    },
-                    {
-                        name: 'B相',
-                        type: 'line',
-                        lineWidth: 0.5,
-                        data: SB.value[i]
-                    },
-                    {
-                        name: 'C相',
-                        type: 'line',
-                        lineWidth: 0.5,
-                        data: SC.value[i]
-                    }
-                ],
-
-            });
-        }, 0);
-    }
-}
-
-var init = () => {
-    Highcharts.chart('container', {
-        chart: {
-            type: 'spline'
-        },
-        title: {
-            text: 'Snow depth at Vikjafjellet, Norway'
-        },
-        subtitle: {
-            text: 'Irregular time data in Highcharts JS'
-        },
-        xAxis: {
-            type: 'datetime',
-            dateTimeLabelFormats: {
-                // don't display the year
-                month: '%e. %b',
-                year: '%b'
-            },
-            title: {
-                text: 'Date'
-            }
-        },
-        yAxis: {
-            title: {
-                text: 'Snow depth (m)'
-            },
-            min: 0
-        },
-        // tooltip: {
-        //     headerFormat: '<b>{series.name}</b><br>',
-        //     pointFormat: '{point.x:%e. %b}: {point.y:.2f} m'
-        // },
-
-        plotOptions: {
-            series: {
-                marker: {
-                    symbol: 'circle',
-                    fillColor: '#FFFFFF',
-                    enabled: true,
-                    radius: 2.5,
-                    lineWidth: 1,
-                    lineColor: null
-                }
-            }
-        },
-
-        colors: ['#6CF', '#39F', '#06C', '#036', '#000'],
-
-
-        series: [
-
-        ]
-    });
-
-
-
-}
-
-onMounted(() => {
-    info()
-
-    // init();
-})
-onUnmounted(() => {
-    SA.value = []
-    SB.value = []
-    SC.value = []
-})
-
-
-
-</script>
-<style lang="scss" scoped></style>

src/components/echarts/waveForm.vue

@@ -1,190 +1,190 @@
-<template>
-    <div v-if="view2">
-        <el-row>
-            <el-col :span="12">
-                <span style="font-size: 14px; line-height: 30px">值类型选择:</span>
-                <el-select
-                    style="min-width: 200px; width: 200px"
-                    @change="changeView"
-                    v-model="value"
-                    placeholder="请选择值类型"
-                >
-                    <el-option
-                        v-for="item in options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value"
-                    ></el-option>
-                </el-select>
-                <!-- <el-button v-if="view2 && senior" class="ml10" type="primary"
-                    @click="AdvancedAnalytics">高级分析</el-button> -->
-            </el-col>
-            <el-col :span="12">
-                <el-button
-                    @click="backbxlb"
-                    class="el-icon-refresh-right"
-                    icon="el-icon-CloseBold"
-                    style="float: right"
-                >
-                    返回
-                </el-button>
-            </el-col>
-        </el-row>
-        <div v-loading="loading" style="height: calc(100vh - 190px)">
-            <el-tabs v-if="view4" class="default-main" v-model="bxactiveName" @tab-click="bxhandleClick">
-                <el-tab-pane
-                    label="瞬时波形"
-                    name="ssbx"
-                    class="boxbx pt10 pb10"
-                    :style="'height:' + bxecharts + ';overflow-y: scroll;'"
-                >
-                    <shushiboxi
-                        ref="shushiboxiRef"
-                        v-if="bxactiveName == 'ssbx' && showBoxi"
-                        :value="value"
-                        :parentHeight="parentHeight"
-                        :boxoList="boxoList"
-                        :wp="wp"
-                    ></shushiboxi>
-                </el-tab-pane>
-                <el-tab-pane
-                    label="RMS波形"
-                    class="boxbx pt10 pb10"
-                    name="rmsbx"
-                    :style="'height:' + bxecharts + ';overflow-y: scroll;'"
-                >
-                    <rmsboxi
-                        ref="rmsboxiRef"
-                        v-if="bxactiveName == 'rmsbx' && showBoxi"
-                        :value="value"
-                        :parentHeight="parentHeight"
-                        :boxoList="boxoList"
-                        :wp="wp"
-                    ></rmsboxi>
-                </el-tab-pane>
-            </el-tabs>
-            <el-empty v-else description="暂无数据" style="height: calc(100vh - 190px)" />
-        </div>
-    </div>
-    <div v-if="view3" class="pd10">
-        <span style="font-weight: 500; font-size: 22px">高级分析</span>
-        <el-button icon="el-icon-Back" @click="gaoBack" style="float: right">返回</el-button>
-        <analytics :flag="true" :GJList="GJList" :boxoList="boxoList"></analytics>
-    </div>
-</template>
-<script setup lang="ts">
-import shushiboxi from '@/components/echarts/shushiboxi.vue'
-import rmsboxi from '@/components/echarts/rmsboxi.vue'
-import analytics from '@/components/echarts/analytics.vue'
-import { ref, reactive } from 'vue'
-import { analysis } from '@/api/advance-boot/analyse'
-import { mainHeight } from '@/utils/layout'
-import { getMonitorEventAnalyseWave, downloadWaveFile } from '@/api/event-boot/transient'
-const emit = defineEmits(['backbxlb'])
-interface Props {
-    // boxoList: any
-    // wp: any,
-    senior?: boolean
-}
-
-const props = withDefaults(defineProps<Props>(), {
-    senior: false
-})
-const parentHeight = ref(0)
-const loading = ref(true)
-const bxactiveName = ref('ssbx')
-const rmsboxiRef = ref()
-const value = ref(1)
-const options = ref([
-    {
-        value: 1,
-        label: '一次值'
-    },
-    {
-        value: 2,
-        label: '二次值'
-    }
-])
-const shushiboxiRef = ref()
-const bxecharts = ref(mainHeight(95).height as any)
-const view2 = ref(true)
-const boxoList = ref(null)
-const wp = ref(null)
-const showBoxi = ref(true)
-const view3 = ref(false)
-const view4 = ref(false)
-const GJList = ref([])
-
-const open = async (row: any) => {
-    loading.value = true
-    await getMonitorEventAnalyseWave({ id: row.eventId, systemType: 0 })
-        .then(res => {
-            row.loading = false
-            if (res != undefined) {
-                boxoList.value = row
-                wp.value = res.data
-                loading.value = false
-                view4.value = true
-            }
-        })
-        .catch(() => {
-            loading.value = false
-        })
-}
-const bxhandleClick = (tab: any) => {
-    if (shushiboxiRef.value) shushiboxiRef.value.backbxlb()
-    if (rmsboxiRef.value) rmsboxiRef.value.backbxlb()
-
-    loading.value = true
-    if (tab.name == 'ssbx') {
-        bxactiveName.value = 'ssbx'
-    } else if (tab.name == 'rmsbx') {
-        bxactiveName.value = 'rmsbx'
-    }
-    setTimeout(() => {
-        loading.value = false
-    }, 0)
-    //  console.log(tab, event);
-}
-const backbxlb = () => {
-    boxoList.value = null
-    wp.value = null
-    if (shushiboxiRef.value) shushiboxiRef.value.backbxlb()
-    if (rmsboxiRef.value) rmsboxiRef.value.backbxlb()
-
-    emit('backbxlb')
-}
-const setHeight = (h: any, vh: any) => {
-    if (h != false) {
-        parentHeight.value = h
-    }
-
-    setTimeout(() => {
-        bxecharts.value = mainHeight(vh).height
-    }, 100)
-}
-// 高级分析
-const AdvancedAnalytics = () => {
-    analysis({
-        eventIndex: boxoList.value.eventId
-    }).then(res => {
-        GJList.value = res.data
-        view3.value = true
-        view2.value = false
-    })
-}
-const changeView = () => {
-    if (shushiboxiRef.value) shushiboxiRef.value.backbxlb()
-    if (rmsboxiRef.value) rmsboxiRef.value.backbxlb()
-    showBoxi.value = false
-    setTimeout(() => {
-        showBoxi.value = true
-    }, 0)
-}
-const gaoBack = () => {
-    view2.value = true
-    view3.value = false
-}
-defineExpose({ open, setHeight })
-</script>
-<style lang="scss" scoped></style>
+<template>
+    <div v-if="view2">
+        <el-row>
+            <el-col :span="12">
+                <span style="font-size: 14px; line-height: 30px">值类型选择:</span>
+                <el-select
+                    style="min-width: 200px; width: 200px"
+                    @change="changeView"
+                    v-model="value"
+                    placeholder="请选择值类型"
+                >
+                    <el-option
+                        v-for="item in options"
+                        :key="item.value"
+                        :label="item.label"
+                        :value="item.value"
+                    ></el-option>
+                </el-select>
+                <!-- <el-button v-if="view2 && senior" class="ml10" type="primary"
+                    @click="AdvancedAnalytics">高级分析</el-button> -->
+            </el-col>
+            <el-col :span="12">
+                <el-button
+                    @click="backbxlb"
+                    class="el-icon-refresh-right"
+                    icon="el-icon-Back"
+                    style="float: right"
+                >
+                    返回
+                </el-button>
+            </el-col>
+        </el-row>
+        <div v-loading="loading" style="height: calc(100vh - 190px)">
+            <el-tabs v-if="view4" class="default-main" v-model="bxactiveName" @tab-click="bxhandleClick">
+                <el-tab-pane
+                    label="瞬时波形"
+                    name="ssbx"
+                    class="boxbx pt10 pb10"
+                    :style="'height:' + bxecharts + ';overflow-y: scroll;'"
+                >
+                    <shushiboxi
+                        ref="shushiboxiRef"
+                        v-if="bxactiveName == 'ssbx' && showBoxi"
+                        :value="value"
+                        :parentHeight="parentHeight"
+                        :boxoList="boxoList"
+                        :wp="wp"
+                    ></shushiboxi>
+                </el-tab-pane>
+                <el-tab-pane
+                    label="RMS波形"
+                    class="boxbx pt10 pb10"
+                    name="rmsbx"
+                    :style="'height:' + bxecharts + ';overflow-y: scroll;'"
+                >
+                    <rmsboxi
+                        ref="rmsboxiRef"
+                        v-if="bxactiveName == 'rmsbx' && showBoxi"
+                        :value="value"
+                        :parentHeight="parentHeight"
+                        :boxoList="boxoList"
+                        :wp="wp"
+                    ></rmsboxi>
+                </el-tab-pane>
+            </el-tabs>
+            <el-empty v-else description="暂无数据" style="height: calc(100vh - 190px)" />
+        </div>
+    </div>
+    <div v-if="view3" class="pd10">
+        <span style="font-weight: 500; font-size: 22px">高级分析</span>
+        <el-button icon="el-icon-Back" @click="gaoBack" style="float: right">返回</el-button>
+        <analytics :flag="true" :GJList="GJList" :boxoList="boxoList"></analytics>
+    </div>
+</template>
+<script setup lang="ts">
+import shushiboxi from '@/components/echarts/shushiboxi.vue'
+import rmsboxi from '@/components/echarts/rmsboxi.vue'
+import analytics from '@/components/echarts/analytics.vue'
+import { ref, reactive } from 'vue'
+import { analysis } from '@/api/advance-boot/analyse'
+import { mainHeight } from '@/utils/layout'
+import { getMonitorEventAnalyseWave, downloadWaveFile } from '@/api/event-boot/transient'
+const emit = defineEmits(['backbxlb'])
+interface Props {
+    // boxoList: any
+    // wp: any,
+    senior?: boolean
+}
+
+const props = withDefaults(defineProps<Props>(), {
+    senior: false
+})
+const parentHeight = ref(0)
+const loading = ref(true)
+const bxactiveName = ref('ssbx')
+const rmsboxiRef = ref()
+const value = ref(1)
+const options = ref([
+    {
+        value: 1,
+        label: '一次值'
+    },
+    {
+        value: 2,
+        label: '二次值'
+    }
+])
+const shushiboxiRef = ref()
+const bxecharts = ref(mainHeight(95).height as any)
+const view2 = ref(true)
+const boxoList = ref(null)
+const wp = ref(null)
+const showBoxi = ref(true)
+const view3 = ref(false)
+const view4 = ref(false)
+const GJList = ref([])
+
+const open = async (row: any) => {
+    loading.value = true
+    await getMonitorEventAnalyseWave({ id: row.eventId, systemType: 0 })
+        .then(res => {
+            row.loading = false
+            if (res != undefined) {
+                boxoList.value = row
+                wp.value = res.data
+                loading.value = false
+                view4.value = true
+            }
+        })
+        .catch(() => {
+            loading.value = false
+        })
+}
+const bxhandleClick = (tab: any) => {
+    if (shushiboxiRef.value) shushiboxiRef.value.backbxlb()
+    if (rmsboxiRef.value) rmsboxiRef.value.backbxlb()
+
+    loading.value = true
+    if (tab.name == 'ssbx') {
+        bxactiveName.value = 'ssbx'
+    } else if (tab.name == 'rmsbx') {
+        bxactiveName.value = 'rmsbx'
+    }
+    setTimeout(() => {
+        loading.value = false
+    }, 0)
+    //  console.log(tab, event);
+}
+const backbxlb = () => {
+    boxoList.value = null
+    wp.value = null
+    if (shushiboxiRef.value) shushiboxiRef.value.backbxlb()
+    if (rmsboxiRef.value) rmsboxiRef.value.backbxlb()
+
+    emit('backbxlb')
+}
+const setHeight = (h: any, vh: any) => {
+    if (h != false) {
+        parentHeight.value = h
+    }
+
+    setTimeout(() => {
+        bxecharts.value = mainHeight(vh).height
+    }, 100)
+}
+// 高级分析
+const AdvancedAnalytics = () => {
+    analysis({
+        eventIndex: boxoList.value.eventId
+    }).then(res => {
+        GJList.value = res.data
+        view3.value = true
+        view2.value = false
+    })
+}
+const changeView = () => {
+    if (shushiboxiRef.value) shushiboxiRef.value.backbxlb()
+    if (rmsboxiRef.value) rmsboxiRef.value.backbxlb()
+    showBoxi.value = false
+    setTimeout(() => {
+        showBoxi.value = true
+    }, 0)
+}
+const gaoBack = () => {
+    view2.value = true
+    view3.value = false
+}
+defineExpose({ open, setHeight })
+</script>
+<style lang="scss" scoped></style>

src/components/formContainer/index.vue

@@ -1,54 +1,54 @@
-<template>
-    <el-dialog v-if="isModal" size="50%" v-model="visibles" @cancel="cancel" v-bind="$attrs" :append-to-body="true">
-        <template v-for="slotKey in slotKeys" #[slotKey]>
-            <slot :name="slotKey" />
-        </template>
-    </el-dialog>
-    <el-drawer v-else size="50%"  v-model="visibles" v-bind="$attrs"  :append-to-body="true" :footer-style="{ textAlign: 'right' }">
-        <template v-for="slotKey in slotKeys" #[slotKey]>
-            <slot :name="slotKey" />
-        </template>
-    </el-drawer>
-</template>
-
-<script>
-import { mapState } from 'pinia'
-import { globalStore } from '@/stores/indexs'
-
-const FormContainerTypeEnum = {
-    DRAWER: 'drawer',
-    MODAL: 'modal'
-}
-export default {
-    inheritAttrs: false,
-    props: {
-        visible: {
-            type: Boolean,
-            default: false,
-            required: true
-        }
-    },
-    computed: {
-        ...mapState(globalStore, ['formStyle']),
-        slotKeys() {
-            return Object.keys(this.$slots)
-        },
-        isModal() {
-            return FormContainerTypeEnum.MODAL === this.formStyle
-        }
-    },
-    data() {
-        return {
-            visibles: ''
-        }
-    },
-    methods: {
-        cancel() {
-            this.$emit('close')
-        }
-    },
-    mounted() {
-        this.visibles = this.visible
-    }
-}
-</script>
+<template>
+    <el-dialog v-if="isModal" size="50%" v-model="visibles" @cancel="cancel" v-bind="$attrs" :append-to-body="true">
+        <template v-for="slotKey in slotKeys" #[slotKey]>
+            <slot :name="slotKey" />
+        </template>
+    </el-dialog>
+    <el-drawer v-else size="50%"  v-model="visibles" v-bind="$attrs"  :append-to-body="true" :footer-style="{ textAlign: 'right' }">
+        <template v-for="slotKey in slotKeys" #[slotKey]>
+            <slot :name="slotKey" />
+        </template>
+    </el-drawer>
+</template>
+
+<script>
+import { mapState } from 'pinia'
+// import { globalStore } from '@/stores/indexs'
+
+const FormContainerTypeEnum = {
+    DRAWER: 'drawer',
+    MODAL: 'modal'
+}
+export default {
+    inheritAttrs: false,
+    props: {
+        visible: {
+            type: Boolean,
+            default: false,
+            required: true
+        }
+    },
+    computed: {
+        // ...mapState(globalStore, ['formStyle']),
+        slotKeys() {
+            return Object.keys(this.$slots)
+        },
+        isModal() {
+            return FormContainerTypeEnum.MODAL === this.formStyle
+        }
+    },
+    data() {
+        return {
+            visibles: ''
+        }
+    },
+    methods: {
+        cancel() {
+            this.$emit('close')
+        }
+    },
+    mounted() {
+        this.visibles = this.visible
+    }
+}
+</script>

src/components/table/defaultAttribute.ts

@@ -4,7 +4,7 @@ export const defaultAttribute: VxeTableProps = {
     align: 'center',
     headerCellClassName: 'table-header-cell',
     border: true,
-   
+    stripe: true,
     size: 'small',
     columnConfig: { resizable: true },
     rowConfig: { isCurrent: true, isHover: true },
@@ -13,6 +13,7 @@ export const defaultAttribute: VxeTableProps = {
     treeConfig: {
         reserve: true
     },
-
-    showOverflow: true
+    showOverflow: true,
+     showFooter:true
 }
+

src/components/table/header/index.vue

@@ -1,375 +1,405 @@
-<template>
-    <div ref="tableHeader" class="cn-table-header">
-        <div class="table-header ba-scroll-style">
-            <el-form
-                style="flex: 1; height: 32px; display: flex; flex-wrap: wrap"
-                ref="headerForm"
-                @submit.prevent=""
-                @keyup.enter="onComSearch"
-                label-position="left"
-                :inline="true"
-            >
-                <el-form-item v-if="datePicker" style="grid-column: span 2; max-width: 590px">
-                    <template #label>
-                        <el-checkbox v-if="showTimeAll" v-model="timeAll" label="时间" />
-                        <span v-else>时间</span>
-                    </template>
-                    <DatePicker
-                        ref="datePickerRef"
-                        v-if="timeAll"
-                        :nextFlag="nextFlag"
-                        :theCurrentTime="theCurrentTime"
-                    ></DatePicker>
-                </el-form-item>
-
-                <el-form-item label="区域" v-if="area">
-                    <Area ref="areaRef" v-model="tableStore.table.params.deptIndex" />
-                </el-form-item>
-                <slot name="select"></slot>
-            </el-form>
-            <template v-if="$slots.select || datePicker || showSearch">
-                <el-button type="primary" @click="showSelectChange" v-if="showUnfoldButton">
-                    <Icon size="14" name="el-icon-ArrowUp" style="color: #fff" v-if="showSelect" />
-                    <Icon size="14" name="el-icon-ArrowDown" style="color: #fff" v-else />
-                </el-button>
-                <el-button
-                    @click="onComSearch"
-                    v-if="showSearch"
-                    :loading="tableStore.table.loading"
-                    type="primary"
-                    :icon="Search"
-                >
-                    查询
-                </el-button>
-                <el-button
-                    @click="onResetForm"
-                    v-if="showSearch && showReset"
-                    :loading="tableStore.table.loading"
-                    :icon="RefreshLeft"
-                >
-                    重置
-                </el-button>
-                <el-button
-                    @click="onExport"
-                    v-if="showExport"
-                    :loading="tableStore.table.loading"
-                    type="primary"
-                    icon="el-icon-Download"
-                >
-                    导出
-                </el-button>
-            </template>
-            <slot name="operation"></slot>
-        </div>
-        <el-form
-            :style="showSelect && showUnfoldButton ? headerFormSecondStyleOpen : headerFormSecondStyleClose"
-            ref="headerFormSecond"
-            @submit.prevent=""
-            @keyup.enter="onComSearch"
-            label-position="left"
-            :inline="true"
-        ></el-form>
-    </div>
-</template>
-
-<script setup lang="ts">
-import { inject, ref, onMounted, nextTick, onUnmounted, watch } from 'vue'
-import type TableStore from '@/utils/tableStore'
-import DatePicker from '@/components/form/datePicker/index.vue'
-import Area from '@/components/form/area/index.vue'
-import { mainHeight } from '@/utils/layout'
-import { useDictData } from '@/stores/dictData'
-import { Search, RefreshLeft } from '@element-plus/icons-vue'
-import { defineProps } from 'vue'
-const emit = defineEmits(['selectChange'])
-const tableStore = inject('tableStore') as TableStore
-const tableHeader = ref()
-const datePickerRef = ref()
-const dictData = useDictData()
-const areaRef = ref()
-const headerForm = ref()
-const headerFormSecond = ref()
-const timeAll = ref(true)
-interface Props {
-    datePicker?: boolean
-    area?: boolean
-    showSearch?: boolean
-    nextFlag?: boolean //控制时间是否可以往后推
-    theCurrentTime?: boolean //控制时间前3天展示上个月时间
-    showReset?: boolean //是否显示重置按钮
-    showExport?: boolean //导出控制
-    showTimeAll?: boolean //控制时间是否显示
-}
-
-const props = withDefaults(defineProps<Props>(), {
-    datePicker: false,
-    area: false,
-    showSearch: true,
-    nextFlag: false,
-    theCurrentTime: false,
-    showReset: true,
-    showExport: false,
-    showTimeAll: false
-})
-// 动态计算table高度
-const resizeObserver = new ResizeObserver(entries => {
-    for (const entry of entries) {
-        handlerHeight()
-        computedSearchRow()
-    }
-})
-const showUnfoldButton = ref(false)
-const headerFormSecondStyleOpen = {
-    opacity: 1,
-    height: 'auto',
-    padding: '0 15px 13px 15px'
-}
-const headerFormSecondStyleClose = {
-    opacity: 0,
-    height: '0',
-    padding: '0'
-}
-
-watch(
-    () => tableStore.table.params.deptIndex,
-    newVal => {
-        setTimeout(() => {
-            areaRef.value && areaRef.value.change()
-        }, 0)
-    }
-)
-watch(
-    () => timeAll.value,
-    newVal => {
-        tableStore.timeAll = newVal
-        setTimeout(() => {
-            computedSearchRow()
-        }, 500)
-    }
-)
-onMounted(() => {
-    timeAll.value = props.showTimeAll ? false : true
-    if (props.datePicker && timeAll.value) {
-        tableStore.table.params.searchBeginTime = datePickerRef.value.timeValue[0]
-        tableStore.table.params.searchEndTime = datePickerRef.value.timeValue[1]
-        tableStore.table.params.startTime = datePickerRef.value.timeValue[0]
-        tableStore.table.params.endTime = datePickerRef.value.timeValue[1]
-        tableStore.table.params.timeFlag = datePickerRef.value.timeFlag
-        tableStore.table.params.interval = datePickerRef.value.interval
-    }
-    if (props.area) {
-        tableStore.table.params.deptIndex = dictData.state.area[0].id
-    }
-    nextTick(() => {
-        resizeObserver.observe(tableHeader.value)
-        setTimeout(() => {
-            computedSearchRow()
-        }, 500)
-    })
-})
-onUnmounted(() => {
-    resizeObserver.disconnect()
-})
-
-const handlerHeight = () => {
-    tableStore.table.publicHeight + tableHeader.value.offsetHeight + (tableStore.showPage ? 58 : 0) + 20
-    tableStore.table.height = mainHeight(
-        tableStore.table.publicHeight + tableHeader.value.offsetHeight + (tableStore.showPage ? 58 : 0) + 20
-    ).height as string
-}
-const computedSearchRow = () => {
-    if (!headerForm.value.$el) return
-    // 清空headerFormSecond.value.$el下的元素
-    while (headerFormSecond.value.$el.firstChild) {
-        headerForm.value.$el.appendChild(headerFormSecond.value.$el.firstChild)
-    }
-    // 获取第一行放了几个表单
-    const elFormItem = headerForm.value.$el.querySelectorAll('.el-form-item')
-
-    //  把第一行放不下的复制一份放到headerFormSecond.value.$el
-    let width = 0
-    for (let i = 0; i < elFormItem.length; i++) {
-        width += elFormItem[i].offsetWidth + 32
-
-        if (width > headerForm.value.$el.offsetWidth) {
-            headerFormSecond.value.$el.appendChild(elFormItem[i])
-        }
-    }
-
-    // 判断是否需要折叠
-    if (headerFormSecond.value.$el.scrollHeight > 0) {
-        showUnfoldButton.value = true
-    } else {
-        showUnfoldButton.value = false
-    }
-}
-
-const showSelect = ref(false)
-const showSelectChange = () => {
-    showSelect.value = !showSelect.value
-    emit('selectChange', showSelect.value)
-}
-const onComSearch = async () => {
-    if (props.datePicker && timeAll.value) {
-        tableStore.table.params.searchBeginTime = datePickerRef.value.timeValue[0]
-        tableStore.table.params.searchEndTime = datePickerRef.value.timeValue[1]
-        tableStore.table.params.startTime = datePickerRef.value.timeValue[0]
-        tableStore.table.params.endTime = datePickerRef.value.timeValue[1]
-        tableStore.table.params.timeFlag = datePickerRef.value.timeFlag
-        tableStore.table.params.interval = datePickerRef.value.interval
-    }
-
-    await tableStore.onTableAction('search', {})
-}
-const setDatePicker = (list: any) => {
-    datePickerRef.value.setTimeOptions(list)
-}
-const onResetForm = () => {
-    //时间重置成默认值
-    datePickerRef.value?.setTheDate(3)
-    tableStore.onTableAction('reset', {})
-}
-const setTheDate = (val: any) => {
-    datePickerRef.value.setTheDate(val)
-}
-// 导出
-const onExport = () => {
-    console.log('导出')
-    tableStore.onTableAction('export', { showAllFlag: true })
-}
-
-defineExpose({
-    onComSearch,
-    areaRef,
-    setDatePicker,
-    setTheDate,
-    datePickerRef,
-    showSelectChange,
-    showSelect,
-    computedSearchRow,
-    onExport
-})
-</script>
-
-<style scoped lang="scss">
-.cn-table-header {
-    border: 1px solid var(--el-border-color);
-}
-
-.table-header {
-    position: relative;
-    overflow-x: auto;
-    box-sizing: border-box;
-    display: flex;
-    align-items: center;
-    width: 100%;
-    max-width: 100%;
-    background-color: var(--ba-bg-color-overlay);
-
-    border-bottom: none;
-    padding: 13px 15px;
-    font-size: 14px;
-    overflow: hidden;
-    .table-header-operate-text {
-        margin-left: 6px;
-    }
-}
-
-.table-com-search {
-    box-sizing: border-box;
-    width: 100%;
-    max-width: 100%;
-    background-color: var(--ba-bg-color-overlay);
-    border: 1px solid var(--ba-border-color);
-    border-bottom: none;
-    padding: 13px 15px 20px 15px;
-    font-size: 14px;
-}
-
-#header-form-second,
-#header-form {
-    // display: flex;
-    // flex-wrap: wrap;
-    transition: all 0.3s;
-}
-
-.mlr-12 {
-    margin-left: 12px;
-}
-
-.mlr-12 + .el-button {
-    margin-left: 12px;
-}
-
-.table-search {
-    display: flex;
-    margin-left: auto;
-
-    .quick-search {
-        width: auto;
-    }
-}
-
-.table-search-button-group {
-    display: flex;
-    margin-left: 12px;
-    border: 1px solid var(--el-border-color);
-    border-radius: var(--el-border-radius-base);
-    overflow: hidden;
-
-    button:focus,
-    button:active {
-        background-color: var(--ba-bg-color-overlay);
-    }
-
-    button:hover {
-        background-color: var(--el-color-info-light-7);
-    }
-
-    .table-search-button-item {
-        height: 30px;
-        border: none;
-        border-radius: 0;
-    }
-
-    .el-button + .el-button {
-        margin: 0;
-    }
-
-    .right-border {
-        border-right: 1px solid var(--el-border-color);
-    }
-}
-
-html.dark {
-    .table-search-button-group {
-        button:focus,
-        button:active {
-            background-color: var(--el-color-info-dark-2);
-        }
-
-        button:hover {
-            background-color: var(--el-color-info-light-7);
-        }
-
-        button {
-            background-color: var(--ba-bg-color-overlay);
-
-            el-icon {
-                color: white !important;
-            }
-        }
-    }
-}
-
-#header-form,
-#header-form-second {
-    :deep(.el-select) {
-        --el-select-width: 220px;
-    }
-
-    :deep(.el-input) {
-        --el-input-width: 220px;
-    }
-}
-</style>
+<template>
+    <div ref="tableHeader" class="cn-table-header">
+        <div class="table-header ba-scroll-style">
+            <el-form
+                style="flex: 1; height: 32px; display: flex; flex-wrap: wrap"
+                ref="headerForm"
+                @submit.prevent=""
+                @keyup.enter="onComSearch"
+                label-position="left"
+                :inline="true"
+            >
+                <el-form-item v-if="datePicker" style="grid-column: span 2; max-width: 630px">
+                    <template #label>
+                        <el-checkbox v-if="showTimeAll" v-model="timeAll" label="统计时间" />
+                        <span v-else>{{ dateLabel }}</span>
+                    </template>
+                    <DatePicker
+                        ref="datePickerRef"
+                        v-if="timeAll"
+                        :nextFlag="nextFlag"
+                        :theCurrentTime="theCurrentTime"
+                    ></DatePicker>
+                </el-form-item>
+
+                <el-form-item label="区域" v-if="area">
+                    <Area ref="areaRef" v-model="tableStore.table.params.deptIndex"  @change-value="onAreaChange" />
+                </el-form-item>
+                <slot name="select"></slot>
+            </el-form>
+            <template v-if="$slots.select || datePicker || showSearch">
+                <el-button type="primary" @click="showSelectChange" v-if="showUnfoldButton">
+                    <Icon size="14" name="el-icon-ArrowUp" style="color: #fff" v-if="showSelect" />
+                    <Icon size="14" name="el-icon-ArrowDown" style="color: #fff" v-else />
+                </el-button>
+                <el-button
+                    @click="onComSearch"
+                    v-if="showSearch"
+                    :loading="tableStore.table.loading"
+                    type="primary"
+                    :icon="Search"
+                >
+                    查询
+                </el-button>
+                <el-button
+                    @click="onResetForm"
+                    v-if="showSearch && showReset"
+                    :loading="tableStore.table.loading"
+                    :icon="RefreshLeft"
+                >
+                    重置
+                </el-button>
+                <el-button
+                    @click="onExport"
+                    v-if="showExport"
+                    :loading="tableStore.table.exportLoading"
+                    type="primary"
+                    icon="el-icon-Download"
+                >
+                    导出
+                </el-button>
+            </template>
+            <slot name="operation"></slot>
+        </div>
+        <el-form
+            :style="showSelect && showUnfoldButton ? headerFormSecondStyleOpen : headerFormSecondStyleClose"
+            ref="headerFormSecond"
+            @submit.prevent=""
+            @keyup.enter="onComSearch"
+            label-position="left"
+            :inline="true"
+        ></el-form>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { inject, ref, onMounted, nextTick, onUnmounted, watch } from 'vue'
+import type TableStore from '@/utils/tableStore'
+import DatePicker from '@/components/form/datePicker/index.vue'
+import Area from '@/components/form/area/index.vue'
+import { mainHeight } from '@/utils/layout'
+import { useDictData } from '@/stores/dictData'
+import { Search, RefreshLeft } from '@element-plus/icons-vue'
+import { defineProps } from 'vue'
+const emit = defineEmits(['selectChange','areaChange'])
+const tableStore = inject('tableStore') as TableStore
+const tableHeader = ref()
+const datePickerRef = ref()
+const dictData = useDictData()
+const areaRef = ref()
+const headerForm = ref()
+const headerFormSecond = ref()
+const timeAll = ref(true)
+interface Props {
+    datePicker?: boolean
+    area?: boolean
+    showSearch?: boolean
+    nextFlag?: boolean //控制时间是否可以往后推
+    theCurrentTime?: boolean //控制时间前3天展示上个月时间
+    showReset?: boolean //是否显示重置按钮
+    showExport?: boolean //导出控制
+    showTimeAll?: boolean //控制时间是否显示
+    dateLabel?: string //设置时间名称
+}
+
+const props = withDefaults(defineProps<Props>(), {
+    datePicker: false,
+    area: false,
+    showSearch: true,
+    nextFlag: false,
+    theCurrentTime: false,
+    showReset: true,
+    showExport: false,
+    showTimeAll: false,
+    dateLabel: '统计日期'
+})
+// 动态计算table高度
+const resizeObserver = new ResizeObserver(entries => {
+    for (const entry of entries) {
+        handlerHeight()
+        computedSearchRow()
+    }
+})
+const showUnfoldButton = ref(false)
+const headerFormSecondStyleOpen = {
+    opacity: 1,
+    height: 'auto',
+    padding: '0 15px 13px 15px'
+}
+const headerFormSecondStyleClose = {
+    opacity: 0,
+    height: '0',
+    padding: '0'
+}
+
+const onAreaChange = (data) => {
+
+     emit('areaChange', {label: data.label})
+}
+
+watch(
+    () => tableStore?.table.params.deptIndex,
+    newVal => {
+        setTimeout(() => {
+            areaRef.value && areaRef.value.change()
+         
+        }, 0)
+    }
+)
+watch(
+    () => timeAll.value,
+    newVal => {
+        tableStore.timeAll = newVal
+        setTimeout(() => {
+            computedSearchRow()
+        }, 500)
+    }
+)
+onMounted(() => {
+    timeAll.value = props.showTimeAll ? false : true
+    if (props.datePicker && timeAll.value) {
+        tableStore.table.params.searchBeginTime = datePickerRef.value.timeValue[0]
+        tableStore.table.params.searchEndTime = datePickerRef.value.timeValue[1]
+        tableStore.table.params.startTime = datePickerRef.value.timeValue[0]
+        tableStore.table.params.endTime = datePickerRef.value.timeValue[1]
+        tableStore.table.params.timeFlag = datePickerRef.value.timeFlag
+        tableStore.table.params.interval = datePickerRef.value.interval
+    }
+    if (props.area) {
+        tableStore.table.params.deptIndex = dictData.state.area[0].id
+    }
+    nextTick(() => {
+        resizeObserver.observe(tableHeader.value)
+        setTimeout(() => {
+            computedSearchRow()
+        }, 500)
+    })
+})
+onUnmounted(() => {
+    resizeObserver.disconnect()
+})
+
+const handlerHeight = () => {
+    if (tableStore && tableStore.table) {
+        tableStore.table.publicHeight + tableHeader.value.offsetHeight + (tableStore.showPage ? 58 : 0) + 20
+        tableStore.table.height = mainHeight(
+            tableStore.table.publicHeight + tableHeader.value.offsetHeight + (tableStore.showPage ? 58 : 0) + 20
+        ).height as string
+    }
+}
+const computedSearchRow = () => {
+    if (!headerForm.value?.$el) return
+    // 清空headerFormSecond.value.$el下的元素
+    while (headerFormSecond.value.$el.firstChild) {
+        headerForm.value.$el.appendChild(headerFormSecond.value.$el.firstChild)
+    }
+    // 获取第一行放了几个表单
+    const elFormItem = headerForm.value.$el.querySelectorAll('.el-form-item')
+
+    //  把第一行放不下的复制一份放到headerFormSecond.value.$el
+    let width = 0
+    for (let i = 0; i < elFormItem.length; i++) {
+        width += elFormItem[i].offsetWidth + 32
+
+        if (width > headerForm.value.$el.offsetWidth) {
+            headerFormSecond.value.$el.appendChild(elFormItem[i])
+        }
+    }
+
+    // 判断是否需要折叠
+    if (headerFormSecond.value.$el.scrollHeight > 0) {
+        showUnfoldButton.value = true
+    } else {
+        showUnfoldButton.value = false
+    }
+}
+
+const showSelect = ref(false)
+const showSelectChange = () => {
+    showSelect.value = !showSelect.value
+    emit('selectChange', showSelect.value)
+}
+const onComSearch = async () => {
+    if (props.datePicker && timeAll.value) {
+        tableStore.table.params.searchBeginTime = datePickerRef.value.timeValue[0]
+        tableStore.table.params.searchEndTime = datePickerRef.value.timeValue[1]
+        tableStore.table.params.startTime = datePickerRef.value.timeValue[0]
+        tableStore.table.params.endTime = datePickerRef.value.timeValue[1]
+        tableStore.table.params.timeFlag = datePickerRef.value.timeFlag
+        tableStore.table.params.interval = datePickerRef.value.interval
+    }
+
+    await tableStore.onTableAction('search', {})
+}
+const setDatePicker = (list: any) => {
+    datePickerRef.value.setTimeOptions(list)
+}
+const onResetForm = () => {
+    //时间重置成默认值
+    datePickerRef.value?.setTheDate(3)
+
+    if(props.showTimeAll){
+         timeAll.value = false
+         delete tableStore.table.params.searchBeginTime
+         delete tableStore.table.params.searchEndTime
+         delete tableStore.table.params.startTime
+         delete tableStore.table.params.endTime
+         delete tableStore.table.params.timeFlag
+         delete tableStore.table.params.interval
+    }
+
+    if (props.datePicker && timeAll.value) {
+        tableStore.table.params.searchBeginTime = datePickerRef.value.timeValue[0]
+        tableStore.table.params.searchEndTime = datePickerRef.value.timeValue[1]
+        tableStore.table.params.startTime = datePickerRef.value.timeValue[0]
+        tableStore.table.params.endTime = datePickerRef.value.timeValue[1]
+        tableStore.table.params.timeFlag = datePickerRef.value.timeFlag
+        tableStore.table.params.interval = datePickerRef.value.interval
+    }
+
+    tableStore.onTableAction('reset', {})
+}
+const setTheDate = (val: any) => {
+    datePickerRef.value.setTheDate(val)
+}
+// 导出
+const onExport = () => {
+    
+    tableStore.onTableAction('export', { showAllFlag: true })
+}
+
+defineExpose({
+    onComSearch,
+    areaRef,
+    setDatePicker,
+    setTheDate,
+    datePickerRef,
+    showSelectChange,
+    showSelect,
+    computedSearchRow,
+    onExport
+})
+</script>
+
+<style scoped lang="scss">
+.cn-table-header {
+    border: 1px solid var(--el-border-color);
+}
+
+.table-header {
+    position: relative;
+    overflow-x: auto;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    width: 100%;
+    max-width: 100%;
+    background-color: var(--ba-bg-color-overlay);
+
+    border-bottom: none;
+    padding: 13px 15px;
+    font-size: 14px;
+    overflow: hidden;
+    .table-header-operate-text {
+        margin-left: 6px;
+    }
+}
+
+.table-com-search {
+    box-sizing: border-box;
+    width: 100%;
+    max-width: 100%;
+    background-color: var(--ba-bg-color-overlay);
+    border: 1px solid var(--ba-border-color);
+    border-bottom: none;
+    padding: 13px 15px 20px 15px;
+    font-size: 14px;
+}
+
+#header-form-second,
+#header-form {
+    // display: flex;
+    // flex-wrap: wrap;
+    transition: all 0.3s;
+}
+
+.mlr-12 {
+    margin-left: 12px;
+}
+
+.mlr-12 + .el-button {
+    margin-left: 12px;
+}
+
+.table-search {
+    display: flex;
+    margin-left: auto;
+
+    .quick-search {
+        width: auto;
+    }
+}
+
+.table-search-button-group {
+    display: flex;
+    margin-left: 12px;
+    border: 1px solid var(--el-border-color);
+    border-radius: var(--el-border-radius-base);
+    overflow: hidden;
+
+    button:focus,
+    button:active {
+        background-color: var(--ba-bg-color-overlay);
+    }
+
+    button:hover {
+        background-color: var(--el-color-info-light-7);
+    }
+
+    .table-search-button-item {
+        height: 30px;
+        border: none;
+        border-radius: 0;
+    }
+
+    .el-button + .el-button {
+        margin: 0;
+    }
+
+    .right-border {
+        border-right: 1px solid var(--el-border-color);
+    }
+}
+
+html.dark {
+    .table-search-button-group {
+        button:focus,
+        button:active {
+            background-color: var(--el-color-info-dark-2);
+        }
+
+        button:hover {
+            background-color: var(--el-color-info-light-7);
+        }
+
+        button {
+            background-color: var(--ba-bg-color-overlay);
+
+            el-icon {
+                color: white !important;
+            }
+        }
+    }
+}
+
+#header-form,
+#header-form-second {
+    :deep(.el-select) {
+        --el-select-width: 220px;
+    }
+
+    :deep(.el-input) {
+        --el-input-width: 220px;
+    }
+}
+</style>

src/components/table/index.vue

@@ -1,43 +1,24 @@
 <template>
-    <div :style="{ height:props.height?props.height: tableStore.table.height }">
-        <vxe-table
-            ref="tableRef"
-            height="auto"
-            :key="key"
-            :data="tableStore.table.data"
-            v-loading="tableStore.table.loading"
-            v-bind="Object.assign({}, defaultAttribute, $attrs)"
-            @checkbox-all="selectChangeEvent"
-            @checkbox-change="selectChangeEvent"
-            :showOverflow="showOverflow"
-            @sort-change="handleSortChange"
-        >
+    <div :style="{ height: typeof props.height === 'string' ? props.height : tableStore.table.height }">
+        <vxe-table ref="tableRef" height="auto" :key="key" :data="tableStore.table.data"
+            v-loading="tableStore.table.loading" v-bind="Object.assign({}, defaultAttribute, $attrs)"
+            @checkbox-all="selectChangeEvent" @checkbox-change="selectChangeEvent" :showOverflow="showOverflow"
+            @sort-change="handleSortChange">
             <!-- Column 组件内部是 el-table-column -->
             <template v-if="isGroup">
                 <GroupColumn :column="tableStore.table.column" />
             </template>
             <template v-else>
-                <Column
-                    :attr="item"
-                    :key="key + '-column'"
-                    v-for="(item, key) in tableStore.table.column"
-                    :tree-node="item.treeNode"
-                >
+                <Column :attr="item" :key="key + '-column'" v-for="(item, key) in tableStore.table.column"
+                    :tree-node="item.treeNode">
                     <!-- tableStore 预设的列 render 方案 -->
                     <template v-if="item.render" #default="scope">
-                        <FieldRender
-                            :field="item"
-                            :row="scope.row"
-                            :column="scope.column"
-                            :index="scope.rowIndex"
-                            :key="
-                                key +
-                                '-' +
-                                item.render +
-                                '-' +
-                                (item.field ? '-' + item.field + '-' + scope.row[item.field] : '')
-                            "
-                        />
+                        <FieldRender :field="item" :row="scope.row" :column="scope.column" :index="scope.rowIndex" :key="key +
+                            '-' +
+                            item.render +
+                            '-' +
+                            (item.field ? '-' + item.field + '-' + scope.row[item.field] : '')
+                            " />
                     </template>
                 </Column>
             </template>
@@ -46,16 +27,11 @@
     </div>
 
     <div v-if="tableStore.showPage" class="table-pagination">
-        <el-pagination
-            :currentPage="tableStore.table.params!.pageNum"
-            :page-size="tableStore.table.params!.pageSize"
-            :page-sizes="pageSizes"
-            background
+        <el-pagination :currentPage="tableStore.table.params!.pageNum" :page-size="tableStore.table.params!.pageSize"
+            :page-sizes="pageSizes" background
             :layout="config.layout.shrink ? 'prev, next, jumper' : 'sizes,total, ->, prev, pager, next, jumper'"
-            :total="tableStore.table.total"
-            @size-change="onTableSizeChange"
-            @current-change="onTableCurrentChange"
-        ></el-pagination>
+            :total="tableStore.table.total" @size-change="onTableSizeChange"
+            @current-change="onTableCurrentChange"></el-pagination>
     </div>
     <slot name="footer"></slot>
 </template>
@@ -80,13 +56,13 @@ const key = ref(0)
 interface Props extends /* @vue-ignore */ Partial<InstanceType<typeof ElTable>> {
     isGroup?: boolean
     showOverflow?: boolean
-    height?: string | boolean
+    height?: string | number
 }
 
 const props = withDefaults(defineProps<Props>(), {
     isGroup: false,
     showOverflow: true,
-    height: false
+    height: undefined
 })
 onMounted(() => {
     tableStore.table.ref = tableRef.value as VxeTableInstance

src/components/tree/allocation.vue

@@ -0,0 +1,187 @@
+<template>
+    <div :style="{ width: menuCollapse ? '40px' : props.width }" style="transition: all 0.3s; overflow: hidden">
+        <div class="mt15 mr10" style="display: flex; justify-content: end">
+            <el-button type="primary" icon="el-icon-Select" @click="save" :loading="loading">保存</el-button>
+        </div>
+        <Icon
+            v-show="menuCollapse"
+            @click="onMenuCollapse"
+            :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+            :class="menuCollapse ? 'unfold' : ''"
+            size="18"
+            class="fold ml10 mt20 menu-collapse"
+            style="cursor: pointer"
+        />
+        <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1 }">
+            <div style="display: flex; align-items: center" class="mb10">
+                <el-input maxlength="32" show-word-limit v-model.trim="filterText" placeholder="请输入内容" clearable>
+                    <template #prefix>
+                        <Icon name="el-icon-Search" style="font-size: 16px" />
+                    </template>
+                </el-input>
+                <el-tooltip placement="bottom" :hide-after="0" v-if="props.showPush">
+                    <template #content>
+                        <span>台账推送</span>
+                    </template>
+
+                    <Icon
+                        name="el-icon-Promotion"
+                        size="20"
+                        class="fold ml10 menu-collapse"
+                        style="cursor: pointer"
+                        :style="{ color: config.getColorVal('elementUiPrimary') }"
+                        @click="onAdd"
+                    />
+                </el-tooltip>
+                <!-- <Icon @click='onMenuCollapse' :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'" v-else
+                    :class="menuCollapse ? 'unfold' : ''" size='18' class='fold ml10 menu-collapse'
+                    style='cursor: pointer' v-if='props.canExpand' /> -->
+            </div>
+
+            <el-tree
+                :style="{ height: 'calc(100vh - 235px)' }"
+                style="overflow: auto"
+                ref="treeRef"
+                :props="defaultProps"
+                highlight-current
+                :default-expand-all="false"
+                @check-change="checkTreeNodeChange"
+                :filter-node-method="filterNode"
+                node-key="id"
+                v-bind="$attrs"
+            >
+                <template #default="{ node, data }">
+                    <span class="custom-tree-node">
+                        <Icon
+                            :name="data.icon"
+                            style="font-size: 16px"
+                            :style="{ color: data.color }"
+                            v-if="data.icon"
+                        />
+                        <span style="margin-left: 4px">{{ node.label }}</span>
+                    </span>
+                </template>
+            </el-tree>
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import useCurrentInstance from '@/utils/useCurrentInstance'
+import { ElTree } from 'element-plus'
+import { emit } from 'process'
+import { ref, watch } from 'vue'
+import { t } from 'vxe-table'
+import { useConfig } from '@/stores/config'
+
+defineOptions({
+    name: 'govern/tree'
+})
+
+interface Props {
+    width?: string
+    canExpand?: boolean
+    showPush?: boolean
+}
+const loading = ref(false)
+const props = withDefaults(defineProps<Props>(), {
+    width: '280px',
+    canExpand: true,
+    showPush: false
+})
+const config = useConfig()
+const { proxy } = useCurrentInstance()
+const menuCollapse = ref(false)
+const filterText = ref('')
+const defaultProps = {
+    label: 'name',
+    value: 'id'
+}
+const emit = defineEmits(['checkTreeNodeChange', 'onAdd', 'checkChange'])
+watch(filterText, val => {
+    treeRef.value!.filter(val)
+})
+const onMenuCollapse = () => {
+    menuCollapse.value = !menuCollapse.value
+    proxy.eventBus.emit('cnTreeCollapse', menuCollapse)
+}
+const save = () => {
+    loading.value = true
+    emit('checkChange')
+}
+const filterNode = (value: string, data: any, node: any) => {
+    console.log(value, data, node, 'filterNode')
+    if (!value) return true
+    // return data.name.includes(value)
+    if (data.name) {
+        return chooseNode(value, data, node)
+    }
+}
+
+// 过滤父节点 / 子节点 (如果输入的参数是父节点且能匹配，则返回该节点以及其下的所有子节点；如果参数是子节点，则返回该节点的父节点。name是中文字符，enName是英文字符.
+const chooseNode = (value: string, data: any, node: any) => {
+    if (data.name.indexOf(value) !== -1) {
+        return true
+    }
+    const level = node.level
+    // 如果传入的节点本身就是一级节点就不用校验了
+    if (level === 1) {
+        return false
+    }
+    // 先取当前节点的父节点
+    let parentData = node.parent
+    // 遍历当前节点的父节点
+    let index = 0
+    while (index < level - 1) {
+        // 如果匹配到直接返回，此处name值是中文字符，enName是英文字符。判断匹配中英文过滤
+        if (parentData.data.name.indexOf(value) !== -1) {
+            return true
+        }
+        // 否则的话再往上一层做匹配
+        parentData = parentData.parent
+        index++
+    }
+    // 没匹配到返回false
+    return false
+}
+const checkTreeNodeChange = () => {
+    // console.log(treeRef.value?.getCheckedNodes(), "ikkkkkiisiiisis");
+    emit('checkTreeNodeChange', treeRef.value?.getCheckedNodes())
+}
+
+const onAdd = () => {
+    emit('onAdd')
+}
+
+const treeRef = ref<InstanceType<typeof ElTree>>()
+defineExpose({ treeRef, loading })
+</script>
+
+<style lang="scss" scoped>
+.cn-tree {
+    flex-shrink: 0;
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+    padding: 10px;
+    height: 100%;
+    width: 100%;
+
+    :deep(.el-tree) {
+        border: 1px solid var(--el-border-color);
+    }
+
+    :deep(.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content) {
+        background-color: var(--el-color-primary-light-7);
+    }
+
+    .menu-collapse {
+        color: var(--el-color-primary);
+    }
+}
+
+.custom-tree-node {
+    display: flex;
+    align-items: center;
+}
+</style>

src/components/tree/details/monitoringPointDetails.vue

@@ -0,0 +1,205 @@
+<template>
+    <el-dialog draggable v-model="dialogVisible" :title="title" width="1200px">
+        <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
+            <el-tab-pane label="监测点详情" name="tab1">
+                <el-descriptions :column="3" border label-width="150px">
+                    <el-descriptions-item  label="项目工程">
+                        {{ details.areaName }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="项目单位">
+                        {{ details.gdName }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="所属变电站">
+                        {{ details.bdName }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="电压等级">
+                        {{ details.scale }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="终端厂家">
+                        {{ details.manufacturer }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="终端名称">
+                        {{ details.devName }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="网络参数">
+                        {{ details.ip }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="监测点名称">
+                        {{ details.lineName }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="监测点序号">
+                        {{ details.id }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="通讯状态">
+                        {{ details.comFlag }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="干扰源类型">
+                        {{ details.loadType }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="监测点对象名称">
+                        {{ details.objName }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="接线方式">
+                        {{ details.ptType }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="PT变比">
+                        {{ details.pt }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="CT变比">
+                        {{ details.ct }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="基准容量(MVA)">
+                        {{ details.standardCapacity }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="最小短路容量(MVA)">
+                        {{ details.shortCapacity }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="供电设备容量(MVA)">
+                        {{ details.devCapacity }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="用户协议容量(MVA)">
+                        {{ details.dealCapacity }}
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-tab-pane>
+            <el-tab-pane label="监测点限值" name="tab2">
+                <el-descriptions :column="3"  border label-width="250px">
+                    <el-descriptions-item  label="电压偏差上限值(%)">
+                        {{ limitValue.voltageDev }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="电压偏差下限值(%)">
+                        {{ limitValue.uvoltageDev }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="频率偏差限值(Hz)">
+                        {{ limitValue.freqDev }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="三相电压不平衡度限值(%)">
+                        {{ limitValue.ubalance }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="负序电流限值(A)">
+                        {{ limitValue.ineg }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="长时闪变限值(%)">
+                        {{ limitValue.flicker }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="电压总畸变率限值(%)">
+                        {{ limitValue.uaberrance }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="奇次谐波电压含有率限值(%)">
+                        {{ limitValue.oddHarm }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="偶次谐波电压含有率限值(%)">
+                        {{ limitValue.evenHarm }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="3次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm3 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="4次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm4 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="5次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm5 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="6次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm6 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="7次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm7 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="8次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm8 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="9次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm9 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="10次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm10 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="11次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm11 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="12次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm12 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="13次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm13 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="14次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm14 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="15次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm15 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="16次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm16 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="17次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm17 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="18次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm18 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="19次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm19 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="20次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm20 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="21次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm21 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="22次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm22 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="23次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm23 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="24次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm24 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="25次谐波电流幅值限值(A)">
+                        {{ limitValue.iharm25 }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="0.5-1.5次间谐波电压含有率限值(%)">
+                        {{ limitValue.inUharm }}
+                    </el-descriptions-item>
+                    <el-descriptions-item  label="2.5-15.5次谐波电压含有率限值(%)">
+                        {{ limitValue.inUharm16 }}
+                    </el-descriptions-item>
+                </el-descriptions>
+            </el-tab-pane>
+        </el-tabs>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject } from 'vue'
+import { getLineOverLimitData, getLineDetailData } from '@/api/device-boot/line'
+const dialogVisible = ref(false)
+const title = ref('')
+const activeName = ref('tab1')
+const details: any = ref([])
+const limitValue: any = ref([])
+const open = (data: any) => {
+    details.value = []
+    limitValue.value = []
+    activeName.value = 'tab1'
+    title.value = data.name.replace(/（[^）]*）/g, '') + '_详情'
+
+    getLineDetailData(data.id).then(res => {
+        details.value = res.data
+        
+    })
+    getLineOverLimitData(data.id).then(res => {
+        limitValue.value = res.data
+    })
+
+    dialogVisible.value = true
+}
+const handleClick = (tab: any, event: Event) => {}
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+:deep(.el-upload-list__item) {
+    width: 400px;
+}
+</style>

src/components/tree/details/substationDetails.vue

@@ -0,0 +1,34 @@
+<template>
+    <el-dialog draggable v-model="dialogVisible" :title="title" width="500px">
+        <el-descriptions class="margin-top" :column="1" border label-width="150px"> 
+            <el-descriptions-item  label="变电站名称">{{ list[0]?.srbName }}</el-descriptions-item>
+            <el-descriptions-item  label="电压等级">{{ list[0]?.scale }}</el-descriptions-item>
+            <el-descriptions-item  label="经度">{{ list[0]?.coordY }}</el-descriptions-item>
+            <el-descriptions-item  label="纬度">{{ list[0]?.coordX }}</el-descriptions-item>
+        </el-descriptions>
+    </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, inject } from 'vue'
+import { getSubstationSelectLine } from '@/api/device-boot/line'
+const dialogVisible = ref(false)
+const title = ref('')
+const list: any = ref([])
+const open = (data: any) => {
+    list.value = []
+    title.value = data.name.replace(/（[^）]*）/g, '') + '_详情'
+
+    getSubstationSelectLine(data.id).then(res => {
+        list.value = res.data
+    })
+
+    dialogVisible.value = true
+}
+
+defineExpose({ open })
+</script>
+<style lang="scss" scoped>
+:deep(.el-upload-list__item) {
+    width: 400px;
+}
+</style>

src/components/tree/index.vue

@@ -1,162 +1,272 @@
-<template>
-    <div :style="{ width: menuCollapse ? '40px' : props.width }" style="transition: all 0.3s; overflow: hidden">
-        <Icon v-show="menuCollapse" @click="onMenuCollapse" :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
-            :class="menuCollapse ? 'unfold' : ''" size="18" class="fold ml10 mt20 menu-collapse"
-            style="cursor: pointer" />
-        <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1 }">
-            <div style="display: flex; align-items: center" class="mb10">
-                <el-input v-model="filterText" placeholder="请输入内容" clearable maxlength="10" show-word-limit @input="change">
-                    <template #prefix>
-                        <Icon name="el-icon-Search" style="font-size: 16px" />
-                    </template>
-                </el-input>
-                <Icon @click="onMenuCollapse" :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
-                    :class="menuCollapse ? 'unfold' : ''" size="18" class="fold ml10 menu-collapse"
-                    style="cursor: pointer" v-if="props.canExpand" />
-                <el-button icon="el-icon-Plus" v-if="props.addTree" type="primary" class="ml10"
-                    @click="onAddTree">新增</el-button>
-            </div>
-            <el-tree style="flex: 1; overflow: auto" ref="treeRef" :props="defaultProps" highlight-current
-                :filter-node-method="filterNode" node-key="id" v-bind="$attrs">
-                <template #default="{ node, data }">
-                    <span class="custom-tree-node">
-                        <Icon :name="data.icon" style="font-size: 16px" :style="{ color: data.color }"
-                            v-if="data.icon" />
-                        <span style="margin-left: 4px">{{ node.label }}</span>
-                    </span>
-                </template>
-            </el-tree>
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup>
-import useCurrentInstance from '@/utils/useCurrentInstance'
-import { ElTree } from 'element-plus'
-import { ref, watch } from 'vue'
-import { ElMessage } from 'element-plus'
-defineOptions({
-    name: 'govern/tree'
-})
-const emit = defineEmits(['onAddTree'])
-interface Props {
-    width?: string
-    canExpand?: boolean
-    addTree?: boolean
-}
-
-const props = withDefaults(defineProps<Props>(), {
-    width: '280px',
-    canExpand: true,
-    addTree: false
-})
-const { proxy } = useCurrentInstance()
-const menuCollapse = ref(false)
-const filterText = ref('')
-const defaultProps = {
-    label: 'name',
-    value: 'id'
-}
-const specialCharsPattern = /[`~!@$%^&*\-+=<>?:"{}|,.\/;'\\[\]·~！@¥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、～]/g;
-const change=(val) => {
-
-
-    if (specialCharsPattern.test(val)) {
-        ElMessage.warning('禁止输入特殊字符!')
-        filterText.value = val.replace(/[`~!@$%^&*\-+=<>?:"{}|,.\/;'\\[\]·~！@¥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、～]/g, "")
-        console.log("🚀 ~ change ~ filterText.value:", filterText.value)
-        
-        treeRef.value!.filter(filterText.value)
-    }else{
-        treeRef.value!.filter(filterText.value)
-    }
-}
-// watch(filterText, val => {
-
-//     console.log("🚀 ~ val:", specialCharsPattern.test(val))
-//     if (specialCharsPattern.test(val)) {
-//         ElMessage.warning('禁止输入特殊字符!')
-//         filterText.value = val.replace(/[`~!@$%^&*\-+=<>?:"{}|,.\/;'\\[\]·~！@¥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、～]/g, "")
-//         console.log("🚀 ~   filterText.value:",   filterText.value)
-//         treeRef.value!.filter(filterText.value)
-//     }else{
-//         treeRef.value!.filter(filterText.value)
-//     }
-
-// })
-const onMenuCollapse = () => {
-    menuCollapse.value = !menuCollapse.value
-    proxy.eventBus.emit('cnTreeCollapse', menuCollapse)
-}
-const filterNode = (value: string, data: any, node: any) => {
-    if (!value) return true
-    // return data.name.includes(value)
-    if (data.name) {
-
-        return chooseNode(value, data, node)
-    }
-}
-
-// 过滤父节点 / 子节点 (如果输入的参数是父节点且能匹配，则返回该节点以及其下的所有子节点；如果参数是子节点，则返回该节点的父节点。name是中文字符，enName是英文字符.
-const chooseNode = (value: string, data: any, node: any) => {
-
-    if (data.name.indexOf(value) !== -1) {
-        return true
-    }
-    const level = node.level
-    // 如果传入的节点本身就是一级节点就不用校验了
-    if (level === 1) {
-        return false
-    }
-    // 先取当前节点的父节点
-    let parentData = node.parent
-    // 遍历当前节点的父节点
-    let index = 0
-    while (index < level - 1) {
-        // 如果匹配到直接返回，此处name值是中文字符，enName是英文字符。判断匹配中英文过滤
-        if (parentData.data.name.indexOf(value) !== -1) {
-            return true
-        }
-        // 否则的话再往上一层做匹配
-        parentData = parentData.parent
-        index++
-    }
-    // 没匹配到返回false
-    return false
-}
-// 添加树
-const onAddTree = () => {
-    emit('onAddTree')
-}
-const treeRef = ref<InstanceType<typeof ElTree>>()
-defineExpose({ treeRef })
-</script>
-
-<style lang="scss" scoped>
-.cn-tree {
-    flex-shrink: 0;
-    display: flex;
-    flex-direction: column;
-    box-sizing: border-box;
-    padding: 10px;
-    height: 100%;
-    width: 100%;
-
-    :deep(.el-tree) {
-        border: 1px solid var(--el-border-color);
-    }
-
-    :deep(.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content) {
-        background-color: var(--el-color-primary-light-7);
-    }
-
-    .menu-collapse {
-        color: var(--el-color-primary);
-    }
-}
-
-.custom-tree-node {
-    display: flex;
-    align-items: center;
-}
-</style>
+<template>
+    <div :style="{ width: menuCollapse ? '40px' : props.width }" style="transition: all 0.3s; overflow: hidden">
+        <Icon
+            v-show="menuCollapse"
+            @click="onMenuCollapse"
+            :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+            :class="menuCollapse ? 'unfold' : ''"
+            size="18"
+            class="fold ml10 mt20 menu-collapse"
+            style="cursor: pointer"
+        />
+        <div class="cn-tree" :style="{ opacity: menuCollapse ? 0 : 1 }">
+            <div style="display: flex; align-items: center" class="mb10">
+                <el-input
+                    v-model="filterText"
+                    placeholder="请输入内容"
+                    clearable
+                    maxlength="10"
+                    show-word-limit
+                    @input="change"
+                >
+                    <template #prefix>
+                        <Icon name="el-icon-Search" style="font-size: 16px" />
+                    </template>
+                </el-input> 
+                <Icon
+                    @click="onMenuCollapse"
+                    :name="menuCollapse ? 'el-icon-Expand' : 'el-icon-Fold'"
+                    :class="menuCollapse ? 'unfold' : ''"
+                    size="18"
+                    class="fold ml10 menu-collapse"
+                    style="cursor: pointer"
+                    v-if="props.canExpand"
+                />
+                <el-button icon="el-icon-Plus" v-if="props.addTree" type="primary" class="ml10" @click="onAddTree">
+                    新增
+                </el-button>
+            </div>
+            <el-tree
+                style="flex: 1; overflow: auto"
+                ref="treeRef"
+                :props="defaultProps"
+                highlight-current
+                :filter-node-method="filterNode"
+                node-key="id"
+                v-bind="$attrs"
+            >
+                <template #default="{ node, data }">
+                    <span class="custom-tree-node">
+                        <Icon
+                            :name="data.icon"
+                            style="font-size: 16px"
+                            :style="{ color: data.color }"
+                            v-if="data.icon"
+                        />
+
+                        <el-tooltip
+                            class="box-item"
+                            effect="customized"
+                            placement="bottom-start"
+                            :offset="0"
+                            v-if="data.level == 6"
+                        >
+                            <template #content>
+                                <el-button type="primary" plain @click="viewDetails(data)">
+                                    {{ data.level == 3 ? '变电站详情' : '监测点详情' }}
+                                </el-button>
+                            </template>
+                            <span style="margin-left: 4px">{{ node.label }}</span>
+                        </el-tooltip>
+                        <span v-else style="margin-left: 4px">{{ node.label }}</span>
+                    </span>
+                </template>
+            </el-tree>
+        </div>
+        <!-- 变电站详情 -->
+        <SubstationDetails ref="SubstationRef" />
+        <!-- 监测点详情 -->
+        <MonitoringPointDetails ref="MonitoringPointRef" />
+    </div>
+</template>
+
+<script lang="ts" setup>
+import useCurrentInstance from '@/utils/useCurrentInstance'
+import { ElTree } from 'element-plus'
+import { ref, watch, onMounted, nextTick } from 'vue'
+import { ElMessage } from 'element-plus'
+import MonitoringPointDetails from './details/monitoringPointDetails.vue'
+import SubstationDetails from './details/substationDetails.vue'
+
+defineOptions({
+    name: 'govern/tree'
+})
+const emit = defineEmits(['onAddTree'])
+interface Props {
+    width?: string
+    canExpand?: boolean
+    addTree?: boolean
+}
+
+const props = withDefaults(defineProps<Props>(), {
+    width: '280px',
+    canExpand: true,
+    addTree: false
+})
+const { proxy } = useCurrentInstance()
+const menuCollapse = ref(false)
+const MonitoringPointRef = ref()
+const SubstationRef = ref()
+const filterText = ref('')
+const treeRef = ref()
+const defaultProps = {
+    label: 'name',
+    value: 'id'
+}
+const specialCharsPattern = /[`~!@$%^&*\-+=<>?:"{}|,.\/;'\\[\]·~！@¥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、～]/g
+const change = val => {
+    if (specialCharsPattern.test(val)) {
+        ElMessage.warning('禁止输入特殊字符!')
+        filterText.value = val.replace(
+            /[`~!@$%^&*\-+=<>?:"{}|,.\/;'\\[\]·~！@¥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、～]/g,
+            ''
+        )
+        console.log('🚀 ~ change ~ filterText.value:', filterText.value)
+
+        treeRef.value!.filter(filterText.value)
+    } else {
+        treeRef.value!.filter(filterText.value)
+    }
+}
+// watch(filterText, val => {
+
+//     console.log("🚀 ~ val:", specialCharsPattern.test(val))
+//     if (specialCharsPattern.test(val)) {
+//         ElMessage.warning('禁止输入特殊字符!')
+//         filterText.value = val.replace(/[`~!@$%^&*\-+=<>?:"{}|,.\/;'\\[\]·~！@¥%……&*（）——\-+={}|《》？：“”【】、；‘’，。、～]/g, "")
+//         console.log("🚀 ~   filterText.value:",   filterText.value)
+//         treeRef.value!.filter(filterText.value)
+//     }else{
+//         treeRef.value!.filter(filterText.value)
+//     }
+
+// })
+const onMenuCollapse = () => {
+    menuCollapse.value = !menuCollapse.value
+    proxy.eventBus.emit('cnTreeCollapse', menuCollapse)
+}
+// 查看详情
+const viewDetails = (data: any) => {
+   // console.log('🚀 ~ viewDetails ~ data:', data)
+    if (data.level == 3) {
+        // 变电站详情
+        // substationDetails
+        SubstationRef.value.open(data)
+    } else {
+        // 监测点详情
+        MonitoringPointRef.value.open(data)
+    }
+
+    // proxy.eventBus.emit('viewDetails', data)
+}
+const filterNode = (value: string, data: any, node: any) => {
+    if (!value) return true
+    // return data.name.includes(value)
+    if (data.name) {
+        return chooseNode(value, data, node)
+    }
+}
+
+// 过滤父节点 / 子节点 (如果输入的参数是父节点且能匹配，则返回该节点以及其下的所有子节点；如果参数是子节点，则返回该节点的父节点。name是中文字符，enName是英文字符.
+const chooseNode = (value: string, data: any, node: any) => {
+    if (data.name.indexOf(value) !== -1) {
+        return true
+    }
+    const level = node.level
+    // 如果传入的节点本身就是一级节点就不用校验了
+    if (level === 1) {
+        return false
+    }
+    // 先取当前节点的父节点
+    let parentData = node.parent
+    // 遍历当前节点的父节点
+    let index = 0
+    while (index < level - 1) {
+        // 如果匹配到直接返回，此处name值是中文字符，enName是英文字符。判断匹配中英文过滤
+        if (parentData.data.name.indexOf(value) !== -1) {
+            return true
+        }
+        // 否则的话再往上一层做匹配
+        parentData = parentData.parent
+        index++
+    }
+    // 没匹配到返回false
+    return false
+}
+
+onMounted(async () => {
+    // 等待树渲染完成
+    await nextTick()
+    // 可以等待更长时间确保树完全展开
+})
+
+const scrollToNode = (id: string) => {
+   // console.log("🚀 ~ scrollToNode ~ id:", id)
+    if (!treeRef.value) return
+
+    // 获取目标节点的元素
+    const targetNode = treeRef.value.getNode(id)
+    if (!targetNode) return
+
+    // 获取节点的DOM元素
+    const nodeElement = document.querySelector(`[data-key="${id}"]`)
+    if (nodeElement) {
+        // 滚动到节点位置
+        nodeElement.scrollIntoView({
+            behavior: 'smooth', // 平滑滚动
+            block: 'center', // 垂直方向居中
+            inline: 'nearest' // 水平方向最近
+        })
+
+        // 如果需要高亮当前节点
+        treeRef.value.setCurrentKey(id)
+    }
+}
+// 添加树
+const onAddTree = () => {
+    emit('onAddTree')
+}
+defineExpose({ treeRef, scrollToNode })
+</script>
+
+<style lang="scss" scoped>
+.cn-tree {
+    flex-shrink: 0;
+    display: flex;
+    flex-direction: column;
+    box-sizing: border-box;
+    padding: 10px;
+    height: 100%;
+    width: 100%;
+
+    :deep(.el-tree) {
+        border: 1px solid var(--el-border-color);
+    }
+
+    :deep(.el-tree--highlight-current .el-tree-node.is-current > .el-tree-node__content) {
+        background-color: var(--el-color-primary-light-7);
+    }
+
+    .menu-collapse {
+        color: var(--el-color-primary);
+    }
+}
+
+.custom-tree-node {
+    display: flex;
+    align-items: center;
+}
+</style>
+<style>
+.el-popper.is-customized {
+    /* Set padding to ensure the height is 32px */
+    padding: 0;
+    background: var(--el-color-primary-light-3);
+}
+
+.el-popper.is-customized .el-popper__arrow::before {
+    background: var(--el-color-primary-light-3);
+    right: 0;
+    display: none;
+}
+</style>

src/components/tree/pqs/Terminal.vue

@@ -1,197 +1,197 @@
-<template>
-
-    <Tree ref="treRef" :data="tree" style="height: 100%" :width="'100%'" :expanded="expanded" />
-</template>
-    <!-- <div class="mb10">
-        <el-button type="primary" icon="el-icon-Download" size="small" @click="exportExcelTemplate"   :loading="loading">模版下载</el-button>
-        <el-button type="primary" icon="el-icon-Upload" size="small">导入</el-button>
-        <el-button type="primary" icon="el-icon-Download" size="small" @click="ledgerEverywhere"  :loading="loading1">导出</el-button>
-    </div> -->
-<script lang="ts" setup>
-import { ref, nextTick } from 'vue'
-import Tree from './index.vue'
-
-import { getTerminalTree,downTerminalTemplate,exportTerminalBase } from '@/api/device-boot/Business'
-import { useConfig } from '@/stores/config'
-const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
-defineOptions({
-    name: 'govern/deviceTree'
-})
-const loading = ref(false)
-const loading1 = ref(false)
-const emit = defineEmits(['init'])
-const config = useConfig()
-const expanded: any = ref([])
-const tree = ref()
-const treRef = ref()
-const info = (id: any) => {
-    expanded.value = [id]
-    getTerminalTree().then(res => {
-        // let arr: any[] = []
-        if (VITE_FLAG) {
-            res.data.forEach((item: any) => {
-                item.icon = 'el-icon-Menu'
-                item.plevel = item.level
-                item.level = 0
-                item.children.forEach((item2: any) => {
-                    item2.icon = 'el-icon-HomeFilled'
-
-                    item2.plevel = item2.level
-                    item2.level = 100
-                    expanded.value.push(item2.id)
-                    item2.children.forEach((item3: any) => {
-                        item3.icon = 'el-icon-CollectionTag'
-                        item3.plevel = item3.level
-                        item3.level = 200
-                        item3.children.forEach((item4: any) => {
-                            item4.icon = 'el-icon-Flag'
-                            item4.plevel = item4.level
-                            item4.level = 300
-                            // arr.push(item4)
-                            item4.children.forEach((item5: any) => {
-                                item5.icon = 'el-icon-OfficeBuilding'
-                                item5.plevel = item5.level
-                                item5.level = 300
-                                // item5.id = item4.id
-                                item5.children.forEach((item6: any) => {
-                                    item6.icon = 'el-icon-HelpFilled'
-                                    item6.plevel = 4
-                                    if (item6.name == '电网侧' && item6.children.length == 0) {
-                                        item6.level = 400
-                                    } else {
-                                        item6.level = 400
-                                    }
-                                    item6.children.forEach((item7: any) => {
-                                        item7.icon = 'el-icon-Film'
-                                        item7.plevel = item7.level
-                                        item7.level = 400
-                                        item7.children.forEach((item8: any) => {
-                                            item8.icon = 'el-icon-Collection'
-                                            item8.plevel = item8.level
-                                            item8.level = 500
-                                            item8.children.forEach((item9: any) => {
-                                                item9.icon = 'el-icon-Share'
-                                                item9.plevel = item9.level
-                                                item9.level = 600
-                                                item9.children.forEach((item10: any) => {
-                                                    item10.icon = 'el-icon-Location'
-                                                    item10.plevel = item10.level
-                                                    item10.level = 700
-                                                })
-                                            })
-                                        })
-                                    })
-                                })
-                            })
-                        })
-                    })
-                })
-            })
-        } else {
-            res.data.forEach((item: any) => {
-                item.icon = 'el-icon-Menu'
-                item.plevel = item.level
-                item.level = (item.level + 1) * 100
-                item.children.forEach((item2: any) => {
-                    item2.icon = 'el-icon-HomeFilled'
-                    item2.plevel = item2.level
-                    item2.level = (item2.level + 1) * 100
-                    expanded.value.push(item2.id)
-                    item2.children.forEach((item3: any) => {
-                        item3.icon = 'el-icon-CollectionTag'
-                        item3.plevel = item3.level
-                        item3.level = (item3.level + 1) * 100
-                        item3.children.forEach((item4: any) => {
-                            item4.icon = 'el-icon-Flag'
-                            item4.plevel = item4.level
-                            item4.level = (item4.level + 1) * 100
-                            item4.children.forEach((item5: any) => {
-                                item5.icon = 'el-icon-OfficeBuilding'
-                                item5.plevel = item5.level
-                                item5.level = (item5.level == 7 ? 4 : item5.level + 1) * 100
-                                item5.children.forEach((item6: any) => {
-                                    item6.icon = 'el-icon-Film'
-                                    item6.plevel = item6.level
-                                    item6.level = (item6.level + 1) * 100
-                                    item6.children.forEach((item7: any) => {
-                                        item7.icon = 'el-icon-Share'
-                                        item7.plevel = item7.level
-                                        item7.level = (item7.level + 1) * 100
-                                        item7.children.forEach((item8: any) => {
-                                            item8.icon = 'el-icon-Location'
-                                            item8.plevel = item8.level
-                                            item8.level = (item8.level + 1) * 100
-                                        })
-                                    })
-                                })
-                            })
-                        })
-                    })
-                })
-            })
-        }
-
-        tree.value = res.data
-
-        nextTick(() => {
-            treRef.value.setCurrentKey(id)
-            // if (arr.length) {
-            //     treRef.value.treeRef.setCurrentKey(arr[0].id)
-            //     // 注册父组件事件
-            //     emit('init', {
-            //         level: 2,
-            //         ...arr[0]
-            //     })
-            // } else {
-            //     emit('init')
-            // }
-        })
-    })
-}
-// 下载模版
-const exportExcelTemplate = async() => {
-    loading.value = true
-    downTerminalTemplate().then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.ms-excel'
-        })
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a')
-        link.href = url
-        link.download = '终端台账模版'
-        document.body.appendChild(link)
-        link.click()
-        link.remove()
-    })
-    await setTimeout(() => {
-        loading.value = false
-    }, 0)
-}
-// 导出台账
-const ledgerEverywhere = async() => {
-    loading1.value = true
-    exportTerminalBase().then((res: any) => {
-        let blob = new Blob([res], {
-            type: 'application/vnd.ms-excel'
-        })
-        const url = window.URL.createObjectURL(blob)
-        const link = document.createElement('a')
-        link.href = url
-        link.download = '终端台账'
-        document.body.appendChild(link)
-        link.click()
-        link.remove()
-    })
-    await setTimeout(() => {
-        loading1.value = false
-    }, 0)
-}
-info('')
-
-defineExpose({ info })
-</script>
-<style lang="scss" scoped>
-.el-tree {
-    background: #efeff0;
-}
-</style>
+<template>
+
+    <Tree ref="treRef" :data="tree" style="height: 100%" :width="'100%'" :expanded="expanded" />
+</template>
+    <!-- <div class="mb10">
+        <el-button type="primary" icon="el-icon-Download" size="small" @click="exportExcelTemplate"   :loading="loading">模版下载</el-button>
+        <el-button type="primary" icon="el-icon-Upload" size="small">导入</el-button>
+        <el-button type="primary" icon="el-icon-Download" size="small" @click="ledgerEverywhere"  :loading="loading1">导出</el-button>
+    </div> -->
+<script lang="ts" setup>
+import { ref, nextTick } from 'vue'
+import Tree from './index.vue'
+
+import { getTerminalTree,downTerminalTemplate,exportTerminalBase } from '@/api/device-boot/Business'
+import { useConfig } from '@/stores/config'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'jibei'
+defineOptions({
+    name: 'govern/deviceTree'
+})
+const loading = ref(false)
+const loading1 = ref(false)
+const emit = defineEmits(['init'])
+const config = useConfig()
+const expanded: any = ref([])
+const tree = ref()
+const treRef = ref()
+const info = (id: any) => {
+    expanded.value = [id]
+    getTerminalTree().then(res => {
+        // let arr: any[] = []
+        if (VITE_FLAG) {
+            res.data.forEach((item: any) => {
+                item.icon = 'el-icon-Menu'
+                item.plevel = item.level
+                item.level = 0
+                item.children.forEach((item2: any) => {
+                    item2.icon = 'el-icon-HomeFilled'
+
+                    item2.plevel = item2.level
+                    item2.level = 100
+                    expanded.value.push(item2.id)
+                    item2.children.forEach((item3: any) => {
+                        item3.icon = 'el-icon-CollectionTag'
+                        item3.plevel = item3.level
+                        item3.level = 200
+                        item3.children.forEach((item4: any) => {
+                            item4.icon = 'el-icon-Flag'
+                            item4.plevel = item4.level
+                            item4.level = 300
+                            // arr.push(item4)
+                            item4.children.forEach((item5: any) => {
+                                item5.icon = 'el-icon-OfficeBuilding'
+                                item5.plevel = item5.level
+                                item5.level = 300
+                                // item5.id = item4.id
+                                item5.children.forEach((item6: any) => {
+                                    item6.icon = 'el-icon-HelpFilled'
+                                    item6.plevel = 4
+                                    if (item6.name == '电网侧' && item6.children.length == 0) {
+                                        item6.level = 400
+                                    } else {
+                                        item6.level = 400
+                                    }
+                                    item6.children.forEach((item7: any) => {
+                                        item7.icon = 'el-icon-Film'
+                                        item7.plevel = item7.level
+                                        item7.level = 400
+                                        item7.children.forEach((item8: any) => {
+                                            item8.icon = 'el-icon-Collection'
+                                            item8.plevel = item8.level
+                                            item8.level = 500
+                                            item8.children.forEach((item9: any) => {
+                                                item9.icon = 'el-icon-Share'
+                                                item9.plevel = item9.level
+                                                item9.level = 600
+                                                item9.children.forEach((item10: any) => {
+                                                    item10.icon = 'el-icon-Location'
+                                                    item10.plevel = item10.level
+                                                    item10.level = 700
+                                                })
+                                            })
+                                        })
+                                    })
+                                })
+                            })
+                        })
+                    })
+                })
+            })
+        } else {
+            res.data.forEach((item: any) => {
+                item.icon = 'el-icon-Menu'
+                item.plevel = item.level
+                item.level = (item.level + 1) * 100
+                item.children.forEach((item2: any) => {
+                    item2.icon = 'el-icon-HomeFilled'
+                    item2.plevel = item2.level
+                    item2.level = (item2.level + 1) * 100
+                    expanded.value.push(item2.id)
+                    item2.children.forEach((item3: any) => {
+                        item3.icon = 'el-icon-CollectionTag'
+                        item3.plevel = item3.level
+                        item3.level = (item3.level + 1) * 100
+                        item3.children.forEach((item4: any) => {
+                            item4.icon = 'el-icon-Flag'
+                            item4.plevel = item4.level
+                            item4.level = (item4.level + 1) * 100
+                            item4.children.forEach((item5: any) => {
+                                item5.icon = 'el-icon-OfficeBuilding'
+                                item5.plevel = item5.level
+                                item5.level = (item5.level == 7 ? 4 : item5.level + 1) * 100
+                                item5.children.forEach((item6: any) => {
+                                    item6.icon = 'el-icon-Film'
+                                    item6.plevel = item6.level
+                                    item6.level = (item6.level + 1) * 100
+                                    item6.children.forEach((item7: any) => {
+                                        item7.icon = 'el-icon-Share'
+                                        item7.plevel = item7.level
+                                        item7.level = (item7.level + 1) * 100
+                                        item7.children.forEach((item8: any) => {
+                                            item8.icon = 'el-icon-Location'
+                                            item8.plevel = item8.level
+                                            item8.level = (item8.level + 1) * 100
+                                        })
+                                    })
+                                })
+                            })
+                        })
+                    })
+                })
+            })
+        }
+
+        tree.value = res.data
+
+        nextTick(() => {
+            treRef.value.setCurrentKey(id)
+            // if (arr.length) {
+            //     treRef.value.treeRef.setCurrentKey(arr[0].id)
+            //     // 注册父组件事件
+            //     emit('init', {
+            //         level: 2,
+            //         ...arr[0]
+            //     })
+            // } else {
+            //     emit('init')
+            // }
+        })
+    })
+}
+// 下载模版
+const exportExcelTemplate = async() => {
+    loading.value = true
+    downTerminalTemplate().then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.ms-excel'
+        })
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a')
+        link.href = url
+        link.download = '终端台账模版'
+        document.body.appendChild(link)
+        link.click()
+        link.remove()
+    })
+    await setTimeout(() => {
+        loading.value = false
+    }, 0)
+}
+// 导出台账
+const ledgerEverywhere = async() => {
+    loading1.value = true
+    exportTerminalBase().then((res: any) => {
+        let blob = new Blob([res], {
+            type: 'application/vnd.ms-excel'
+        })
+        const url = window.URL.createObjectURL(blob)
+        const link = document.createElement('a')
+        link.href = url
+        link.download = '终端台账'
+        document.body.appendChild(link)
+        link.click()
+        link.remove()
+    })
+    await setTimeout(() => {
+        loading1.value = false
+    }, 0)
+}
+info('')
+
+defineExpose({ info })
+</script>
+<style lang="scss" scoped>
+.el-tree {
+    background: #efeff0;
+}
+</style>

src/components/tree/pqs/algorithmTree.vue

@@ -1,88 +1,105 @@
-<template>
-    <div class="point-tree">
-        <div style="flex: 1; overflow: hidden">
-            <Tree
-                ref="treeRef"
-                :data="tree"
-                :canExpand="false"
-                style="width: 100%; height: 100%"
-                v-bind="$attrs"
-                default-expand-all
-                
-                @onAddTree="onAddTree"
-            />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup>
-import { nextTick, onMounted, ref, useAttrs } from 'vue'
-import Tree from '../index.vue'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { useDictData } from '@/stores/dictData'
-import { getTerminalTreeForFive } from '@/api/device-boot/terminalTree'
-import { useConfig } from '@/stores/config'
-import { queryAllAlgorithmLibrary } from '@/api/supervision-boot/database/index'
-defineOptions({
-    name: 'pms/pointTree'
-})
-const emit = defineEmits(['init', 'onAddTree'])
-const attrs = useAttrs()
-const adminInfo = useAdminInfo()
-const dictData = useDictData()
-const config = useConfig()
-const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
-const tree = ref()
-const treeRef = ref()
-
-const loadData = (id?: any) => {
-    console.log('🚀 ~ loadData ~ id:', id)
-    let nodeKey = ''
-    queryAllAlgorithmLibrary().then(res => {
-        res.data.forEach((item: any) => {
-            item.icon = 'el-icon-FolderOpened'
-            item.color = config.getColorVal('elementUiPrimary')
-            item.children.forEach((item2: any) => {
-                item2.icon = 'el-icon-Document'
-                item2.color = config.getColorVal('elementUiPrimary')
-                item2.childrens = item2.children
-                item2.children = []
-                if (item2.id == id) {
-                    emit('init', item2)
-                }
-            })
-        })
-
-        nodeKey = res.data[0].children[0].id
-
-        tree.value = res.data
-        if (id) {
-            setTimeout(() => {
-                treeRef.value.treeRef.setCurrentKey(id)
-            }, 10)
-        } else {
-            setTimeout(() => {
-                treeRef.value.treeRef.setCurrentKey(nodeKey)
-                emit('init', res.data[0].children[0])
-            }, 10)
-        }
-    })
-}
-
-const onAddTree = () => {
-    emit('onAddTree')
-}
-loadData()
-defineExpose({ loadData })
-</script>
-<style lang="scss">
-.point-tree {
-    height: 100%;
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-    background: #fff;
-    border: 1px solid var(--el-border-color);
-}
-</style>
- 
+<template>
+    <div class="point-tree">
+        <div style="flex: 1; overflow: hidden">
+            <Tree
+                ref="treeRef"
+                :data="tree"
+                :canExpand="false"
+                style="width: 100%; height: 100%"
+                v-bind="$attrs"
+                default-expand-all
+                @onAddTree="onAddTree"
+            />
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { nextTick, onMounted, ref, useAttrs } from 'vue'
+import Tree from '../index.vue'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { useDictData } from '@/stores/dictData'
+import { useConfig } from '@/stores/config'
+import { queryAllAlgorithmLibrary } from '@/api/supervision-boot/database/index'
+defineOptions({
+    name: 'pms/pointTree'
+})
+const emit = defineEmits(['init', 'onAddTree'])
+const attrs = useAttrs()
+const adminInfo = useAdminInfo()
+const dictData = useDictData()
+const config = useConfig()
+const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
+const tree = ref()
+const treeRef = ref()
+
+const loadData = (id?: any) => {
+   // console.log('🚀 ~ loadData ~ id:', id)
+    let nodeKey = ''
+    queryAllAlgorithmLibrary().then(res => {
+        res.data.forEach((item: any) => {
+            item.icon = 'el-icon-FolderOpened'
+            item.color = config.getColorVal('elementUiPrimary')
+            item.children.forEach((item2: any) => {
+                item2.icon = 'el-icon-Document'
+                item2.color = config.getColorVal('elementUiPrimary')
+                item2.childrens = item2.children
+                item2.children = []
+                if (item2.id == id) {
+                    emit('init', item2)
+                }
+            })
+        })
+
+        nodeKey = res.data[0].children[0].id
+
+        tree.value = res.data
+        if (id) {
+            setTimeout(() => {
+                treeRef.value.treeRef.setCurrentKey(id)
+            }, 10)
+        } else {
+            setTimeout(() => {
+                treeRef.value.treeRef.setCurrentKey(nodeKey)
+                emit('init', res.data[0].children[0])
+            }, 10)
+        }
+    })
+}
+
+const onAddTree = () => {
+    emit('onAddTree')
+}
+const setKey = (id: string) => {
+    treeRef.value.treeRef.setCurrentKey(id)
+    return findNodeById(tree.value, id)
+}
+const findNodeById = (tree1: any, targetId: any) => {
+    for (const node of tree1) {
+        // 1. 当前节点匹配ID，直接返回该节点
+        if (node.id === targetId) {
+            return node
+        }
+        // 2. 当前节点有子节点，递归查找子节点
+        if (node.children && node.children.length > 0) {
+            const result: any = findNodeById(node.children, targetId)
+            // 子节点中找到结果，立即返回（终止递归）
+            if (result) return result
+        }
+    }
+    // 3. 遍历完未找到，返回null
+    return null
+}
+loadData()
+defineExpose({ loadData, setKey })
+</script>
+<style lang="scss">
+.point-tree {
+    height: 100%;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    background: #fff;
+    border: 1px solid var(--el-border-color);
+}
+</style>

src/components/tree/pqs/areaTree.vue

@@ -0,0 +1,150 @@
+<template>
+    <div class="point-tree">
+        <div style="flex: 1; overflow: hidden">
+            <Tree ref="treeRef" :data="tree" style="width: 100%; height: 100%" :canExpand="false" v-bind="$attrs" />
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { nextTick, onMounted, ref, useAttrs } from 'vue'
+import Tree from '../index.vue'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { useDictData } from '@/stores/dictData'
+import { getTerminalTreeForFive } from '@/api/device-boot/terminalTree'
+import { useConfig } from '@/stores/config'
+import { getAreaList } from '@/api/common'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'qujing'
+defineOptions({
+    name: 'pms/pointTree'
+})
+interface Props {
+    showSelect?: boolean
+}
+const props = withDefaults(defineProps<Props>(), {
+    showSelect: true
+})
+const emit = defineEmits(['init'])
+const attrs = useAttrs()
+const adminInfo = useAdminInfo()
+const dictData = useDictData()
+const config = useConfig()
+const tree = ref()
+const treeRef = ref()
+
+const loadData = () => {
+    let nodeKey = ''
+    getAreaList().then(res => {
+        processTreeData(res.data, res.data[0].level)
+        let firstLevel6Node = getDeepestFirstChildData(res.data)
+
+        nodeKey = firstLevel6Node.id
+        emit('init', firstLevel6Node)
+
+        tree.value = res.data
+        if (nodeKey) {
+            nextTick(() => {
+                treeRef.value.treeRef.setCurrentKey(nodeKey)
+
+                // treeRef.value.treeRef.setExpandedKeys(nodeKey)
+            })
+        }
+    })
+}
+const scrollToNode = (id: string) => {
+    // 树滚动
+    treeRef.value.scrollToNode(id)
+}
+
+// 定义不同层级对应的图标配置（可根据实际需求调整）
+const levelIconMap = {
+    '-1': 'el-icon-HomeFilled',
+    0: 'el-icon-CollectionTag',
+    1: 'el-icon-CollectionTag',
+    2: 'el-icon-Flag',
+    3: 'el-icon-OfficeBuilding',
+    4: 'el-icon-DataAnalysis',
+    5: 'el-icon-DataAnalysis',
+    7: 'el-icon-DataAnalysis',
+    6: 'fa-solid fa-location-dot'
+}
+
+/**
+ * 递归处理树形数据，为不同层级节点设置图标和颜色
+ * @param data 树形数据数组
+ * @param level 当前层级（默认从1开始）
+ */
+function processTreeData(data: any[], level: number = -1, alias: string = '') {
+    // 空值判断，避免数组为空或undefined时报错
+    if (!Array.isArray(data) || data.length === 0) return
+
+    data.forEach(item => {
+        // 1. 设置基础图标（根据层级匹配）
+        item.icon = levelIconMap[level] || ''
+        item.alias = alias + `${item.name}`
+        // 2. 设置基础颜色
+        item.color = config.getColorVal('elementUiPrimary')
+
+        // 3. 第6层特殊处理：根据comFlag调整颜色
+        if (level === 6 && item.hasOwnProperty('comFlag')) {
+            switch (item.comFlag) {
+                case 0:
+                    item.color = 'red !important'
+                    break
+                case 1:
+                    item.color = '#00f93b !important'
+                    break
+                case 2:
+                    item.color = '#8c8c8c !important'
+                    break
+                // 默认值：保持原有基础颜色
+                default:
+                    item.color = config.getColorVal('elementUiPrimary')
+            }
+        }
+
+        // 4. 递归处理子节点，层级+1
+        if (item.children && item.children.length > 0) {
+            processTreeData(item.children, item.children[0].level, level == '-1' ? '' : item.alias + '>')
+        }
+    })
+}
+/**
+ * 递归获取树形结构中一直向下的第一个children的最后一组有效数据
+ * @param {Array} treeData - 原始递归树形数据
+ * @returns {Object|null} 路径最后一组有效数据，无有效数据时返回null
+ */
+function getDeepestFirstChildData(treeData) {
+    // 递归辅助函数：逐层查找第一个children
+    function findDeepestNode(currentNode) {
+        // 检查当前节点是否有有效的children数组
+        if (currentNode && Array.isArray(currentNode.children) && currentNode.children.length > 0) {
+            // 有下一级children，继续递归查找下一级第一个元素
+            return findDeepestNode(currentNode.children[0])
+        }
+        // 没有下一级children，返回当前节点（递归终止）
+        return currentNode
+    }
+
+    // 边界处理：原始数据非数组/空数组时返回null
+    if (!Array.isArray(treeData) || treeData.length === 0) {
+        return null
+    }
+
+    // 从根节点第一个元素开始递归查找
+    return findDeepestNode(treeData[0])
+}
+
+defineExpose({ treeRef, scrollToNode, tree })
+loadData()
+</script>
+<style lang="scss">
+.point-tree {
+    height: 100%;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    background: #fff;
+    border: 1px solid var(--el-border-color);
+}
+</style>

src/components/tree/pqs/assessTree.vue

@@ -11,12 +11,9 @@ import { nextTick, onMounted, ref, useAttrs } from 'vue'
 import Tree from '../index.vue'
 import { useAdminInfo } from '@/stores/adminInfo'
 import { useDictData } from '@/stores/dictData'
-import { getTerminalTreeForFive } from '@/api/device-boot/terminalTree'
 import { useConfig } from '@/stores/config'
 import { defineProps } from 'vue'
-import {
-    getTree
-} from '@/api/advance-boot/assess'
+import { getTree } from '@/api/advance-boot/assess'
 
 defineOptions({
     name: 'pms/pointTree'
@@ -46,25 +43,24 @@ const formData = ref({
     scale: null
 })
 
-
 // 添加数据转换函数
 const transformTreeData = (data: any[]) => {
-    if (!data || !Array.isArray(data)) return [];
+    if (!data || !Array.isArray(data)) return []
     return data.map(item => {
         // 创建新对象，确保不修改原始数据
         const newItem: any = {
-            name: item.treeName , 
-            id: item.treeId ,
+            name: item.treeName,
+            id: item.treeId,
             children: []
-        };
-   
+        }
+
         // 递归处理子节点
         if (item.children && Array.isArray(item.children)) {
-            newItem.children = transformTreeData(item.children);
+            newItem.children = transformTreeData(item.children)
         }
-        return newItem;
-    });
-};
+        return newItem
+    })
+}
 
 const loadData = () => {
     let obj = classificationData.find(function (i) {
@@ -73,19 +69,22 @@ const loadData = () => {
     let form = JSON.parse(JSON.stringify(formData.value))
     form.statisticalType = classificationData.find((item: any) => item.id == form.statisticalType)
     let nodeKey = ''
-    getTree({}).then(res => { 
-         // 转换数据结构为指定格式
-         const transformedData = transformTreeData(res.data);
-       
-           // 确保有数据再进行处理
-           if (transformedData && transformedData.length > 0 && 
-            transformedData[0].children && transformedData[0].children.length > 0) {
-            
+    getTree({}).then(res => {
+        // 转换数据结构为指定格式
+        const transformedData = transformTreeData(res.data)
+
+        // 确保有数据再进行处理
+        if (
+            transformedData &&
+            transformedData.length > 0 &&
+            transformedData[0].children &&
+            transformedData[0].children.length > 0
+        ) {
             nodeKey = transformedData[0].children[0].id
             emit('init', transformedData[0].children[0])
 
             tree.value = transformedData
-            
+
             if (nodeKey) {
                 nextTick(() => {
                     treeRef.value.treeRef.setCurrentKey(nodeKey)
@@ -94,7 +93,15 @@ const loadData = () => {
         }
     })
 }
+const scrollToNode = (id: string) => {
+    // 树滚动
+    treeRef.value.scrollToNode(id)
+}
 loadData()
+defineExpose({
+    tree,
+    scrollToNode
+})
 </script>
 <style lang="scss">
 .point-tree {

src/components/tree/pqs/bearingTree.vue

@@ -36,6 +36,7 @@ const adminInfo = useAdminInfo()
 const dictData = useDictData()
 const config = useConfig()
 const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
+const VITE_FLAG = import.meta.env.VITE_NAME == 'qujing'
 const tree = ref()
 const treeRef = ref()
 const formData = ref({
@@ -54,6 +55,9 @@ const loadData = () => {
     }) || { code: '' }
     let form = JSON.parse(JSON.stringify(formData.value))
     form.statisticalType = classificationData.find((item: any) => item.id == form.statisticalType)
+    if (VITE_FLAG && form.statisticalType.code == 'Power_Network') {
+        form.statisticalType.deptName = 'qujing'
+    }
     let nodeKey = ''
     getTerminalTreeForFive(form).then(res => {
         console.log(res)
@@ -67,56 +71,62 @@ const loadData = () => {
                 }
             ]
         }
-        res.data.forEach((item: any) => {
-            item.icon = 'el-icon-HomeFilled'
-            item.color = config.getColorVal('elementUiPrimary')
-            item.children.forEach((item2: any) => {
-                item2.icon = 'el-icon-CollectionTag'
-                item2.color = config.getColorVal('elementUiPrimary')
-                item2.children.forEach((item3: any) => {
-                    item3.icon = 'el-icon-Flag'
-                    item3.color = config.getColorVal('elementUiPrimary')
-                    item3.children.forEach((item4: any) => {
-                        item4.icon = 'el-icon-OfficeBuilding'
-                        item4.color = config.getColorVal('elementUiPrimary')
-                        item4.children.forEach((item5: anyObj) => {
-                            if (item5.level == 7) {
-                                item5.icon = 'el-icon-DataAnalysis'
-                                item5.color = config.getColorVal('elementUiPrimary')
-                                item5.children.forEach((item6: anyObj) => {
-                                    item6.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}>${item6.name}`
-                                    item6.pid = item4.id
-                                    item6.icon = 'fa-solid fa-location-dot'
-                                    item6.color = config.getColorVal('elementUiPrimary')
-                                    if (item6.comFlag == 0) {
-                                        item6.color = 'red !important'
-                                    } else if (item6.comFlag == 1) {
-                                        item6.color = '#00f93b !important'
-                                    } else if (item6.comFlag == 2) {
-                                        item6.color = '#8c8c8c !important'
-                                    }
-                                })
-                            } else {
-                                item5.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}`
-                                item5.pid = item4.id
-                                item5.icon = 'fa-solid fa-location-dot'
-                                item5.color = config.getColorVal('elementUiPrimary')
-                                if (item5.comFlag == 0) {
-                                    item5.color = 'red !important'
-                                } else if (item5.comFlag == 1) {
-                                    item5.color = '#00f93b !important'
-                                } else if (item5.comFlag == 2) {
-                                    item5.color = '#8c8c8c !important'
-                                }
-                            }
-                        })
-                    })
-                })
-            })
-        })
+        // if (VITE_FLAG) {
+        processTreeData(res.data)
+        let firstLevel6Node = findFirstLevel6Node(res.data)
 
-        nodeKey = res.data[0].children[0].children[0].children[0].children[0].id
-        emit('init', res.data[0].children[0].children[0].children[0].children[0])
+        nodeKey = firstLevel6Node.id
+        emit('init', firstLevel6Node)
+        // res.data.forEach((item: any) => {
+        //     item.icon = 'el-icon-HomeFilled'
+        //     item.color = config.getColorVal('elementUiPrimary')
+        //     item.children.forEach((item2: any) => {
+        //         item2.icon = 'el-icon-CollectionTag'
+        //         item2.color = config.getColorVal('elementUiPrimary')
+        //         item2.children.forEach((item3: any) => {
+        //             item3.icon = 'el-icon-Flag'
+        //             item3.color = config.getColorVal('elementUiPrimary')
+        //             item3.children.forEach((item4: any) => {
+        //                 item4.icon = 'el-icon-OfficeBuilding'
+        //                 item4.color = config.getColorVal('elementUiPrimary')
+        //                 item4.children.forEach((item5: anyObj) => {
+        //                     if (item5.level == 7) {
+        //                         item5.icon = 'el-icon-DataAnalysis'
+        //                         item5.color = config.getColorVal('elementUiPrimary')
+        //                         item5.children.forEach((item6: anyObj) => {
+        //                             item6.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}>${item6.name}`
+        //                             item6.pid = item4.id
+        //                             item6.icon = 'fa-solid fa-location-dot'
+        //                             item6.color = config.getColorVal('elementUiPrimary')
+        //                             if (item6.comFlag == 0) {
+        //                                 item6.color = 'red !important'
+        //                             } else if (item6.comFlag == 1) {
+        //                                 item6.color = '#00f93b !important'
+        //                             } else if (item6.comFlag == 2) {
+        //                                 item6.color = '#8c8c8c !important'
+        //                             }
+        //                         })
+        //                     } else {
+        //                         item5.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}`
+        //                         item5.pid = item4.id
+        //                         item5.icon = 'fa-solid fa-location-dot'
+        //                         item5.color = config.getColorVal('elementUiPrimary')
+        //                         if (item5.comFlag == 0) {
+        //                             item5.color = 'red !important'
+        //                         } else if (item5.comFlag == 1) {
+        //                             item5.color = '#00f93b !important'
+        //                         } else if (item5.comFlag == 2) {
+        //                             item5.color = '#8c8c8c !important'
+        //                         }
+        //                     }
+        //                 })
+        //             })
+        //         })
+        //     })
+        // })
+
+        // nodeKey = res.data[0].children[0].children[0].children[0].children[0].id
+        // emit('init', res.data[0].children[0].children[0].children[0].children[0])
 
         tree.value = res.data
         if (nodeKey) {
@@ -127,9 +137,113 @@ const loadData = () => {
         }
     })
 }
+
 const setKey = (key: string) => {
     treeRef.value.treeRef.setCurrentKey(key)
 }
+
+// 定义不同层级对应的图标配置（可根据实际需求调整）
+const levelIconMap = {
+    '-1': 'el-icon-HomeFilled',
+    0: 'el-icon-CollectionTag',
+    1: 'el-icon-CollectionTag',
+    2: 'el-icon-Flag',
+    3: 'el-icon-OfficeBuilding',
+    4: 'el-icon-DataAnalysis',
+    5: 'el-icon-DataAnalysis',
+    7: 'el-icon-DataAnalysis',
+    6: 'fa-solid fa-location-dot'
+}
+
+/**
+ * 递归处理树形数据，为不同层级节点设置图标和颜色
+ * @param data 树形数据数组
+ * @param level 当前层级（默认从1开始）
+ */
+function processTreeData(data: any[], level: number = -1) {
+    // 空值判断，避免数组为空或undefined时报错
+    if (!Array.isArray(data) || data.length === 0) return
+
+    data.forEach(item => {
+        // 1. 设置基础图标（根据层级匹配）
+        item.icon = levelIconMap[level] || ''
+
+        // 2. 设置基础颜色
+        item.color = config.getColorVal('elementUiPrimary')
+
+        // 3. 第6层特殊处理：根据comFlag调整颜色
+        if (level === 6 && item.hasOwnProperty('comFlag')) {
+            switch (item.comFlag) {
+                case 0:
+                    item.color = 'red !important'
+                    break
+                case 1:
+                    item.color = '#00f93b !important'
+                    break
+                case 2:
+                    item.color = '#8c8c8c !important'
+                    break
+                // 默认值：保持原有基础颜色
+                default:
+                    item.color = config.getColorVal('elementUiPrimary')
+            }
+        }
+
+        // 4. 递归处理子节点，层级+1
+        if (item.children && item.children.length > 0) {
+            processTreeData(item.children, item.children[0].level)
+        }
+    })
+}
+/**
+ * 递归查找树形结构中第一个level===6的节点（找到即终止递归）
+ * @param {Object|Array} tree - 树形数据（根节点数组 或 单个根节点）
+ * @returns {Object|null} 第一个level为6的节点，无则返回null
+ */
+function findFirstLevel6Node(tree: any) {
+    // 统一处理入参：如果是数组，遍历根节点数组（按顺序找第一个符合条件的）
+    if (Array.isArray(tree)) {
+        for (const rootNode of tree) {
+            const result = traverse(rootNode)
+            // 找到第一个匹配节点，立即返回（终止根节点遍历）
+            if (result) return result
+        }
+        // 所有根节点遍历完未找到
+        return null
+    } else {
+        // 入参是单个节点，直接递归遍历
+        return traverse(tree)
+    }
+
+    // 核心递归遍历函数
+    function traverse(node) {
+        // 终止条件1：节点不存在，返回null
+        if (!node) return null
+
+        // 终止条件2：找到level===6的节点，立即返回（终止递归）
+        if (node.level === 6) {
+            return node
+        }
+
+        // 终止条件3：节点无children，返回null
+        if (!node.children || node.children.length === 0) {
+            return null
+        }
+
+        // 按顺序遍历当前节点的子节点
+        for (const child of node.children) {
+            const foundNode = traverse(child)
+            // 子节点中找到目标节点，立即返回（终止后续子节点遍历）
+            if (foundNode) {
+                return foundNode
+            }
+        }
+
+        // 当前节点及所有子节点都无匹配，返回null
+        return null
+    }
+}
+
 defineExpose({ setKey })
 loadData()
 </script>

src/components/tree/pqs/pointTree.vue

@@ -1,154 +1,276 @@
-<template>
-    <div class="point-tree">
-        <el-select
-            v-model="formData.statisticalType"
-            placeholder="请选择"
-            style="min-width: unset; padding: 10px 10px 0"
-            @change="loadData"
-            v-if="props.showSelect"
-        >
-            <el-option
-                v-for="item in classificationData"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
-            ></el-option>
-        </el-select>
-        <div style="flex: 1; overflow: hidden">
-            <Tree ref="treeRef" :data="tree" style="width: 100%; height: 100%" :canExpand="false" v-bind="$attrs" />
-        </div>
-    </div>
-</template>
-
-<script lang="ts" setup>
-import { nextTick, onMounted, ref, useAttrs } from 'vue'
-import Tree from '../index.vue'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { useDictData } from '@/stores/dictData'
-import { getTerminalTreeForFive } from '@/api/device-boot/terminalTree'
-import { useConfig } from '@/stores/config'
-import { defineProps } from 'vue'
-defineOptions({
-    name: 'pms/pointTree'
-})
-interface Props {
-    showSelect?: boolean
-}
-const props = withDefaults(defineProps<Props>(), {
-    showSelect: true
-})
-const emit = defineEmits(['init'])
-const attrs = useAttrs()
-const adminInfo = useAdminInfo()
-const dictData = useDictData()
-const config = useConfig()
-const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
-const tree = ref()
-const treeRef = ref()
-const formData = ref({
-    deptIndex: adminInfo.$state.deptIndex,
-    monitorFlag: 2,
-    powerFlag: 2,
-    loadType: null,
-    manufacturer: null,
-    serverName: 'event-boot',
-    statisticalType: classificationData[0].id,
-    scale: null
-})
-const loadData = () => {
-    let obj = classificationData.find(function (i) {
-        return i.id === formData.value.statisticalType
-    }) || { code: '' }
-    let form = JSON.parse(JSON.stringify(formData.value))
-    form.statisticalType = classificationData.find((item: any) => item.id == form.statisticalType)
-    let nodeKey = ''
-    getTerminalTreeForFive(form).then(res => {
-        //console.log('---',res)
-        if (obj.code == 'Power_Network') {
-            res.data = [
-                {
-                    name: '电网拓扑',
-                    level: -1,
-                    id: 0,
-                    children: res.data
-                }
-            ]
-        }
-        res.data.forEach((item: any) => {
-            item.icon = 'el-icon-HomeFilled'
-            item.color = config.getColorVal('elementUiPrimary')
-            item.children.forEach((item2: any) => {
-                item2.icon = 'el-icon-CollectionTag'
-                item2.color = config.getColorVal('elementUiPrimary')
-                item2.children.forEach((item3: any) => {
-                    item3.icon = 'el-icon-Flag'
-                    item3.color = config.getColorVal('elementUiPrimary')
-                    item3.children.forEach((item4: any) => {
-                        item4.icon = 'el-icon-OfficeBuilding'
-                        item4.color = config.getColorVal('elementUiPrimary')
-                        item4.children.forEach((item5: anyObj) => {
-                            if (item5.level == 7) {
-                                item5.icon = 'el-icon-DataAnalysis'
-                                item5.color = config.getColorVal('elementUiPrimary')
-                                item5.children.forEach((item6: anyObj) => {
-                                    item6.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}>${item6.name}`
-                                    item6.pid = item4.id
-                                    item6.icon = 'fa-solid fa-location-dot'
-                                    item6.color = config.getColorVal('elementUiPrimary')
-                                    if (item6.comFlag == 0) {
-                                        item6.color = 'red !important'
-                                    } else if (item6.comFlag == 1) {
-                                        item6.color = '#00f93b !important'
-                                    } else if (item6.comFlag == 2) {
-                                        item6.color = '#8c8c8c !important'
-                                    }
-                                })
-                            } else {
-                                item5.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}`
-                                item5.pid = item4.id
-                                item5.icon = 'fa-solid fa-location-dot'
-                                item5.color = config.getColorVal('elementUiPrimary')
-                                if (item5.comFlag == 0) {
-                                    item5.color = 'red !important'
-                                } else if (item5.comFlag == 1) {
-                                    item5.color = '#00f93b !important'
-                                } else if (item5.comFlag == 2) {
-                                    item5.color = '#8c8c8c !important'
-                                }
-                            }
-                        })
-                    })
-                })
-            })
-        })
-
-        nodeKey =
-            res.data[0].children[0].children[0].children[0].children[0].children[0]?.id ||
-            res.data[0].children[0].children[0].children[0].children[0]?.id
-        emit(
-            'init',
-            res.data[0].children[0].children[0].children[0].children[0]?.children[0] ||
-                res.data[0].children[0].children[0].children[0].children[0]
-        )
-
-        tree.value = res.data
-        if (nodeKey) {
-            nextTick(() => {
-                treeRef.value.treeRef.setCurrentKey(nodeKey)
-                // treeRef.value.treeRef.setExpandedKeys(nodeKey)
-            })
-        }
-    })
-}
-loadData()
-</script>
-<style lang="scss">
-.point-tree {
-    height: 100%;
-    width: 100%;
-    display: flex;
-    flex-direction: column;
-    background: #fff;
-    border: 1px solid var(--el-border-color);
-}
-</style>
+<template>
+    <div class="point-tree">
+        <el-select
+            v-model="formData.statisticalType"
+            placeholder="请选择"
+            style="min-width: unset; padding: 10px 10px 0"
+            @change="loadData"
+            v-if="props.showSelect"
+        >
+            <el-option
+                v-for="item in classificationData"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+            ></el-option>
+        </el-select>
+        <div style="flex: 1; overflow: hidden">
+            <Tree ref="treeRef" :data="tree" style="width: 100%; height: 100%" :canExpand="false" v-bind="$attrs" />
+        </div>
+    </div>
+</template>
+
+<script lang="ts" setup>
+import { nextTick, onMounted, ref, useAttrs } from 'vue'
+import Tree from '../index.vue'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { useDictData } from '@/stores/dictData'
+import { getTerminalTreeForFive } from '@/api/device-boot/terminalTree'
+import { useConfig } from '@/stores/config'
+import { defineProps } from 'vue'
+const VITE_FLAG = import.meta.env.VITE_NAME == 'qujing'
+defineOptions({
+    name: 'pms/pointTree'
+})
+interface Props {
+    showSelect?: boolean
+}
+const props = withDefaults(defineProps<Props>(), {
+    showSelect: true
+})
+const emit = defineEmits(['init'])
+const attrs = useAttrs()
+const adminInfo = useAdminInfo()
+const dictData = useDictData()
+const config = useConfig()
+const classificationData = dictData.getBasicData('Statistical_Type', ['Report_Type'])
+const tree = ref()
+const treeRef = ref()
+const formData = ref({
+    deptIndex: adminInfo.$state.deptIndex,
+    monitorFlag: 2,
+    powerFlag: 2,
+    loadType: null,
+    manufacturer: null,
+    serverName: 'event-boot',
+    statisticalType: classificationData[0].id,
+    scale: null
+})
+const loadData = () => {
+    let obj = classificationData.find(function (i) {
+        return i.id === formData.value.statisticalType
+    }) || { code: '' }
+    let form = JSON.parse(JSON.stringify(formData.value))
+    form.statisticalType = classificationData.find((item: any) => item.id == form.statisticalType)
+    if (VITE_FLAG && form.statisticalType.code == 'Power_Network') {
+        form.statisticalType.deptName = 'qujing'
+    }
+    let nodeKey = ''
+    getTerminalTreeForFive(form).then(res => {
+        //console.log('---',res)
+        if (obj.code == 'Power_Network') {
+            res.data = [
+                {
+                    name: '电网拓扑',
+                    level: -1,
+                    id: 0,
+                    children: res.data
+                }
+            ]
+        }
+        // if (VITE_FLAG) {
+        processTreeData(res.data)
+        let firstLevel6Node = findFirstLevel6Node(res.data)
+
+        nodeKey = firstLevel6Node.id
+        emit('init', firstLevel6Node)
+        // } else {
+        //     // 正常树处理
+        //     res.data.forEach((item: any) => {
+        //         item.icon = 'el-icon-HomeFilled'
+        //         item.color = config.getColorVal('elementUiPrimary')
+        //         item.children.forEach((item2: any) => {
+        //             item2.icon = 'el-icon-CollectionTag'
+        //             item2.color = config.getColorVal('elementUiPrimary')
+        //             item2.children.forEach((item3: any) => {
+        //                 item3.icon = 'el-icon-Flag'
+        //                 item3.color = config.getColorVal('elementUiPrimary')
+        //                 item3.children.forEach((item4: any) => {
+        //                     item4.icon = 'el-icon-OfficeBuilding'
+        //                     item4.color = config.getColorVal('elementUiPrimary')
+        //                     item4.children.forEach((item5: anyObj) => {
+        //                         if (item5.level == 7) {
+        //                             item5.icon = 'el-icon-DataAnalysis'
+        //                             item5.color = config.getColorVal('elementUiPrimary')
+        //                             item5.children.forEach((item6: anyObj) => {
+        //                                 item6.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}>${item6.name}`
+        //                                 item6.pid = item4.id
+        //                                 item6.icon = 'fa-solid fa-location-dot'
+        //                                 item6.color = config.getColorVal('elementUiPrimary')
+        //                                 if (item6.comFlag == 0) {
+        //                                     item6.color = 'red !important'
+        //                                 } else if (item6.comFlag == 1) {
+        //                                     item6.color = '#00f93b !important'
+        //                                 } else if (item6.comFlag == 2) {
+        //                                     item6.color = '#8c8c8c !important'
+        //                                 }
+        //                             })
+        //                         } else {
+        //                             item5.alias = `${item.name}>${item2.name}>${item3.name}>${item4.name}>${item5.name}`
+        //                             item5.pid = item4.id
+        //                             item5.icon = 'fa-solid fa-location-dot'
+        //                             item5.color = config.getColorVal('elementUiPrimary')
+        //                             if (item5.comFlag == 0) {
+        //                                 item5.color = 'red !important'
+        //                             } else if (item5.comFlag == 1) {
+        //                                 item5.color = '#00f93b !important'
+        //                             } else if (item5.comFlag == 2) {
+        //                                 item5.color = '#8c8c8c !important'
+        //                             }
+        //                         }
+        //                     })
+        //                 })
+        //             })
+        //         })
+        //     })
+
+        //     nodeKey =
+        //         res.data[0].children[0].children[0].children[0].children[0].children[0]?.id ||
+        //         res.data[0].children[0].children[0].children[0].children[0]?.id
+        //     emit(
+        //         'init',
+        //         res.data[0].children[0].children[0].children[0].children[0]?.children[0] ||
+        //             res.data[0].children[0].children[0].children[0].children[0]
+        //     )
+        // }
+
+        tree.value = res.data
+        if (nodeKey) {
+            nextTick(() => {
+                treeRef.value.treeRef.setCurrentKey(nodeKey)
+
+                // treeRef.value.treeRef.setExpandedKeys(nodeKey)
+            })
+        }
+    })
+}
+const scrollToNode = (id: string) => {
+    // 树滚动
+    treeRef.value.scrollToNode(id)
+}
+
+// 定义不同层级对应的图标配置（可根据实际需求调整）
+const levelIconMap = {
+    '-1': 'el-icon-HomeFilled',
+    0: 'el-icon-CollectionTag',
+    1: 'el-icon-CollectionTag',
+    2: 'el-icon-Flag',
+    3: 'el-icon-OfficeBuilding',
+    4: 'el-icon-DataAnalysis',
+    5: 'el-icon-DataAnalysis',
+    7: 'el-icon-DataAnalysis',
+    6: 'fa-solid fa-location-dot'
+}
+
+/**
+ * 递归处理树形数据，为不同层级节点设置图标和颜色
+ * @param data 树形数据数组
+ * @param level 当前层级（默认从1开始）
+ */
+function processTreeData(data: any[], level: number = -1, alias: string = '') {
+    // 空值判断，避免数组为空或undefined时报错
+    if (!Array.isArray(data) || data.length === 0) return
+
+    data.forEach(item => {
+        // 1. 设置基础图标（根据层级匹配）
+        item.icon = levelIconMap[level] || ''
+        item.alias = alias + `${item.name}`
+        // 2. 设置基础颜色
+        item.color = config.getColorVal('elementUiPrimary')
+
+        // 3. 第6层特殊处理：根据comFlag调整颜色
+        if (level === 6 && item.hasOwnProperty('comFlag')) {
+            switch (item.comFlag) {
+                case 0:
+                    item.color = 'red !important'
+                    break
+                case 1:
+                    item.color = '#00f93b !important'
+                    break
+                case 2:
+                    item.color = '#8c8c8c !important'
+                    break
+                // 默认值：保持原有基础颜色
+                default:
+                    item.color = config.getColorVal('elementUiPrimary')
+            }
+        }
+
+        // 4. 递归处理子节点，层级+1
+        if (item.children && item.children.length > 0) {
+            processTreeData(item.children, item.children[0].level, level == '-1' ? '' : item.alias + '>')
+        }
+    })
+}
+/**
+ * 递归查找树形结构中第一个level===6的节点（找到即终止递归）
+ * @param {Object|Array} tree - 树形数据（根节点数组 或 单个根节点）
+ * @returns {Object|null} 第一个level为6的节点，无则返回null
+ */
+function findFirstLevel6Node(tree: any) {
+    // 统一处理入参：如果是数组，遍历根节点数组（按顺序找第一个符合条件的）
+    if (Array.isArray(tree)) {
+        for (const rootNode of tree) {
+            const result = traverse(rootNode)
+            // 找到第一个匹配节点，立即返回（终止根节点遍历）
+            if (result) return result
+        }
+        // 所有根节点遍历完未找到
+        return null
+    } else {
+        // 入参是单个节点，直接递归遍历
+        return traverse(tree)
+    }
+
+    // 核心递归遍历函数
+    function traverse(node) {
+        // 终止条件1：节点不存在，返回null
+        if (!node) return null
+
+        // 终止条件2：找到level===6的节点，立即返回（终止递归）
+        if (node.level === 6) {
+            return node
+        }
+
+        // 终止条件3：节点无children，返回null
+        if (!node.children || node.children.length === 0) {
+            return null
+        }
+
+        // 按顺序遍历当前节点的子节点
+        for (const child of node.children) {
+            const foundNode = traverse(child)
+            // 子节点中找到目标节点，立即返回（终止后续子节点遍历）
+            if (foundNode) {
+                return foundNode
+            }
+        }
+
+        // 当前节点及所有子节点都无匹配，返回null
+        return null
+    }
+}
+
+defineExpose({ treeRef, scrollToNode, tree })
+loadData()
+</script>
+<style lang="scss">
+.point-tree {
+    height: 100%;
+    width: 100%;
+    display: flex;
+    flex-direction: column;
+    background: #fff;
+    border: 1px solid var(--el-border-color);
+}
+</style>

src/components/tree/pqs/standardTree.vue

@@ -28,7 +28,7 @@ const tree = ref()
 const treeRef = ref()
 
 const loadData = (id?: any) => {
-    console.log('🚀 ~ loadData ~ id:', id)
+   
     let nodeKey = ''
     queryAll().then(res => {
         res.data.forEach((item: any) => {

src/layouts/admin/components/globalPopUp.vue

@@ -79,7 +79,7 @@ const init = async () => {
         // 设置消息接收回调
         mqttClient.onMessage((topic, message) => {
             const msg = JSON.parse(message.toString())
-            console.log('🚀 ~ init ~ msg:', msg)
+           // console.log('🚀 ~ init ~ msg:', msg)
             if (msg.deptList.includes(adminInfo.$state.deptId)) {
                 drawer.value = true
                 isLoading.value = true

src/layouts/admin/components/logo.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="layout-logo">
-        <img v-if="!config.layout.menuCollapse" class="logo-img" :src="getTheme.logoUrl" />
+        <img  v-if="!config.layout.menuCollapse && getTheme && getTheme.logoUrl"  class="logo-img" :src="getTheme.logoUrl" />
         <!--        <div-->
         <!--            v-if="!config.layout.menuCollapse"-->
         <!--            :style="{ color: config.getColorVal('menuActiveColor') }"-->
@@ -28,7 +28,9 @@ import { Session } from '@/utils/storage'
 import { setNavTabsWidth } from '@/utils/layout'
 
 const config = useConfig()
-const getTheme = JSON.parse(window.localStorage.getItem('getTheme') as string)
+const getTheme = window.localStorage.getItem('getTheme') 
+  ? JSON.parse(window.localStorage.getItem('getTheme') as string) 
+  : null
 const onMenuCollapse = function () {
     if (config.layout.shrink && !config.layout.menuCollapse) {
         closeShade()

src/layouts/admin/components/navBar/classic.vue

@@ -9,7 +9,7 @@
             />
         </div>
         <span class="nav-bar-title">
-            {{ getTheme.name }}
+            {{ getTheme?.name || '' }}
             <span style="font-size: 14px">({{ Version || 'v1.0.0' }})</span>
             <!-- <span style="font-size: 14px;" v-if="Version?.versionName">
                 ({{ Version?.versionName }})
@@ -28,8 +28,10 @@ import { getLastData } from '@/api/systerm'
 
 const Version: any = ref(null)
 const config = useConfig()
-const getTheme = JSON.parse(window.localStorage.getItem('getTheme') as string)
-
+const getTheme = window.localStorage.getItem('getTheme') 
+  ? JSON.parse(window.localStorage.getItem('getTheme') as string) 
+  : { name: '' }
+const VITE_FLAG = import.meta.env.VITE_NAME == 'hainan'
 const onMenuCollapse = () => {
     showShade('ba-aside-menu-shade', () => {
         config.setLayout('menuCollapse', true)
@@ -37,10 +39,13 @@ const onMenuCollapse = () => {
     config.setLayout('menuCollapse', false)
 }
 onMounted(() => {
-    getLastData({ versionType: 'WEB' }).then(res => {
-        Version.value = res.data.versionName
-    })
-    document.title = getTheme.name
+    if(!VITE_FLAG){
+         getLastData({ versionType: 'WEB' }).then(res => {
+            Version.value = res.data.versionName
+        })
+    }
+   
+    document.title = getTheme?.name || ''
 })
 </script>
 

src/layouts/admin/container/classic.vue

@@ -1,33 +1,33 @@
-<template>
-    <el-container class="layout-container">
-        <Aside />
-        <el-container class="content-wrapper">
-            <Header />
-            <Nav />
-            <Main />
-        </el-container>
-    </el-container>
-    <CloseFullScreen v-if="navTabs.state.tabFullScreen" />
-</template>
-
-<script setup lang="ts">
-import Aside from '@/layouts/admin/components/aside.vue'
-import Header from '@/layouts/admin/components/header.vue'
-import Main from '@/layouts/admin/router-view/main.vue'
-import CloseFullScreen from '@/layouts/admin/components/closeFullScreen.vue'
-import { useNavTabs } from '@/stores/navTabs'
-import Nav from '@/layouts/admin/components/nav.vue'
-const navTabs = useNavTabs()
-</script>
-
-<style scoped>
-.layout-container {
-    height: 100%;
-    width: 100%;
-}
-.content-wrapper {
-    flex-direction: column;
-    width: 100%;
-    height: 100%;
-}
-</style>
+<template>
+    <el-container class="layout-container">
+        <Aside />
+        <el-container class="content-wrapper">
+            <Header />
+            <Nav />
+            <Main />
+        </el-container>
+    </el-container>
+    <CloseFullScreen v-if="navTabs.state.tabFullScreen" />
+</template>
+
+<script setup lang="ts">
+import Aside from '@/layouts/admin/components/aside.vue'
+import Header from '@/layouts/admin/components/header.vue'
+import Main from '@/layouts/admin/router-view/main.vue'
+import CloseFullScreen from '@/layouts/admin/components/closeFullScreen.vue'
+import { useNavTabs } from '@/stores/navTabs'
+import Nav from '@/layouts/admin/components/nav.vue'
+const navTabs = useNavTabs()
+</script>
+
+<style scoped>
+.layout-container {
+    height: 100%;
+    width: 100%;
+}
+.content-wrapper {
+    flex-direction: column;
+    width: 100%;
+    height: 100%;
+}
+</style>

src/layouts/admin/router-view/main.vue

@@ -1,104 +1,104 @@
-<template>
-    <el-main class="layout-main" :style="mainHeight()">
-        <router-view v-slot="{ Component }">
-            <transition :name="config.layout.mainAnimation" mode="out-in">
-                <keep-alive :include="state.keepAliveComponentNameList">
-                    <component :is="Component" :key="state.componentKey" />
-                </keep-alive>
-            </transition>
-        </router-view>
-    </el-main>
-</template>
-
-<script setup lang="ts">
-import { ref, reactive, onMounted, watch, onBeforeMount, onUnmounted, nextTick, provide } from 'vue'
-import { useRoute, type RouteLocationNormalized } from 'vue-router'
-import { mainHeight } from '@/utils/layout'
-import useCurrentInstance from '@/utils/useCurrentInstance'
-import { useConfig } from '@/stores/config'
-import { useNavTabs } from '@/stores/navTabs'
-
-defineOptions({
-    name: 'layout/main'
-})
-
-const { proxy } = useCurrentInstance()
-
-const route = useRoute()
-const config = useConfig()
-const navTabs = useNavTabs()
-
-const state: {
-    componentKey: string
-    keepAliveComponentNameList: string[]
-} = reactive({
-    componentKey: route.path,
-    keepAliveComponentNameList: []
-})
-
-const addKeepAliveComponentName = function (keepAliveName: string | undefined) {
-    if (keepAliveName) {
-        let exist = state.keepAliveComponentNameList.find((name: string) => {
-            return name === keepAliveName
-        })
-        if (exist) return
-        state.keepAliveComponentNameList.push(keepAliveName)
-    }
-}
-
-onBeforeMount(() => {
-    proxy.eventBus.on('onTabViewRefresh', (menu: RouteLocationNormalized) => {
-        state.keepAliveComponentNameList = state.keepAliveComponentNameList.filter(
-            (name: string) => menu.meta.keepalive !== name
-        )
-        state.componentKey = ''
-        nextTick(() => {
-            state.componentKey = menu.path
-            addKeepAliveComponentName(menu.meta.keepalive as string)
-        })
-    })
-    proxy.eventBus.on('onTabViewClose', (menu: RouteLocationNormalized) => {
-        state.keepAliveComponentNameList = state.keepAliveComponentNameList.filter(
-            (name: string) => menu.meta.keepalive !== name
-        )
-    })
-})
-
-onUnmounted(() => {
-    proxy.eventBus.off('onTabViewRefresh')
-    proxy.eventBus.off('onTabViewClose')
-})
-
-onMounted(() => {
-    // 确保刷新页面时也能正确取得当前路由 keepalive 参数
-    if (typeof navTabs.state.activeRoute?.meta.keepalive == 'string') {
-        addKeepAliveComponentName(navTabs.state.activeRoute?.meta.keepalive)
-    }
-})
-
-watch(
-    () => route.path,
-    () => {
-        state.componentKey = route.path
-        if (typeof navTabs.state.activeRoute?.meta.keepalive == 'string') {
-            addKeepAliveComponentName(navTabs.state.activeRoute?.meta.keepalive)
-        }
-    }
-)
-
-</script>
-
-<style scoped lang="scss">
-.layout-container .layout-main {
-    padding: 0 !important;
-    overflow: hidden;
-    width: 100%;
-    height: 100%;
-}
-
-.layout-main-scrollbar {
-    width: 100%;
-    position: relative;
-    //overflow: hidden;
-}
-</style>
+<template>
+    <el-main class="layout-main" :style="mainHeight()">
+        <router-view v-slot="{ Component }">
+            <transition :name="config.layout.mainAnimation" mode="out-in">
+                <keep-alive :include="state.keepAliveComponentNameList">
+                    <component :is="Component" :key="state.componentKey" />
+                </keep-alive>
+            </transition>
+        </router-view>
+    </el-main>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, onMounted, watch, onBeforeMount, onUnmounted, nextTick, provide } from 'vue'
+import { useRoute, type RouteLocationNormalized } from 'vue-router'
+import { mainHeight } from '@/utils/layout'
+import useCurrentInstance from '@/utils/useCurrentInstance'
+import { useConfig } from '@/stores/config'
+import { useNavTabs } from '@/stores/navTabs'
+
+defineOptions({
+    name: 'layout/main'
+})
+
+const { proxy } = useCurrentInstance()
+
+const route = useRoute()
+const config = useConfig()
+const navTabs = useNavTabs()
+
+const state: {
+    componentKey: string
+    keepAliveComponentNameList: string[]
+} = reactive({
+    componentKey: route.path,
+    keepAliveComponentNameList: []
+})
+
+const addKeepAliveComponentName = function (keepAliveName: string | undefined) {
+    if (keepAliveName) {
+        let exist = state.keepAliveComponentNameList.find((name: string) => {
+            return name === keepAliveName
+        })
+        if (exist) return
+        state.keepAliveComponentNameList.push(keepAliveName)
+    }
+}
+
+onBeforeMount(() => {
+    proxy.eventBus.on('onTabViewRefresh', (menu: RouteLocationNormalized) => {
+        state.keepAliveComponentNameList = state.keepAliveComponentNameList.filter(
+            (name: string) => menu.meta.keepalive !== name
+        )
+        state.componentKey = ''
+        nextTick(() => {
+            state.componentKey = menu.path
+            addKeepAliveComponentName(menu.meta.keepalive as string)
+        })
+    })
+    proxy.eventBus.on('onTabViewClose', (menu: RouteLocationNormalized) => {
+        state.keepAliveComponentNameList = state.keepAliveComponentNameList.filter(
+            (name: string) => menu.meta.keepalive !== name
+        )
+    })
+})
+
+onUnmounted(() => {
+    proxy.eventBus.off('onTabViewRefresh')
+    proxy.eventBus.off('onTabViewClose')
+})
+
+onMounted(() => {
+    // 确保刷新页面时也能正确取得当前路由 keepalive 参数
+    if (typeof navTabs.state.activeRoute?.meta.keepalive == 'string') {
+        addKeepAliveComponentName(navTabs.state.activeRoute?.meta.keepalive)
+    }
+})
+
+watch(
+    () => route.path,
+    () => {
+        state.componentKey = route.path
+        if (typeof navTabs.state.activeRoute?.meta.keepalive == 'string') {
+            addKeepAliveComponentName(navTabs.state.activeRoute?.meta.keepalive)
+        }
+    }
+)
+
+</script>
+
+<style scoped lang="scss">
+.layout-container .layout-main {
+    padding: 0 !important;
+    overflow: hidden;
+    width: 100%;
+    height: 100%;
+}
+
+.layout-main-scrollbar {
+    width: 100%;
+    position: relative;
+    //overflow: hidden;
+}
+</style>

src/layouts/components/UserInfo/src/components/LockDialog.vue

@@ -29,7 +29,7 @@ const emit = defineEmits(['update:modelValue'])
 const dialogVisible = computed({
   get: () => props.modelValue,
   set: (val) => {
-    console.log('set: ', val)
+ 
     emit('update:modelValue', val)
   }
 })

src/main.ts

@@ -16,12 +16,14 @@ import '@/assets/font/iconfont.css'
 import { ElDialog } from 'element-plus'
 import BaiduMap from 'vue-baidu-map-3x'
 import BaiduMapOffline from 'vue-baidu-map-offline'
+
 import ExcelJS from 'exceljs'
 import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx'
 // 方式1：NPM 安装，注入 ExcelJS 对象
 VXETable.use(VXETablePluginExportXLSX, {
     ExcelJS
 })
+// 全局注册 tooltip 组件
 window.XEUtils = XEUtils
 
 // 初始化多语言
@@ -61,6 +63,7 @@ const setupAll = async () => {
     app.use(pinia)
     app.use(ElementPlus)
     app.use(VXETable)
+   
     ;(app._context.components.ElDialog as typeof ElDialog).props.closeOnClickModal.default = false
     registerIcons(app) // icons
 

src/stores/modules/dict.ts

@@ -68,6 +68,7 @@ export const useDictStore = defineStore('dict', {
       }
     },
     getDictByType(type: string) {
+      console.log("🚀 ~ type:", type)
       if (!this.isSetDict) {
         this.setDictMap()
       }

src/stores/monitoringPoint.ts

@@ -25,16 +25,18 @@ export const useMonitoringPoint = defineStore(
             val: any
         ) => {
             state[key] = val
+           
         }
         const setShowCheckBox = (val: boolean) => {
             if (val && state.lineIds.length === 0) {
                 state.lineIds = [state.lineId]
-                console.log('====================================')
-                console.log(state.lineIds)
-                console.log('====================================')
+                // console.log('====================================')
+                // console.log(state.lineIds)
+                // console.log('====================================')
             }
             state.showCheckBox = val
         }
+
         return { state, setValue, setShowCheckBox }
     },
     {

src/stores/timeCache.ts

@@ -0,0 +1,34 @@
+// src/stores/timeCache.ts
+import { defineStore } from 'pinia'
+import { RouteLocationNormalizedLoaded } from 'vue-router'
+
+// 时间组件的缓存值   用于驾驶舱放大的时候和内部的时间组件同步
+interface TimeCacheState {
+  cache: Map<string, {
+    interval: number | undefined  // 时间组件的月份、年份、时间、时间格式的缓存值
+    timeValue: any   // 时间组件的值
+  }>
+}
+
+export const useTimeCacheStore = defineStore('timeCache', {
+  state: (): TimeCacheState => ({
+    cache: new Map()
+  }),
+  
+  actions: {
+    setCache(routePath: string, interval: number | undefined, timeValue: any) {
+      this.cache.set(routePath, {
+        interval,
+        timeValue
+      })
+    },
+    
+    getCache(routePath: string) {
+      return this.cache.get(routePath)
+    },
+    
+    hasCache(routePath: string) {
+      return this.cache.has(routePath)
+    }
+  }
+})

src/styles/app.css

@@ -373,3 +373,4 @@ body,
 .w-e-scroll {
   min-height: 200px !important;
 }
+

src/styles/element.scss

@@ -268,3 +268,8 @@
 .el-drawer__body {
     padding: 10px;
 }
+
+.aLoad{
+    color: var(--el-color-primary);
+    cursor: pointer;
+}

src/styles/var.scss

@@ -8,29 +8,31 @@ $primary-light: #3f6ad8;
 // --ba-background
 $bg-color: () !default;
 $bg-color: map.merge(
-                (
-                        '': #edf0f3,
-                        'overlay': #ffffff,
-                ),
-                $bg-color
+    (
+        '': #edf0f3,
+        'overlay': #ffffff
+    ),
+    $bg-color
 );
 
 // --ba-border-color
 $border-color: () !default;
 $border-color: map.merge(
-                (
-                        '': #f6f6f6,
-                ),
-                $border-color
+    (
+        '': #f6f6f6
+    ),
+    $border-color
 );
 
 :root {
-  @include set-css-var-value('main-space', $main-space);
-  @include set-css-var-value('color-primary-light', $primary-light);
-  @include set-component-css-var('bg-color', $bg-color);
-  @include set-component-css-var('border-color', $border-color);
-//   --vxe-table-row-current-background-color: var(--el-color-primary-light-7);
-//   --vxe-table-row-hover-background-color: var(--el-color-primary-light-9);
-//   --vxe-table-row-hover-current-background-color: var(--el-color-primary-light-7);
-//   --vxe-table-row-hover-striped-background-color: var(--el-color-primary-light-9);
+    @include set-css-var-value('main-space', $main-space);
+    @include set-css-var-value('color-primary-light', $primary-light);
+    @include set-component-css-var('bg-color', $bg-color);
+    @include set-component-css-var('border-color', $border-color);
+    --vxe-ui-table-row-current-background-color: var(--el-color-primary-light-8);
+    --vxe-ui-table-row-hover-current-background-color: var(--el-color-primary-light-8);
+    //   --vxe-table-row-current-background-color: var(--el-color-primary-light-7);
+    //   --vxe-table-row-hover-background-color: var(--el-color-primary-light-9);
+    //   --vxe-table-row-hover-current-background-color: var(--el-color-primary-light-7);
+    //   --vxe-table-row-hover-striped-background-color: var(--el-color-primary-light-9);
 }

src/styles/vxeTable.css

@@ -1,7 +1,7 @@
 .vxe-header--row {
-  background: var(--vxe-table-header-background-color);
-  color: var(--vxe-table-header-font-color);
-  font-size: 14px;
+    background: var(--vxe-table-header-background-color);
+    color: var(--vxe-table-header-font-color);
+    font-size: 14px;
 }
 
 .is--checked.vxe-checkbox,
@@ -25,7 +25,7 @@
 .vxe-table--render-default .is--indeterminate.vxe-cell--checkbox,
 .vxe-table--render-default .is--indeterminate.vxe-cell--checkbox .vxe-checkbox--icon,
 .vxe-table--render-default .is--checked.vxe-cell--radio .vxe-radio--icon {
-  color: var(--el-color-primary-light-3);
+    color: var(--el-color-primary-light-3);
 }
 
 .vxe-checkbox:not(.is--disabled):hover .vxe-checkbox--icon,
@@ -38,40 +38,41 @@
 .vxe-export--panel-column-option:not(.is--disabled):hover .vxe-radio--icon,
 .vxe-table--filter-option:not(.is--disabled):hover .vxe-radio--icon,
 .vxe-table--render-default .vxe-cell--radio:not(.is--disabled):hover .vxe-radio--icon {
-  color: var(--el-color-primary-light-5);
+    color: var(--el-color-primary-light-5);
 }
 
 .vxe-table--tooltip-wrapper {
-  z-index: 10000 !important;
+    z-index: 10000 !important;
 }
 
 .is--disabled {
-  background-color: var(--vxe-input-disabled-color);
+    background-color: var(--vxe-input-disabled-color);
 }
 
 .vxe-modal--wrapper {
-  z-index: 5000 !important;
+    z-index: 5000 !important;
 }
 
 .vxe-table--body .vxe-body--row:nth-child(even) {
-  background-color: #f9f9f9;
+    background-color: #f9f9f9;
 }
 
 .vxe-table--body .vxe-body--row:nth-child(odd) {
-  background-color: #ffffff;
+    background-color: #ffffff;
 }
 
 .default-theme.splitpanes--vertical > .splitpanes__splitter,
 .default-theme .splitpanes--vertical > .splitpanes__splitter {
-  width: 10px !important;
+    width: 10px !important;
 }
 
 .default-theme.splitpanes--vertical > .splitpanes__splitter:after,
 .default-theme .splitpanes--vertical > .splitpanes__splitter:after {
-  background-color: #000 !important;
+    background-color: #000 !important;
 }
 
 .default-theme.splitpanes--vertical > .splitpanes__splitter:before,
 .default-theme .splitpanes--vertical > .splitpanes__splitter:before {
-  background-color: #000 !important;
+    background-color: #000 !important;
 }
+

src/styles/vxeTable.scss

@@ -63,7 +63,10 @@
 .vxe-table--render-default .vxe-cell--radio:not(.is--disabled):hover .vxe-radio--icon {
     color: var(--el-color-primary-light-5);
 }
-
+.vxe-table--render-default .vxe-body--row.row--current,
+.vxe-table--render-default .vxe-body--row.row--current:hover {
+    background-color: var(--el-color-primary-light-8);
+}
 // .vxe-table--render-default .is--disabled.vxe-cell--checkbox .vxe-checkbox--icon{
 //     color: #fff0;
 // }
@@ -77,14 +80,14 @@
 .vxe-modal--wrapper {
     z-index: 5000 !important;
 }
-.vxe-table--body .vxe-body--row:nth-child(even) {
-    background-color: #f9f9f9;
-    // background-color: var(--el-color-primary-light-9);
-}
+// .vxe-table--body .vxe-body--row:nth-child(even) {
+//     background-color: #f9f9f9;
+//     // background-color: var(--el-color-primary-light-9);
+// }
 
-.vxe-table--body .vxe-body--row:nth-child(odd) {
-    background-color: #ffffff;
-}
+// .vxe-table--body .vxe-body--row:nth-child(odd) {
+//     background-color: #ffffff;
+// }
 .default-theme.splitpanes--vertical > .splitpanes__splitter,
 .default-theme .splitpanes--vertical > .splitpanes__splitter {
     width: 10px !important;

src/utils/auth.ts

@@ -1,71 +1,70 @@
-import { useCache, CACHE_KEY } from '@/hooks/web/useCache'
-import { TokenType } from '@/api/login/types'
-import { decrypt, encrypt } from '@/utils/jsencrypt'
-
-const { wsCache } = useCache()
-
-const AccessTokenKey = 'ACCESS_TOKEN'
-const RefreshTokenKey = 'REFRESH_TOKEN'
-
-// 获取token
-export const getAccessToken = () => {
-  // 此处与TokenKey相同，此写法解决初始化时Cookies中不存在TokenKey报错
-  return wsCache.get(AccessTokenKey) ? wsCache.get(AccessTokenKey) : wsCache.get('ACCESS_TOKEN')
-}
-
-// 刷新token
-export const getRefreshToken = () => {
-  return wsCache.get(RefreshTokenKey)
-}
-
-// 设置token
-export const setToken = (token: TokenType) => {
-  wsCache.set(RefreshTokenKey, token.refreshToken)
-  wsCache.set(AccessTokenKey, token.accessToken)
-}
-
-// 删除token
-export const removeToken = () => {
-  wsCache.delete(AccessTokenKey)
-  wsCache.delete(RefreshTokenKey)
-}
-
-/** 格式化token（jwt格式） */
-export const formatToken = (token: string): string => {
-  return 'Bearer ' + token
-}
-// ========== 账号相关 ==========
-
-export type LoginFormType = {
-  tenantName: string
-  username: string
-  password: string
-  rememberMe: boolean
-}
-
-export const getLoginForm = () => {
-  const loginForm: LoginFormType = wsCache.get(CACHE_KEY.LoginForm)
-  if (loginForm) {
-    loginForm.password = decrypt(loginForm.password) as string
-  }
-  return loginForm
-}
-
-export const setLoginForm = (loginForm: LoginFormType) => {
-  loginForm.password = encrypt(loginForm.password) as string
-  wsCache.set(CACHE_KEY.LoginForm, loginForm, { exp: 30 * 24 * 60 * 60 })
-}
-
-export const removeLoginForm = () => {
-  wsCache.delete(CACHE_KEY.LoginForm)
-}
-
-// ========== 租户相关 ==========
-
-export const getTenantId = () => {
-  return wsCache.get(CACHE_KEY.TenantId)
-}
-
-export const setTenantId = (username: string) => {
-  wsCache.set(CACHE_KEY.TenantId, username)
-}
+import { useCache, CACHE_KEY } from '@/hooks/web/useCache'
+import { decrypt, encrypt } from '@/utils/jsencrypt'
+
+const { wsCache } = useCache()
+
+const AccessTokenKey = 'ACCESS_TOKEN'
+const RefreshTokenKey = 'REFRESH_TOKEN'
+
+// 获取token
+export const getAccessToken = () => {
+  // 此处与TokenKey相同，此写法解决初始化时Cookies中不存在TokenKey报错
+  return wsCache.get(AccessTokenKey) ? wsCache.get(AccessTokenKey) : wsCache.get('ACCESS_TOKEN')
+}
+
+// 刷新token
+export const getRefreshToken = () => {
+  return wsCache.get(RefreshTokenKey)
+}
+
+// 设置token
+export const setToken = (token: any) => {
+  wsCache.set(RefreshTokenKey, token.refreshToken)
+  wsCache.set(AccessTokenKey, token.accessToken)
+}
+
+// 删除token
+export const removeToken = () => {
+  wsCache.delete(AccessTokenKey)
+  wsCache.delete(RefreshTokenKey)
+}
+
+/** 格式化token（jwt格式） */
+export const formatToken = (token: string): string => {
+  return 'Bearer ' + token
+}
+// ========== 账号相关 ==========
+
+export type LoginFormType = {
+  tenantName: string
+  username: string
+  password: string
+  rememberMe: boolean
+}
+
+export const getLoginForm = () => {
+  const loginForm: LoginFormType = wsCache.get(CACHE_KEY.LoginForm)
+  if (loginForm) {
+    loginForm.password = decrypt(loginForm.password) as string
+  }
+  return loginForm
+}
+
+export const setLoginForm = (loginForm: LoginFormType) => {
+  loginForm.password = encrypt(loginForm.password) as string
+  wsCache.set(CACHE_KEY.LoginForm, loginForm, { exp: 30 * 24 * 60 * 60 })
+}
+
+export const removeLoginForm = () => {
+  wsCache.delete(CACHE_KEY.LoginForm)
+}
+
+// ========== 租户相关 ==========
+
+export const getTenantId = () => {
+  return wsCache.get(CACHE_KEY.TenantId)
+}
+
+export const setTenantId = (username: string) => {
+  wsCache.set(CACHE_KEY.TenantId, username)
+}

src/utils/dict.ts

@@ -40,6 +40,7 @@ export const getIntDictOptions = (dictType: string): NumberDictDataType[] => {
       value: parseInt(dict.value + '')
     })
   })
+  console.log("🚀 ~ getIntDictOptions ~ dictOption:", dictOption)
   return dictOption
 }
 

src/utils/echartMethod.ts

@@ -1,159 +1,302 @@
-const dataProcessing = (arr: any[]) => {
-    return arr
-        .filter(item => typeof item === 'number' || (typeof item === 'string' && !isNaN(parseFloat(item))))
-        .map(item => (typeof item === 'number' ? item : parseFloat(item)))
-}
-const calculateValue = (o: number, value: number, num: number, isMin: boolean) => {
-    if (value === 0) {
-        return 0
-    } else if (value > 0 && Math.abs(value) < 1 && isMin == true) {
-        return 0
-    } else if (value > -1 && value < 0 && isMin == false) {
-        return 0
-    }
-    let base
-    if (Math.abs(o) >= 100) {
-        base = 100
-    } else if (Math.abs(o) >= 10) {
-        base = 10
-    } else if (Math.abs(o) >= 1) {
-        base = 1
-    } else {
-        base = 0.1
-    }
-    let calculatedValue
-    if (isMin) {
-        if (value < 0) {
-            calculatedValue = value + num * value
-        } else {
-            calculatedValue = value - num * value
-        }
-    } else {
-        if (value < 0) {
-            calculatedValue = value - num * value
-        } else {
-            calculatedValue = value + num * value
-        }
-    }
-    if (base === 0.1) {
-        return parseFloat(calculatedValue.toFixed(1))
-    } else if (isMin) {
-        return Math.floor(calculatedValue / base) * base
-    } else {
-        return Math.ceil(calculatedValue / base) * base
-    }
-}
-
-// 处理y轴最大最小值
-export const yMethod = (arr: any) => {
-    let num = 0.1
-    let numList = dataProcessing(arr)
-    let maxValue = 0
-    let minValue = 0
-    let max = 0
-    let min = 0
-    maxValue = Math.max(...numList)
-    minValue = Math.min(...numList)
-    const o = maxValue - minValue
-    if (Math.abs(o) >= 300) {
-        num = 0.02
-    }
-
-    min = calculateValue(o, minValue, num, true)
-    max = calculateValue(o, maxValue, num, false)
-    // if (-100 >= minValue) {
-    //     min = Math.floor((minValue + num * minValue) / 100) * 100
-    // } else if (-10 >= minValue && minValue > -100) {
-    //     min = Math.floor((minValue + num * minValue) / 10) * 10
-    // } else if (-1 >= minValue && minValue > -10) {
-    //     min = Math.floor(minValue + num * minValue)
-    // } else if (0 > minValue && minValue > -1) {
-    //     min = parseFloat((minValue + num * minValue).toFixed(1))
-    // } else if (minValue == 0) {
-    //     min = 0
-    // } else if (0 < minValue && minValue < 1) {
-    //     min = parseFloat((minValue - num * minValue).toFixed(1))
-    // } else if (1 <= minValue && minValue < 10) {
-    //     min = Math.floor(minValue - num * minValue)
-    // } else if (10 <= minValue && minValue < 100) {
-    //     min = Math.floor((minValue - num * minValue) / 10) * 10
-    // } else if (100 <= minValue) {
-    //     min = Math.floor((minValue - num * minValue) / 100) * 100
-    // }
-
-    // if (-100 >= maxValue) {
-    //     max = Math.ceil((maxValue - num * maxValue) / 100) * 100
-    // } else if (-10 >= maxValue && maxValue > -100) {
-    //     max = Math.ceil((maxValue - num * maxValue) / 10) * 10
-    // } else if (-1 >= maxValue && maxValue > -10) {
-    //     max = Math.ceil(maxValue - num * maxValue)
-    // } else if (0 > maxValue && maxValue > -1) {
-    //     max = parseFloat((maxValue - num * maxValue).toFixed(1))
-    // } else if (maxValue == 0) {
-    //     max = 0
-    // } else if (0 < maxValue && maxValue < 1) {
-    //     max = parseFloat((maxValue + num * maxValue).toFixed(1))
-    // } else if (1 <= maxValue && maxValue < 10) {
-    //     max = Math.ceil(maxValue + num * maxValue)
-    // } else if (10 <= maxValue && maxValue < 100) {
-    //     max = Math.ceil((maxValue + num * maxValue) / 10) * 10
-    // } else if (100 <= maxValue) {
-    //     max = Math.ceil((maxValue + num * maxValue) / 100) * 100
-    // }
-
-    // if (maxValue > 1000 || minValue < -1000) {
-    //     max = Math.ceil(maxValue / 100) * 100
-    //     if (minValue == 0) {
-    //         min = 0
-    //     } else {
-    //         min = Math.floor(minValue / 100) * 100
-    //     }
-    // } else if (maxValue < 60 && minValue > 40) {
-    //     max = 60
-    //     min = 40
-    // } else if (maxValue == minValue && maxValue < 10 && minValue > 0) {
-    //     max = Math.ceil(maxValue / 10) * 10
-    //     min = Math.floor(minValue / 10) * 10
-    // } else if (maxValue == minValue && maxValue != 0 && minValue != 0) {
-    //     max = Math.ceil(maxValue / 10 + 1) * 10
-    //     min = Math.floor(minValue / 10 - 1) * 10
-    // } else {
-    //     max = Math.ceil(maxValue / 10) * 10
-    //     min = Math.floor(minValue / 10) * 10
-    // }
-
-    // if (maxValue > 0 && maxValue < 1) {
-    //     max = 1
-    // } else if (max == 0 && minValue > -1 && minValue < 0) {
-    //     min = -1
-    // }
-
-    return [min, max]
-}
-
-/**
- * title['A相','B相',]
- * data[[1,2],[3,4]]
- */
-// 导出csv文件
-const convertToCSV = (title: object, data: any) => {
-    console.log('🚀 ~ convertToCSV ~ data:', data)
-    let csv = ''
-    // 添加列头
-    csv += ',' + title.join(',') + '\n'
-    // 遍历数据并添加到CSV字符串中
-    data?.map(item => {
-        csv += item.join(',') + '\n'
-    })
-    return csv
-}
-export const exportCSV = (title: object, data: any, filename: string) => {
-    const csv = convertToCSV(title, data)
-    const blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' })
-    const link = document.createElement('a')
-    link.href = URL.createObjectURL(blob)
-    link.download = filename
-    link.click()
-    // 释放URL对象
-    URL.revokeObjectURL(link.href)
-}
+const dataProcessing = (arr: any[]) => {
+    return arr
+        .filter(item => typeof item === 'number' || (typeof item === 'string' && !isNaN(parseFloat(item))))
+        .map(item => (typeof item === 'number' ? item : parseFloat(item)))
+}
+const calculateValue = (o: number, value: number, num: number, isMin: boolean) => {
+    if (value === 0) {
+        return 0
+    } else if (value > 0 && Math.abs(value) < 1 && isMin == true) {
+        return 0
+    } else if (value > -1 && value < 0 && isMin == false) {
+        return 0
+    }
+    let base
+    if (Math.abs(o) >= 100) {
+        base = 100
+    } else if (Math.abs(o) >= 10) {
+        base = 10
+    } else if (Math.abs(o) >= 1) {
+        base = 1
+    } else {
+        base = 0.1
+    }
+    let calculatedValue
+    if (isMin) {
+        if (value < 0) {
+            calculatedValue = value + num * value
+        } else {
+            calculatedValue = value - num * value
+        }
+    } else {
+        if (value < 0) {
+            calculatedValue = value - num * value
+        } else {
+            calculatedValue = value + num * value
+        }
+    }
+    if (base === 0.1) {
+        return parseFloat(calculatedValue.toFixed(1))
+    } else if (isMin) {
+        return Math.floor(calculatedValue / base) * base
+    } else {
+        return Math.ceil(calculatedValue / base) * base
+    }
+}
+
+// 处理y轴最大最小值
+export const yMethod = (arr: any) => {
+    let num = 0.1
+    let numList = dataProcessing(arr)
+    let maxValue = 0
+    let minValue = 0
+    let max = 0
+    let min = 0
+    maxValue = Math.max(...numList)
+    minValue = Math.min(...numList)
+    const o = maxValue - minValue
+    if (Math.abs(o) >= 300) {
+        num = 0.02
+    }
+
+    min = calculateValue(o, minValue, num, true)
+    max = calculateValue(o, maxValue, num, false)
+    // if (-100 >= minValue) {
+    //     min = Math.floor((minValue + num * minValue) / 100) * 100
+    // } else if (-10 >= minValue && minValue > -100) {
+    //     min = Math.floor((minValue + num * minValue) / 10) * 10
+    // } else if (-1 >= minValue && minValue > -10) {
+    //     min = Math.floor(minValue + num * minValue)
+    // } else if (0 > minValue && minValue > -1) {
+    //     min = parseFloat((minValue + num * minValue).toFixed(1))
+    // } else if (minValue == 0) {
+    //     min = 0
+    // } else if (0 < minValue && minValue < 1) {
+    //     min = parseFloat((minValue - num * minValue).toFixed(1))
+    // } else if (1 <= minValue && minValue < 10) {
+    //     min = Math.floor(minValue - num * minValue)
+    // } else if (10 <= minValue && minValue < 100) {
+    //     min = Math.floor((minValue - num * minValue) / 10) * 10
+    // } else if (100 <= minValue) {
+    //     min = Math.floor((minValue - num * minValue) / 100) * 100
+    // }
+
+    // if (-100 >= maxValue) {
+    //     max = Math.ceil((maxValue - num * maxValue) / 100) * 100
+    // } else if (-10 >= maxValue && maxValue > -100) {
+    //     max = Math.ceil((maxValue - num * maxValue) / 10) * 10
+    // } else if (-1 >= maxValue && maxValue > -10) {
+    //     max = Math.ceil(maxValue - num * maxValue)
+    // } else if (0 > maxValue && maxValue > -1) {
+    //     max = parseFloat((maxValue - num * maxValue).toFixed(1))
+    // } else if (maxValue == 0) {
+    //     max = 0
+    // } else if (0 < maxValue && maxValue < 1) {
+    //     max = parseFloat((maxValue + num * maxValue).toFixed(1))
+    // } else if (1 <= maxValue && maxValue < 10) {
+    //     max = Math.ceil(maxValue + num * maxValue)
+    // } else if (10 <= maxValue && maxValue < 100) {
+    //     max = Math.ceil((maxValue + num * maxValue) / 10) * 10
+    // } else if (100 <= maxValue) {
+    //     max = Math.ceil((maxValue + num * maxValue) / 100) * 100
+    // }
+
+    // if (maxValue > 1000 || minValue < -1000) {
+    //     max = Math.ceil(maxValue / 100) * 100
+    //     if (minValue == 0) {
+    //         min = 0
+    //     } else {
+    //         min = Math.floor(minValue / 100) * 100
+    //     }
+    // } else if (maxValue < 60 && minValue > 40) {
+    //     max = 60
+    //     min = 40
+    // } else if (maxValue == minValue && maxValue < 10 && minValue > 0) {
+    //     max = Math.ceil(maxValue / 10) * 10
+    //     min = Math.floor(minValue / 10) * 10
+    // } else if (maxValue == minValue && maxValue != 0 && minValue != 0) {
+    //     max = Math.ceil(maxValue / 10 + 1) * 10
+    //     min = Math.floor(minValue / 10 - 1) * 10
+    // } else {
+    //     max = Math.ceil(maxValue / 10) * 10
+    //     min = Math.floor(minValue / 10) * 10
+    // }
+
+    // if (maxValue > 0 && maxValue < 1) {
+    //     max = 1
+    // } else if (max == 0 && minValue > -1 && minValue < 0) {
+    //     min = -1
+    // }
+
+    return [min, max]
+}
+
+/**
+ * title['A相','B相',]
+ * data[[1,2],[3,4]]
+ */
+// 导出csv文件
+const convertToCSV = (title: object, data: any) => {
+    console.log('🚀 ~ convertToCSV ~ data:', data)
+    let csv = ''
+    // 添加列头
+    csv += ',' + title.join(',') + '\n'
+    // 遍历数据并添加到CSV字符串中
+    data?.map(item => {
+        csv += item.join(',') + '\n'
+    })
+    return csv
+}
+export const exportCSV = (title: object, data: any, filename: string) => {
+    const csv = convertToCSV(title, data)
+    const blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' })
+    const link = document.createElement('a')
+    link.href = URL.createObjectURL(blob)
+    link.download = filename
+    link.click()
+    // 释放URL对象
+    URL.revokeObjectURL(link.href)
+}
+
+
+
+/**
+ * 补全时间序列数据中缺失的条目
+ * @param rawData 原始数据，格式为 [["时间字符串", "数值", "单位", "类型"], ...]
+ * @returns 补全后的数据，缺失条目数值为 null
+ */
+export const completeTimeSeries = (rawData: string[][]): (string | null)[][] => {
+    // 步骤1：校验原始数据并解析时间
+    if (rawData.length < 2) {
+        console.warn('数据量不足2条，无法计算时间间隔，直接返回原始数据')
+        return rawData.map(item => [...item])
+    }
+
+    // 解析所有时间为Date对象，过滤无效时间并按时间排序
+    const validData = rawData
+        .map(item => {
+            // 确保至少有时间和数值字段
+            if (!item[0]) {
+                return { time: new Date(0), item, isValid: false }
+            }
+            const time = new Date(item[0])
+            return { time, item, isValid: !isNaN(time.getTime()) }
+        })
+        .filter(data => data.isValid)
+        .sort((a, b) => a.time.getTime() - b.time.getTime()) // 确保数据按时间排序
+        .map(data => data.item)
+
+    if (validData.length < 2) {
+        throw new Error('有效时间数据不足2条，无法继续处理')
+    }
+
+    // 步骤2：计算时间间隔（分析前几条数据确定最可能的间隔）
+    const intervals: number[] = []
+    // 分析前10条数据来确定间隔，避免单一间隔出错
+    const analyzeCount = Math.min(10, validData.length - 1)
+    for (let i = 0; i < analyzeCount; i++) {
+        const currentTime = new Date(validData[i][0]!).getTime()
+        const nextTime = new Date(validData[i + 1][0]!).getTime()
+        const interval = nextTime - currentTime
+        if (interval > 0) {
+            intervals.push(interval)
+        }
+    }
+
+    // 取最常见的间隔作为标准间隔
+    const timeInterval = getMostFrequentValue(intervals)
+    if (timeInterval <= 0) {
+        throw new Error('无法确定有效的时间间隔')
+    }
+
+    // 步骤3：生成完整的时间序列范围（从第一条到最后一条）
+    const startTime = new Date(validData[0][0]!).getTime()
+    const endTime = new Date(validData[validData.length - 1][0]!).getTime()
+    const completeTimes: Date[] = []
+
+    // 生成从 startTime 到 endTime 的所有间隔时间点
+    for (let time = startTime; time <= endTime; time += timeInterval) {
+        completeTimes.push(new Date(time))
+    }
+
+    // 步骤4：将原始数据转为时间映射表，使用精确的时间字符串匹配
+    const timeDataMap = new Map<string, (string | undefined)[]>()
+    validData.forEach(item => {
+        // 使用原始时间字符串作为键，避免格式转换导致的匹配问题
+        if (item[0]) {
+            timeDataMap.set(item[0], item)
+        }
+    })
+
+    // 提取模板数据（从第一条有效数据中提取单位和类型，处理可能的缺失）
+    const template = validData[0]
+
+    // 步骤5：对比补全数据，缺失条目数值为 null
+    const completedData = completeTimes.map(time => {
+        // 保持与原始数据相同的时间格式
+        const timeStr = formatTime(time)
+        const existingItem = timeDataMap.get(timeStr)
+
+        if (existingItem) {
+            // 存在该时间，返回原始数据
+            return [...existingItem]
+        } else {
+            // 缺失该时间，数值设为 null，其他字段沿用第一个有效数据的格式
+            // 处理可能缺失的单位和类型字段
+            const result: (string | null | undefined)[] = [timeStr, '/']
+            // 仅在原始数据有单位字段时才添加
+            if (template.length > 2) {
+                result.push(template[2])
+            }
+            // 仅在原始数据有类型字段时才添加
+            if (template.length > 3) {
+                result.push(template[3])
+            }
+            return result
+        }
+    })
+
+    return completedData
+}
+
+/**
+ * 格式化时间为 "YYYY-MM-DD HH:mm:ss" 格式
+ * @param date 日期对象
+ * @returns 格式化后的时间字符串
+ */
+function formatTime(date: Date): string {
+    const year = date.getFullYear()
+    const month = String(date.getMonth() + 1).padStart(2, '0')
+    const day = String(date.getDate()).padStart(2, '0')
+    const hours = String(date.getHours()).padStart(2, '0')
+    const minutes = String(date.getMinutes()).padStart(2, '0')
+    const seconds = String(date.getSeconds()).padStart(2, '0')
+
+    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`
+}
+
+/**
+ * 获取数组中出现频率最高的值
+ * @param arr 数字数组
+ * @returns 出现频率最高的值
+ */
+function getMostFrequentValue(arr: number[]): number {
+    if (arr.length === 0) return 0
+
+    const frequencyMap = new Map<number, number>()
+    arr.forEach(num => {
+        frequencyMap.set(num, (frequencyMap.get(num) || 0) + 1)
+    })
+
+    let maxFrequency = 0
+    let mostFrequent = arr[0]
+
+    frequencyMap.forEach((frequency, num) => {
+        if (frequency > maxFrequency) {
+            maxFrequency = frequency
+            mostFrequent = num
+        }
+    })
+
+    return mostFrequent
+}

src/utils/fileDownLoad.ts

@@ -0,0 +1,91 @@
+import { downloadFile } from '@/api/system-boot/file'
+
+const sanitizeUrl = (url: string): string => {
+    return url.replace(/\[/g, '(').replace(/\]/g, ')')
+}
+
+// 下载文件
+export const download = (urls: string) => {
+    //console.log('下载', urls)
+    
+    downloadFile({ filePath: urls })
+        .then((res: any) => {
+            // 1. 确定文件MIME类型（优化：用更简洁的方式）
+            const getFileType = (url: string) => {
+                const ext = url.split('.').pop()?.toLowerCase() || ''
+                const mimeMap: Record<string, string> = {
+                    pdf: 'application/pdf',
+                    zip: 'application/zip',
+                    doc: 'application/msword',
+                    docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                    xls: 'application/vnd.ms-excel',
+                    xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                    png: 'image/png',
+                    jpeg: 'image/jpeg',
+                    jpg: 'image/jpg'
+                }
+                return mimeMap[ext] || ''
+            }
+          
+            const blob = new Blob([res], { type: getFileType(urls) })
+         
+            // 2. 提取文件名并保留原生后缀（核心修复点）
+            const fileName = urls.split('/').at(-1) || '下载文件' // 先提取URL最后一段（文件名）
+
+            // 3. 创建下载链接
+            const url = window.URL.createObjectURL(blob)
+            const link = document.createElement('a')
+            link.href = url
+            link.download = fileName // 直接使用原文件名（保留后缀）
+            document.body.appendChild(link)
+            link.click()
+
+            // 4. 清理资源（优化）
+            link.remove()
+            window.URL.revokeObjectURL(url) // 释放blob URL
+        })
+        .catch(err => {
+            console.error('下载失败：', err)
+            // 可添加错误提示（如Toast）
+        })
+}
+function removeLastDotSuffix(str: string) {
+    // 找到最后一个 . 的位置
+    const lastDotIndex = str.lastIndexOf('.')
+    // 如果存在 .，截取到 . 之前的部分；否则返回原字符串
+    return lastDotIndex !== -1 ? str.slice(0, lastDotIndex) : str
+}
+
+// 预览文件
+export const previewFile = async (urls: any) => {
+    //console.log('预览', urls)
+    let url = ''
+    await downloadFile({ filePath: decodeURI(urls) })
+        .then((res: any) => {           
+            // 1. 确定文件MIME类型（优化：用更简洁的方式）
+            const getFileType = (url: string) => {
+                const ext = url.split('.').pop()?.toLowerCase() || ''
+                const mimeMap: Record<string, string> = {
+                    pdf: 'application/pdf',
+                    zip: 'application/zip',
+                    doc: 'application/msword',
+                    docx: 'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
+                    xls: 'application/vnd.ms-excel',
+                    xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+                    png: 'image/png',
+                    jpeg: 'image/jpeg',
+                    jpg: 'image/jpg'
+                }
+                return mimeMap[ext] || ''
+            }           
+            const blob = new Blob([res], { type: getFileType(decodeURI(urls)) })
+            // 3. 创建下载链接
+            url = window.URL.createObjectURL(blob)
+        })
+        .catch(err => {
+            console.error('下载失败：', err)
+            // 可添加错误提示（如Toast）
+        })
+    //console.log('url', url)
+    return url
+}

src/utils/formatTime.ts

@@ -362,3 +362,4 @@ export function getTimeOfTheMonth(key: string): [string, string] {
             throw new Error('Invalid key')
     }
 }
+

src/utils/pageBubble.ts

@@ -1,104 +1,114 @@
-// 页面气泡效果
-
-const bubble: {
-    width: number
-    height: number
-    bubbleEl: any
-    canvas: any
-    ctx: any
-    circles: any[]
-    animate: boolean
-    requestId: any
-} = {
-    width: 0,
-    height: 0,
-    bubbleEl: null,
-    canvas: null,
-    ctx: {},
-    circles: [],
-    animate: true,
-    requestId: null,
-}
-
-export const init = function (): void {
-    bubble.width = window.innerWidth
-    bubble.height = window.innerHeight
-
-    bubble.bubbleEl = document.getElementById('bubble')
-    bubble.bubbleEl.style.height = bubble.height + 'px'
-
-    bubble.canvas = document.getElementById('bubble-canvas')
-    bubble.canvas.width = bubble.width
-    bubble.canvas.height = bubble.height
-    bubble.ctx = bubble.canvas.getContext('2d')
-
-    // create particles
-    bubble.circles = []
-    for (let x = 0; x < bubble.width * 0.5; x++) {
-        const c = new Circle()
-        bubble.circles.push(c)
-    }
-    animate()
-    addListeners()
-}
-
-function scrollCheck() {
-    bubble.animate = document.body.scrollTop > bubble.height ? false : true
-}
-
-function resize() {
-    bubble.width = window.innerWidth
-    bubble.height = window.innerHeight
-    bubble.bubbleEl.style.height = bubble.height + 'px'
-    bubble.canvas.width = bubble.width
-    bubble.canvas.height = bubble.height
-}
-
-function animate() {
-    if (bubble.animate) {
-        bubble.ctx.clearRect(0, 0, bubble.width, bubble.height)
-        for (const i in bubble.circles) {
-            bubble.circles[i].draw()
-        }
-    }
-    bubble.requestId = requestAnimationFrame(animate)
-}
-
-class Circle {
-    pos: {
-        x: number
-        y: number
-    }
-    alpha: number
-    scale: number
-    velocity: number
-    draw: () => void
-    constructor() {
-        this.pos = {
-            x: Math.random() * bubble.width,
-            y: bubble.height + Math.random() * 100,
-        }
-        this.alpha = 0.1 + Math.random() * 0.3
-        this.scale = 0.1 + Math.random() * 0.3
-        this.velocity = Math.random()
-        this.draw = function () {
-            this.pos.y -= this.velocity
-            this.alpha -= 0.0005
-            bubble.ctx.beginPath()
-            bubble.ctx.arc(this.pos.x, this.pos.y, this.scale * 10, 0, 2 * Math.PI, false)
-            bubble.ctx.fillStyle = 'rgba(255,255,255,' + this.alpha + ')'
-            bubble.ctx.fill()
-        }
-    }
-}
-
-function addListeners() {
-    window.addEventListener('scroll', scrollCheck)
-    window.addEventListener('resize', resize)
-}
-
-export function removeListeners() {
-    window.removeEventListener('scroll', scrollCheck)
-    window.removeEventListener('resize', resize)
-    cancelAnimationFrame(bubble.requestId)
-}
+// 页面气泡效果
+
+const bubble: {
+    width: number
+    height: number
+    bubbleEl: any
+    canvas: any
+    ctx: any
+    circles: any[]
+    animate: boolean
+    requestId: any
+} = {
+    width: 0,
+    height: 0,
+    bubbleEl: null,
+    canvas: null,
+    ctx: {},
+    circles: [],
+    animate: true,
+    requestId: null
+}
+
+export const init = function (): void {
+    bubble.width = window.innerWidth
+    bubble.height = window.innerHeight
+
+    bubble.bubbleEl = document.getElementById('bubble')
+    bubble.bubbleEl.style.height = bubble.height + 'px'
+
+    bubble.canvas = document.getElementById('bubble-canvas')
+    bubble.canvas.width = bubble.width
+    bubble.canvas.height = bubble.height
+    bubble.ctx = bubble.canvas.getContext('2d')
+
+    // create particles
+    bubble.circles = []
+    for (let x = 0; x < bubble.width * 0.5; x++) {
+        const c = new Circle()
+        bubble.circles.push(c)
+    }
+    animate()
+    addListeners()
+}
+
+function scrollCheck() {
+    bubble.animate = document.body.scrollTop > bubble.height ? false : true
+}
+
+function resize() {
+    bubble.width = window.innerWidth
+    bubble.height = window.innerHeight
+    bubble.bubbleEl.style.height = bubble.height + 'px'
+    bubble.canvas.width = bubble.width
+    bubble.canvas.height = bubble.height
+}
+
+function animate() {
+    if (bubble.animate) {
+        bubble.ctx.clearRect(0, 0, bubble.width, bubble.height)
+        for (const i in bubble.circles) {
+            bubble.circles[i].draw()
+        }
+    }
+    bubble.requestId = requestAnimationFrame(animate)
+}
+
+class Circle {
+    pos: {
+        x: number
+        y: number
+    }
+    alpha: number
+    scale: number
+    velocity: number
+    draw: () => void
+    constructor() {
+        this.pos = {
+            x: Math.random() * bubble.width,
+            y: bubble.height + Math.random() * 100
+        }
+        this.alpha = 0.1 + Math.random() * 0.3
+        this.scale = 0.1 + Math.random() * 0.3
+        this.velocity = Math.random()
+        this.draw = function () {
+            this.pos.y -= this.velocity
+            this.alpha -= 0.0005
+            // 当气泡超出顶部或透明度为 0 时，重置位置和属性
+            if (this.pos.y < -10 || this.alpha < 0) {
+                this.pos = {
+                    x: Math.random() * bubble.width,
+                    y: bubble.height + Math.random() * 100
+                }
+                this.alpha = 0.1 + Math.random() * 0.35
+                this.scale = 0.1 + Math.random() * 0.35
+                this.velocity = Math.random()
+            }
+            bubble.ctx.beginPath()
+            bubble.ctx.arc(this.pos.x, this.pos.y, this.scale * 10, 0, 2 * Math.PI, false)
+            bubble.ctx.fillStyle = 'rgba(255,255,255,' + this.alpha + ')'
+            bubble.ctx.fill()
+        }
+    }
+}
+
+function addListeners() {
+    window.addEventListener('scroll', scrollCheck)
+    window.addEventListener('resize', resize)
+}
+
+export function removeListeners() {
+    window.removeEventListener('scroll', scrollCheck)
+    window.removeEventListener('resize', resize)
+    cancelAnimationFrame(bubble.requestId)
+}

src/utils/request.ts

@@ -1,326 +1,327 @@
-import type { AxiosRequestConfig, Method } from 'axios'
-import axios from 'axios'
-import { ElLoading, ElNotification, type LoadingOptions } from 'element-plus'
-import { refreshToken } from '@/api/user-boot/user'
-import router from '@/router/index'
-import { useAdminInfo } from '@/stores/adminInfo'
-import { debounce } from 'lodash-es';
-let loginExpireTimer:any = null
-window.requests = []
-window.tokenRefreshing = false
-const pendingMap = new Map()
-const loadingInstance: LoadingInstance = {
-    target: null,
-    count: 0
-}
-const VITE_FLAG = import.meta.env.VITE_NAME == 'removeMode'
-// console.log('🚀 ~ import.meta.env.VITE_NAME:', import.meta.env.VITE_NAME)
-/**
- * 根据运行环境获取基础请求URL
- */
-export const getUrl = (): string => {
-    return '/api'
-}
-function removeBeforeSecondSlash(str: string) {
-    // 找到第一个斜杠的位置
-    const firstSlashIndex = str.indexOf('/')
-    if (firstSlashIndex === -1) {
-        // 如果没有斜杠，返回原字符串
-        return str
-    }
-    // 从第一个斜杠之后开始找第二个斜杠
-    const secondSlashIndex = str.indexOf('/', firstSlashIndex + 1)
-    if (secondSlashIndex === -1) {
-        // 如果只有一个斜杠，返回原字符串
-        return str
-    }
-    // 返回第二个斜杠及之后的内容
-    return str.substring(secondSlashIndex)
-}
-/**
- * 创建`Axios`
- * 默认开启`reductDataFormat(简洁响应)`,返回类型为`ApiPromise`
- * 关闭`reductDataFormat`,返回类型则为`AxiosPromise`
- */
-function createAxios<Data = any, T = ApiPromise<Data>>(
-    axiosConfig: AxiosRequestConfig,
-    options: Options = {},
-    loading: LoadingOptions = {}
-): T {
-    const adminInfo = useAdminInfo()
-
-    const Axios = axios.create({
-        baseURL: getUrl(),
-        timeout: 1000 * 60 * 5,
-        headers: {},
-        responseType: 'json'
-    })
-
-    options = Object.assign(
-        {
-            CancelDuplicateRequest: true, // 是否开启取消重复请求, 默认为 true
-            loading: false, // 是否开启loading层效果, 默认为false
-            reductDataFormat: true, // 是否开启简洁的数据结构响应, 默认为true
-            showErrorMessage: true, // 是否开启接口错误信息展示,默认为true
-            showCodeMessage: true, // 是否开启code不为1时的信息提示, 默认为true
-            showSuccessMessage: false, // 是否开启code为1时的信息提示, 默认为false
-            anotherToken: '' // 当前请求使用另外的用户token
-        },
-        options
-    )
-
-    // 请求拦截
-    Axios.interceptors.request.use(
-        async (config: any) => {
-            //嵌入去除所有请求头
-            if (VITE_FLAG) {
-                config.url = await removeBeforeSecondSlash(config.url)
-            }
-
-            // 取消重复请求
-
-            if (
-                !(
-                    config.url == '/system-boot/file/upload' ||
-                    config.url == '/harmonic-boot/grid/getAssessOverview' ||
-                    config.url == '/system-boot/file/getFileVO' ||
-                    config.url == '/harmonic-boot/gridDiagram/getGridDiagramAreaData'
-                )
-            )
-                removePending(config)
-
-            options.CancelDuplicateRequest && addPending(config)
-            // 创建loading实例
-            if (options.loading) {
-                loadingInstance.count++
-                if (loadingInstance.count === 1) {
-                    loadingInstance.target = ElLoading.service(loading)
-                }
-            }
-            // 自动携带token
-            if (config.headers) {
-                const token = adminInfo.getToken()
-                if (token) {
-                    ;(config.headers as anyObj).Authorization = token
-                } else {
-                    config.headers.Authorization = 'Basic bmpjbnRlc3Q6bmpjbnBxcw=='
-                }
-            }
-            if (config.url == '/user-boot/user/generateSm2Key' || config.url == '/pqs-auth/oauth/token') {
-                config.headers.Authorization = 'Basic bmpjbnRlc3Q6bmpjbnBxcw=='
-            }
-
-            return config
-        },
-        error => {
-            return Promise.reject(error)
-        }
-    )
-
-    // 响应拦截
-    Axios.interceptors.response.use(
-        response => {
-            removePending(response.config)
-            options.loading && closeLoading(options) // 关闭loading
-
-            if (
-                response.data.code === 'A0000' ||
-                response.data.type === 'application/json' ||
-                Array.isArray(response.data) ||
-                response.data.size ||
-                response.config.url == '/harmonic-boot/exportmodel/exportModelJB' ||
-                response.config.url == '/system-boot/file/download' ||
-                response.config.url == '/harmonic-boot/powerStatistics/exportExcelListTemplate' ||
-                response.config.url == '/harmonic-boot/powerStatistics/exportExcelRangTemplate'
-                // ||
-                // response.data.type === 'application/octet-stream' ||
-                // response.data.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-            ) {
-                return options.reductDataFormat ? response.data : response
-            } else if (response.data.code == 'A0202') {
-                if (!window.tokenRefreshing) {
-                    window.tokenRefreshing = true
-
-                    return refreshToken()
-                        .then(res => {
-                            adminInfo.setToken(res.data.access_token, 'auth')
-                            window.requests.forEach(cb => cb(res.data.access_token))
-                            window.requests = []
-
-                            return Axios(response.config)
-                        })
-                        .catch(err => {
-                            adminInfo.removeToken()
-                            router.push({ name: 'login' })
-                            return Promise.reject(err)
-                        })
-                        .finally(() => {
-                            window.tokenRefreshing = false
-                        })
-                } else {
-                    return new Promise(resolve => {
-                        // 用函数形式将 resolve 存入，等待刷新后再执行
-                        window.requests.push((token: string) => {
-                            response.headers.Authorization = `${token}`
-                            resolve(Axios(response.config))
-                        })
-                    })
-                }
-            } else if (response.data.code == 'A0024' || response.data.code == 'null') {
-                // // 登录失效
-                // 清除上一次的定时器
-                if (loginExpireTimer) {
-                    clearTimeout(loginExpireTimer)
-                }
-                loginExpireTimer = setTimeout(() => {
-                    ElNotification({
-                        type: 'error',
-                        message: response.data.message
-                    })
-                    adminInfo.removeToken()
-                    router.push({ name: 'login' })
-                    loginExpireTimer = null // 执行后清空定时器
-                }, 100) // 可根据实际情况调整延迟时间
-                return Promise.reject(response.data)
-            } else {
-                if (options.showCodeMessage) {
-                    ElNotification({
-                        type: 'error',
-                        message: response.data.message || '未知错误'
-                    })
-                }
-                return Promise.reject(response.data)
-            }
-        },
-        error => {
-            error.config && removePending(error.config)
-            options.loading && closeLoading(options) // 关闭loading
-            return Promise.reject(error) // 错误继续返回给到具体页面
-        }
-    )
-    return Axios(axiosConfig) as T
-}
-
-export default createAxios
-
-/**
- * 关闭Loading层实例
- */
-function closeLoading(options: Options) {
-    if (options.loading && loadingInstance.count > 0) loadingInstance.count--
-    if (loadingInstance.count === 0) {
-        loadingInstance.target.close()
-        loadingInstance.target = null
-    }
-}
-
-/**
- * 储存每个请求的唯一cancel回调, 以此为标识
- */
-function addPending(config: AxiosRequestConfig) {
-    const pendingKey = getPendingKey(config)
-    config.cancelToken =
-        config.cancelToken ||
-        new axios.CancelToken(cancel => {
-            if (!pendingMap.has(pendingKey)) {
-                pendingMap.set(pendingKey, cancel)
-            }
-        })
-}
-
-/**
- * 删除重复的请求
- */
-function removePending(config: AxiosRequestConfig) {
-    const pendingKey = getPendingKey(config)
-    if (pendingMap.has(pendingKey)) {
-        const cancelToken = pendingMap.get(pendingKey)
-        cancelToken(pendingKey)
-        pendingMap.delete(pendingKey)
-    }
-}
-
-/**
- * 生成每个请求的唯一key
- */
-function getPendingKey(config: AxiosRequestConfig) {
-    let { data } = config
-    const { url, method, params, headers } = config
-    if (typeof data === 'string') data = JSON.parse(data) // response里面返回的config.data是个字符串对象
-    return [
-        url,
-        method,
-        headers && (headers as anyObj).Authorization ? (headers as anyObj).Authorization : '',
-        headers && (headers as anyObj)['ba-user-token'] ? (headers as anyObj)['ba-user-token'] : '',
-        JSON.stringify(params),
-        JSON.stringify(data)
-    ].join('&')
-}
-
-/**
- * 根据请求方法组装请求数据/参数
- */
-export function requestPayload(method: Method, data: anyObj, paramsPOST: boolean) {
-    if (method == 'GET') {
-        return {
-            params: data
-        }
-    } else if (method == 'POST') {
-        if (paramsPOST) {
-            return { params: data }
-        } else {
-            return { data: data }
-        }
-    }
-}
-// 适配器, 用于适配不同的请求方式
-export function baseRequest(url, value = {}, method = 'post', options = {}) {
-    url = sysConfig.API_URL + url
-    if (method === 'post') {
-        return service.post(url, value, options)
-    } else if (method === 'get') {
-        return service.get(url, { params: value, ...options })
-    } else if (method === 'formdata') {
-        // form-data表单提交的方式
-        return service.post(url, qs.stringify(value), {
-            headers: {
-                'Content-Type': 'multipart/form-data'
-            },
-            ...options
-        })
-    } else {
-        // 其他请求方式，例如：put、delete
-        return service({
-            method: method,
-            url: url,
-            data: value,
-            ...options
-        })
-    }
-}
-// 模块内的请求, 会自动加上模块的前缀
-export const moduleRequest =
-    moduleUrl =>
-    (url, ...arg) => {
-        return baseRequest(moduleUrl + url, ...arg)
-    }
-
-interface LoadingInstance {
-    target: any
-    count: number
-}
-
-interface Options {
-    // 是否开启取消重复请求, 默认为 true
-    CancelDuplicateRequest?: boolean
-    // 是否开启loading层效果, 默认为false
-    loading?: boolean
-    // 是否开启简洁的数据结构响应, 默认为true
-    reductDataFormat?: boolean
-    // 是否开启code不为A0000时的信息提示, 默认为true
-    showCodeMessage?: boolean
-    // 是否开启code为0时的信息提示, 默认为false
-    showSuccessMessage?: boolean
-    // 当前请求使用另外的用户token
-    anotherToken?: string
-}
+import type { AxiosRequestConfig, Method } from 'axios'
+import axios from 'axios'
+import { ElLoading, ElNotification, type LoadingOptions } from 'element-plus'
+import { refreshToken } from '@/api/user-boot/user'
+import router from '@/router/index'
+import { useAdminInfo } from '@/stores/adminInfo'
+import { debounce } from 'lodash-es'
+let loginExpireTimer: any = null
+window.requests = []
+window.tokenRefreshing = false
+const pendingMap = new Map()
+const loadingInstance: LoadingInstance = {
+    target: null,
+    count: 0
+}
+const VITE_FLAG = import.meta.env.VITE_NAME == 'removeMode'
+// console.log('🚀 ~ import.meta.env.VITE_NAME:', import.meta.env.VITE_NAME)
+/**
+ * 根据运行环境获取基础请求URL
+ */
+export const getUrl = (): string => {
+    return '/api'
+}
+function removeBeforeSecondSlash(str: string) {
+    // 找到第一个斜杠的位置
+    const firstSlashIndex = str.indexOf('/')
+    if (firstSlashIndex === -1) {
+        // 如果没有斜杠，返回原字符串
+        return str
+    }
+    // 从第一个斜杠之后开始找第二个斜杠
+    const secondSlashIndex = str.indexOf('/', firstSlashIndex + 1)
+    if (secondSlashIndex === -1) {
+        // 如果只有一个斜杠，返回原字符串
+        return str
+    }
+    // 返回第二个斜杠及之后的内容
+    return str.substring(secondSlashIndex)
+}
+/**
+ * 创建`Axios`
+ * 默认开启`reductDataFormat(简洁响应)`,返回类型为`ApiPromise`
+ * 关闭`reductDataFormat`,返回类型则为`AxiosPromise`
+ */
+function createAxios<Data = any, T = ApiPromise<Data>>(
+    axiosConfig: AxiosRequestConfig,
+    options: Options = {},
+    loading: LoadingOptions = {}
+): T {
+    const adminInfo = useAdminInfo()
+
+    const Axios = axios.create({
+        baseURL: getUrl(),
+        timeout: 1000 * 60 * 5,
+        headers: {},
+        responseType: 'json'
+    })
+
+    options = Object.assign(
+        {
+            CancelDuplicateRequest: true, // 是否开启取消重复请求, 默认为 true
+            loading: false, // 是否开启loading层效果, 默认为false
+            reductDataFormat: true, // 是否开启简洁的数据结构响应, 默认为true
+            showErrorMessage: true, // 是否开启接口错误信息展示,默认为true
+            showCodeMessage: true, // 是否开启code不为1时的信息提示, 默认为true
+            showSuccessMessage: false, // 是否开启code为1时的信息提示, 默认为false
+            anotherToken: '' // 当前请求使用另外的用户token
+        },
+        options
+    )
+
+    // 请求拦截
+    Axios.interceptors.request.use(
+        async (config: any) => {
+            //嵌入去除所有请求头
+            if (VITE_FLAG) {
+                config.url = await removeBeforeSecondSlash(config.url)
+            }
+
+            // 取消重复请求
+
+            if (
+                !(
+                    config.url == '/system-boot/file/upload' ||
+                    config.url == '/harmonic-boot/grid/getAssessOverview' ||
+                    config.url == '/system-boot/file/getFileVO' ||
+                    config.url == '/harmonic-boot/gridDiagram/getGridDiagramAreaData' ||
+                    config.url == '/supervision-boot/userReport/bindAssessmentId'
+                )
+            )
+                removePending(config)
+
+            options.CancelDuplicateRequest && addPending(config)
+            // 创建loading实例
+            if (options.loading) {
+                loadingInstance.count++
+                if (loadingInstance.count === 1) {
+                    loadingInstance.target = ElLoading.service(loading)
+                }
+            }
+            // 自动携带token
+            if (config.headers) {
+                const token = adminInfo.getToken()
+                if (token) {
+                    ;(config.headers as anyObj).Authorization = token
+                } else {
+                    config.headers.Authorization = 'Basic bmpjbnRlc3Q6bmpjbnBxcw=='
+                }
+            }
+            if (config.url == '/user-boot/user/generateSm2Key' || config.url == '/pqs-auth/oauth/token') {
+                config.headers.Authorization = 'Basic bmpjbnRlc3Q6bmpjbnBxcw=='
+            }
+
+            return config
+        },
+        error => {
+            return Promise.reject(error)
+        }
+    )
+
+    // 响应拦截
+    Axios.interceptors.response.use(
+        response => {
+            removePending(response.config)
+            options.loading && closeLoading(options) // 关闭loading
+
+            if (
+                response.data.code === 'A0000' ||
+                response.data.type === 'application/json' ||
+                Array.isArray(response.data) ||
+                response.data.size ||
+                response.config.url == '/harmonic-boot/exportmodel/exportModelJB' ||
+                response.config.url == '/system-boot/file/download' ||
+                response.config.url == '/harmonic-boot/powerStatistics/exportExcelListTemplate' ||
+                response.config.url == '/harmonic-boot/powerStatistics/exportExcelRangTemplate'
+                // ||
+                // response.data.type === 'application/octet-stream' ||
+                // response.data.type === 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+            ) {
+                return options.reductDataFormat ? response.data : response
+            } else if (response.data.code == 'A0202') {
+                if (!window.tokenRefreshing) {
+                    window.tokenRefreshing = true
+
+                    return refreshToken()
+                        .then(res => {
+                            adminInfo.setToken(res.data.access_token, 'auth')
+                            window.requests.forEach(cb => cb(res.data.access_token))
+                            window.requests = []
+
+                            return Axios(response.config)
+                        })
+                        .catch(err => {
+                            adminInfo.removeToken()
+                            router.push({ name: 'login' })
+                            return Promise.reject(err)
+                        })
+                        .finally(() => {
+                            window.tokenRefreshing = false
+                        })
+                } else {
+                    return new Promise(resolve => {
+                        // 用函数形式将 resolve 存入，等待刷新后再执行
+                        window.requests.push((token: string) => {
+                            response.headers.Authorization = `${token}`
+                            resolve(Axios(response.config))
+                        })
+                    })
+                }
+            } else if (response.data.code == 'A0024' || response.data.code == 'null') {
+                // // 登录失效
+                // 清除上一次的定时器
+                if (loginExpireTimer) {
+                    clearTimeout(loginExpireTimer)
+                }
+                loginExpireTimer = setTimeout(() => {
+                    ElNotification({
+                        type: 'error',
+                        message: response.data.message
+                    })
+                    adminInfo.removeToken()
+                    router.push({ name: 'login' })
+                    loginExpireTimer = null // 执行后清空定时器
+                }, 100) // 可根据实际情况调整延迟时间
+                return Promise.reject(response.data)
+            } else {
+                if (options.showCodeMessage) {
+                    ElNotification({
+                        type: 'error',
+                        message: response.data.message || '未知错误'
+                    })
+                }
+                return Promise.reject(response.data)
+            }
+        },
+        error => {
+            error.config && removePending(error.config)
+            options.loading && closeLoading(options) // 关闭loading
+            return Promise.reject(error) // 错误继续返回给到具体页面
+        }
+    )
+    return Axios(axiosConfig) as T
+}
+
+export default createAxios
+
+/**
+ * 关闭Loading层实例
+ */
+function closeLoading(options: Options) {
+    if (options.loading && loadingInstance.count > 0) loadingInstance.count--
+    if (loadingInstance.count === 0) {
+        loadingInstance.target.close()
+        loadingInstance.target = null
+    }
+}
+
+/**
+ * 储存每个请求的唯一cancel回调, 以此为标识
+ */
+function addPending(config: AxiosRequestConfig) {
+    const pendingKey = getPendingKey(config)
+    config.cancelToken =
+        config.cancelToken ||
+        new axios.CancelToken(cancel => {
+            if (!pendingMap.has(pendingKey)) {
+                pendingMap.set(pendingKey, cancel)
+            }
+        })
+}
+
+/**
+ * 删除重复的请求
+ */
+function removePending(config: AxiosRequestConfig) {
+    const pendingKey = getPendingKey(config)
+    if (pendingMap.has(pendingKey)) {
+        const cancelToken = pendingMap.get(pendingKey)
+        cancelToken(pendingKey)
+        pendingMap.delete(pendingKey)
+    }
+}
+
+/**
+ * 生成每个请求的唯一key
+ */
+function getPendingKey(config: AxiosRequestConfig) {
+    let { data } = config
+    const { url, method, params, headers } = config
+    if (typeof data === 'string') data = JSON.parse(data) // response里面返回的config.data是个字符串对象
+    return [
+        url,
+        method,
+        headers && (headers as anyObj).Authorization ? (headers as anyObj).Authorization : '',
+        headers && (headers as anyObj)['ba-user-token'] ? (headers as anyObj)['ba-user-token'] : '',
+        JSON.stringify(params),
+        JSON.stringify(data)
+    ].join('&')
+}
+
+/**
+ * 根据请求方法组装请求数据/参数
+ */
+export function requestPayload(method: Method, data: anyObj, paramsPOST: boolean) {
+    if (method == 'GET') {
+        return {
+            params: data
+        }
+    } else if (method == 'POST') {
+        if (paramsPOST) {
+            return { params: data }
+        } else {
+            return { data: data }
+        }
+    }
+}
+// 适配器, 用于适配不同的请求方式
+export function baseRequest(url, value = {}, method = 'post', options = {}) {
+    url = sysConfig.API_URL + url
+    if (method === 'post') {
+        return service.post(url, value, options)
+    } else if (method === 'get') {
+        return service.get(url, { params: value, ...options })
+    } else if (method === 'formdata') {
+        // form-data表单提交的方式
+        return service.post(url, qs.stringify(value), {
+            headers: {
+                'Content-Type': 'multipart/form-data'
+            },
+            ...options
+        })
+    } else {
+        // 其他请求方式，例如：put、delete
+        return service({
+            method: method,
+            url: url,
+            data: value,
+            ...options
+        })
+    }
+}
+// 模块内的请求, 会自动加上模块的前缀
+export const moduleRequest =
+    moduleUrl =>
+    (url, ...arg) => {
+        return baseRequest(moduleUrl + url, ...arg)
+    }
+
+interface LoadingInstance {
+    target: any
+    count: number
+}
+
+interface Options {
+    // 是否开启取消重复请求, 默认为 true
+    CancelDuplicateRequest?: boolean
+    // 是否开启loading层效果, 默认为false
+    loading?: boolean
+    // 是否开启简洁的数据结构响应, 默认为true
+    reductDataFormat?: boolean
+    // 是否开启code不为A0000时的信息提示, 默认为true
+    showCodeMessage?: boolean
+    // 是否开启code为0时的信息提示, 默认为false
+    showSuccessMessage?: boolean
+    // 当前请求使用另外的用户token
+    anotherToken?: string
+}

src/utils/router.ts

@@ -1,295 +1,331 @@
-import router from '@/router/index'
-import { isNavigationFailure, NavigationFailureType } from 'vue-router'
-import type { RouteRecordRaw, RouteLocationRaw } from 'vue-router'
-import { ElNotification } from 'element-plus'
-import { useConfig } from '@/stores/config'
-import { useNavTabs } from '@/stores/navTabs'
-import { closeShade } from '@/utils/pageShade'
-import { adminBaseRoute } from '@/router/static'
-import { compact, isEmpty, reverse } from 'lodash-es'
-import { isAdminApp } from '@/utils/common'
-
-/**
- * 导航失败有错误消息的路由push
- * @param to — 导航位置，同 router.push
- */
-export const routePush = async (to: RouteLocationRaw) => {
-    try {
-        const failure = await router.push(to)
-        if (isNavigationFailure(failure, NavigationFailureType.aborted)) {
-            ElNotification({
-                message: 'utils.Navigation failed, navigation guard intercepted!',
-                type: 'error'
-            })
-        } else if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
-            // ElNotification({
-            //     message: '已在目标页',
-            //     type: 'warning'
-            // })
-        }
-    } catch (error) {
-        ElNotification({
-            message: '导航失败，路由无效',
-            type: 'error'
-        })
-        console.error(error)
-    }
-}
-
-/**
- * 获取第一个菜单
- */
-export const getFirstRoute = (routes: RouteRecordRaw[], menuType = 'tab'): false | RouteRecordRaw => {
-    const routerPaths: string[] = []
-    const routers = router.getRoutes()
-    routers.forEach(item => {
-        if (item.path) routerPaths.push(item.path)
-    })
-    let find: boolean | RouteRecordRaw = false
-    for (const key in routes) {
-        if (
-            routes[key].meta?.type == 'menu' &&
-            routes[key].meta?.menu_type == menuType &&
-            routerPaths.indexOf(routes[key].path) !== -1
-        ) {
-            return routes[key]
-        } else if (routes[key].children && routes[key].children?.length) {
-            find = getFirstRoute(routes[key].children!)
-            if (find) return find
-        }
-    }
-    return find
-}
-
-/**
- * 打开侧边菜单
- * @param menu 菜单数据
- */
-export const onClickMenu = (menu: RouteRecordRaw) => {
-    switch (menu.meta?.menu_type) {
-        case 'iframe':
-        case 'tab':
-            routePush({ path: menu.path })
-            break
-        case 'link':
-            window.open(menu.path, '_blank')
-            break
-
-        default:
-            ElNotification({
-                message: 'utils.Navigation failed, the menu type is unrecognized!',
-                type: 'error'
-            })
-            break
-    }
-
-    const config = useConfig()
-    if (config.layout.shrink) {
-        closeShade(() => {
-            config.setLayout('menuCollapse', true)
-        })
-    }
-}
-
-/**
- * 处理后台的路由
- */
-export const handleAdminRoute = (routes: any) => {
-    const viewsComponent = import.meta.glob('/src/views/**/*.vue')
-    addRouteAll(viewsComponent, routes, adminBaseRoute.name as string)
-    const menuAdminBaseRoute = (adminBaseRoute.path as string) + '/'
-    // 更新stores中的路由菜单数据
-    const navTabs = useNavTabs()
-    navTabs.setTabsViewRoutes(handleMenuRule(routes, menuAdminBaseRoute))
-    navTabs.fillAuthNode(handleAuthNode(routes, menuAdminBaseRoute))
-}
-
-/**
- * 获取菜单的paths
- */
-export const getMenuPaths = (menus: RouteRecordRaw[]): string[] => {
-    let menuPaths: string[] = []
-    menus.forEach(item => {
-        menuPaths.push(item.path)
-        if (item.children && item.children.length > 0) {
-            menuPaths = menuPaths.concat(getMenuPaths(item.children))
-        }
-    })
-    return menuPaths
-}
-
-/**
- * 后台的菜单处理
- */
-const handleMenuRule = (routes: any, pathPrefix = '/', type = ['menu', 'menu_dir']) => {
-    const menuRule: RouteRecordRaw[] = []
-    for (const key in routes) {
-        if (routes[key].extend == 'add_rules_only') {
-            continue
-        }
-        if (!type.includes(routes[key].type)) {
-            continue
-        }
-        if (routes[key].type == 'menu_dir' && routes[key].children && !routes[key].children.length) {
-            continue
-        }
-        if (
-            ['route', 'menu', 'nav_user_menu', 'nav'].includes(routes[key].type) &&
-            ((routes[key].menu_type == 'tab' && !routes[key].component) ||
-                (['link', 'iframe'].includes(routes[key].menu_type) && !routes[key].url))
-        ) {
-            continue
-        }
-        const currentPath = ['link', 'iframe'].includes(routes[key].menu_type)
-            ? routes[key].url
-            : pathPrefix + routes[key].path
-        let children: RouteRecordRaw[] = []
-        if (routes[key].children && routes[key].children.length > 0) {
-            children = handleMenuRule(routes[key].children, pathPrefix, type)
-        }
-        menuRule.push({
-            path: currentPath,
-            name: routes[key].name,
-            component: routes[key].component,
-            meta: {
-                id: routes[key].id,
-                title: routes[key].title,
-                icon: routes[key].icon,
-                keepalive: routes[key].keepalive,
-                menu_type: routes[key].menu_type,
-                type: routes[key].type
-            },
-            children: children
-        })
-    }
-    return menuRule
-}
-
-/**
- * 处理权限节点
- * @param routes 路由数据
- * @param prefix 节点前缀
- * @returns 组装好的权限节点
- */
-const handleAuthNode = (routes: any, prefix = '/') => {
-    const authNode: Map<string, string[]> = new Map([])
-    assembleAuthNode(routes, authNode, prefix, prefix)
-    return authNode
-}
-const assembleAuthNode = (routes: any, authNode: Map<string, string[]>, prefix = '/', parent = '/') => {
-    const authNodeTemp = []
-    for (const key in routes) {
-        if (routes[key].type == 'button') authNodeTemp.push(prefix + routes[key].name)
-        if (routes[key].children && routes[key].children.length > 0) {
-            assembleAuthNode(routes[key].children, authNode, prefix, prefix + routes[key].name)
-        }
-    }
-    if (authNodeTemp && authNodeTemp.length > 0) {
-        authNode.set(parent, authNodeTemp)
-    }
-}
-
-/**
- * 动态添加路由-带子路由
- * @param viewsComponent
- * @param routes
- * @param parentName
- * @param analyticRelation 根据 name 从已注册路由分析父级路由
- */
-export const addRouteAll = (
-    viewsComponent: Record<string, any>,
-    routes: any,
-    parentName: string,
-    analyticRelation = false
-) => {
-    for (const idx in routes) {
-        if (routes[idx].extend == 'add_menu_only') {
-            continue
-        }
-        if (
-            (routes[idx].menu_type == 'tab' && viewsComponent[routes[idx].component]) ||
-            routes[idx].menu_type == 'iframe'
-        ) {
-            addRouteItem(viewsComponent, routes[idx], parentName, analyticRelation)
-        }
-
-        if (routes[idx].children && routes[idx].children.length > 0) {
-            addRouteAll(viewsComponent, routes[idx].children, parentName, analyticRelation)
-        }
-    }
-}
-
-/**
- * 动态添加路由
- * @param viewsComponent
- * @param route
- * @param parentName
- * @param analyticRelation 根据 name 从已注册路由分析父级路由
- */
-export const addRouteItem = (
-    viewsComponent: Record<string, any>,
-    route: any,
-    parentName: string,
-    analyticRelation: boolean
-) => {
-    let path = '',
-        component
-    if (route.menu_type == 'iframe') {
-        path = (isAdminApp() ? adminBaseRoute.path : '') + '/iframe/' + encodeURIComponent(route.url)
-        component = () => import('@/layouts/common/router-view/iframe.vue')
-    } else {
-        path = parentName ? route.path : '/' + route.path
-        component = viewsComponent[route.component]
-    }
-
-    if (route.menu_type == 'tab' && analyticRelation) {
-        const parentNames = getParentNames(route.name)
-        if (parentNames.length) {
-            for (const key in parentNames) {
-                if (router.hasRoute(parentNames[key])) {
-                    parentName = parentNames[key]
-                    break
-                }
-            }
-        }
-    }
-
-    const routeBaseInfo: RouteRecordRaw = {
-        path: path,
-        name: route.name,
-        component: component,
-        meta: {
-            ...route,
-            title: route.title,
-            extend: route.extend,
-            icon: route.icon,
-            keepalive: route.keepalive,
-            menu_type: route.menu_type,
-            type: route.type,
-            url: route.url,
-            addtab: true
-        }
-    }
-    if (parentName) {
-        router.addRoute(parentName, routeBaseInfo)
-    } else {
-        router.addRoute(routeBaseInfo)
-    }
-}
-
-/**
- * 根据name字符串，获取父级name组合的数组
- * @param name
- */
-const getParentNames = (name: string) => {
-    const names = compact(name.split('/'))
-    const tempNames = []
-    const parentNames = []
-    for (const key in names) {
-        tempNames.push(names[key])
-        if (parseInt(key) != names.length - 1) {
-            parentNames.push(tempNames.join('/'))
-        }
-    }
-    return reverse(parentNames)
-}
+import router from '@/router/index'
+import { isNavigationFailure, NavigationFailureType } from 'vue-router'
+import type { RouteRecordRaw, RouteLocationRaw } from 'vue-router'
+import { ElNotification } from 'element-plus'
+import { useConfig } from '@/stores/config'
+import { useNavTabs } from '@/stores/navTabs'
+import { closeShade } from '@/utils/pageShade'
+import { adminBaseRoute } from '@/router/static'
+import { compact, isEmpty, reverse } from 'lodash-es'
+import { getRouteMenu, dictDataCache } from '@/api/auth'
+import { isAdminApp } from '@/utils/common'
+import { adminBaseRoutePath } from '@/router/static'
+const route:any = useRouter()
+/**
+ * 导航失败有错误消息的路由push
+ * @param to — 导航位置，同 router.push
+ */
+export const routePush = async (to: RouteLocationRaw) => {
+    try {
+        const failure = await router.push(to)
+        if (isNavigationFailure(failure, NavigationFailureType.aborted)) {
+            ElNotification({
+                message: 'utils.Navigation failed, navigation guard intercepted!',
+                type: 'error'
+            })
+        } else if (isNavigationFailure(failure, NavigationFailureType.duplicated)) {
+            // ElNotification({
+            //     message: '已在目标页',
+            //     type: 'warning'
+            // })
+        }
+    } catch (error) {
+        ElNotification({
+            message: '导航失败，路由无效',
+            type: 'error'
+        })
+        console.error(error)
+    }
+}
+
+/**
+ * 获取第一个菜单
+ */
+export const getFirstRoute = (routes: RouteRecordRaw[], menuType = 'tab'): false | RouteRecordRaw => {
+    const routerPaths: string[] = []
+    const routers = router.getRoutes()
+    routers.forEach(item => {
+        if (item.path) routerPaths.push(item.path)
+    })
+    let find: boolean | RouteRecordRaw = false
+    for (const key in routes) {
+        if (
+            routes[key].meta?.type == 'menu' &&
+            routes[key].meta?.menu_type == menuType &&
+            routerPaths.indexOf(routes[key].path) !== -1
+        ) {
+            return routes[key]
+        } else if (routes[key].children && routes[key].children?.length) {
+            find = getFirstRoute(routes[key].children!)
+            if (find) return find
+        }
+    }
+    return find
+}
+
+/**
+ * 打开侧边菜单
+ * @param menu 菜单数据
+ */
+export const onClickMenu = (menu: RouteRecordRaw) => {
+    switch (menu.meta?.menu_type) {
+        case 'iframe':
+        case 'tab':
+            routePush({ path: menu.path })
+            break
+        case 'link':
+            window.open(menu.path, '_blank')
+            break
+
+        default:
+            ElNotification({
+                message: 'utils.Navigation failed, the menu type is unrecognized!',
+                type: 'error'
+            })
+            break
+    }
+
+    const config = useConfig()
+    if (config.layout.shrink) {
+        closeShade(() => {
+            config.setLayout('menuCollapse', true)
+        })
+    }
+}
+
+/**
+ * 处理后台的路由
+ */
+export const handleAdminRoute = (routes: any) => {
+    const viewsComponent = import.meta.glob('/src/views/**/*.vue')
+    addRouteAll(viewsComponent, routes, adminBaseRoute.name as string)
+    const menuAdminBaseRoute = (adminBaseRoute.path as string) + '/'
+    // 更新stores中的路由菜单数据
+    const navTabs = useNavTabs()
+    navTabs.setTabsViewRoutes(handleMenuRule(routes, menuAdminBaseRoute))
+    navTabs.fillAuthNode(handleAuthNode(routes, menuAdminBaseRoute))
+}
+
+/**
+ * 获取菜单的paths
+ */
+export const getMenuPaths = (menus: RouteRecordRaw[]): string[] => {
+    let menuPaths: string[] = []
+    menus.forEach(item => {
+        menuPaths.push(item.path)
+        if (item.children && item.children.length > 0) {
+            menuPaths = menuPaths.concat(getMenuPaths(item.children))
+        }
+    })
+    return menuPaths
+}
+
+/**
+ * 后台的菜单处理
+ */
+const handleMenuRule = (routes: any, pathPrefix = '/', type = ['menu', 'menu_dir']) => {
+    const menuRule: RouteRecordRaw[] = []
+    for (const key in routes) {
+        if (routes[key].extend == 'add_rules_only') {
+            continue
+        }
+        if (!type.includes(routes[key].type)) {
+            continue
+        }
+        if (routes[key].type == 'menu_dir' && routes[key].children && !routes[key].children.length) {
+            continue
+        }
+        if (
+            ['route', 'menu', 'nav_user_menu', 'nav'].includes(routes[key].type) &&
+            ((routes[key].menu_type == 'tab' && !routes[key].component) ||
+                (['link', 'iframe'].includes(routes[key].menu_type) && !routes[key].url))
+        ) {
+            continue
+        }
+        const currentPath = ['link', 'iframe'].includes(routes[key].menu_type)
+            ? routes[key].url
+            : pathPrefix + routes[key].path
+        let children: RouteRecordRaw[] = []
+        if (routes[key].children && routes[key].children.length > 0) {
+            children = handleMenuRule(routes[key].children, pathPrefix, type)
+        }
+        menuRule.push({
+            path: currentPath,
+            name: routes[key].name,
+            component: routes[key].component,
+            meta: {
+                id: routes[key].id,
+                title: routes[key].title,
+                icon: routes[key].icon,
+                keepalive: routes[key].keepalive,
+                menu_type: routes[key].menu_type,
+                type: routes[key].type
+            },
+            children: children
+        })
+    }
+    return menuRule
+}
+
+/**
+ * 处理权限节点
+ * @param routes 路由数据
+ * @param prefix 节点前缀
+ * @returns 组装好的权限节点
+ */
+const handleAuthNode = (routes: any, prefix = '/') => {
+    const authNode: Map<string, string[]> = new Map([])
+    assembleAuthNode(routes, authNode, prefix, prefix)
+    return authNode
+}
+const assembleAuthNode = (routes: any, authNode: Map<string, string[]>, prefix = '/', parent = '/') => {
+    const authNodeTemp = []
+    for (const key in routes) {
+        if (routes[key].type == 'button') authNodeTemp.push(prefix + routes[key].name)
+        if (routes[key].children && routes[key].children.length > 0) {
+            assembleAuthNode(routes[key].children, authNode, prefix, prefix + routes[key].name)
+        }
+    }
+    if (authNodeTemp && authNodeTemp.length > 0) {
+        authNode.set(parent, authNodeTemp)
+    }
+}
+
+/**
+ * 动态添加路由-带子路由
+ * @param viewsComponent
+ * @param routes
+ * @param parentName
+ * @param analyticRelation 根据 name 从已注册路由分析父级路由
+ */
+export const addRouteAll = (
+    viewsComponent: Record<string, any>,
+    routes: any,
+    parentName: string,
+    analyticRelation = false
+) => {
+    for (const idx in routes) {
+        if (routes[idx].extend == 'add_menu_only') {
+            continue
+        }
+        if (
+            (routes[idx].menu_type == 'tab' && viewsComponent[routes[idx].component]) ||
+            routes[idx].menu_type == 'iframe'
+        ) {
+            addRouteItem(viewsComponent, routes[idx], parentName, analyticRelation)
+        }
+
+        if (routes[idx].children && routes[idx].children.length > 0) {
+            addRouteAll(viewsComponent, routes[idx].children, parentName, analyticRelation)
+        }
+    }
+}
+
+/**
+ * 动态添加路由
+ * @param viewsComponent
+ * @param route
+ * @param parentName
+ * @param analyticRelation 根据 name 从已注册路由分析父级路由
+ */
+export const addRouteItem = (
+    viewsComponent: Record<string, any>,
+    route: any,
+    parentName: string,
+    analyticRelation: boolean
+) => {
+    let path = '',
+        component
+    if (route.menu_type == 'iframe') {
+        path = (isAdminApp() ? adminBaseRoute.path : '') + '/iframe/' + encodeURIComponent(route.url)
+        component = () => import('@/layouts/common/router-view/iframe.vue')
+    } else {
+        path = parentName ? route.path : '/' + route.path
+        component = viewsComponent[route.component]
+    }
+
+    if (route.menu_type == 'tab' && analyticRelation) {
+        const parentNames = getParentNames(route.name)
+        if (parentNames.length) {
+            for (const key in parentNames) {
+                if (router.hasRoute(parentNames[key])) {
+                    parentName = parentNames[key]
+                    break
+                }
+            }
+        }
+    }
+
+    const routeBaseInfo: RouteRecordRaw = {
+        path: path,
+        name: route.name,
+        component: component,
+        meta: {
+            ...route,
+            title: route.title,
+            extend: route.extend,
+            icon: route.icon,
+            keepalive: route.keepalive,
+            menu_type: route.menu_type,
+            type: route.type,
+            url: route.url,
+            addtab: true
+        }
+    }
+    if (parentName) {
+        router.addRoute(parentName, routeBaseInfo)
+    } else {
+        router.addRoute(routeBaseInfo)
+    }
+}
+
+/**
+ * 根据name字符串，获取父级name组合的数组
+ * @param name
+ */
+const getParentNames = (name: string) => {
+    const names = compact(name.split('/'))
+    const tempNames = []
+    const parentNames = []
+    for (const key in names) {
+        tempNames.push(names[key])
+        if (parseInt(key) != names.length - 1) {
+            parentNames.push(tempNames.join('/'))
+        }
+    }
+    return reverse(parentNames)
+}
+// 刷新菜单
+export const getMenu = () => {
+    getRouteMenu().then((res: any) => {
+        const handlerMenu = (data: any) => {
+            data.forEach((item: any) => {
+                item.routePath =
+                    item.routePath[0] == '/' ? item.routePath.substring(1, item.routePath.length) : item.routePath
+                item.path = item.routePath
+                item.name = item.routePath
+                item.keepalive = item.routePath
+                item.component = item.routeName
+                    ? item.routeName.indexOf('/src/views/') > -1
+                        ? item.routeName
+                        : `/src/views/${item.routeName}/index.vue`
+                    : ''
+                item.type = item.children && item.children.length > 0 ? 'menu_dir' : 'menu'
+                item.menu_type = item.children && item.children.length > 0 ? null : 'tab'
+                if (item.children) {
+                    handlerMenu(item.children)
+                }
+            })
+        }
+        handlerMenu(res.data)
+        handleAdminRoute(res.data)
+        if (route?.params.to) {
+            const lastRoute = JSON.parse(route.params.to as string)
+            if (lastRoute.path != adminBaseRoutePath) {
+                let query = !isEmpty(lastRoute.query) ? lastRoute.query : {}
+                routePush({ path: lastRoute.path, query: query })
+                return
+            }
+        }
+    })
+}

src/utils/tableStore.ts

@@ -19,7 +19,7 @@ interface TableStoreParams {
     publicHeight?: number //计算高度
     resetCallback?: () => void // 重置
     loadCallback?: () => void // 接口调用后的回调
-    exportProcessingData?:() => void //导出处理数据
+    exportProcessingData?: () => void //导出处理数据
     beforeSearchFun?: () => void // 接口调用前的回调
 }
 
@@ -45,8 +45,9 @@ export default class TableStore {
             pageNum: 1,
             pageSize: 20
         },
-        filename:null,
+        filename: null,
         loading: true,
+        exportLoading: false,
         column: [],
         loadCallback: null,
         exportProcessingData: null,
@@ -65,7 +66,7 @@ export default class TableStore {
         this.table.filename = options.filename || null
         this.table.column = options.column
         this.showPage = options.showPage !== false
-       
+
         this.table.publicHeight = options.publicHeight || 0
         this.table.resetCallback = options.resetCallback || null
         this.table.loadCallback = options.loadCallback || null
@@ -84,13 +85,11 @@ export default class TableStore {
             this.initData = JSON.parse(JSON.stringify(this.table.params))
         }
         if (!this.timeAll) {
-            delete this.table.params.startTime;
-            delete this.table.params.endTime;
-            delete this.table.params.searchBeginTime;
-            delete this.table.params.searchEndTime;
-            delete this.table.params.timeFlag;
-
-      
+            delete this.table.params.startTime
+            delete this.table.params.endTime
+            delete this.table.params.searchBeginTime
+            delete this.table.params.searchEndTime
+            delete this.table.params.timeFlag
         }
         createAxios(
             Object.assign(
@@ -134,6 +133,7 @@ export default class TableStore {
             [
                 'search',
                 () => {
+                  
                     this.table.params.pageNum = 1
                     this.index()
                 }
@@ -201,7 +201,9 @@ export default class TableStore {
             [
                 'export',
                 () => {
+                     this.table.exportLoading = true
                     // this.index()
+                    //console.log('export')
                     let params = { ...this.table.params, pageNum: 1, pageSize: this.table.total }
                     createAxios(
                         Object.assign(
@@ -211,11 +213,17 @@ export default class TableStore {
                             },
                             requestPayload(this.method, params, this.paramsPOST)
                         )
-                    ).then(res => {
-                        this.table.allData = filtration(res.data.records || res.data)
-                        this.table.exportProcessingData && this.table.exportProcessingData()
-                        this.table.allFlag = data.showAllFlag || true
-                    })
+                    )
+                        .then(res => {
+                            this.table.allData = filtration(res.data.records || res.data)
+                            this.table.exportProcessingData && this.table.exportProcessingData()
+                            this.table.allFlag = data.showAllFlag || true
+                            this.table.exportLoading = false
+                            
+                        })
+                        .catch(() => {
+                            this.table.exportLoading = false
+                        })
                 }
             ]
         ])

src/views/cockpit/TerminalLog.vue

@@ -23,7 +23,7 @@ const prop = defineProps({
 const dictData = useDictData()
 const fontdveoption = dictData.getBasicData('Dev_Ops')
 
-const tableStore = new TableStore({
+const tableStore:any = new TableStore({
     url: '/device-boot/pqsTerminalLogs/getList',
     method: 'POST',
     column: [

src/views/pqs/auditManage/auditList/index.vue

@@ -146,7 +146,7 @@ const tableStore: any = new TableStore({
         { field: 'describe', title: '事件描述' },
         { field: 'type', title: '事件类型', sortable: true },
         { field: 'result', title: '操作结果', sortable: true },
-        { field: 'ip', title: '操作IP' },
+        { field: 'ip', title: '操作IP' ,width:'120px'},
         { field: 'level', title: '事件等级', sortable: true }
     ],
     loadCallback: () => {

src/views/pqs/auditManage/userInfo/index.vue

@@ -26,7 +26,7 @@ const tableStore: any = new TableStore({
     method: 'POST',
     column: [
         { field: 'userName', title: '登录用户' },
-        { field: 'ip', title: '登录ip' },
+        { field: 'ip', title: '登录ip' ,width:'120px'},
         { field: 'time', title: '登录时间' }
     ]
 })

src/views/pqs/bearingCapacity/evaluationList/components/charge.vue

@@ -450,7 +450,7 @@ const selChange = async (e: any) => {
 }
 // 导出
 const onExport = () => {
-    console.log("🚀 ~ onExport ~ document.getElementById('exportId'):", document.getElementById('exportId'))
+   // console.log("🚀 ~ onExport ~ document.getElementById('exportId'):", document.getElementById('exportId'))
 
     // 转换成canvas
     html2canvas(document.getElementById('exportId'), {
@@ -459,7 +459,7 @@ const onExport = () => {
         logging: false, // 关闭日志
         scale: 2 // 提高缩放比例以获得更清晰的截图
     }).then(function (canvas) {
-        console.log('🚀 ~ onExport ~ canvas:', canvas)
+       // console.log('🚀 ~ onExport ~ canvas:', canvas)
         // 创建a标签，实现下载
         let creatIMg = document.createElement('a')
         creatIMg.download = '光伏电站承载能力评估结果.png' // 设置下载的文件名，

src/views/pqs/bearingCapacity/evaluationList/components/photovoltaic.vue

@@ -14,7 +14,7 @@
             <pane style="background: #fff">
                 <TableHeader :showSearch="false" v-show="props.rowList.id == undefined">
                     <template #select>
-                        <el-form-item label="时间">
+                        <el-form-item label="统计时间">
                             <DatePicker ref="datePickerRef"></DatePicker>
                         </el-form-item>
                     </template>
@@ -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(0)
+const size = ref(19)
 const dictData = useDictData()
 const datePickerRef = ref()
 const height = mainHeight(80).height

src/views/pqs/bearingCapacity/evaluationList/components/policy.vue

@@ -176,7 +176,7 @@ const info = () => {
                 })
             })
         })
-        console.log('🚀 ~ queyDetail ~ photovoltaicData.value:', photovoltaicData.value)
+       // console.log('🚀 ~ queyDetail ~ photovoltaicData.value:', photovoltaicData.value)
     })
     // 电弧炉
     queyDetailDhl().then(res => {