no message

.env.dev

@@ -4,7 +4,7 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径 注：/api 正常不需要 当前是访问演示环境nginx转发用
-VITE_BASE_URL='https://demo.jeelowcode.com/api'
+VITE_BASE_URL='http://10.28.117.100'
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
 VITE_UPLOAD_TYPE=server

src/App.vue

@@ -63,7 +63,7 @@ watch(
 </script>
 <template>
   <ConfigGlobal :size="currentSize">
-    <div class="h-100% w-100%" style="overflow-y: auto;" :class="greyMode ? `${prefixCls}-grey-mode` : ''">
+    <div class="h-100% w-100%" :class="greyMode ? `${prefixCls}-grey-mode` : ''">
       <RouterView />
     </div>
     <routerSearch />

src/api/bpm/processInstance/index.ts

@@ -68,7 +68,3 @@ export const createProcessInstanceCC = async (data) => {
 export const getProcessInstanceCCPage = async (params) => {
   return await request.get({ url: '/bpm/process-instance/cc/my-page', params })
 }
-
-export const handleProcessInstanceCC = async (processInstanceId: string) => {
-  return await request.post({url: '/bpm/process-instance/cc/process-current-user-copy/' + processInstanceId})
-}

src/api/design/table/index.ts

@@ -1,6 +1,5 @@
 import request from '@/config/axios'
 import { encryptAES } from '@/components/LowDesign/src/utils/aes'
-import download from '@/utils/download'
 
 //获取表单开发列表
 export const getDbList = (data) => {
@@ -159,11 +158,6 @@ export const exportExcelData = (tableId, data) => {
   return request.download({ url: `/jeelowcode/excel/exportExcel/${tableId}`, method: 'POST', data })
 }
 
-//导出Excel表数据
-export const exportExcelDataCustom = (explain,tableId, data) => {
-  return request.download({ url: `/jeelowcode/excel/exportExcelCustom/${tableId}`, method: 'POST', data }).then((data) => download.excel(data, explain, 'xlsx'))
-}
-
 //下载导入模板
 export const downloadImportTemplate = (tableId) => {
   return request.download({ url: `/jeelowcode/excel/exportExcelTemplate/${tableId}` })

src/api/index.ts

@@ -1,141 +0,0 @@
-import request from '@/config/axios'
-
-// 获取集团外协管理数据
-export const getOutsourcingManagementData = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_wx_jt', data })
-}
-
-// 获取集团风险管理数据
-export const getRiskManagementData = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_fx_jt', data })
-}
-
-// 数据看板-隐患管理-集团(天) /jeelowcode/report-data/list/kb_yh_jt_d
-export const getHiddenDangerManagementData = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_yh_jt_d', data })
-}
-
-// 数据看板-隐患管理-集团(周) /jeelowcode/report-data/list/kb_yh_jt_w
-export const getHiddenDangerManagementDataWeek = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_yh_jt_w', data })
-}
-
-// 数据看板-隐患管理-集团(月) /jeelowcode/report-data/list/kb_yh_jt_m
-export const getHiddenDangerManagementDataMonth = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_yh_jt_m', data })
-}
-
-// 数据看板-高危作业-集团 /jeelowcode/report-data/list/kb_gw_jt
-export const getHighRiskManagementData = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_gw_jt', data })
-}
-
-// 数据看板-应急预案-集团 /jeelowcode/report-data/list/kb_yj_jt
-export const getEmergencyPlanManagementData = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_yj_jt', data })
-}
-
-// 数据看板-培训-集团 /jeelowcode/report-data/list/kb_px_jt
-export const getTrainingManagementData = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_px_jt', data })
-}
-
-// 数据看板-外协管理-区域 /jeelowcode/report-data/list/kb_wx_qy
-export const getOutsourcingManagementDataRegion = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_wx_qy', data })
-}
-
-// 数据看板-外协管理-园区 /jeelowcode/report-data/list/kb_wx_yq
-export const getOutsourcingManagementDataPark = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_wx_yq', data })
-}
-
-// 数据看板-风险管理-区域 /jeelowcode/report-data/list/kb_fx_qy
-export const getRiskManagementDataRegion = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_fx_qy', data })
-}
-
-// 数据看板-风险管理-园区 /jeelowcode/report-data/list/kb_fx_yq
-export const getRiskManagementDataPark = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_fx_yq', data })
-}
-
-// 数据看板-隐患管理-区域(天) /jeelowcode/report-data/list/kb_yh_qy_d
-export const getHiddenDangerManagementDataRegion = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_yh_qy_d', data })
-}
-
-// 数据看板-隐患管理-区域(周) /jeelowcode/report-data/list/kb_yh_qy_w
-export const getHiddenDangerManagementDataRegionWeek = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_yh_qy_w', data })
-}
-
-// 数据看板-隐患管理-区域(月) /jeelowcode/report-data/list/kb_yh_qy_m
-export const getHiddenDangerManagementDataRegionMonth = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_yh_qy_m', data })
-}
-
-// 数据看板-隐患管理-园区(天)
-export const getHiddenDangerManagementDataPark = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_gw_qy_d', data })
-}
-
-// 数据看板-隐患管理-园区(周) /jeelowcode/report-data/list/kb_yh_yq_w
-export const getHiddenDangerManagementDataParkWeek = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_yh_yq_w', data })
-}
-
-// 数据看板-隐患管理-园区(月) /jeelowcode/report-data/list/kb_yh_yq_m
-export const getHiddenDangerManagementDataParkMonth = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_yh_yq_m', data })
-}
-
-// 数据看板-高危作业-区域 /jeelowcode/report-data/list/kb_gw_dq
-export const getHighRiskManagementDataRegion = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_gw_dq', data })
-}
-
-// 数据看板-高危作业-园区 /jeelowcode/report-data/list/kb_gw_yq
-export const getHighRiskManagementDataPark = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_gw_yq', data })
-}
-
-// 数据看板-应急预案-区域 /jeelowcode/report-data/list/kb_yj_dq
-export const getEmergencyPlanManagementDataRegion = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_yj_dq', data })
-}
-
-// 数据看板-应急预案-园区 /jeelowcode/report-data/list/kb_yj_yq
-export const getEmergencyPlanManagementDataPark = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_yj_yq', data })
-}
-
-// 数据看板-安全培训-区域 /jeelowcode/report-data/list/kb_px_qy
-export const getTrainingManagementDataRegion = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_px_qy', data })
-}
-
-// 数据看板-安全培训-园区 /jeelowcode/report-data/list/kb_px_yq
-export const getTrainingManagementDataPark = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/kb_px_yq', data })
-}
-
-// 动环监控-总设备数 /jeelowcode/power_env_device_totol_num
-export const getPowerEnvDeviceTotalNum = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/power_env_device_totol_num', data })
-}
-
-// 动环监控-告警设备类型分布 /jeelowcode/power_env_device_alarm_distribution
-export const getPowerEnvDeviceAlarmDistribution = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/power_env_device_alarm_distribution', data })
-}
-
-// 动环监控-当月告警趋势 /jeelowcode/power_env_alarm_trend
-export const getPowerEnvAlarmTrend = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/power_env_alarm_trend', data })
-}
-
-// 动环监控-园区信息列表 /jeelowcode/power_env_device_group_type_campus
-export const getPowerEnvDeviceGroupTypeCampus = (data) => {
-  return request.post({ url: '/jeelowcode/report-data/list/power_env_device_group_type_campus', data })
-}

src/assets/svgs/trend.svg

@@ -1,3 +0,0 @@
-            <svg class="trend-icon" viewBox="0 0 1024 1024" width="16" height="16" fill="currentColor">
-              <path d="M868 545.5L536.1 163a31.96 31.96 0 0 0-48.3 0L156 545.5a7.97 7.97 0 0 0 6 13.2h81c4.6 0 9-2 12.1-5.5L474 300.9V864c0 4.4 3.6 8 8 8h60c4.4 0 8-3.6 8-8V300.9l218.9 252.3c3 3.5 7.4 5.5 12.1 5.5h81c6.8 0 10.5-8 6-13.2z"></path>
-            </svg>

src/components/BpmTaskAssign/TaskSelectAssigneeForm.vue

@@ -1,107 +0,0 @@
-<template>
-  <ContentWrap>
-    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="80px">
-      <div v-for="taskAssignRule in props?.taskAssignRules" :key="taskAssignRule.taskDefinitionKey">
-        <el-divider content-position="left">审批节点：{{ taskAssignRule?.taskDefinitionName }}</el-divider>
-        <el-form-item :label="'候选人'"
-                      :prop="taskAssignRule.taskDefinitionKey"
-                      label-width="122">
-          <UserSelect
-            v-model="formData[taskAssignRule.taskDefinitionKey]"
-            :column="userSelectColumn"
-            :prop="taskAssignRule.taskDefinitionKey"
-            type="edit"
-            :func="(value)=>{console.log(JSON.stringify(value))}"
-          >
-          </UserSelect>
-        </el-form-item>
-      </div>
-    </el-form>
-  </ContentWrap>
-</template>
-<script lang="ts" setup>
-// 从 UserSelect 组件导入 Column 类型
-import type {Column} from '@/components/LowDesign/src/shareControl/UserSelect.vue'
-
-// 定义组件选项
-defineOptions({
-  name: "BpmTaskSelectAssigneeForm"
-})
-
-interface TaskAssignRule {
-  id: number
-  modelId: string
-  processDefinitionId: string
-  taskDefinitionKey: string
-  taskDefinitionName: string
-  type: number
-  options: number[]
-}
-
-const props = defineProps<{
-  taskAssignRules: TaskAssignRule[]
-  modelValue: {}
-}>()
-
-const formRef = ref()
-const formData = ref(props.modelValue)
-const formRules = ref({})
-const userSelectColumn: Column = {
-  label: '候选人',
-  findType: 'all',
-  multiple: false,
-  columnKey: ['sex', 'post', 'deptName']
-}
-
-const emit = defineEmits(['updateModelValue'])
-
-watch(
-  () => props.modelValue,
-  (val: {}) => {
-    formData.value = val
-  },
-  {
-    deep: true,
-    immediate: true,
-  }
-)
-
-watch(
-  () => formData.value,
-  (val: {}) => {
-    emit('updateModelValue', val)
-  },
-  {
-    deep: true,
-    immediate: true,
-  }
-)
-
-const validateAssignee = (successCallBack: () => void, failCallback: () => void) => {
-  formRef.value.validate((valid: boolean) => {
-    if (valid) successCallBack()
-    else failCallback()
-  })
-}
-
-defineExpose({validateAssignee})
-
-// 初始化 formData
-onMounted(() => {
-  if (props.taskAssignRules) {
-    props.taskAssignRules.forEach(rule => {
-      formData.value[rule.taskDefinitionKey] = ''
-      formRules.value[rule.taskDefinitionKey] = [
-        {
-          required: true,
-          message: '请选择候选人',
-          trigger: 'blur'
-        }
-      ]
-    })
-  }
-})
-
-</script>
-
-

src/components/LowDesign/src/LowTable/index.vue

@@ -18,18 +18,6 @@
           v-bind="userVBind"
           class="w-100%"
         ></userSelect>
-   </span>
-      <span prop="delegateDictId" style="display:none">
-    
-    <DicTableSelect
-    id="costomDictSelect"
-      :column="distSelectColumn"
-      size="default"
-      type="add"
-      prop="fields_7897245"
-      :scope="dictSelectScope"
-      @set-form-data="handleSetFormData"
-    ></DicTableSelect>
    </span>
     <!-- 顶部统计 -->
     <div
@@ -395,108 +383,12 @@ interface Props {
   dicRowKey?: string //dicTable模式 行数据的 Key
 }
 
