Merge branch 'dev' of http://120.46.213.136:9528/isoftstone/lc_frontend into dev

src/components/LowDesign/src/utils/defaultUseUtil.ts

@@ -19,7 +19,7 @@ export default {
    * @param options 请求配置 如：{ params:{ text:'测试' } }
   */
   requestApi: (Method, url, options) => callApiFun(Method, url, options),
-  exportExcelCustom: (tableId, data) => exportExcelDataCustom(tableId, data),
+  exportExcelCustom: (explain,tableId, data) => exportExcelDataCustom(explain,tableId, data),
   cloneDeep, //深拷贝
   listToTree,//列表转树结构
   formatDate,//时间格式化

src/views/Home/Index10.vue

@@ -26,7 +26,7 @@
       <div class="card-row">
         <!-- 外协管理卡片 -->
         <div class="dashboard-card">
-          <div class="card-header">
+          <div class="card-header" @click="navigateToModule('/person/table/view/1959187451673116674')">
             <div class="card-title">
               <span class="card-icon">👥</span>
               外协管理
@@ -70,7 +70,7 @@
 
         <!-- 风险管理卡片 -->
         <div class="dashboard-card">
-          <div class="card-header">
+          <div class="card-header" @click="navigateToModule('/fx/table/view/1978723750599790594')">
             <div class="card-title">
               <span class="card-icon">🛡️</span>
               风险管理
@@ -130,7 +130,7 @@
 
         <!-- 隐患管理卡片 -->
         <div class="dashboard-card">
-          <div class="card-header">
+          <div class="card-header" @click="navigateToModule('/fx/table/view/1963446160885366786')">
             <div class="card-title">
               <span class="card-icon warning">⚠️</span>
               隐患管理
@@ -188,7 +188,7 @@
       <div class="card-row">
         <!-- 高危作业卡片 -->
         <div class="dashboard-card">
-          <div class="card-header">
+          <div class="card-header" @click="navigateToModule('/low/table/view/1964253329070571521')">
             <div class="card-title">
               <span class="card-icon">🚧</span>
               高危作业
@@ -225,7 +225,7 @@
 
         <!-- 应急预案卡片 -->
         <div class="dashboard-card">
-          <div class="card-header">
+          <div class="card-header" @click="navigateToModule('/yayl/table/view/1966394259751907330')">
             <div class="card-title">
               <span class="card-icon">📄</span>
               应急预案
@@ -265,7 +265,7 @@
 
         <!-- 安全培训卡片 -->
         <div class="dashboard-card">
-          <div class="card-header">
+          <div class="card-header" @click="navigateToModule('/pxks/table/view/1968225010550091777')">
             <div class="card-title">
               <span class="card-icon">📚</span>
               安全培训
@@ -998,6 +998,10 @@ const safetyTrainingChartOption = computed<EChartsOption>(() => {
 })
 
 // 方法定义
+const navigateToModule = (path: string): void => {
+  router.push(path)
+}
+
 const openRegionSelector = (): void => {
   regionSelectorVisible.value = true
 }
@@ -1600,7 +1604,7 @@ onMounted(async () => {
     .back-button {
       display: inline-flex;
       align-items: center;
-      padding: 8px 16px;
+      padding: 8px 30px;
       background: #409eff;
       border: 1px solid #e5e7eb;
       border-radius: 6px;
@@ -1747,6 +1751,19 @@ onMounted(async () => {
     margin-bottom: 16px;
     padding-bottom: 12px;
     border-bottom: 1px solid #e5e7eb;
+    cursor: pointer;
+    transition: all 0.3s;
+
+    &:hover {
+      background-color: #f9fafb;
+      border-radius: 4px;
+      padding-left: 8px;
+      padding-right: 8px;
+      margin-left: -8px;
+      margin-right: -8px;
+      padding-top: 4px;
+      margin-top: -4px;
+    }
 
     .card-title {
       display: flex;

src/views/screen/mainScreen.vue

@@ -308,8 +308,13 @@ onMounted(async () => {
     // 将parkMap转换为数组
     query.campus_id = Array.from(parkMap.values()).map(e1 => e1.code).join();
   }
-
+  // 将初始化的逻辑放在这里
-  // 初始化数据
+  dashboardData.value.hiddenDangerData.general = 0
+  dashboardData.value.hiddenDangerData.major = 0
+  dashboardData.value.hiddenDangerData.progress.overdue = 0
+  dashboardData.value.hiddenDangerData.progress.processed = 0
+  dashboardData.value.hiddenDangerData.progress.processing = 0
+  // 初始化数据，loadDashboardData()既然是包含初始化的逻辑，所以并不适合定时调用，不然每次都要初始化。
   await loadDashboardData()
 
   // 启动定时器
@@ -453,11 +458,6 @@ const handleHiddenDangerPannelData = (query) => {
     pending: 0
   }
   try {
-    dashboardData.value.hiddenDangerData.general = 0
-    dashboardData.value.hiddenDangerData.major = 0
-    dashboardData.value.hiddenDangerData.progress.overdue = 0
-    dashboardData.value.hiddenDangerData.progress.processed = 0
-    dashboardData.value.hiddenDangerData.progress.processing = 0
     // 获取隐患排查治理数据
     getTableList('risk_level_count', query).then(res => {
       if (res.records && res.records.length > 0) {

src/views/screen/regionScreen.vue

@@ -310,7 +310,12 @@ onMounted(async () => {
 
     query.campus_id = regionOption.value.map(el => el.code).join()
   }
-
+  // 暂时先放在这里
+  dashboardData.value.hiddenDangerData.general = 0
+  dashboardData.value.hiddenDangerData.major = 0
+  dashboardData.value.hiddenDangerData.progress.overdue = 0
+  dashboardData.value.hiddenDangerData.progress.processed = 0
+  dashboardData.value.hiddenDangerData.progress.processing = 0
   // 初始化数据
   await loadDashboardData()
 
@@ -456,11 +461,6 @@ const handleHiddenDangerPannelData = (query) => {
     pending: 0
   }
   try {
-    dashboardData.value.hiddenDangerData.general = 0
-    dashboardData.value.hiddenDangerData.major = 0
-    dashboardData.value.hiddenDangerData.progress.overdue = 0
-    dashboardData.value.hiddenDangerData.progress.processed = 0
-    dashboardData.value.hiddenDangerData.progress.processing = 0
     // 获取隐患排查治理数据
     getTableList('risk_level_count', query).then(res => {
       if (res.records && res.records.length > 0) {