-const dictSelectScope = {
-        "key": 0,
-        "value": "",
-        "column": {
-            "type": "dicTableSelect",
-            "controlType": "select",
-            "label": "表格选择框",
-            // "fixedSearch":{
-            //   "approveStatusName":"已审批"
-            // },
-            "separator": " | ",
-            "multiple": true,
-            "display": true,
-            "span": 12,
-            "disabled": false,
-            "required": false,
-            "hideLabel": false,
-            "i18nCode": "fields_7897245",
-            "dictTable": "1959187451673116674",
-            "dictCode": "id",
-            "dictText": "personName",
-            "dictTableColumn": [
-              "personName",
-              "personAge",
-              "personSex",
-              "mobile",
-              "approveStatusName"
-            ],
-            "prop": "fields_7897245",
-            "dataType": "string",
-            "className": "control-dicTableSelect control-fields_7897245 ",
-            "props": {
-                "lable": "personName",
-                "value": "id"
-            },
-            "rules": [
-
-            ]
-        },
-        "size": "default",
-        "disabled": false
-    }
-
-const distSelectColumn = {
-        "type": "dicTableSelect",
-        "controlType": "select",
-        "multiple": true,
-        "label": "表格选择框",
-        "separator": " | ",
-        "display": true,
-        "span": 12,
-        "disabled": false,
-        // "fixedSearch":{
-        //       "approveStatusName":"已审批"
-        //     },
-        "required": false,
-        "hideLabel": false,
-        "i18nCode": "fields_7897245",
-        "dictTable": "1959187451673116674",
-        "dictCode": "id",
-        "dictText": "personName",
-        "dictTableColumn": [
-          "personName",
-          "personAge",
-          "personSex",
-          "mobile",
-          "approveStatusName"
-          ]
-        ,
-        "prop": "fields_7897245",
-        "dataType": "string",
-        "className": "control-dicTableSelect control-fields_7897245 ",
-        "props": {
-            "lable": "personName",
-            "value": "id"
-        },
-        "rules": [
-
-        ]
-    }
-
 const props = withDefaults(defineProps<Props>(), {
   model: 'default',
   fixedSearch: () => {
     return {}
   }
 })
-const handleSetFormData = (key, val) => {
-  const cleaned = val.split('|').map(s => s.trim()).join(','); // "1975577437793124352 | 1965778349088899074"
-  console.log(cleaned);
-  // 在这里添加其他处理逻辑
-  useFun.requestApi('get', '/jeelowcode/outsidePerson/importOutside?tableId='+props.tableId+'&ids=' + cleaned, {
-  }).then(res => {
-    if (res.length > 0) {
-        message.success('下发成功')
-        useFun.refreshChange()
-    } else {
-      message.error(res.message)
-    }
-  })
-};
-
 const userVBind = {
   prop: 'delegateUserId',
   type: 'edit',
@@ -548,17 +440,6 @@ const userVBind = {
     }else if(props.tableId=='1968562717683908610'){ // 考试计划
         useFun.requestApi('get', '/jeelowcode/examIssus/addRecord?tableId='+props.tableId+'&ids=' + ids+'&userIds='+resultValue, {
           
-        }).then(res => {
-          if (res.length > 0) {
-             message.success('下发成功')
-             useFun.refreshChange()
-          } else {
-            message.error(res.message)
-          }
-        })
-    }else if(props.tableId=='1983351353033953281'){ // 工作事项
-        useFun.requestApi('get', '/jeelowcode/itemIssus/addResult?tableId='+props.tableId+'&ids=' + ids+'&userIds='+resultValue, {
-          
         }).then(res => {
           if (res.length > 0) {
              message.success('下发成功')

src/components/LowDesign/src/shareControl/DicTableSelect.vue

@@ -1,6 +1,5 @@
 <template>
   <div class="dic-table-select-box w-100%">
-    {{ JSON.stringify(props) }}
     <div
       class="table-input pos-relative"
       :class="[{ disabled }, type, size]"
@@ -274,9 +273,9 @@ const getCurrTableSelect = (type?) => {
   const dicObj = {}
   const textList: string[] = []
   const ids = tableRef.value.tableSelect.map((item) => {
-    if (item[props.column.dictCode]) {
+    if (item[props.column.dictText]) {
-      dicObj[item[dicCode.value]] = item[props.column.dictCode]
+      dicObj[item[dicCode.value]] = item[props.column.dictText]
-      textList.push(item[props.column.dictCode])
+      textList.push(item[props.column.dictText])
     }
     return item[dicCode.value]
   })

src/components/LowDesign/src/shareControl/UserSelect.vue

@@ -217,7 +217,7 @@ defineOptions({ name: 'UserSelect' })
  * all_sub 所有下级
  */
 
-export interface Column {
+interface Column {
   label: string
   findType: 'all' | 'now' | 'sub' | 'all_sub' | 'direct_sub' //查询类型
   columnKey: Array<'mobile' | 'email' | 'sex' | 'post' | 'deptName'> //扩展显示列

src/components/LowDesign/src/utils/controlOption.ts

@@ -34,7 +34,7 @@ const dicObj = {
     { label: '邮箱', value: 'email' }, { label: '性别', value: 'sex' }, { label: '岗位', value: 'post' }, { label: '部门', value: 'deptName' }
   ],
   userFindType: [{ label: '全部用户', value: 'all' }, { label: '本级用户', value: 'now' }, { label: '本级及下级用户', value: 'sub' }],
-  deptFindType: [{ label: '全部部门', value: 'all' }, { label: '本级部门', value: 'now' }, { label: '本级及下级部门', value: 'sub' }, { label: '外协单位', value: 'out' }, { label: '内部单位', value: 'internal' }],
+  deptFindType: [{ label: '全部部门', value: 'all' }, { label: '本级部门', value: 'now' }, { label: '本级及下级部门', value: 'sub' }],
   customControlType: [{ label: '未全局注册', value: false }, { label: '已全局注册', value: true }],
   regionType: [{ label: '全球-国家', value: 'gj' }, { label: '中国-省市区', value: 'ssq' }, { label: '中国-省市', value: 'ss' }, { label: '中国-省', value: 's' }],
   dictTextFormatter: [

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

@@ -7,7 +7,6 @@ import { encryptAES, decryptAES } from '@/components/LowDesign/src/utils/aes'
 import { useUserStoreWithOut } from '@/store/modules/user'
 import { useI18n } from '@/hooks/web/useI18n';
 import router from '@/router/index'
-import {exportExcelDataCustom} from '@/api/design/table'
 
 const message = useMessage() // 消息弹窗
 
@@ -19,7 +18,6 @@ export default {
    * @param options 请求配置 如：{ params:{ text:'测试' } }
   */
   requestApi: (Method, url, options) => callApiFun(Method, url, options),
-  exportExcelCustom: (tableId, data) => exportExcelDataCustom(tableId, data),
   cloneDeep, //深拷贝
   listToTree,//列表转树结构
   formatDate,//时间格式化

src/components/LowDesign/src/utils/formUtil.ts

@@ -546,15 +546,13 @@ export const formDataFormatting = (formOption, formData, formType) => {
           echoObj[dicKey].push(...data[key].split(','))
         }
       } else echoObj[type].push(...data[key].split(','))
-    } else if (column[key]?.controlType == 'date'||key=='create_time') {
+    } else if (column[key]?.controlType == 'date') {
-      
       if (data[key]) {
         if (typeof data[key] == 'number' || typeof data[key] == 'string') {
           data[key] = data[key] + ''
           if (!(/[-|\/]/g.test(data[key]))) {
             //如果是时间戳强制转换
-            const timestamp = parseInt(data[key], 10)
+            data[key] = formatDate(new Date(data[key]), column[key].valueFormat || 'YYYY-MM-DD HH:mm:ss')
-            data[key] = formatDate(new Date(timestamp), column[key].valueFormat || 'YYYY-MM-DD HH:mm:ss')
           }
         }
       }

src/components/Verifition/src/Verify/VerifyPoints.vue

@@ -171,7 +171,7 @@ const canvasClick = (e) => {
         token: backToken.value
       }
       reqCheck(data).then((res) => {
-        if (res.repCode == '0000') {
+        if (res?.repCode == '0000') {
           barAreaColor.value = '#4cae4c'
           barAreaBorderColor.value = '#5cb85c'
           text.value = t('captcha.success')
@@ -228,14 +228,14 @@ const getPictrue = async () => {
     captchaType: captchaType.value
   }
   const res = await getCode(data)
-  if (res.repCode == '0000') {
+  if (res?.repCode == '0000') {
-    pointBackImgBase.value = res.repData.originalImageBase64
+    pointBackImgBase.value = res?.repData?.originalImageBase64
-    backToken.value = res.repData.token
+    backToken.value = res?.repData?.token
-    secretKey.value = res.repData.secretKey
+    secretKey.value = res?.repData?.secretKey
-    poinTextList.value = res.repData.wordList
+    poinTextList.value = res?.repData?.wordList || []
-    text.value = t('captcha.point') + '【' + poinTextList.value.join(',') + '】'
+    text.value = t('captcha.point') + '【' + poinTextList.value?.join(',') + '】'
   } else {
-    text.value = res.repMsg
+    text.value = res?.repMsg
   }
 }
 //坐标转换函数

src/components/Verifition/src/Verify/VerifySlide.vue

@@ -287,7 +287,7 @@ const end = () => {
       token: backToken.value
     }
     reqCheck(data).then((res) => {
-      if (res.repCode == '0000') {
+      if (res?.repCode == '0000') {
         moveBlockBackgroundColor.value = '#5cb85c'
         leftBarBorderColor.value = '#5cb85c'
         iconColor.value = '#fff'
@@ -364,13 +364,13 @@ const getPictrue = async () => {
     captchaType: captchaType.value
   }
   const res = await getCode(data)
-  if (res.repCode == '0000') {
+  if (res?.repCode == '0000') {
-    backImgBase.value = res.repData.originalImageBase64
+    backImgBase.value = res?.repData?.originalImageBase64
-    blockBackImgBase.value = res.repData.jigsawImageBase64
+    blockBackImgBase.value = res?.repData?.jigsawImageBase64
-    backToken.value = res.repData.token
+    backToken.value = res?.repData?.token
-    secretKey.value = res.repData.secretKey
+    secretKey.value = res?.repData?.secretKey
   } else {
-    tipWords.value = res.repMsg
+    tipWords.value = res?.repMsg
   }
 }
 </script>

src/config/axios/config.ts

@@ -16,7 +16,7 @@ const config: {
   /**
    * 接口请求超时时间
    */
-  request_timeout: 300000,
+  request_timeout: 30000,
 
   /**
    * 默认接口请求类型

src/permission.ts

@@ -102,17 +102,10 @@ router.beforeEach(async (to, from, next) => {
     } else {
       if(import.meta.env.VITE_DEFAULT_SSO =='true'){
         authUtil.setTenantId("1")
-        // 正确构造包含查询参数的重定向URL
-        let redirectUrl = to.fullPath;
-        if (Object.keys(to.query).length > 0) {
-          const queryParams = new URLSearchParams(to.query as Record<string, string>).toString();
-          redirectUrl = `${to.path}?${queryParams}`;
-        }
-        
         const redirectUri =
         location.origin +
         '/social-login?' +
-        `type=100&redirect=${encodeURIComponent(redirectUrl)}`
+       `type=100&redirect=${to.fullPath}`
 
     // 进行跳转
         const res = await LoginApi.socialAuthRedirect(100, encodeURIComponent(redirectUri))

src/plugins/echarts/index.ts

@@ -7,8 +7,7 @@ import {
   MapChart,
   PictorialBarChart,
   RadarChart,
-  GaugeChart,
+  GaugeChart
-  CandlestickChart
 } from 'echarts/charts'
 
 import {
@@ -42,8 +41,7 @@ echarts.use([
   CanvasRenderer,
   PictorialBarChart,
   RadarChart,
-  GaugeChart,
+  GaugeChart
-  CandlestickChart
 ])
 
 export default echarts

src/router/modules/remaining.ts

@@ -57,17 +57,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
     name: 'Home',
     meta: {},
     children: [
-      // {
-      //   path: 'index',
-      //   component: () => import('@/views/Home/Index10.vue'),
-      //   name: 'Index',
-      //   meta: {
-      //     title: t('router.home'),
-      //     icon: 'ep:home-filled',
-      //     noCache: false,
-      //     affix: true
-      //   }
-      // },
       {
         path: 'index',
         component: () => import('@/views/Home/Index10.vue'),
@@ -78,30 +67,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
           noCache: false,
           affix: true
         }
-      },
-      {
-        path: 'region', // 区域数据看板
-        component: () => import('@/views/Home/Index12.vue'),
-        name: 'RegionIndex',
-        meta: {
-          title: '区域视角数据看板',
-          icon: 'ep:home-filled',
-          noCache: false,
-          hidden: true,
-          affix: false
-        }
-      },
-      {
-        path: 'park', // 园区数据看板
-        component: () => import('@/views/Home/Index13.vue'),
-        name: 'ParkIndex',
-        meta: {
-          title: '园区视角数据看板',
-          icon: 'ep:home-filled',
-          hidden: true,
-          noCache: false,
-          affix: false
-        }
       }
     ]
   },
@@ -399,17 +364,6 @@ const remainingRouter: AppRouteRecordRaw[] = [
       catalogue: true,
     }
   },
-  {
-    path: '/screen/powerMonitoring',
-    component: () => import('@/views/screen/powerMonitoring.vue'),
-    name: 'powerMonitoring',
-    meta: {
-      hidden: true,
-      title: '动环监控大屏',
-      noTagsView: true,
-      catalogue: true,
-    }
-  },
   {
     path: '/screen/main',
     component: () => import('@/views/screen/mainScreen.vue'),

src/views/Login/components/LoginForm.vue

@@ -227,11 +227,13 @@ const getCookie = () => {
 // 根据域名，获得租户信息
 const getTenantByWebsite = async () => {
   const website = location.host
+  try {
     const res = await LoginApi.getTenantByWebsite(website)
     if (res) {
       loginData.loginForm.tenantName = res.name
       authUtil.setTenantId(res.id)
     }
+  } catch (e) { }
 }
 const loading = ref() // ElLoading.service 返回的实例
 // 登录
@@ -268,12 +270,7 @@ const handleLogin = async (params) => {
     } else {
       push({ path: redirect.value || permissionStore.addRouters[0].path })
     }
-  }
+  } finally {
-  catch (e) {
-    loginLoading.value = false
-    loading.value?.close()
-  }
-  finally {
     loginLoading.value = false
     loading.value?.close()
   }

src/views/bpm/processInstance/detail/TaskCCDialogForm.vue

@@ -14,7 +14,7 @@
         <el-input v-model="formData.processInstanceKey" disabled placeholder="请输入流程标识" />
       </el-form-item>
       <el-form-item label="规则类型" prop="type">
-        <el-select v-model="formData.type" clearable style="width: 100%" disabled>
+        <el-select v-model="formData.type" clearable style="width: 100%">
           <el-option
             v-for="dict in getIntDictOptions(DICT_TYPE.BPM_TASK_ASSIGN_RULE_TYPE)"
             :key="dict.value"
@@ -165,7 +165,7 @@ const open = async (row) => {
   resetForm()
   // 2. 再设置表单
   if (row != null) {
-    formData.value.type = 30
+    formData.value.type = undefined as unknown as number
     formData.value.taskName = row.name
     formData.value.taskId = row.id
     formData.value.processInstanceName = row.processInstance.name

src/views/bpm/processInstance/detail/index.vue

@@ -41,20 +41,18 @@
             <Icon icon="ep:close" />
             不通过
           </el-button>
-
+          <el-button type="primary" @click="openTaskUpdateAssigneeForm(item.id)">
-          <el-button type="primary" @click="handleCC(item)">
+            <Icon icon="ep:edit" />
-            <Icon icon="ep:position"/>
+            转办
-            抄送
           </el-button>
-          <!-- <el-button type="primary" @click="handleDelegate(item)">
+          <el-button type="primary" @click="handleDelegate(item)">
             <Icon icon="ep:position" />
             委派
           </el-button>
           <el-button type="primary" @click="handleSign(item)">
             <Icon icon="ep:plus" />
             加签
-         </el-button> -->
+          </el-button>
-
           <el-button type="warning" @click="handleBack(item)">
             <Icon icon="ep:back" />
             回退
@@ -104,7 +102,6 @@
     <TaskDelegateForm ref="taskDelegateForm" @success="getDetail" />
     <!-- 加签，当前任务审批人为A，向前加签选了一个C，则需要C先审批，然后再是A审批，向后加签B，A审批完，需要B再审批完，才算完成这个任务节点 -->
     <TaskAddSignDialogForm ref="taskAddSignDialogForm" @success="getDetail" />
-    <TaskCCDialogForm ref="taskCCDialogForm"/>
   </ContentWrap>
 </template>
 <script lang="ts" setup>
@@ -122,7 +119,6 @@ import {registerComponent} from '@/utils/routerHelper'
 import { isEmpty } from '@/utils/is'
 import router from '@/router/index'
 import { $Print } from '@smallwei/avue'
-import TaskCCDialogForm from '../../processInstance/detail/TaskCCDialogForm.vue'
 
 defineOptions({ name: 'BpmProcessInstanceDetail' })
 
@@ -132,7 +128,6 @@ const {proxy} = getCurrentInstance() as any
 
 const userId = useUserStore().getUser.id // 当前登录的编号
 const id = query.id as unknown as number // 流程实例的编号
-const read = query.read as unknown as boolean // 是否是待阅的标记
 const processInstanceLoading = ref(false) // 流程实例的加载中
 const processInstance = ref<any>({}) // 流程实例
 const bpmnXML = ref('') // BPMN XML
@@ -178,17 +173,9 @@ const handleAudit = async (task, pass) => {
   getDetail()
 }
 
-const taskCCDialogForm = ref()
-/** 处理抄送按钮 */
-const handleCC = (row) => {
-  taskCCDialogForm.value.open(row)
-}
-
-
 const printPage = async () => {
  
-  const {href} = router.resolve({
+ const { href } = router.resolve({ name: 'BpmProcessInstanceInfo', 
-    name: 'BpmProcessInstanceInfo',
                                   query: { id: String(id), isPrint: '1'  }
                                 })
   window.open(href, '_blank', 'noopener,noreferrer')
@@ -219,15 +206,6 @@ const handleSign = async (task) => {
   taskAddSignDialogForm.value.open(task.id)
 }
 
-// 处理待阅的操作
-const handleRead = async () => {
-  if (read) {
-    // 向后端发送接口，让后端发起已阅接口
-    const data = await ProcessInstanceApi.handleProcessInstanceCC(id + '')
-    console.log(JSON.stringify(data))
-  }
-}
-
 /** 获得详情 */
 const getDetail = () => {
   // 1. 获得流程实例相关
@@ -253,10 +231,6 @@ const getProcessInstance = async () => {
     if (processDefinition.formType === 10) {
       detailForm.value.formId = processDefinition.formId
       detailForm.value.optionsData = JSON.parse(processDefinition.formConf)
-      if (data.formVariables.jeelowcode_subtable_data) {
-        data.formVariables = {...data.formVariables, ...data.formVariables.jeelowcode_subtable_data}
-        delete data.formVariables.jeelowcode_subtable_data
-      }
       detailForm.value.defaultData = data.formVariables
       // setConfAndFields2(
       //   detailForm,
@@ -343,7 +317,6 @@ const loadRunningTask = (tasks) => {
 
 /** 初始化 */
 onMounted(async() => {
-  await handleRead()
   await getDetail()
   await nextTick()
  if (query.isPrint === '1') {

src/views/bpm/processInstance/index.vue

@@ -38,9 +38,8 @@
         />
       </template>
       <template #menu-left>
-        <el-button type="primary" v-hasPermi="['bpm:process-instance:create']" @click="handleCreate">
+        <el-button type="primary" v-hasPermi="['bpm:process-instance:query']" @click="handleCreate">
-          <Icon icon="ep:plus" class="mr-5px"/>
+          <Icon icon="ep:plus" class="mr-5px" /> 发起流程
-          发起流程
         </el-button>
       </template>
       <!-- 自定义操作栏 -->
@@ -48,20 +47,20 @@
         <el-button
           link
           type="primary"
-          v-hasPermi="['bpm:process-instance:query']"
+          v-hasPermi="['bpm:process-instance:cancel']"
           @click="handleDetail(row)"
         >
           详情
         </el-button>
-        <el-button
+        <!-- <el-button
           link
           type="danger"
-          v-if="row.result === 1|| row.result === 2"
+          v-if="row.result === 1"
-          v-hasPermi="['bpm:process-instance:cancel']"
+          v-hasPermi="['bpm:process-instance:query']"
           @click="handleCancel(row)"
         >
           取消
-        </el-button>
+        </el-button> -->
       </template>
     </avue-crud>
   </ContentWrap>
@@ -204,8 +203,7 @@ const searchChange = (params, done) => {
 
 /** 清空按钮操作 */
 const resetChange = () => {
-  searchChange({}, () => {
+  searchChange({}, () => {})
-  })
 }
 
 const sizeChange = (pageSize) => {

src/views/bpm/task/copy/index.vue

@@ -1,175 +0,0 @@
-<!-- 工作流，抄送我的流程 -->
-<template>
-  <ContentWrap>
-    <avue-crud
-      ref="crudRef"
-      v-model="tableForm"
-      v-model:page="tablePage"
-      v-model:search="tableSearch"
-      :data="tableData"
-      :option="tableOption"
-      :permission="permission"
-      @search-change="searchChange"
-      @search-reset="resetChange"
-      @refresh-change="getTableData"
-      @size-change="sizeChange"
-      @current-change="currentChange"
-    >
-      <template #menu="{ row }">
-        <el-button link type="primary" @click="handleAudit(row)">流程</el-button>
-      </template>
-    </avue-crud>
-  </ContentWrap>
-</template>
-<script lang="ts" setup>
-import {dateFormatter} from '@/utils/formatTime'
-import * as ProcessInstanceApi from '@/api/bpm/processInstance'
-
-defineOptions({
-  name: 'BpmCopyTask'
-})
-
-// 路由
-const {push} = useRouter()
-// 列表的加载中
-const loading = ref(true)
-
-const {getCurrPermi} = useCrudPermi()
-
-// 表格的配置
-const tableOption = reactive({
-  addBtn: false,
-  editBtn: false,
-  delBtn: false,
-  viewBtn: true,
-  viewBtnText: '详情',
-  viewBtnIcon: 'none',
-  align: 'center',
-  headerAlign: 'center',
-  searchMenuSpan: 6,
-  searchMenuPosition: 'left',
-  labelSuffix: ' ',
-  span: 24,
-  dialogWidth: '50%',
-  column: {
-    taskId: {
-      label: '任务编号'
-    },
-    taskName: {
-      label: '任务名称'
-    },
-    processInstanceId: {
-      label: '流程编号',
-      search: true,
-    },
-    processInstanceName: {
-      label: '所属流程',
-      search: true,
-    },
-    startUserNickname: {
-      label: '流程发起人',
-    },
-    reason: {
-      label: '抄送原因'
-    },
-    creatorNickname: {
-      label: '抄送人'
-    },
-    createTime: {
-      label: '抄送时间',
-      type: 'datetime',
-      width: 180,
-      formatter: (row: any, value: any, rowv: any, column: any) => {
-        return dateFormatter(row, column, value)
-      }
-    },
-    searchCreateTime: {
-      label: '抄送时间',
-      display: false,
-      hide: true,
-      search: true,
-      searchType: 'datetimerange',
-      valueFormat: 'YYYY-MM-DD HH:mm:ss',
-      startPlaceholder: '开始时间',
-      endPlaceholder: '结束时间',
-      searchRange: true,
-    }
-  }
-})
-
-const tableForm = ref<any>({})
-const tableData = ref([])
-const tableSearch = ref<any>({})
-const tablePage = ref({
-  currentPage: 1,
-  pageSize: 10,
-  total: 0
-})
-
-const permission = getCurrPermi(['bpm:task'])
-
-const crudRef = ref()
-useCrudHeight(crudRef)
-
-const getTableData = async () => {
-  // 列表的加载中...
-  loading.value = true
-  // 拼接查询参数
-  let searchObj = {
-    ...tableSearch.value,
-    pageNo: tablePage.value.currentPage,
-    pageSize: tablePage.value.pageSize
-  }
-  // 处理时间参数，如果为空则去掉这个属性
-  if (!searchObj.createTime?.length) delete searchObj.createTime
-  // 去掉空字符串属性
-  for (let key in searchObj) if (searchObj[key] === '') delete searchObj[key]
-
-  // 请求我的待阅数据
-  try {
-    const data = await ProcessInstanceApi.getProcessInstanceCCPage(searchObj)
-    tableData.value = data.list
-    tablePage.value.total = data.total
-  } finally {
-    // 无论请求成功或者失败，这里都需要将加载中关闭
-    loading.value = false
-  }
-
-}
-
-const searchChange = (params: any, done: any) => {
-  tablePage.value.currentPage = 1
-  // 获取数据
-  getTableData().finally(() => done())
-}
-
-const resetChange = () => {
-  searchChange({}, () => {
-  })
-}
-
-const sizeChange = (pageSize) => {
-  tablePage.value.pageSize = pageSize
-  resetChange()
-}
-
-const currentChange = (currentPage) => {
-  tablePage.value.currentPage = currentPage
-  getTableData()
-}
-
-const handleAudit = (row: any) => {
-  push({
-    name: 'BpmProcessInstanceDetail',
-    query: {
-      id: row.processInstanceId
-    }
-  })
-}
-
-/** 初始化 **/
-onMounted(async () => {
-  await getTableData()
-})
-
-</script>

src/views/bpm/task/todo/index.vue

@@ -26,7 +26,7 @@
       </template>
       <template #menu="{ row }">
         <el-button link type="primary" @click="handleAudit(row)">审批</el-button>
-        <el-button link type="primary" @click="handleCC(row)">抄送</el-button>
+<!--        <el-button link type="primary" @click="handleCC(row)">抄送</el-button>-->
       </template>
     </avue-crud>
     <TaskCCDialogForm ref="taskCCDialogForm" />

src/views/bpm/taskAssignRule/index.vue

@@ -65,7 +65,6 @@ const getUserKey = (val) => {
   else if ([20, 21].includes(val)) key = 'deptIds'
   else if (val == 22) key = 'postIds'
   else if ([30, 31, 32].includes(val)) key = 'userIds'
-  else if (val == 35) key = 'userSelects'
   else if (val == 40) key = 'userGroupIds'
   else if (val == 50) key = 'scripts'
   return key
@@ -96,8 +95,7 @@ const tableOption = reactive({
           postIds: { display: false },
           userIds: { display: false },
           userGroupIds: { display: false },
-          scripts: {display: false},
+          scripts: { display: false }
-          userSelects: {display: false},
         }
         const key = getUserKey(val)
         if (key) columnObj[key].display = true
@@ -114,7 +112,6 @@ const tableOption = reactive({
         let arr = row.options.map((id) => {
           if (key == 'deptIds') return lowStore.dicObj.deptSelect?.[id] || id
           else if (key == 'userIds') return lowStore.dicObj.userSelect?.[id] || id
-          else if (key == 'userSelects') return ''
           else return dicObj.value[key][id]
         })
 
@@ -201,7 +198,7 @@ const rowUpdate = async (form, index, done, loading) => {
   const delKey = ['roleIds', 'deptIds', 'postIds', 'userIds', 'userGroupIds', 'scripts']
   if (key) {
     if (typeof form[key] == 'number') form[key] = form[key] + ''
-    const value = key === 'userSelects' ? '' : form[key]
+    const value = form[key]
     form.options = typeof value == 'string' ? value.split(',') : value
   }
   delKey.forEach((prop) => delete form[prop])

src/views/document/TabsCardDocument.vue

@@ -61,13 +61,6 @@ const tabsPaneList = ref([
     calcHeight: 200,
     fixedSearch: {file_main_type: 4}
   },
-  {
-    label: '工作档案',
-    name: 'workArchive',
-    formId: '1966386366515343361',
-    calcHeight: 200,
-    fixedSearch: {file_main_type: 5}
-  },
 ])
 
 // 定义点击tab的事件动作

src/views/lowdesign/tableDesign/index.vue

@@ -86,17 +86,6 @@
             <Icon :size="14" icon="hugeicons:java" />
             <span class="ml-3px!">JAVA增强</span>
           </el-button>
-          <!-- 批量同步 -->
-          <el-button
-            type="primary"
-            :size="size"
-            @click="handleBatchSync"
-            v-hasPermi="['jeelowcode:dbform:sync']"
-          >
-            <Icon :size="14" icon="simple-icons:oracle"/>
-            <span class="ml-3px!">批量同步</span>
-          </el-button>
-
         </template>
         <template #menu="{ size, row }">
           <div class="flex justify-center flex-items-center">
@@ -201,8 +190,7 @@
                   @click="openDataOrigin"
                   :disabled="!tableForm.dataOrigin"
                 >
-                  <Icon :size="14" icon="lucide:text-search"></Icon>
+                  <Icon :size="14" icon="lucide:text-search"></Icon> <span>数据源SQL配置</span>
-                  <span>数据源SQL配置</span>
                 </el-button>
                 <el-button
                   type="primary"
@@ -223,12 +211,10 @@
                   <span>表格扩展配置</span>
                 </el-button>
                 <el-button @click="sortPopup = true">
-                  <Icon :size="14" icon="mdi:sort"></Icon>
+                  <Icon :size="14" icon="mdi:sort"></Icon> <span>默认排序</span>
-                  <span>默认排序</span>
                 </el-button>
                 <el-button @click="searchPopup = true">
-                  <Icon :size="14" icon="lucide:text-search"></Icon>
+                  <Icon :size="14" icon="lucide:text-search"></Icon> <span>默认搜索</span>
-                  <span>默认搜索</span>
                 </el-button>
               </div>
             </template>
@@ -431,8 +417,7 @@
                 size="small"
                 type="primary"
                 @click="copySampleStr(key)"
-              >点击复制
+                >点击复制</el-button
-              </el-button
               >
             </div>
           </div>
@@ -1539,8 +1524,7 @@ const searchChange = (params, done) => {
 
 /** 清空按钮操作 */
 const resetChange = () => {
-  searchChange({}, () => {
+  searchChange({}, () => {})
-  })
 }
 
 const sizeChange = (pageSize) => {
@@ -1754,35 +1738,13 @@ const rowDel = async (form) => {
     message.success(t('common.delSuccess'))
     // 刷新列表
     await getTableData()
-  } catch {
+  } catch {}
-  }
 }
 
 const beforeUnload = (event) => {
   if (isUnload.value) return (event.returnValue = '您确定要关闭页面吗？')
 }
 
-/** 批量同步 **/
-const handleBatchSync = async () => {
-  // 首先需要查询有没有需要同步的表单，如果没有则提示消息并结束，如果有则打开弹窗
-  let searchObj = {
-    isDbSync: 'N',
-    pageNo: tablePage.value.currentPage,
-    pageSize: -1
-  }
-  const data = await TableApi.getDbList(searchObj)
-  if (data?.records?.length > 0) {
-    // 将data.records取出来，每个记录的id作为row.id，并且发起普通同步
-    const promises = data.records.map((row) => TableApi.asyncDbData(row.id, 'default'))
-    await Promise.all(promises).catch(() => message.alert('同步失败'))
-    // 刷新列表
-    getTableData()
-  } else {
-    // 没有需要同步的表单，提示信息并结束方法
-    message.info('没有需要同步的表单')
-  }
-}
-
 /** 初始化 **/
 onMounted(async () => {
   window.addEventListener('beforeunload', beforeUnload)

src/views/screen/companyScreen.vue

@@ -70,18 +70,17 @@
           </div>
           <div class="bottom-card">
             <div class="bottom-card-title">
-              <!-- 隐患排查治理 标题需要隐藏 2025-10-31 -->
+              <span>隐患排查治理</span>
-              <span></span>
               <img width="50%" style="margin: 8px 0" src="@/assets/images/line_1.png" />
             </div>
             <div class="type-wrapper">
                <div class="type-item">
                 <span class="type-btn yellow">重大</span>
-                <span class="type-num cursor-pointer" @click="handleSeverityCountClick">{{ mockData.hiddenDangerData.severityCount }}</span>
+                <span class="type-num">{{ mockData.hiddenDangerData.severityCount }}</span>
               </div>
               <div class="type-item">
                 <span class="type-btn green">一般</span>
-                <span class="type-num cursor-pointer"  @click="handleGeneralCountClick">{{ mockData.hiddenDangerData.generalCount }}</span>
+                <span class="type-num">{{ mockData.hiddenDangerData.generalCount }}</span>
               </div>
               <!-- <div class="type-item">
                 <span class="type-btn blue">较大</span>
@@ -108,11 +107,11 @@
             <div class="tabs">
               <span class="tab" :class="{ active: activeTab === '高危作业' }" @click="handleTabClick('高危作业')">高危作业</span>
               <span class="divider">|</span>
-              <span class="tab" :class="{ active: activeTab === '安全培训考试' }"
+              <span
+class="tab" :class="{ active: activeTab === '安全培训考试' }"
                 @click="handleTabClick('安全培训考试')">安全培训考试</span>
                 <span class="divider">|</span>
-              <span class="tab" :class="{ active: activeTab === '应急预案及演练' }"
+                <span class="tab" :class="{ active: activeTab === '应急预案及演练' }" @click="handleTabClick('应急预案及演练')">应急预案及演练</span>
-                @click="handleTabClick('应急预案及演练')">应急预案及演练</span>
             </div>
           </div>
           <img style="margin: 8px 0" src="@/assets/images/title_border_line.png" />
@@ -161,8 +160,7 @@
               <img width="50%" style="margin: 8px 0" src="@/assets/images/line_1.png" />
             </div>
           </div>
-              <AlertList maxHeight="40vh" style="margin-left: 1vw;" :table-title="trainingTableTitle"
+          <AlertList maxHeight="40vh" style="margin-left: 1vw;" :table-title="trainingTableTitle" :list-data="drillList" />
-                :list-data="drillList" />
         </template>
         </div>
         </div>
@@ -193,13 +191,11 @@
               </div>
               <div class="col-item" style=" display: flex;margin-left: 2vw; align-items: center;">
                 <span>待处理</span>
-                <span style="font-size: 1.2rem; marker-start: 2vw; color: yellow;">{{ mockData.alertData.pending
+                <span style="font-size: 1.2rem; marker-start: 2vw; color: yellow;">{{ mockData.alertData.pending }}</span>
-                }}</span>
               </div>
               <div class="col-item" style=" display: flex;margin-left: 2vw; align-items: center;">
                 <span>处理中</span>
-                <span style="font-size: 1.2rem; marker-start: 2vw; color: yellow;">{{ mockData.alertData.processing
+                <span style="font-size: 1.2rem; marker-start: 2vw; color: yellow;">{{ mockData.alertData.processing }}</span>
-                }}</span>
               </div>
             </div>
           </div>
@@ -221,8 +217,7 @@
               <div class="col-item">
                 <img src="@/assets/images/screen/warning_img.png" width="23" />
                 <span>超时工单数</span>
-                <span style="font-size: 1.2rem; marker-start: 2vw; color: red;">{{ mockData.timeoutWorkOrders.total
+                <span style="font-size: 1.2rem; marker-start: 2vw; color: red;">{{ mockData.timeoutWorkOrders.total }}</span>
-                }}</span>
               </div>
             </div>
           </div>
@@ -233,12 +228,14 @@
       </div>
       <div class="center-container">
         <!-- 中部区域 -->
-        <ParkCenter :parkName="selectedPark" :backgroundImage="backgroundImage" @point-hover="handlePointHover"
+        <ParkCenter
+:parkName="selectedPark" :backgroundImage="backgroundImage" @point-hover="handlePointHover"
           @point-leave="handlePointLeave" />
       </div>
 
       <!-- 点位信息弹窗 -->
-      <PointInfoPopup v-if="showPointPopup" :visible="showPointPopup" :point-info="currentPoint"
+      <PointInfoPopup
+v-if="showPointPopup" :visible="showPointPopup" :point-info="currentPoint"
         :park-name="selectedPark || '雄安园区'" />
     </div>
   </div>
@@ -285,12 +282,6 @@ const unfinishedCount = ref<number>(0)
 const inProgressCount = ref<number>(0)
 const finishedCount = ref<number>(0)
 
-const handleSeverityCountClick = () => {
-  window.open('http://10.0.64.20/configcenter/console/device-manage', '_blank')
-}
-const handleGeneralCountClick = () => {
-  window.open('http://10.0.64.20/configcenter/console/device-manage', '_blank')
-}
 
   const tableTitle = [
     {
@@ -551,14 +542,12 @@ const initProgressChart = () => {
           labelLayout: function (params: any) {
             const isLeft = params.labelRect.x < width / 2;
             const points = params.labelLinePoints;
-            if (points && points.length && points[2]) {
             points[2][0] = isLeft
               ? params.labelRect.x
               : params.labelRect.x + params.labelRect.width;
             return {
               labelLinePoints: points
             };
-            }
           },
         }
       ]
@@ -854,14 +843,12 @@ const handleHiddenDangerPannelData = (query) => {
         labelLayout: function (params: any) {
           const isLeft = params.labelRect.x < width / 2;
           const points = params.labelLinePoints;
-          if (points && points.length && points[2]) {
           points[2][0] = isLeft
             ? params.labelRect.x
             : params.labelRect.x + params.labelRect.width;
           return {
             labelLinePoints: points
           };
-          }
         },
       }
     ]
@@ -1198,9 +1185,6 @@ onUnmounted(() => {
 </script>
 
 <style scoped lang="scss">
-.cursor-pointer {
-  cursor: pointer;
-}
 /* 响应式设计 - 自动适应不同屏幕尺寸 */
 @media (width <=1200px) {
   .dashboard-container {

src/views/screen/components/AlertList.vue

@@ -15,7 +15,7 @@
       <div class="list-wrapper" ref="listWrapperRef" @mouseenter="handleMouseEnter" @mouseleave="handleMouseLeave">
         <!-- 表格模式 -->
         <template v-if="tableTitle && tableTitle.length > 0">
-          <div @click="handleItemClick(item)" class="table-row cursor-pointer" v-for="(item, index) in listData" :key="`table-${index}`"  @mouseenter="handleMouseEnter">
+          <div class="table-row" v-for="(item, index) in listData" :key="`table-${index}`"  @mouseenter="handleMouseEnter">
             <div class="table-cell" v-for="(title, cellIndex) in tableTitle" :key="`cell-${index}-${cellIndex}`">
               {{ item[title.key] || '-' }}
             </div>
@@ -24,7 +24,7 @@
         
         <!-- 列表模式 -->
         <template v-else>
-          <div @click="handleItemClick(item)" class="list-item cursor-pointer" v-for="(item, index) in listData" :key="`list-${index}`"  @mouseenter="handleMouseEnter">
+          <div class="list-item" v-for="(item, index) in listData" :key="`list-${index}`"  @mouseenter="handleMouseEnter">
             <span class="alert-text" :class="[{ error: item.alarm_level_code == 'severity' }, { warn: item.alarm_level_code == 'major' }]">
               {{ (index + 1) }} {{ item.description }}
             </span>
@@ -71,14 +71,9 @@ const props = withDefaults(defineProps<Props>(), {
 const listWrapperRef = ref<HTMLElement | null>(null)
 let scrollTimer: NodeJS.Timeout | null = null
 let isScrolling = false
-let scrollDirection: 'down' | 'up' = 'down' // 滚动方向：向下或向上
-
-const handleItemClick = (item: AlertItem) => {
-  window.open(`http://10.0.64.20/configcenter/console/device-manage`, '_blank')
-}
 
 // 自动滚动功能
-const startAutoScroll = (resetToTop: boolean = false) => {
+const startAutoScroll = () => {
   if (!props.autoScroll || !listWrapperRef.value) return
 
   const wrapper = listWrapperRef.value
@@ -88,61 +83,20 @@ const startAutoScroll = (resetToTop: boolean = false) => {
   // 只有当内容高度超过容器高度时才启动滚动
   if (scrollHeight <= clientHeight) return
 
-  // 如果是首次启动或需要重置，从顶部开始向下滚动
-  if (resetToTop) {
-    wrapper.scrollTop = 0
-    scrollDirection = 'down'
-  } else {
-    // 否则根据当前位置判断滚动方向
-    const currentScrollTop = wrapper.scrollTop
-    const maxScrollTop = scrollHeight - clientHeight
-    
-    if (currentScrollTop >= maxScrollTop - 1) {
-      // 在底部，向上滚动
-      scrollDirection = 'up'
-    } else if (currentScrollTop <= 1) {
-      // 在顶部，向下滚动
-      scrollDirection = 'down'
-    }
-    // 在中间位置，保持当前方向（或默认向下）
-  }
-  
   isScrolling = true
+  let currentScrollTop = listWrapperRef.value.scrollTop
 
   const scroll = () => {
     if (!isScrolling || !wrapper) return
 
-    const currentScrollTop = wrapper.scrollTop
+    currentScrollTop += props.scrollSpeed
-    const maxScrollTop = scrollHeight - clientHeight
 
-    if (scrollDirection === 'down') {
+    // 如果滚动到底部，重置到顶部
-      // 向下滚动
+    if (currentScrollTop >= scrollHeight - clientHeight) {
-      const nextScrollTop = currentScrollTop + props.scrollSpeed
+      currentScrollTop = 0
-      
-      if (nextScrollTop >= maxScrollTop) {
-        // 滚动到底部，切换方向为向上
-        wrapper.scrollTop = maxScrollTop
-        scrollDirection = 'up'
-        // 在底部停留一小段时间后开始向上滚动
-        scrollTimer = setTimeout(scroll, 500)
-        return
-      } else {
-        wrapper.scrollTop = nextScrollTop
-      }
-    } else {
-      // 向上滚动
-      const nextScrollTop = currentScrollTop - props.scrollSpeed
-      
-      if (nextScrollTop <= 0) {
-        // 滚动到顶部，切换方向为向下
       wrapper.scrollTop = 0
-        scrollDirection = 'down'
-        // 在顶部停留一小段时间后开始向下滚动
-        scrollTimer = setTimeout(scroll, 500)
-        return
     } else {
-        wrapper.scrollTop = nextScrollTop
+      wrapper.scrollTop = currentScrollTop
-      }
     }
 
     scrollTimer = setTimeout(scroll, 50) // 每50ms滚动一次，实现平滑效果
@@ -167,9 +121,8 @@ const handleMouseEnter = () => {
 const handleMouseLeave = () => {
   if (props.autoScroll) {
     // 延迟启动滚动，避免鼠标快速进出
-    // 从当前位置继续，不重置
     setTimeout(() => {
-      startAutoScroll(false)
+      startAutoScroll()
     }, 500)
   }
 }
@@ -180,8 +133,7 @@ watch(() => props.listData, () => {
     if (props.autoScroll) {
       stopAutoScroll()
       setTimeout(() => {
-        // 数据更新后从顶部重新开始
+        startAutoScroll()
-        startAutoScroll(true)
       }, 1000) // 数据更新后1秒开始滚动
     }
   })
@@ -189,9 +141,9 @@ watch(() => props.listData, () => {
 
 onMounted(() => {
   if (props.autoScroll) {
-    // 组件挂载后延迟启动滚动，从顶部开始
+    // 组件挂载后延迟启动滚动
     setTimeout(() => {
-      startAutoScroll(true)
+      startAutoScroll()
     }, 2000)
   }
 })
@@ -202,9 +154,6 @@ onUnmounted(() => {
 </script>
 
 <style scoped lang="scss">
-.cursor-pointer {
-  cursor: pointer;
-}
 .list-content {
   display: flex;
   width: 68%;

src/views/screen/components/AlertPanel.vue

@@ -52,7 +52,7 @@
               class="alert-text" 
               :class="[{ error: item.error }, { warn: item.warn }]"
             >
-              <a href="'http://10.0.64.20/pms/workorder-list'">{{ (index + 1) }} {{ item.text }}</a>
+              {{ (index + 1) }} {{ item.text }}
             </span>
           </div>
         </div>

src/views/screen/components/HiddenDangerPanel.vue

@@ -1,10 +1,9 @@
 <template>
   <div class="center-container">
     <div class="center-content">
-      <!-- 隐患排查治理 这个标题需要隐藏 2025-10-31 -->
+      <span class="title">隐患排查治理</span>
-      <span class="title"></span>
       <img class="bottom-border-line" src="@/assets/images/title_border_line_1.png" />
-      <span class="sub-title">隐患等级</span>
+      <span class="sub-title">分类风险</span>
       <img width="50%" src="@/assets/images/line_1.png" />
 
       <div class="type-wrapper">
@@ -61,7 +60,7 @@
       <div class="safe-wrapper">
         <span class="safe-title">
           <img width="22" style="margin: 3px 5px 0 0" src="@/assets/images/ybp_icon.png" />
-          安全指数:<p title="安全指数 = 逾期隐患百分比 × 60% + 安全考核通过率 × 20% + 安全培训完成率 × 20%"></p>
+          安全指数:
         </span>
         <span class="pending-count">{{ hiddenDangerData?.safetyIndex || 0 }}</span>
       </div>
@@ -193,15 +192,6 @@ watch(() => props.hiddenDangerData?.progress, (newVal) => {
   refreshProcessCharts(newVal)
 }, { deep: true })
 
-// 辅助函数：安全地将值转换为数字，处理 NaN 和字符串 "NaN" 的情况
-const safeNumber = (val: any): number => {
-  if (val === null || val === undefined || val === '' || val === 'NaN') {
-    return 0
-  }
-  const num = Number(val)
-  return isNaN(num) ? 0 : num
-}
-
 // 更新图表数据
 const refreshProcessCharts = (process): void => {
   if (!props.hiddenDangerData?.progress) {
@@ -209,12 +199,11 @@ const refreshProcessCharts = (process): void => {
     return
   }
   const option = { ...progressChartOption.value }
-  // 确保所有 value 都是有效的数字，将字符串 "NaN" 或真正的 NaN 转换为 0
   option.series[0].data = [
-    { value: safeNumber(process.overdue), name: '已逾期', itemStyle: { color: '#ef4444' } },
+    { value: process.overdue || 0, name: '已逾期', itemStyle: { color: '#ef4444' } },
-    { value: safeNumber(process.processed), name: '已处理', itemStyle: { color: '#10b981' } },
+    { value: process.processed || 0, name: '已处理', itemStyle: { color: '#10b981' } },
-    // { value: safeNumber(process.pending), name: '待排查', itemStyle: { color: '#eab308' } },
+    // { value: process.pending || 0, name: '待排查', itemStyle: { color: '#eab308' } },
-    { value: safeNumber(process.processing), name: '处理中', itemStyle: { color: '#3b82f6' } }
+    { value: process.processing || 0, name: '处理中', itemStyle: { color: '#3b82f6' } }
   ]
   progressChartOption.value = option
 }
@@ -392,8 +381,7 @@ onMounted(() => {
     }
   }
 }
-p{width:17px;    height:17px;   background-color:rgb(125, 125, 152);    border-radius:50%;    text-align:center;    }
+
-p:before{content:'?';    color:yellow;    font-weight: bold;}
 .center-container {
   position: fixed;
   top: 55%;

src/views/screen/components/OverviewPanel.vue

@@ -263,7 +263,7 @@ onMounted(() => {
             line-height: 25px;
             color: #fff;
             text-align: center;
-            background-color: #158e56;
+            background-color: #1afb8f;
             border-radius: 2px;
             transition: all 0.3s ease;
           }

src/views/screen/components/ScreenFrame.vue

@@ -11,12 +11,12 @@
         {{ currentTime }}
       </div>
     </div>
-    <!-- <span class="weather-warning">
+    <span class="weather-warning">
       天气预警:
       <span style="color: red">
         2025年08月19日13:25分中央气象台发布雄安地区于17时至夜间将有200毫米强降雨，并伴有10级大风......
       </span>
-    </span> -->
+    </span>
     <!-- 主内容区 -->
     <div class="content-container">
       <div class="left-wrapper">

src/views/screen/components/WeatherWarning.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="weather-warning">
-    <!-- <span>天气预警:</span> -->
+    <span>天气预警:</span>
     <!-- 预报内容 -->
-    <!-- <div class="weather-scroll-container" @mouseenter="stopWeatherScroll" @mouseleave="startWeatherScroll">
+    <div class="weather-scroll-container" @mouseenter="stopWeatherScroll" @mouseleave="startWeatherScroll">
       <div class="weather-scroll-content" :style="{ transform: `translateX(${scrollPosition}px)` }">
         <span v-for="(item, index) in weatherData" :key="index" class="weather-item"
           :style="{ color: getLevelColor(item.level_code) }">
           {{ item.content }}
         </span>
       </div>
-    </div> -->
+    </div>
   </div>
 </template>
 

src/views/screen/mainScreen.vue

@@ -3,7 +3,7 @@
     <!-- 顶部标题栏 -->
     <div class="header-container">
       <div class="header-left">
-        <div class="back-button" @click="openRegionSelector"> 集团
+        <div class="back-button" @click="openRegionSelector"> 总部
           <span>···</span>
         </div>
       </div>
@@ -60,7 +60,6 @@ import RiskStatisticsPanel from './components/RiskStatisticsPanel.vue'
 import HighRiskAlertPanel from './components/HighRiskAlertPanel.vue'
 import TimeoutWorkOrderPanel from './components/TimeoutWorkOrderPanel.vue'
 import HiddenDangerPanel from './components/HiddenDangerPanel.vue'
-import {error} from "echarts/types/src/util/log";
 
 // 类型定义
 interface AlertItem {
@@ -485,16 +484,7 @@ const handleHiddenDangerPannelData = (query) => {
         _data2.general = Number(res.records[0].general)
         _data2.major = Number(res.records[0].major)
 
-        // 安全指数另算，再起一个报表
-        // dashboardData.value.hiddenDangerData.safetyIndex = res.records[0].safetyIndex
-        // 在这里添加获取安全指数的逻辑
-        getTableList('hidden_danger_safety_index', query).then(res => {
-          if (res.records && res.records.length > 0) {
         dashboardData.value.hiddenDangerData.safetyIndex = res.records[0].safetyIndex
-          }
-        }).catch(error => {
-          console.error('获取隐患排查治理数据失败:', error)
-        })
 
         // 获取隐患排查治理处理进度数据
         getTableList('hidden_danger_process_progress', query).then(res => {
@@ -1355,7 +1345,7 @@ const timeOut1 = (): void => {
 
               @keyframes typeFlashEffect {
                 0% {
-                  background-color: #158e56;
+                  background-color: #1afb8f;
                 }
 
                 50% {
@@ -1363,7 +1353,7 @@ const timeOut1 = (): void => {
                 }
 
                 100% {
-                  background-color: #158e56;
+                  background-color: #1afb8f;
                 }
               }
 
@@ -1381,14 +1371,14 @@ const timeOut1 = (): void => {
                 line-height: 25px;
                 color: #fff;
                 text-align: center;
-                background-color: #158e56;
+                background-color: #1afb8f;
                 border-radius: 2px;
                 animation: typeNumberPulse 1.5s ease-in-out infinite;
                 transition: all 0.3s ease;
               }
 
               .type-number:hover {
-                background-color: #158e56;
+                background-color: #16d47a;
                 transform: scale(1.2);
               }
 

src/views/screen/mainScreenV1.vue

@@ -33,10 +33,9 @@
 
       <div class="center-container">
         <div class="center-content">
-          <!-- 隐患排查治理 -->
+          <span class="title">隐患排查治理</span>
-          <span class="title"></span>
           <img class="bottom-border-line" src="@/assets/images/title_border_line_1.png" />
-          <span class="sub-title">隐患等级</span>
+          <span class="sub-title">分类风险</span>
           <img width="50%" src="@/assets/images/line_1.png" />
           <div class="type-wrapper">
             <div class="type-item">

src/views/screen/parkScreen.vue

@@ -60,8 +60,7 @@
           </div>
           <div class="bottom-card">
             <div class="bottom-card-title">
-              <!--隐患排查治理-->
+              <span>隐患排查治理</span>
-              <span></span>
               <img width="50%" style="margin: 8px 0" src="@/assets/images/line_1.png" />
             </div>
             <div class="type-wrapper">

src/views/screen/powerMonitoring.vue

@@ -1,946 +0,0 @@
-<template>
-  <div class="big-screen-container">
-    <!-- 标题栏 -->
-    <div class="screen-header">
-      <h1 class="screen-title">动环监控大屏</h1>
-      <div class="screen-datetime">{{ currentDateTime }}</div>
-    </div>
-
-    <!-- 主要内容区域 -->
-    <div class="screen-content">
-      <!-- 第一行：统计卡片 -->
-      <div class="stats-row">
-        <!-- 总设备数卡片 -->
-        <div class="stat-card">
-          <div class="card-title">总设备数</div>
-          <div class="card-value">{{ totalDevices.toLocaleString() }}</div>
-          <div class="card-trend growth">
-            <svg class="trend-icon" viewBox="0 0 1024 1024" width="16" height="16" fill="currentColor">
-              <path d="M868 545.5L536.1 163a31.96 31.96 0 0 0-48.3 0L156 545.5a7.97 7.97 0 0 0 6 13.2h81c4.6 0 9-2 12.1-5.5L474 300.9V864c0 4.4 3.6 8 8 8h60c4.4 0 8-3.6 8-8V300.9l218.9 252.3c3 3.5 7.4 5.5 12.1 5.5h81c6.8 0 10.5-8 6-13.2z" />
-            </svg>
-            <!-- <span>较上月增长 {{ totalDevicesGrowth }}%</span> -->
-          </div>
-        </div>
-
-        <!-- 在线设备数卡片 -->
-        <div class="stat-card">
-          <div class="card-title">在线设备数</div>
-          <div class="card-value">{{ onlineDevices.toLocaleString() }}</div>
-          <div class="card-trend online-rate">
-            <!-- <span>在线率 {{ onlineRate }}%</span> -->
-          </div>
-        </div>
-      </div>
-
-      <!-- 第二行：图表 -->
-      <div class="charts-row">
-        <!-- 告警趋势折线图 -->
-        <div class="chart-card">
-          <div class="chart-title">当月告警趋势</div>
-          <div ref="alarmTrendChartRef" class="chart-container"></div>
-        </div>
-
-        <!-- 设备类型分布饼图 -->
-        <div class="chart-card">
-          <div class="chart-title">告警设备类型分布</div>
-          <div ref="deviceTypePieChartRef" class="chart-container"></div>
-        </div>
-      </div>
-
-      <!-- 第三行：园区信息列表 -->
-      <div class="table-row">
-        <div class="table-card">
-          <div class="table-title">园区信息列表</div>
-          <el-table
-            :data="parkList"
-            :style="{ width: '100%' }"
-            class="park-table"
-            height="calc(100% - 50px)"
-            :header-cell-style="{
-              background: '#1a3a52',
-              color: '#ffffff',
-              borderBottom: '1px solid rgba(78, 155, 248, 0.15)',
-              fontWeight: '500',
-              padding: '12px 8px'
-            }"
-            :row-style="getRowStyle"
-            :cell-style="{
-              borderBottom: '1px solid rgba(78, 155, 248, 0.08)',
-              color: '#ffffff',
-              padding: '12px 8px'
-            }"
-          >
-            <el-table-column prop="parkName" label="园区名称" min-width="200" align="left" />
-            <el-table-column prop="totalDevices" label="设备总数" min-width="120" align="center">
-              <template #default="{ row }">
-                <span class="device-count">{{ row.totalDevices }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="upsStatus" label="UPS" min-width="140" align="center">
-              <template #default="{ row }">
-                <span :class="['status-text', row.upsStatus === '正常' ? 'status-normal' : 'status-alarm']">
-                  {{ row.upsStatus }}
-                </span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="airConditionStatus" label="精密空调" min-width="140" align="center">
-              <template #default="{ row }">
-                <span :class="['status-text', row.airConditionStatus === '正常' ? 'status-normal' : 'status-alarm']">
-                  {{ row.airConditionStatus }}
-                </span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="temperatureStatus" label="温湿度" min-width="140" align="center">
-              <template #default="{ row }">
-                <span :class="['status-text', row.temperatureStatus === '正常' ? 'status-normal' : 'status-alarm']">
-                  {{ row.temperatureStatus }}
-                </span>
-              </template>
-            </el-table-column>
-            <el-table-column prop="otherStatus" label="其他" min-width="140" align="center">
-              <template #default="{ row }">
-                <span :class="['status-text', row.otherStatus === '正常' ? 'status-normal' : 'status-alarm']">
-                  {{ row.otherStatus }}
-                </span>
-              </template>
-            </el-table-column>
-            <el-table-column label="详情" min-width="180" align="center">
-              <template #default="{ row }">
-                <a
-                  :class="['detail-link', row.hasAlarm ? 'detail-alarm' : 'detail-normal']"
-                  @click="handleViewDetail(row)"
-                  :href="'http://10.0.64.20/configcenter/console/device-manage'"
-                  target="_blank"
-                >
-                  <span v-if="row.hasAlarm" class="alarm-badge">异常</span>
-                  <span v-else class="normal-badge">正常</span>
-                  查看详情
-                </a>
-              </template>
-            </el-table-column>
-          </el-table>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ref, onMounted, onBeforeUnmount } from 'vue';
-import * as echarts from 'echarts';
-import type { EChartsOption } from 'echarts';
-import { 
-  getPowerEnvDeviceTotalNum,
-  getPowerEnvDeviceAlarmDistribution,
-  getPowerEnvAlarmTrend,
-  getPowerEnvDeviceGroupTypeCampus
-} from '@/api/index';
-
-// 定义园区信息类型
-interface ParkInfo {
-  key: string;
-  parkName: string;
-  totalDevices: number;
-  upsStatus: string;
-  airConditionStatus: string;
-  temperatureStatus: string | number;
-  otherStatus: string;
-  hasAlarm: boolean;
-}
-
-// 当前日期时间
-const currentDateTime = ref('');
-
-// 统计数据
-const totalDevices = ref(0);
-const onlineDevices = ref(0);
-const onlineRate = ref(100); // 在线率写死100%
-
-// 图表引用
-const alarmTrendChartRef = ref<HTMLDivElement>();
-const deviceTypePieChartRef = ref<HTMLDivElement>();
-
-// 图表实例
-let alarmTrendChart: echarts.ECharts | null = null;
-let deviceTypePieChart: echarts.ECharts | null = null;
-
-// 告警趋势数据
-const alarmTrendData = ref({
-  dates: ['5日', '10日', '15日', '20日', '25日', '30日'],
-  values: [8, 4, 20, 16, 21, 9]
-});
-
-// 设备类型分布数据
-const deviceTypeData = ref([
-  { name: 'UPS', value: 35 },
-  { name: '精密空调', value: 25 },
-  { name: '温湿度检测', value: 20 },
-  { name: '其他', value: 20 }
-]);
-
-// 园区信息列表数据
-const parkList = ref<ParkInfo[]>([]);
-
-// 分页参数
-const parkListPage = ref({
-  pageNo: 1,
-  pageSize: 10,
-  total: 0
-});
-
-// 更新日期时间
-const updateDateTime = () => {
-  const now = new Date();
-  const year = now.getFullYear();
-  const month = String(now.getMonth() + 1).padStart(2, '0');
-  const day = String(now.getDate()).padStart(2, '0');
-  const hours = String(now.getHours()).padStart(2, '0');
-  const minutes = String(now.getMinutes()).padStart(2, '0');
-  const seconds = String(now.getSeconds()).padStart(2, '0');
-  currentDateTime.value = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-};
-
-// 初始化告警趋势图表
-const initAlarmTrendChart = (yAxisMax: number = 25) => {
-  if (!alarmTrendChartRef.value) return;
-
-  if (!alarmTrendChart) {
-    alarmTrendChart = echarts.init(alarmTrendChartRef.value);
-  }
-
-  // 计算峰值点（找出最大值）
-  const maxValue = Math.max(...alarmTrendData.value.values, 0);
-  const maxIndex = alarmTrendData.value.values.indexOf(maxValue);
-  const markPointData = maxValue > 0 ? [{ name: '峰值', coord: [maxIndex, maxValue] }] : [];
-
-  const option: EChartsOption = {
-    grid: {
-      top: '15%',
-      left: '8%',
-      right: '5%',
-      bottom: '12%',
-      containLabel: true
-    },
-    xAxis: {
-      type: 'category',
-      data: alarmTrendData.value.dates,
-      axisLine: {
-        lineStyle: {
-          color: '#3a5165'
-        }
-      },
-      axisLabel: {
-        color: '#8b9bb3',
-        fontSize: 12
-      },
-      splitLine: {
-        show: true,
-        lineStyle: {
-          color: '#1e3a52',
-          type: 'dashed'
-        }
-      }
-    },
-    yAxis: {
-      type: 'value',
-      min: 0,
-      max: yAxisMax,
-      interval: yAxisMax / 5,
-      axisLine: {
-        show: false
-      },
-      axisLabel: {
-        color: '#8b9bb3',
-        fontSize: 12
-      },
-      splitLine: {
-        lineStyle: {
-          color: '#1e3a52',
-          type: 'dashed'
-        }
-      }
-    },
-    series: [
-      {
-        data: alarmTrendData.value.values,
-        type: 'line',
-        smooth: true,
-        lineStyle: {
-          color: '#4e9bf8',
-          width: 2
-        },
-        itemStyle: {
-          color: '#4e9bf8',
-          borderWidth: 2
-        },
-        areaStyle: {
-          color: {
-            type: 'linear',
-            x: 0,
-            y: 0,
-            x2: 0,
-            y2: 1,
-            colorStops: [
-              { offset: 0, color: 'rgba(78, 155, 248, 0.3)' },
-              { offset: 1, color: 'rgba(78, 155, 248, 0.05)' }
-            ]
-          }
-        },
-        markPoint: {
-          symbol: 'circle',
-          symbolSize: 8,
-          itemStyle: {
-            color: '#ff5555',
-            borderWidth: 2,
-            borderColor: '#ff5555'
-          },
-          data: markPointData
-        }
-      }
-    ]
-  };
-
-  alarmTrendChart.setOption(option);
-};
-
-// 更新告警趋势图表
-const updateAlarmTrendChart = (yAxisMax: number = 25) => {
-  if (!alarmTrendChart) {
-    initAlarmTrendChart(yAxisMax);
-    return;
-  }
-  
-  // 计算峰值点
-  const maxValue = Math.max(...alarmTrendData.value.values, 0);
-  const maxIndex = alarmTrendData.value.values.indexOf(maxValue);
-  const markPointData = maxValue > 0 ? [{ name: '峰值', coord: [maxIndex, maxValue] }] : [];
-
-  alarmTrendChart.setOption({
-    xAxis: {
-      data: alarmTrendData.value.dates
-    },
-    yAxis: {
-      max: yAxisMax,
-      interval: yAxisMax / 5
-    },
-    series: [
-      {
-        data: alarmTrendData.value.values,
-        markPoint: {
-          data: markPointData
-        }
-      }
-    ]
-  });
-};
-
-// 初始化设备类型分布饼图
-const initDeviceTypePieChart = () => {
-  if (!deviceTypePieChartRef.value) return;
-
-  if (!deviceTypePieChart) {
-    deviceTypePieChart = echarts.init(deviceTypePieChartRef.value);
-  }
-
-  updateDeviceTypePieChart();
-};
-
-// 更新设备类型分布饼图
-const updateDeviceTypePieChart = () => {
-  if (!deviceTypePieChart) {
-    initDeviceTypePieChart();
-    return;
-  }
-
-  const total = deviceTypeData.value.reduce((sum, item) => sum + item.value, 0);
-
-  const option: EChartsOption = {
-    legend: {
-      orient: 'vertical',
-      right: '10%',
-      top: 'center',
-      textStyle: {
-        color: '#ffffff',
-        fontSize: 13
-      },
-      formatter: (name: string) => {
-        const item = deviceTypeData.value.find(d => d.name === name);
-        return `${name} (${item?.value || 0})`;
-      }
-    },
-    series: [
-      {
-        type: 'pie',
-        radius: ['45%', '70%'],
-        center: ['35%', '50%'],
-        avoidLabelOverlap: false,
-        label: {
-          show: true,
-          position: 'center',
-          formatter: () => {
-            return `{value|${total}}\n{label|告警}`;
-          },
-          rich: {
-            value: {
-              color: '#ffffff',
-              fontSize: 28,
-              fontWeight: 'bold',
-              lineHeight: 40
-            },
-            label: {
-              color: '#8b9bb3',
-              fontSize: 14,
-              lineHeight: 20
-            }
-          }
-        },
-        labelLine: {
-          show: false
-        },
-        data: deviceTypeData.value.map((item, index) => {
-          const colors = ['#4e9bf8', '#52c41a', '#fa8c16', '#8c8c8c'];
-          return {
-            name: item.name,
-            value: item.value,
-            itemStyle: {
-              color: colors[index]
-            }
-          };
-        })
-      }
-    ]
-  };
-
-  deviceTypePieChart.setOption(option);
-};
-
-// 获取行样式（条纹效果）
-const getRowStyle = ({ rowIndex }: { rowIndex: number }) => {
-  if (rowIndex % 2 === 0) {
-    return {
-      background: 'rgba(78, 155, 248, 0.03)',
-      color: '#ffffff'
-    };
-  }
-  return {
-    background: 'transparent',
-    color: '#ffffff'
-  };
-};
-
-// 查看详情
-const handleViewDetail = (record: ParkInfo) => {
-  console.log('查看园区详情:', record);
-  // TODO: 实现详情页面跳转或弹窗
-};
-
-// 获取总设备数
-const fetchTotalDevices = async () => {
-  try {
-    const params = {
-      pageNo: 1,
-      pageSize: 10
-    };
-    const response = await getPowerEnvDeviceTotalNum(params);
-    debugger
-    if (response.records?.length > 0) {
-      debugger
-      const total = parseInt(response.records[0].total || '0', 10);
-      totalDevices.value = total;
-      onlineDevices.value = total; // 在线设备数也用total
-    }
-  } catch (error) {
-    console.error('获取总设备数失败:', error);
-  }
-};
-
-// 获取告警设备类型分布
-const fetchAlarmDistribution = async () => {
-  try {
-    const params = {
-      pageNo: 1,
-      pageSize: 10
-    };
-    const response = await getPowerEnvDeviceAlarmDistribution(params);
-    if (response.code === 0 && response.data?.records?.length > 0) {
-      const record = response.data.records[0];
-      deviceTypeData.value = [
-        { name: 'UPS', value: parseInt(record.ups_num || '0', 10) },
-        { name: '精密空调', value: parseInt(record.jmkt_num || '0', 10) },
-        { name: '温湿度检测', value: parseInt(record.wsd_num || '0', 10) },
-        { name: '其他', value: parseInt(record.other_num || '0', 10) }
-      ];
-      // 更新饼图
-      updateDeviceTypePieChart();
-    }
-  } catch (error) {
-    console.error('获取告警设备类型分布失败:', error);
-  }
-};
-
-// 获取当月告警趋势
-const fetchAlarmTrend = async () => {
-  try {
-    const params = {
-      pageNo: 1,
-      pageSize: 100 // 可能需要获取更多数据
-    };
-    const response = await getPowerEnvAlarmTrend(params);
-    if (response.code === 0 && response.data?.records?.length > 0) {
-      const records = response.data.records;
-      // 处理日期格式：从 "2025-12-10" 转换为 "10日"
-      const dates = records.map((item: any) => {
-        const date = new Date(item.alarm_date);
-        return `${date.getDate()}日`;
-      });
-      const values = records.map((item: any) => parseInt(item.alarm_count || '0', 10));
-      
-      alarmTrendData.value = {
-        dates,
-        values
-      };
-      
-      // 计算最大值用于设置y轴
-      const maxValue = Math.max(...values, 0);
-      const yAxisMax = maxValue > 0 ? Math.ceil(maxValue / 5) * 5 : 25;
-      
-      // 更新折线图
-      updateAlarmTrendChart(yAxisMax);
-    }
-  } catch (error) {
-    console.error('获取当月告警趋势失败:', error);
-  }
-};
-
-// 格式化状态显示：如果数量>0显示"X个告警"，否则"正常"
-const formatStatus = (count: string | number): string => {
-  const num = typeof count === 'string' ? parseInt(count || '0', 10) : count;
-  return num > 0 ? `${num}个告警` : '正常';
-};
-
-// 获取园区信息列表
-const fetchParkList = async () => {
-  try {
-    const params = {
-      pageNo: parkListPage.value.pageNo,
-      pageSize: parkListPage.value.pageSize
-    };
-    const response = await getPowerEnvDeviceGroupTypeCampus(params);
-    debugger
-    if (response.records?.length>0) {
-      parkListPage.value.total = response.records?.length || 0;
-      
-      if (response.records && response.records.length > 0) {
-        parkList.value = response.records.map((item: any) => {
-          const upsCount = parseInt(item.ups || '0', 10);
-          const jmktCount = parseInt(item.jmkt || '0', 10);
-          const wsdCount = parseInt(item.wsd || '0', 10);
-          const otherCount = parseInt(item.other || '0', 10);
-          const alarmCount = parseInt(item.alarm || '0', 10);
-          
-          return {
-            key: item.campus_id || item.row_id,
-            parkName: item.campus_name || '',
-            totalDevices: parseInt(item.total || '0', 10),
-            upsStatus: formatStatus(upsCount),
-            airConditionStatus: formatStatus(jmktCount),
-            temperatureStatus: formatStatus(wsdCount),
-            otherStatus: formatStatus(otherCount),
-            hasAlarm: alarmCount > 0
-          };
-        });
-      } else {
-        parkList.value = [];
-      }
-    }
-  } catch (error) {
-    console.error('获取园区信息列表失败:', error);
-  }
-};
-
-// 定时器
-let dateTimeTimer: number | null = null;
-
-// 组件挂载
-onMounted(async () => {
-  // 更新日期时间
-  updateDateTime();
-  dateTimeTimer = window.setInterval(updateDateTime, 1000);
-
-  // 获取总设备数
-  fetchTotalDevices();
-
-  // 获取园区信息列表
-  fetchParkList();
-
-  // 初始化图表（先用默认数据）
-  setTimeout(() => {
-    initAlarmTrendChart();
-    initDeviceTypePieChart();
-    
-    // 图表初始化后再获取数据并更新
-    fetchAlarmDistribution();
-    fetchAlarmTrend();
-  }, 100);
-
-  // 监听窗口大小变化
-  window.addEventListener('resize', handleResize);
-});
-
-// 组件卸载
-onBeforeUnmount(() => {
-  if (dateTimeTimer) {
-    clearInterval(dateTimeTimer);
-  }
-  if (alarmTrendChart) {
-    alarmTrendChart.dispose();
-  }
-  if (deviceTypePieChart) {
-    deviceTypePieChart.dispose();
-  }
-  window.removeEventListener('resize', handleResize);
-});
-
-// 处理窗口大小变化
-const handleResize = () => {
-  alarmTrendChart?.resize();
-  deviceTypePieChart?.resize();
-};
-</script>
-
-<style scoped lang="scss">
-.big-screen-container {
-  width: 100%;
-  min-height: 100vh;
-  background: linear-gradient(180deg, #0a1929 0%, #0d1e2f 100%);
-  padding: 20px;
-  box-sizing: border-box;
-  overflow: auto;
-}
-
-// 标题栏
-.screen-header {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  margin-bottom: 20px;
-  padding: 0 10px;
-
-  .screen-title {
-    font-size: 32px;
-    font-weight: bold;
-    color: #ffffff;
-    margin: 0;
-    letter-spacing: 2px;
-  }
-
-  .screen-datetime {
-    font-size: 18px;
-    color: #8b9bb3;
-    font-family: 'Courier New', monospace;
-  }
-}
-
-// 主要内容区域
-.screen-content {
-  display: flex;
-  flex-direction: column;
-  gap: 20px;
-}
-
-// 统计卡片行
-.stats-row {
-  display: grid;
-  grid-template-columns: repeat(2, 1fr);
-  gap: 20px;
-}
-
-.stat-card {
-  background: linear-gradient(135deg, #1a2940 0%, #0f1e2d 100%);
-  border-radius: 12px;
-  padding: 30px;
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
-  border: 1px solid rgba(78, 155, 248, 0.1);
-
-  .card-title {
-    font-size: 16px;
-    color: #8b9bb3;
-    margin-bottom: 15px;
-  }
-
-  .card-value {
-    font-size: 48px;
-    font-weight: bold;
-    color: #ffffff;
-    margin-bottom: 12px;
-    font-family: 'Arial', sans-serif;
-  }
-
-  .card-trend {
-    display: flex;
-    align-items: center;
-    gap: 6px;
-    font-size: 14px;
-
-    &.growth {
-      color: #52c41a;
-
-      .trend-icon {
-        width: 16px;
-        height: 16px;
-        flex-shrink: 0;
-      }
-    }
-
-    &.online-rate {
-      color: #13c2c2;
-    }
-  }
-}
-
-// 图表行
-.charts-row {
-  display: grid;
-  grid-template-columns: repeat(2, 1fr);
-  gap: 20px;
-}
-
-.chart-card {
-  background: linear-gradient(135deg, #1a2940 0%, #0f1e2d 100%);
-  border-radius: 12px;
-  padding: 20px;
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
-  border: 1px solid rgba(78, 155, 248, 0.1);
-  height: 350px;
-
-  .chart-title {
-    font-size: 16px;
-    color: #ffffff;
-    margin-bottom: 15px;
-    font-weight: 500;
-  }
-
-  .chart-container {
-    width: 100%;
-    height: calc(100% - 40px);
-  }
-}
-
-// 表格行
-.table-row {
-  width: 100%;
-}
-
-.table-card {
-  background: linear-gradient(135deg, #1a2940 0%, #0f1e2d 100%);
-  border-radius: 12px;
-  padding: 20px;
-  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
-  border: 1px solid rgba(78, 155, 248, 0.1);
-  height: 450px;
-
-  .table-title {
-    font-size: 16px;
-    color: #ffffff;
-    margin-bottom: 15px;
-    font-weight: 500;
-  }
-
-  :deep(.park-table) {
-    background: transparent !important;
-    
-    // 表格主体背景
-    .el-table__inner-wrapper {
-      background: transparent !important;
-      
-      &::before {
-        display: none;
-      }
-    }
-
-    .el-table__body-wrapper {
-      background: transparent !important;
-      
-      // 滚动条样式
-      scrollbar-width: thin;
-      scrollbar-color: rgba(78, 155, 248, 0.3) transparent;
-
-      &::-webkit-scrollbar {
-        width: 6px;
-      }
-
-      &::-webkit-scrollbar-thumb {
-        background: rgba(78, 155, 248, 0.3);
-        border-radius: 3px;
-      }
-
-      &::-webkit-scrollbar-track {
-        background: transparent;
-      }
-    }
-
-    .el-table__header-wrapper,
-    .el-table__footer-wrapper {
-      background: transparent !important;
-    }
-
-    // 表格行悬浮效果
-    .el-table__row {
-      &:hover > td {
-        background: rgba(78, 155, 248, 0.1) !important;
-      }
-    }
-
-    // 空数据样式
-    .el-table__empty-block {
-      background: transparent !important;
-      
-      .el-table__empty-text {
-        color: #8b9bb3;
-      }
-    }
-
-    .device-count {
-      color: #ffffff;
-      font-weight: 500;
-    }
-
-    .status-text {
-      padding: 2px 8px;
-      border-radius: 4px;
-      font-size: 13px;
-
-      &.status-normal {
-        color: #52c41a;
-      }
-
-      &.status-alarm {
-        color: #ff4d4f;
-      }
-    }
-
-    .detail-link {
-      cursor: pointer;
-      font-size: 13px;
-      display: inline-flex;
-      align-items: center;
-      gap: 8px;
-      text-decoration: none;
-      color: #4e9bf8;
-
-      .alarm-badge,
-      .normal-badge {
-        display: inline-block;
-        padding: 4px 12px;
-        border-radius: 4px;
-        font-size: 12px;
-        color: #ffffff;
-        font-weight: 500;
-      }
-
-      .alarm-badge {
-        background: #ff4d4f;
-      }
-
-      .normal-badge {
-        background: #52c41a;
-      }
-
-      &:hover {
-        opacity: 0.8;
-      }
-    }
-  }
-}
-
-// 响应式布局
-@media screen and (max-width: 1600px) {
-  .screen-header {
-    .screen-title {
-      font-size: 28px;
-    }
-
-    .screen-datetime {
-      font-size: 16px;
-    }
-  }
-
-  .stat-card {
-    padding: 25px;
-
-    .card-value {
-      font-size: 42px;
-    }
-  }
-
-  .chart-card {
-    height: 320px;
-  }
-
-  .table-card {
-    height: 400px;
-  }
-}
-
-@media screen and (max-width: 1280px) {
-  .screen-header {
-    .screen-title {
-      font-size: 26px;
-    }
-
-    .screen-datetime {
-      font-size: 15px;
-    }
-  }
-
-  .stat-card {
-    padding: 20px;
-
-    .card-title {
-      font-size: 14px;
-    }
-
-    .card-value {
-      font-size: 38px;
-    }
-
-    .card-trend {
-      font-size: 13px;
-    }
-  }
-
-  .chart-card {
-    height: 300px;
-    padding: 15px;
-
-    .chart-title {
-      font-size: 14px;
-    }
-  }
-
-  .table-card {
-    height: 380px;
-    padding: 15px;
-
-    .table-title {
-      font-size: 14px;
-    }
-  }
-}
-
-// 仅在非常小的屏幕（小于1024px）才改为单列
-@media screen and (max-width: 1024px) {
-  .stats-row,
-  .charts-row {
-    grid-template-columns: 1fr;
-  }
-
-  .chart-card {
-    height: 280px;
-  }
-
-  .table-card {
-    height: 360px;
-  }
-}
-</style>

src/views/screen/regionScreen.vue

@@ -3,8 +3,7 @@
     <!-- 顶部标题栏 -->
     <div class="header-container">
       <div class="header-left">
-        <img class="back-img" @click="returnToHeadquarters"
+        <img class="back-img" @click="returnToHeadquarters" src="@/assets/images/screen/back_image.png" />
-             src="@/assets/images/screen/back_image.png"/>
         <div class="back-button" @click="openRegionSelector"> {{ selectedRegion }}
           <span>···</span>
         </div>
@@ -23,28 +22,23 @@
       <div class="left-wrapper">
         <OverviewPanel :totalCount="dashboardData?.totalCount || 0"
           :formalEmployeeCount="dashboardData?.formalEmployeeCount || 0"
-                       :externalStaffCount="dashboardData?.externalStaffCount || 0"
+          :externalStaffCount="dashboardData?.externalStaffCount || 0" :visitorCount="dashboardData?.visitorCount || 0"
-                       :visitorCount="dashboardData?.visitorCount || 0"
           :parkStatistics="dashboardData?.parkStatistics" />
-        <RiskStatisticsPanel :riskStatistics="riskStatistics" :dangerDetail="dangerDetail"
+        <RiskStatisticsPanel :riskStatistics="riskStatistics" :dangerDetail="dangerDetail" :park="parkValue"
-                             :park="parkValue"
           @tab-change="handleRiskTabChange" :campus_id="query.campus_id" />
       </div>
       <div class="right-wrapper">
-        <HighRiskAlertPanel :alertData="dashboardData?.alertData"
+        <HighRiskAlertPanel :alertData="dashboardData?.alertData" :alertDetails="dashboardData?.alertData.details"
-                            :alertDetails="dashboardData?.alertData.details"
           :sourceIndex="sourceIndex" />
         <TimeoutWorkOrderPanel :timeoutWorkOrders="dashboardData?.timeoutWorkOrders"
-                               :alertDetails="dashboardData?.timeoutWorkOrders.details"
+          :alertDetails="dashboardData?.timeoutWorkOrders.details" :sourceIndex="sourceIndex" />
-                               :sourceIndex="sourceIndex"/>
       </div>
       <HiddenDangerPanel :hiddenDangerData="dashboardData?.hiddenDangerData" />
     </div>
   </div>
 
   <!-- 区域选择弹窗 -->
-  <RegionSelector v-model="regionSelectorVisible" :modelSelected="selectedPark"
+  <RegionSelector v-model="regionSelectorVisible" :modelSelected="selectedPark" :regions="regionOption"
-                  :regions="regionOption"
     @change="onRegionChange" />
 </template>
 
@@ -258,9 +252,7 @@ onMounted(async () => {
       // 去重region字段，使用Map来确保唯一性
       const regionMap = new Map()
       records.filter((el) => el.region_id == query.regionCode)
-        .map(el => {
+        .map(el => { return el })
-          return el
-        })
         .forEach(el => {
           if (!regionMap.has(el.park_name)) {
             regionMap.set(el.park_name, {
@@ -374,9 +366,9 @@ const loadDashboardData = async (): Promise<void> => {
   try {
     // 获取风险预警详情数据
     getTableList('risk_alert_detail', query).then(risk_alert_detail => {
-      // if (risk_alert_detail.records && risk_alert_detail.records.length > 0) {
+      if (risk_alert_detail.records && risk_alert_detail.records.length > 0) {
-        dashboardData.value.alertData.details = risk_alert_detail.records || []
+        dashboardData.value.alertData.details = risk_alert_detail.records
-      // }
+      }
     }).catch(error => {
       console.error('获取风险预警详情数据失败:', error)
     })
@@ -488,16 +480,7 @@ const handleHiddenDangerPannelData = (query) => {
         _data2.general = Number(res.records[0].general)
         _data2.major = Number(res.records[0].major)
 
-        // 安全指数另算，再起一个报表
-        // dashboardData.value.hiddenDangerData.safetyIndex = res.records[0].safetyIndex
-        // 在这里添加获取安全指数的逻辑
-        getTableList('hidden_danger_safety_index', query).then(res => {
-          if (res.records && res.records.length > 0) {
         dashboardData.value.hiddenDangerData.safetyIndex = res.records[0].safetyIndex
-          }
-        }).catch(error => {
-          console.error('获取隐患排查治理数据失败:', error)
-        })
 
         // 获取隐患排查治理处理进度数据
         getTableList('hidden_danger_process_progress', query).then(res => {
@@ -1236,10 +1219,12 @@ const timeOut1 = (): void => {
 
     .left-top {
       padding: 0 5px;
-      background-image: url('@/assets/images/screen/left_top_img.png'),
+      background-image:
+        url('@/assets/images/screen/left_top_img.png'),
         url('@/assets/images/screen/left_center_img.png'),
         url('@/assets/images/screen/left_bottom_img.png');
-      background-position: top center,
+      background-position:
+        top center,
         left center,
         bottom center;
 
@@ -1247,7 +1232,8 @@ const timeOut1 = (): void => {
       background-repeat: no-repeat, no-repeat, no-repeat;
 
       /* 设置位置 */
-      background-size: 100% 90px,
+      background-size:
+        100% 90px,
         cover,
         100% 68px;
       flex: 1;
@@ -1410,10 +1396,12 @@ const timeOut1 = (): void => {
     }
 
     .left-bottom {
-      background-image: url('@/assets/images/screen/left_top_2_img.png'),
+      background-image:
+        url('@/assets/images/screen/left_top_2_img.png'),
         url('@/assets/images/screen/left_center_img.png'),
         url('@/assets/images/screen/left_bottom_img.png');
-      background-position: top center,
+      background-position:
+        top center,
         left center,
         bottom center;
 
@@ -1421,7 +1409,8 @@ const timeOut1 = (): void => {
       background-repeat: no-repeat, no-repeat, no-repeat;
 
       /* 设置位置 */
-      background-size: 100% 90px,
+      background-size:
+        100% 90px,
         cover,
         100% 68px;
       flex: 1;
@@ -1473,6 +1462,8 @@ const timeOut1 = (): void => {
     row-gap: 1rem;
 
 
+
+
   }
 
   .center-container {

vite.config.ts

@@ -32,7 +32,7 @@ export default ({ command, mode }: ConfigEnv): UserConfig => {
       // 本地跨域代理. 目前注释的原因：暂时没有用途，server 端已经支持跨域
       proxy: {
         ['/admin-api']: {
-          target: 'http://carson.wang:48080',
+          target: 'http://10.28.117.100:48080',
           ws: false,
           changeOrigin: true,
           rewrite: (path) => path.replace(new RegExp(`^/admin-api`), ''),