feat(bpm): 添加处理待阅功能并优化流程实例详情页

- 新增 handleProcessInstanceCC 接口用于处理待阅操作
- 在流程实例详情页初始化时调用待阅处理接口
- 优化页面按钮图标与文字的布局展示
- 调整打印表单相关逻辑及页面结构
- 统一接口请求参数格式并移除多余空格
- 修复表单变量合并逻辑并优化对象展开语法
- 更新组件引用路径及函数调用方式一致性

.env.dev

@@ -4,7 +4,7 @@ VITE_NODE_ENV=development
 VITE_DEV=true
 
 # 请求路径 注：/api 正常不需要 当前是访问演示环境nginx转发用
-VITE_BASE_URL='http://10.28.117.100'
+VITE_BASE_URL='https://demo.jeelowcode.com/api'
 
 # 文件上传类型：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%" :class="greyMode ? `${prefixCls}-grey-mode` : ''">
+    <div class="h-100% w-100%" style="overflow-y: auto;" :class="greyMode ? `${prefixCls}-grey-mode` : ''">
       <RouterView />
     </div>
     <routerSearch />

src/api/bpm/processInstance/index.ts

@@ -27,16 +27,16 @@ export type ProcessInstanceCCVO = {
   processInstanceName: string,
   processInstanceKey: string,
   startUserId: string,
-  options:string [],
+  options: string [],
   reason: string
 }
 
 export const getMyProcessInstancePage = async (params) => {
-  return await request.get({ url: '/bpm/process-instance/my-page', params })
+  return await request.get({url: '/bpm/process-instance/my-page', params})
 }
 
 export const createProcessInstance = async (data) => {
-  return await request.post({ url: '/bpm/process-instance/create', data: data })
+  return await request.post({url: '/bpm/process-instance/create', data: data})
 }
 
 export const cancelProcessInstance = async (id: number, reason: string) => {
@@ -44,11 +44,11 @@ export const cancelProcessInstance = async (id: number, reason: string) => {
     id: id,
     reason: reason
   }
-  return await request.delete({ url: '/bpm/process-instance/cancel', data: data })
+  return await request.delete({url: '/bpm/process-instance/cancel', data: data})
 }
 
 export const getProcessInstance = async (id: number) => {
-  return await request.get({ url: '/bpm/process-instance/get?id=' + id })
+  return await request.get({url: '/bpm/process-instance/get?id=' + id})
 }
 
 /**
@@ -57,7 +57,7 @@ export const getProcessInstance = async (id: number) => {
  * @returns 是否抄送成功
  */
 export const createProcessInstanceCC = async (data) => {
-  return await request.post({ url: '/bpm/process-instance/cc/create', data: data })
+  return await request.post({url: '/bpm/process-instance/cc/create', data: data})
 }
 
 /**
@@ -66,5 +66,9 @@ export const createProcessInstanceCC = async (data) => {
  * @returns
  */
 export const getProcessInstanceCCPage = async (params) => {
-  return await request.get({ url: '/bpm/process-instance/cc/my-page', 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,5 +1,6 @@
 import request from '@/config/axios'
 import { encryptAES } from '@/components/LowDesign/src/utils/aes'
+import download from '@/utils/download'
 
 //获取表单开发列表
 export const getDbList = (data) => {
@@ -158,6 +159,11 @@ 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

@@ -0,0 +1,121 @@
+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 })
+}

src/assets/svgs/trend.svg

@@ -0,0 +1,3 @@
+            <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

@@ -0,0 +1,107 @@
+<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,6 +18,18 @@
           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
@@ -383,12 +395,108 @@ 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',
@@ -440,6 +548,17 @@ 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,5 +1,6 @@
 <template>
   <div class="dic-table-select-box w-100%">
+    {{ JSON.stringify(props) }}
     <div
       class="table-input pos-relative"
       :class="[{ disabled }, type, size]"
@@ -273,9 +274,9 @@ const getCurrTableSelect = (type?) => {
   const dicObj = {}
   const textList: string[] = []
   const ids = tableRef.value.tableSelect.map((item) => {
-    if (item[props.column.dictText]) {
+    if (item[props.column.dictCode]) {
-      dicObj[item[dicCode.value]] = item[props.column.dictText]
+      dicObj[item[dicCode.value]] = item[props.column.dictCode]
-      textList.push(item[props.column.dictText])
+      textList.push(item[props.column.dictCode])
     }
     return item[dicCode.value]
   })

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

@@ -217,7 +217,7 @@ defineOptions({ name: 'UserSelect' })
  * all_sub 所有下级
  */
 
-interface Column {
+export 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' }],
+  deptFindType: [{ label: '全部部门', value: 'all' }, { label: '本级部门', value: 'now' }, { label: '本级及下级部门', value: 'sub' }, { label: '外协单位', value: 'out' }, { label: '内部单位', value: 'internal' }],
   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,6 +7,7 @@ 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() // 消息弹窗
 
@@ -18,6 +19,7 @@ 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,13 +546,15 @@ 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') {
+    } else if (column[key]?.controlType == 'date'||key=='create_time') {
+      
       if (data[key]) {
         if (typeof data[key] == 'number' || typeof data[key] == 'string') {
           data[key] = data[key] + ''
           if (!(/[-|\/]/g.test(data[key]))) {
             //如果是时间戳强制转换
-            data[key] = formatDate(new Date(data[key]), column[key].valueFormat || 'YYYY-MM-DD HH:mm:ss')
+            const timestamp = parseInt(data[key], 10)
+            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: 30000,
+  request_timeout: 300000,
 
   /**
    * 默认接口请求类型
@@ -30,4 +30,4 @@ const specificApiTimeoutObj = {
   '/infra/file/jeelowcode/upload': 120000,//上传文件接口
 }
 
-export { config, specificApiTimeoutObj }
+export {config, specificApiTimeoutObj}

src/plugins/echarts/index.ts

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

src/router/modules/remaining.ts

@@ -57,6 +57,17 @@ 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'),
@@ -67,6 +78,30 @@ 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
+        }
       }
     ]
   },
@@ -364,6 +399,17 @@ 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,13 +227,11 @@ const getCookie = () => {
 // 根据域名，获得租户信息
 const getTenantByWebsite = async () => {
   const website = location.host
-  try {
+  const res = await LoginApi.getTenantByWebsite(website)
-    const res = await LoginApi.getTenantByWebsite(website)
+  if (res) {
-    if (res) {
+    loginData.loginForm.tenantName = res.name
-      loginData.loginForm.tenantName = res.name
+    authUtil.setTenantId(res.id)
-      authUtil.setTenantId(res.id)
+  }
-    }
-  } catch (e) { }
 }
 const loading = ref() // ElLoading.service 返回的实例
 // 登录
@@ -270,7 +268,12 @@ 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%">
+        <el-select v-model="formData.type" clearable style="width: 100%" disabled>
           <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 = undefined as unknown as number
+    formData.value.type = 30
     formData.value.taskName = row.name
     formData.value.taskId = row.id
     formData.value.processInstanceName = row.processInstance.name

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

@@ -34,27 +34,29 @@
         </el-form>
         <div style="margin-bottom: 20px; margin-left: 10%; font-size: 14px">
           <el-button type="success" @click="handleAudit(item, true)">
-            <Icon icon="ep:select" />
+            <Icon icon="ep:select"/>
             通过
           </el-button>
           <el-button type="danger" @click="handleAudit(item, false)">
-            <Icon icon="ep:close" />
+            <Icon icon="ep:close"/>
             不通过
           </el-button>
-          <el-button type="primary" @click="openTaskUpdateAssigneeForm(item.id)">
+
-            <Icon icon="ep:edit" />
+          <el-button type="primary" @click="handleCC(item)">
-            转办
+            <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)">
+         <el-button type="primary" @click="handleSign(item)">
-            <Icon icon="ep:plus" />
+           <Icon icon="ep:plus" />
-            加签
+           加签
-          </el-button>
+         </el-button> -->
+
           <el-button type="warning" @click="handleBack(item)">
-            <Icon icon="ep:back" />
+            <Icon icon="ep:back"/>
             回退
           </el-button>
         </div>
@@ -62,28 +64,28 @@
     </el-card>
 
     <div id="Printer">
-    <!-- 申请信息 -->
+      <!-- 申请信息 -->
-    <el-card v-loading="processInstanceLoading" class="box-card" 
+      <el-card v-loading="processInstanceLoading" class="box-card"
       >
-      <template #header>
+        <template #header>
-        <span class="el-icon-document">申请信息【{{ processInstance.name  }}】</span>
+          <span class="el-icon-document">申请信息【{{ processInstance.name }}】</span>
-         <el-button type="success" @click="printPage()">
+          <el-button type="success" @click="printPage()">
-            <Icon icon="ep:printer" />
+            <Icon icon="ep:printer"/>
             打印表单
           </el-button>
-      </template>
+        </template>
-      <!-- 情况一：流程表单 -->
+        <!-- 情况一：流程表单 -->
-      <el-col v-if="processInstance?.processDefinition?.formType === 10" :span="24">
+        <el-col v-if="processInstance?.processDefinition?.formType === 10" :span="24">
-        <FormView form-type="view" show-type="view" v-bind="detailForm"></FormView>
+          <FormView form-type="view" show-type="view" v-bind="detailForm"></FormView>
-      </el-col>
+        </el-col>
-      <!-- 情况二：业务表单 -->
+        <!-- 情况二：业务表单 -->
-      <div v-if="processInstance?.processDefinition?.formType === 20">
+        <div v-if="processInstance?.processDefinition?.formType === 20">
-        <BusinessFormComponent :id="processInstance.businessKey" />
+          <BusinessFormComponent :id="processInstance.businessKey"/>
-      </div>
+        </div>
-    </el-card>
+      </el-card>
 
-    <!-- 审批记录 -->
+      <!-- 审批记录 -->
-    <ProcessInstanceTaskList :loading="tasksLoad" :tasks="tasks" />
+      <ProcessInstanceTaskList :loading="tasksLoad" :tasks="tasks"/>
     </div>
     <!-- 高亮流程图 -->
     <ProcessInstanceBpmnViewer
@@ -95,17 +97,18 @@
     />
 
     <!-- 弹窗：转派审批人 -->
-    <TaskUpdateAssigneeForm ref="taskUpdateAssigneeFormRef" @success="getDetail" />
+    <TaskUpdateAssigneeForm ref="taskUpdateAssigneeFormRef" @success="getDetail"/>
     <!-- 弹窗，回退节点 -->
-    <TaskReturnDialog ref="taskReturnDialogRef" @success="getDetail" />
+    <TaskReturnDialog ref="taskReturnDialogRef" @success="getDetail"/>
     <!-- 委派，将任务委派给别人处理，处理完成后，会重新回到原审批人手中-->
-    <TaskDelegateForm ref="taskDelegateForm" @success="getDetail" />
+    <TaskDelegateForm ref="taskDelegateForm" @success="getDetail"/>
     <!-- 加签，当前任务审批人为A，向前加签选了一个C，则需要C先审批，然后再是A审批，向后加签B，A审批完，需要B再审批完，才算完成这个任务节点 -->
-    <TaskAddSignDialogForm ref="taskAddSignDialogForm" @success="getDetail" />
+    <TaskAddSignDialogForm ref="taskAddSignDialogForm" @success="getDetail"/>
+    <TaskCCDialogForm ref="taskCCDialogForm"/>
   </ContentWrap>
 </template>
 <script lang="ts" setup>
-import { useUserStore } from '@/store/modules/user'
+import {useUserStore} from '@/store/modules/user'
 import * as DefinitionApi from '@/api/bpm/definition'
 import * as ProcessInstanceApi from '@/api/bpm/processInstance'
 import * as TaskApi from '@/api/bpm/task'
@@ -115,19 +118,21 @@ import ProcessInstanceTaskList from './ProcessInstanceTaskList.vue'
 import TaskReturnDialog from './TaskReturnDialogForm.vue'
 import TaskDelegateForm from './TaskDelegateForm.vue'
 import TaskAddSignDialogForm from './TaskAddSignDialogForm.vue'
-import { registerComponent } from '@/utils/routerHelper'
+import {registerComponent} from '@/utils/routerHelper'
-import { isEmpty } from '@/utils/is'
+import {isEmpty} from '@/utils/is'
 import router from '@/router/index'
-import { $Print } from '@smallwei/avue'
+import {$Print} from '@smallwei/avue'
+import TaskCCDialogForm from '../../processInstance/detail/TaskCCDialogForm.vue'
 
-defineOptions({ name: 'BpmProcessInstanceDetail' })
+defineOptions({name: 'BpmProcessInstanceDetail'})
 
-const { query } = useRoute() // 查询参数
+const {query} = useRoute() // 查询参数
 const message = useMessage() // 消息弹窗
-const { proxy } = getCurrentInstance() as any
+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
@@ -137,7 +142,7 @@ const tasks = ref<any[]>([]) // 任务列表
 const runningTasks = ref<any[]>([]) // 运行中的任务
 const auditForms = ref<any[]>([]) // 审批任务的表单
 const auditRule = reactive({
-  reason: [{ required: true, message: '审批建议不能为空', trigger: 'blur' }]
+  reason: [{required: true, message: '审批建议不能为空', trigger: 'blur'}]
 })
 // ========== 申请信息 ==========
 const detailForm = ref({
@@ -173,11 +178,19 @@ const handleAudit = async (task, pass) => {
   getDetail()
 }
 
+const taskCCDialogForm = ref()
+/** 处理抄送按钮 */
+const handleCC = (row) => {
+  taskCCDialogForm.value.open(row)
+}
+
+
 const printPage = async () => {
 
- const { href } = router.resolve({ name: 'BpmProcessInstanceInfo', 
+  const {href} = router.resolve({
-                                  query: { id: String(id), isPrint: '1'  }
+    name: 'BpmProcessInstanceInfo',
-                                })
+    query: {id: String(id), isPrint: '1'}
+  })
   window.open(href, '_blank', 'noopener,noreferrer')
 }
 
@@ -206,6 +219,15 @@ 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. 获得流程实例相关
@@ -231,6 +253,10 @@ 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,
@@ -308,7 +334,7 @@ const loadRunningTask = (tasks) => {
       return
     }
     // 2.3 添加到处理任务
-    runningTasks.value.push({ ...task })
+    runningTasks.value.push({...task})
     auditForms.value.push({
       reason: ''
     })
@@ -316,10 +342,11 @@ const loadRunningTask = (tasks) => {
 }
 
 /** 初始化 */
-onMounted(async() => {
+onMounted(async () => {
+  await handleRead()
   await getDetail()
   await nextTick()
- if (query.isPrint === '1') {
+  if (query.isPrint === '1') {
     await new Promise(resolve => setTimeout(resolve, 2000))
     $Print('#Printer')
   }

src/views/bpm/processInstance/index.vue

@@ -16,7 +16,7 @@
       @current-change="currentChange"
     >
       <template #category="{ row }">
-        <dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="row.category || ''" />
+        <dict-tag :type="DICT_TYPE.BPM_MODEL_CATEGORY" :value="row.category || ''"/>
       </template>
       <template #status="scope">
         <dict-tag
@@ -38,8 +38,9 @@
         />
       </template>
       <template #menu-left>
-        <el-button type="primary" v-hasPermi="['bpm:process-instance:query']" @click="handleCreate">
+        <el-button type="primary" v-hasPermi="['bpm:process-instance:create']" @click="handleCreate">
-          <Icon icon="ep:plus" class="mr-5px" /> 发起流程
+          <Icon icon="ep:plus" class="mr-5px"/>
+          发起流程
         </el-button>
       </template>
       <!-- 自定义操作栏 -->
@@ -47,34 +48,34 @@
         <el-button
           link
           type="primary"
-          v-hasPermi="['bpm:process-instance:cancel']"
+          v-hasPermi="['bpm:process-instance:query']"
           @click="handleDetail(row)"
         >
           详情
         </el-button>
-        <!-- <el-button
+        <el-button
           link
           type="danger"
-          v-if="row.result === 1"
+          v-if="row.result === 1|| row.result === 2"
-          v-hasPermi="['bpm:process-instance:query']"
+          v-hasPermi="['bpm:process-instance:cancel']"
           @click="handleCancel(row)"
         >
           取消
-        </el-button> -->
+        </el-button>
       </template>
     </avue-crud>
   </ContentWrap>
 </template>
 <script lang="ts" setup>
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import {DICT_TYPE, getIntDictOptions} from '@/utils/dict'
-import { dateFormatter, getSearchDate } from '@/utils/formatTime'
+import {dateFormatter, getSearchDate} from '@/utils/formatTime'
 import * as ProcessInstanceApi from '@/api/bpm/processInstance'
 
-defineOptions({ name: 'BpmCCProcessInstance' })
+defineOptions({name: 'BpmCCProcessInstance'})
 const router = useRouter() // 路由
 const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
+const {t} = useI18n() // 国际化
-const { getCurrPermi } = useCrudPermi()
+const {getCurrPermi} = useCrudPermi()
 
 const loading = ref(true) // 列表的加载中
 const tableOption = reactive({
@@ -104,7 +105,7 @@ const tableOption = reactive({
       type: 'select',
       span: 12,
       dicData: getIntDictOptions(DICT_TYPE.BPM_MODEL_CATEGORY),
-      rules: [{ required: true, message: '流程分类不能为空', trigger: 'blur' }]
+      rules: [{required: true, message: '流程分类不能为空', trigger: 'blur'}]
     },
     tasks: {
       label: '当前审批任务'
@@ -115,7 +116,7 @@ const tableOption = reactive({
       type: 'select',
       span: 12,
       dicData: getIntDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_STATUS),
-      rules: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
+      rules: [{required: true, message: '状态不能为空', trigger: 'blur'}]
     },
     result: {
       label: '结果',
@@ -123,7 +124,7 @@ const tableOption = reactive({
       type: 'select',
       span: 12,
       dicData: getIntDictOptions(DICT_TYPE.BPM_PROCESS_INSTANCE_RESULT),
-      rules: [{ required: true, message: '结果不能为空', trigger: 'blur' }]
+      rules: [{required: true, message: '结果不能为空', trigger: 'blur'}]
     },
     createTime: {
       label: '提交时间',
@@ -203,7 +204,8 @@ const searchChange = (params, done) => {
 
 /** 清空按钮操作 */
 const resetChange = () => {
-  searchChange({}, () => {})
+  searchChange({}, () => {
+  })
 }
 
 const sizeChange = (pageSize) => {
@@ -218,7 +220,7 @@ const currentChange = (currentPage) => {
 /** 取消按钮操作 */
 const handleCancel = async (row) => {
   // 二次确认
-  const { value } = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
+  const {value} = await ElMessageBox.prompt('请输入取消原因', '取消流程', {
     confirmButtonText: t('common.ok'),
     cancelButtonText: t('common.cancel'),
     inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格

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

@@ -0,0 +1,175 @@
+<!-- 工作流，抄送我的流程 -->
+<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

@@ -32,22 +32,22 @@
   </ContentWrap>
 </template>
 <script lang="ts" setup>
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import {DICT_TYPE, getIntDictOptions} from '@/utils/dict'
 import * as TaskAssignRuleApi from '@/api/bpm/taskAssignRule'
 import * as RoleApi from '@/api/system/role'
 import * as PostApi from '@/api/system/post'
 import * as UserGroupApi from '@/api/bpm/userGroup'
-import { setUserAndDeptName } from '@/components/LowDesign/src/utils/getName'
+import {setUserAndDeptName} from '@/components/LowDesign/src/utils/getName'
-import { useLowStoreWithOut } from '@/store/modules/low'
+import {useLowStoreWithOut} from '@/store/modules/low'
 
 const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
+const {t} = useI18n() // 国际化
-const { getCurrPermi } = useCrudPermi()
+const {getCurrPermi} = useCrudPermi()
 const lowStore = useLowStoreWithOut()
 
-defineOptions({ name: 'BpmTaskAssignRule' })
+defineOptions({name: 'BpmTaskAssignRule'})
 
-const { query } = useRoute() // 查询参数
+const {query} = useRoute() // 查询参数
 
 const loading = ref(true)
 const getRules = (label) => {
@@ -65,6 +65,7 @@ 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
@@ -81,8 +82,8 @@ const tableOption = reactive({
   delBtn: false,
   calcHeight: 20,
   column: {
-    taskDefinitionName: { label: '任务名', disabled: true },
+    taskDefinitionName: {label: '任务名', disabled: true},
-    taskDefinitionKey: { label: '任务标识', disabled: true },
+    taskDefinitionKey: {label: '任务标识', disabled: true},
     type: {
       label: '规则类型',
       type: 'select',
@@ -90,12 +91,13 @@ const tableOption = reactive({
       rules: getRules('规则类型'),
       control: (val) => {
         const columnObj = {
-          roleIds: { display: false },
+          roleIds: {display: false},
-          deptIds: { display: false },
+          deptIds: {display: false},
-          postIds: { display: false },
+          postIds: {display: false},
-          userIds: { display: false },
+          userIds: {display: false},
-          userGroupIds: { display: false },
+          userGroupIds: {display: false},
-          scripts: { display: false }
+          scripts: {display: false},
+          userSelects: {display: false},
         }
         const key = getUserKey(val)
         if (key) columnObj[key].display = true
@@ -112,6 +114,7 @@ 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]
         })
 
@@ -198,7 +201,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 = form[key]
+    const value = key === 'userSelects' ? '' : form[key]
     form.options = typeof value == 'string' ? value.split(',') : value
   }
   delKey.forEach((prop) => delete form[prop])
@@ -228,14 +231,14 @@ const getDicData = () => {
         const id = item.id + ''
         const name = item.name
         dicObj.value[key][id] = name
-        return { label: name, value: id }
+        return {label: name, value: id}
       })
     })
     dicObj.value.scripts = {}
     tableOption.column.scripts.dicData = getIntDictOptions(DICT_TYPE.BPM_TASK_ASSIGN_SCRIPT).map(
       (item) => {
         dicObj.value.scripts[item.value] = item.label
-        return { value: item.value + '', label: item.label }
+        return {value: item.value + '', label: item.label}
       }
     ) as never[]
     dicObj.value.type = {}
@@ -262,7 +265,7 @@ const formattingTableData = (data): Promise<any[]> => {
       }
       return item
     })
-    await setUserAndDeptName({ userIdList, deptIdList })
+    await setUserAndDeptName({userIdList, deptIdList})
     resolve(data)
   })
 }

src/views/document/TabsCardDocument.vue

@@ -61,6 +61,13 @@ 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

@@ -41,7 +41,7 @@
       >
         <template #menu-left="{ size }">
           <el-button type="primary" :size="size" @click="menuLeftHandle('aiCreated')">
-            <Icon :size="14" icon="jam:magic-f" />
+            <Icon :size="14" icon="jam:magic-f"/>
             <span class="ml-3px!">AI建表</span>
           </el-button>
           <el-button
@@ -51,12 +51,12 @@
             @click="menuLeftHandle('btn')"
             class="mr-10px"
           >
-            <Icon :size="14" icon="teenyicons:button-outline" />
+            <Icon :size="14" icon="teenyicons:button-outline"/>
             <span class="ml-3px!">自定义按钮</span>
           </el-button>
           <el-dropdown @command="menuLeftHandle" v-hasPermi="['jeelowcode:web']">
             <el-button type="primary" :size="size">
-              <Icon :size="14" icon="teenyicons:webpack-outline" />
+              <Icon :size="14" icon="teenyicons:webpack-outline"/>
               <span class="ml-3px!">前端增强</span>
             </el-button>
             <template #dropdown>
@@ -74,7 +74,7 @@
             @click="menuLeftHandle('sql')"
             v-hasPermi="['jeelowcode:sql']"
           >
-            <Icon :size="14" icon="devicon-plain:sqldeveloper" />
+            <Icon :size="14" icon="devicon-plain:sqldeveloper"/>
             <span class="ml-3px!">SQL增强</span>
           </el-button>
           <el-button
@@ -83,9 +83,20 @@
             @click="menuLeftHandle('java')"
             v-hasPermi="['jeelowcode:java']"
           >
-            <Icon :size="14" icon="hugeicons:java" />
+            <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">
@@ -107,7 +118,7 @@
               <div class="mt--2px cursor-pointer">
                 <el-text :size="size" type="primary">
                   更多
-                  <Icon :size="16" icon="iconamoon:arrow-down-2-light" />
+                  <Icon :size="16" icon="iconamoon:arrow-down-2-light"/>
                 </el-text>
               </div>
               <template #dropdown>
@@ -190,7 +201,8 @@
                   @click="openDataOrigin"
                   :disabled="!tableForm.dataOrigin"
                 >
-                  <Icon :size="14" icon="lucide:text-search"></Icon> <span>数据源SQL配置</span>
+                  <Icon :size="14" icon="lucide:text-search"></Icon>
+                  <span>数据源SQL配置</span>
                 </el-button>
                 <el-button
                   type="primary"
@@ -211,10 +223,12 @@
                   <span>表格扩展配置</span>
                 </el-button>
                 <el-button @click="sortPopup = true">
-                  <Icon :size="14" icon="mdi:sort"></Icon> <span>默认排序</span>
+                  <Icon :size="14" icon="mdi:sort"></Icon>
+                  <span>默认排序</span>
                 </el-button>
                 <el-button @click="searchPopup = true">
-                  <Icon :size="14" icon="lucide:text-search"></Icon> <span>默认搜索</span>
+                  <Icon :size="14" icon="lucide:text-search"></Icon>
+                  <span>默认搜索</span>
                 </el-button>
               </div>
             </template>
@@ -300,7 +314,7 @@
         </template>
         <template #optionCondition="{ row }">
           <template v-for="item in row.optionCondition" :key="item.key">
-            <el-tag v-if="item.value !== 0" size="small"> {{ item.label }}{{ item.value }} </el-tag>
+            <el-tag v-if="item.value !== 0" size="small"> {{ item.label }}{{ item.value }}</el-tag>
           </template>
         </template>
       </avue-crud>
@@ -417,7 +431,8 @@
                 size="small"
                 type="primary"
                 @click="copySampleStr(key)"
-                >点击复制</el-button
+              >点击复制
+              </el-button
               >
             </div>
           </div>
@@ -462,32 +477,32 @@ import {
   DataOriginOption,
   AuthConfig
 } from './components'
-import { TipView } from '../general/components/index'
+import {TipView} from '../general/components/index'
 import * as TableApi from '@/api/design/table'
 import * as JsApi from '@/api/design/table/jsEnhance'
-import { dicObj, pageOption, tableInfoOption } from './designData'
+import {dicObj, pageOption, tableInfoOption} from './designData'
-import { scssEnhanceExample, controlInitExample } from '@/components/LowDesign/src/utils/example'
+import {scssEnhanceExample, controlInitExample} from '@/components/LowDesign/src/utils/example'
-import { formattingLengStr } from '@/utils/lowDesign'
+import {formattingLengStr} from '@/utils/lowDesign'
 import controlPath from '@/components/LowDesign/src/controlPath'
 import useMEDialog from '@/hooks/design/useMEDialog'
 import useCopyText from '@/hooks/design/useCopyText'
-import { ElButton, ElLoading } from 'element-plus'
+import {ElButton, ElLoading} from 'element-plus'
-import { cloneDeep } from 'lodash-es'
+import {cloneDeep} from 'lodash-es'
-import { useRenderVxeColumn } from '../general/components/useRenderVxeColumn'
+import {useRenderVxeColumn} from '../general/components/useRenderVxeColumn'
-import { useGroup } from '@/hooks/design/useGroup'
+import {useGroup} from '@/hooks/design/useGroup'
-import { checkPermi } from '@/utils/permission'
+import {checkPermi} from '@/utils/permission'
-import { ElMessage } from 'element-plus'
+import {ElMessage} from 'element-plus'
 
-defineOptions({ name: 'TableDesign' })
+defineOptions({name: 'TableDesign'})
 
-const { MEDialog, MEData, openMEDialog } = useMEDialog()
+const {MEDialog, MEData, openMEDialog} = useMEDialog()
-const { copyText } = useCopyText()
+const {copyText} = useCopyText()
 useRenderVxeColumn()
 
 const message = useMessage() // 消息弹窗
 const router = useRouter() // 路由
-const { t } = useI18n() // 国际化
+const {t} = useI18n() // 国际化
-const { getCurrPermi } = useCrudPermi()
+const {getCurrPermi} = useCrudPermi()
 
 const loading = ref(true) // 列表的加载中
 const saveLoading = ref(false)
@@ -555,7 +570,7 @@ const authPopup = ref({
   show: false,
   vBind: {}
 })
-const aiCreatedObj = ref({ popup: false, loading: false, describe: '', timer: null as any })
+const aiCreatedObj = ref({popup: false, loading: false, describe: '', timer: null as any})
 
 const basicPopup = ref({
   show: false,
@@ -580,9 +595,9 @@ const samplePopup = ref(false)
 const permission = getCurrPermi(['jeelowcode:dbform'])
 
 const tableConfigList = [
-  { label: '表格选择', prop: 'tableSelect', valClass: 'w-75px!' },
+  {label: '表格选择', prop: 'tableSelect', valClass: 'w-75px!'},
-  { label: '搜索样式', prop: 'searchStyle', valClass: 'w-100px!' },
+  {label: '搜索样式', prop: 'searchStyle', valClass: 'w-100px!'},
-  { label: '操作栏样式', prop: 'operateMenuStyle', labelWidth: '90px', valClass: 'w-100px!' },
+  {label: '操作栏样式', prop: 'operateMenuStyle', labelWidth: '90px', valClass: 'w-100px!'},
   {
     label: '操作栏最大横排数',
     prop: 'maxMenuNum',
@@ -598,7 +613,7 @@ const tableConfigList = [
     showKey: 'tableType',
     showVal: 1,
     valClass: 'w-114px!',
-    changeFun: ({ value }) => {
+    changeFun: ({value}) => {
       let dicData = cloneDeep(dicObj.tableConfig)
       if (value == 'card') {
         dicData = dicData.filter(
@@ -632,8 +647,8 @@ const tableConfigList = [
     showVal: 'expand',
     valClass: 'w-90px!'
   },
-  { label: '树表样式', prop: 'treeStyle', showKey: 'tableType', showVal: 2 },
+  {label: '树表样式', prop: 'treeStyle', showKey: 'tableType', showVal: 2},
-  { label: '树表模式', prop: 'treeMode', showKey: 'tableType', showVal: 2 }
+  {label: '树表模式', prop: 'treeMode', showKey: 'tableType', showVal: 2}
 ]
 
 const menuMoreList = [
@@ -642,14 +657,14 @@ const menuMoreList = [
     type: 'sync',
     isShow: (row) => row.isDbSync == 'N' && checkPermi(['jeelowcode:dbform:sync'])
   },
-  { label: '功能测试', type: 'test' },
+  {label: '功能测试', type: 'test'},
-  { label: '路由地址', type: 'address' },
+  {label: '路由地址', type: 'address'},
-  { label: '接口地址', type: 'apiUrl' },
+  {label: '接口地址', type: 'apiUrl'},
-  { label: '租户权限配置', type: 'auth' },
+  {label: '租户权限配置', type: 'auth'},
-  { label: '复制表', type: 'copy', isShow: () => checkPermi(['jeelowcode:dbform:create']) },
+  {label: '复制表', type: 'copy', isShow: () => checkPermi(['jeelowcode:dbform:create'])},
-  { label: 'js增强解锁', type: 'jsUnlock', isShow: () => checkPermi(['jeelowcode:web']) },
+  {label: 'js增强解锁', type: 'jsUnlock', isShow: () => checkPermi(['jeelowcode:web'])},
-  { label: 'scss增强解锁', type: 'scssUnlock', isShow: () => checkPermi(['jeelowcode:web']) },
+  {label: 'scss增强解锁', type: 'scssUnlock', isShow: () => checkPermi(['jeelowcode:web'])},
-  { label: '删除', type: 'del', isShow: () => checkPermi(['jeelowcode:dbform:delete']) }
+  {label: '删除', type: 'del', isShow: () => checkPermi(['jeelowcode:dbform:delete'])}
 ]
 
 useCrudHeight(crudRef)
@@ -747,8 +762,8 @@ const tableFormVerify = (type) => {
     customFormRef.value.validate((bool, done, msg) => {
       done()
       if (!bool) return reject(msg)
-      const { tableName, tableType, tableClassify } = tableForm.value
+      const {tableName, tableType, tableClassify} = tableForm.value
-      const subTable = { bool: true, len: 0 }
+      const subTable = {bool: true, len: 0}
       if (tableClassify == 2 && tableName && tableName.indexOf('view_') != 0) {
         message.warning('视图表的表名请以 view_ 开头')
         return reject('message')
@@ -813,7 +828,7 @@ const tableFormVerify = (type) => {
 
         if (messageText) {
           handleVerifyError(tabKey, item._X_ROW_KEY, index)
-          ElMessage({ dangerouslyUseHTMLString: true, message: messageText })
+          ElMessage({dangerouslyUseHTMLString: true, message: messageText})
           errText = 'message'
           break
         }
@@ -846,7 +861,7 @@ const tableFormVerify = (type) => {
               : ''
           }
           if (key == 'summaryList') {
-            const { sqlType, sqlValue } = item.summaryJson
+            const {sqlType, sqlValue} = item.summaryJson
             itemObj.summaryType = 'bottom'
             itemObj.summarySql = sqlType == 'custom' ? sqlValue : sqlType
             itemObj.summaryJson = JSON.stringify(item.summaryJson)
@@ -938,7 +953,7 @@ const contrastEditData = (infoData) => {
 }
 
 const setApiDetailData = (data) => {
-  apiDetailData.value = { delIdVo: {} }
+  apiDetailData.value = {delIdVo: {}}
   for (const key in data) {
     let listKey = key
     if (['summaryBottomList', 'summaryTopList'].includes(listKey)) listKey = 'summaryList'
@@ -990,9 +1005,9 @@ const menuLeftHandle = (type) => {
     if (aiCreatedObj.value.timer) clearInterval(aiCreatedObj.value.timer)
   }
 }
-const menuHandle = async ({ type, row, index }) => {
+const menuHandle = async ({type, row, index}) => {
   if (type == 'edit') crudRef.value.rowEdit(row, index)
-  else if (type == 'test') router.push({ path: '/low/table/test/' + row.id })
+  else if (type == 'test') router.push({path: '/low/table/test/' + row.id})
   else if (type == 'sync') syncDbTable(row)
   else if (type == 'address') showAddress(row)
   else if (type == 'apiUrl') showApiUrl(row)
@@ -1002,7 +1017,7 @@ const menuHandle = async ({ type, row, index }) => {
   else if (type == 'auth') {
     authPopup.value = {
       show: true,
-      vBind: { dbformId: row.id, tableName: row.tableName, tableDescribe: row.tableDescribe }
+      vBind: {dbformId: row.id, tableName: row.tableName, tableDescribe: row.tableDescribe}
     }
   }
 }
@@ -1014,7 +1029,7 @@ const syncDbTable = (row) => {
     title: '同步数据库',
     width: '400px',
     isCenter: true,
-    dialogParams: { alignCenter: true },
+    dialogParams: {alignCenter: true},
     footerBtn: [
       {
         name: '取 消',
@@ -1023,7 +1038,7 @@ const syncDbTable = (row) => {
       {
         name: '确 定',
         loading: true,
-        params: { type: 'primary' },
+        params: {type: 'primary'},
         clickFun: async (done) => {
           if (syncData.value.value == 'force') {
             await message.prompt(
@@ -1086,7 +1101,7 @@ const showApiUrl = async (row) => {
       value: `/jeelowcode/${isOpen ? 'open' : 'dbform-data'}/save/batch/${row.id}`,
       tipText: '接口参数格式：data:[ { 新增的数据... },{ ... } ]'
     },
-    { label: '编辑数据[put]', value: `/jeelowcode/dbform-data/edit/${row.id}` },
+    {label: '编辑数据[put]', value: `/jeelowcode/dbform-data/edit/${row.id}`},
     {
       label: '批量编辑数据[put]',
       value: `/jeelowcode/dbform-data/edit/batch/${row.id}`,
@@ -1107,19 +1122,19 @@ const showApiUrl = async (row) => {
   let list: VNode[] = []
   apiList.forEach((item) => {
     list.push(
-      h('div', { style: { marginBottom: '10px', border: ' 1px solid #eee', padding: '10px' } }, [
+      h('div', {style: {marginBottom: '10px', border: ' 1px solid #eee', padding: '10px'}}, [
         h('div', [
-          h('span', { style: { fontWeight: 600, fontSize: '14px' } }, item.label + '：'),
+          h('span', {style: {fontWeight: 600, fontSize: '14px'}}, item.label + '：'),
           h(
             ElButton,
-            { size: 'small', type: 'primary', onClick: () => copyText(item.value) },
+            {size: 'small', type: 'primary', onClick: () => copyText(item.value)},
             () => '复制'
           )
         ]),
-        h('div', { style: { fontSize: '12px' } }, item.value),
+        h('div', {style: {fontSize: '12px'}}, item.value),
         h(
           'div',
-          { style: { display: !!item.tipText, fontSize: '12px', color: '#E6A23C' } },
+          {style: {display: !!item.tipText, fontSize: '12px', color: '#E6A23C'}},
           item.tipText
         )
       ])
@@ -1127,11 +1142,11 @@ const showApiUrl = async (row) => {
   })
   message.alert('', '接口地址', {
     message: () => {
-      return h('div', { width: '360px' }, list)
+      return h('div', {width: '360px'}, list)
     },
     confirmButtonText: '关闭',
     dangerouslyUseHTMLString: true,
-    customStyle: { width: '384px' }
+    customStyle: {width: '384px'}
   })
 }
 const copyDbTable = (row) => {
@@ -1146,7 +1161,7 @@ const copyDbTable = (row) => {
         if (!RExp.test(value)) return '表名只能使用小写字母、数字、下划线，并以字母开头'
       }
     })
-    .then(async ({ value }) => {
+    .then(async ({value}) => {
       loading.value = true
       const bool = await TableApi.verifyDbName(value)
       if (bool) {
@@ -1169,7 +1184,7 @@ const unlockEnhance = (type, row) => {
 
 const openWebEnhance = async (enhanceType) => {
   loading.value = true
-  jsEnhanceData.value = { jsJson: '' }
+  jsEnhanceData.value = {jsJson: ''}
   const dbformId = tableSelect.value[0].id
   const detailData = await JsApi.getJsDetail({
     dbformId,
@@ -1217,7 +1232,7 @@ const openWebEnhance = async (enhanceType) => {
     },
     footerBtn: [
       {
-        params: { type: 'primary' },
+        params: {type: 'primary'},
         name: '保 存',
         icon: 'mingcute:save-line',
         loading: true,
@@ -1228,7 +1243,7 @@ const openWebEnhance = async (enhanceType) => {
         }
       },
       {
-        params: { type: 'success' },
+        params: {type: 'success'},
         name: '保存并关闭',
         icon: 'mingcute:save-line',
         loading: true,
@@ -1257,11 +1272,11 @@ const openWebEnhance = async (enhanceType) => {
   }
   if (enhanceType == 'js') {
     params['providerType'] = 'tableJsEnhance'
-    params['otherParams'] = { type: 'simple', width: '300px', tipKeyList: ['TableJsEnhance'] }
+    params['otherParams'] = {type: 'simple', width: '300px', tipKeyList: ['TableJsEnhance']}
     params['language'] = 'javascript'
     params['headerBtn'] = [
       {
-        params: { type: 'success' },
+        params: {type: 'success'},
         name: '控件使用示例',
         icon: 'jam:code-sample',
         clickFun: async () => (samplePopup.value = true)
@@ -1279,7 +1294,7 @@ const openWebEnhance = async (enhanceType) => {
     }
   }
 
-  openMEDialog({ params, prop: 'jsJson' }, jsEnhanceData.value)
+  openMEDialog({params, prop: 'jsJson'}, jsEnhanceData.value)
   isUnload.value = true
 }
 const handleWebEnhance = (dbformId, enhanceType) => {
@@ -1301,16 +1316,16 @@ const handleWebEnhance = (dbformId, enhanceType) => {
   })
 }
 
-const cellStyle = ({ row, columnIndex }) => {
+const cellStyle = ({row, columnIndex}) => {
   if (columnIndex == 6) {
-    return { color: row.isDbSync == 'Y' ? '#67C23A' : '#F56C6C' }
+    return {color: row.isDbSync == 'Y' ? '#67C23A' : '#F56C6C'}
   }
   if (columnIndex == 5) {
     let color = ''
     if (row.tableClassify == 1) color = '#409EFF'
     else if (row.tableClassify == 2) color = '#909399'
     else if (row.tableClassify == 3) color = '#E6A23C'
-    return { color }
+    return {color}
   }
 }
 
@@ -1327,7 +1342,7 @@ const radioClick = (row) => {
 
 const setTreeLabelDicData = (dicData) => {
   if (dicData.length == 0) {
-    dicData = [{ label: '请先添加字段', value: 'low', disabled: true }]
+    dicData = [{label: '请先添加字段', value: 'low', disabled: true}]
   }
   customFormRef.value.updateDic('treeLabelField', dicData)
 }
@@ -1354,7 +1369,7 @@ const openDataOrigin = () => {
   })
   const filedData = [...tableInfoRef.value.infoData.basics, ...tableInfoRef.value.tableInfoDefault]
   dataOriginPopup.value.viewField = filedData.map((item) => {
-    return { label: item.fieldName, value: item.fieldCode }
+    return {label: item.fieldName, value: item.fieldCode}
   })
   dataOriginPopup.value.show = true
 }
@@ -1391,14 +1406,14 @@ const analysisDataOrigin = async () => {
           return item
         })
       }
-      let { infoData } = tableInfoOption.formattingInitData(analysisData)
+      let {infoData} = tableInfoOption.formattingInitData(analysisData)
       infoData = infoData.map((item) => {
         for (const key in item) {
           if (item[key] === null || item[key] === undefined || key == 'fieldList_id') {
             delete item[key]
           }
         }
-        return { ...cloneDeep(tableInfoOption.infoDefaultData.basics), ...item }
+        return {...cloneDeep(tableInfoOption.infoDefaultData.basics), ...item}
       })
       setInfoBasics(infoData)
       message.success('解析成功')
@@ -1422,11 +1437,11 @@ const getSqlFormConfig = async () => {
         (item) => !tableInfoOption.disabledArr.includes(item.fieldCode) || item.fieldCode == 'pid'
       )
       fieldList = fieldList.map((item) => {
-        return { ...cloneDeep(tableInfoOption.infoDefaultData.basics), ...item }
+        return {...cloneDeep(tableInfoOption.infoDefaultData.basics), ...item}
       })
       setInfoBasics(fieldList)
       message.success('生成成功')
-      let { tableName } = customFormOption.value.column
+      let {tableName} = customFormOption.value.column
       tableName['disabled'] = true
     })
     .finally(() => (sqlFormLoading.value = false))
@@ -1457,7 +1472,7 @@ const handleAiCreatedTable = async () => {
       (item) => !tableInfoOption.disabledArr.includes(item.fieldCode) || item.fieldCode == 'pid'
     )
     data.fieldModelList = data.fieldModelList.map((item) => {
-      return { ...cloneDeep(tableInfoOption.infoDefaultData.basics), ...item }
+      return {...cloneDeep(tableInfoOption.infoDefaultData.basics), ...item}
     })
     aiCreatedObj.value.popup = false
     crudRef.value.rowAdd()
@@ -1499,7 +1514,7 @@ const getTableData = async () => {
         if (typeof item[key] == 'number') {
           let val: number | string = item[key]
           if (['jsCou', 'scssCou'].includes(key)) val = val > 0 ? '√' : val
-          item.optionCondition.push({ label: couKey[key], value: val, key })
+          item.optionCondition.push({label: couKey[key], value: val, key})
         }
       }
       return item
@@ -1524,7 +1539,8 @@ const searchChange = (params, done) => {
 
 /** 清空按钮操作 */
 const resetChange = () => {
-  searchChange({}, () => {})
+  searchChange({}, () => {
+  })
 }
 
 const sizeChange = (pageSize) => {
@@ -1542,7 +1558,7 @@ const beforeOpen = async (done, type) => {
   isTableInfo.value = false
   const groupData = cloneDeep(treeData.value)
   customFormOption.value.column.groupDbformId.dicData = groupData[0].children
-  const { tableName, subTableListStr } = customFormOption.value.column
+  const {tableName, subTableListStr} = customFormOption.value.column
   if (['edit', 'view'].includes(type) && tableForm.value.id) {
     loading.value = true
     const data = await TableApi.getDbDetail(tableForm.value.id, ['all'])
@@ -1550,7 +1566,7 @@ const beforeOpen = async (done, type) => {
     data.dbForm.tableConfig = data.dbForm.tableConfig?.split(',') || []
     data.dbForm.dataConfig = data.dbForm.dataConfig?.split(',') || []
     editInfoData.value = data
-    tableForm.value = { ...data.dbForm }
+    tableForm.value = {...data.dbForm}
     tableName['disabled'] = true
     tableName['rules'] = []
     subTableListStr['display'] = tableForm.value.tableType == 3 && tableForm.value.subTableListStr
@@ -1585,7 +1601,7 @@ const beforeOpen = async (done, type) => {
       searchStyle: 'default'
     }
     tableName['disabled'] = false
-    tableName['rules'] = [{ validator: pageOption.tableName_required, trigger: 'blur' }] as any
+    tableName['rules'] = [{validator: pageOption.tableName_required, trigger: 'blur'}] as any
     subTableListStr['display'] = false
     if (groupValue.value) tableForm.value.groupDbformId = groupValue.value
     authValue.value = ''
@@ -1648,8 +1664,8 @@ const rowSave = async (formData, done, loading) => {
   const form = handleApiFormData(formData)
   tableFormVerify('add')
     .then(async (infoData: object) => {
-      const elLoading = ElLoading.service({ fullscreen: true })
+      const elLoading = ElLoading.service({fullscreen: true})
-      let bool = await TableApi.saveDbData({ dbForm: { ...form }, ...infoData }).catch(() => false)
+      let bool = await TableApi.saveDbData({dbForm: {...form}, ...infoData}).catch(() => false)
       if (bool) {
         message.success(t('common.createSuccess'))
         resetChange()
@@ -1662,7 +1678,7 @@ const rowSave = async (formData, done, loading) => {
         let key = Object.keys(error)[0]
         message.info(error[key][0].message)
       } else if (error !== 'message') {
-        message.alert(error, '请修改', { dangerouslyUseHTMLString: true })
+        message.alert(error, '请修改', {dangerouslyUseHTMLString: true})
       }
       loading()
     })
@@ -1680,7 +1696,7 @@ const rowUpdate = async (formData, index?, done?, loading?) => {
   const form = handleApiFormData(formData)
   tableFormVerify('edit')
     .then(async (infoData: object) => {
-      let bool = await TableApi.updateDbData({ dbForm: { ...form }, ...infoData }).catch(
+      let bool = await TableApi.updateDbData({dbForm: {...form}, ...infoData}).catch(
         () => false
       )
       if (bool) {
@@ -1702,7 +1718,7 @@ const rowUpdate = async (formData, index?, done?, loading?) => {
         let key = Object.keys(error)[0]
         message.info(error[key][0].message)
       } else if (error !== 'message') {
-        message.alert(error, '请修改', { dangerouslyUseHTMLString: true })
+        message.alert(error, '请修改', {dangerouslyUseHTMLString: true})
       }
       loading()
     })
@@ -1738,13 +1754,35 @@ 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,7 +70,8 @@
           </div>
           <div class="bottom-card">
             <div class="bottom-card-title">
-              <span>隐患排查治理</span>
+              <!-- 隐患排查治理 标题需要隐藏 2025-10-31 -->
+              <span></span>
               <img width="50%" style="margin: 8px 0" src="@/assets/images/line_1.png" />
             </div>
             <div class="type-wrapper">

src/views/screen/components/HiddenDangerPanel.vue

@@ -1,9 +1,10 @@
 <template>
   <div class="center-container">
     <div class="center-content">
-      <span class="title">隐患排查治理</span>
+      <!-- 隐患排查治理 这个标题需要隐藏 2025-10-31 -->
+      <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">

src/views/screen/mainScreen.vue

@@ -60,6 +60,7 @@ 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 {
@@ -484,7 +485,16 @@ 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
+        // 安全指数另算，再起一个报表
+        // 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 => {

src/views/screen/mainScreenV1.vue

@@ -33,9 +33,10 @@
 
       <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,7 +60,8 @@
           </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

@@ -0,0 +1,862 @@
+<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)"
+                >
+                  <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';
+
+// 定义园区信息类型
+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(1286);
+const totalDevicesGrowth = ref(5.2);
+const onlineDevices = ref(1254);
+const onlineRate = ref(97.5);
+
+// 图表引用
+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[]>([
+  {
+    key: '1',
+    parkName: '雄安总部',
+    totalDevices: 156,
+    upsStatus: '3个告警',
+    airConditionStatus: '正常',
+    temperatureStatus: '正常',
+    otherStatus: '正常',
+    hasAlarm: true
+  },
+  {
+    key: '2',
+    parkName: '恒毅大厦',
+    totalDevices: 98,
+    upsStatus: '正常',
+    airConditionStatus: '正常',
+    temperatureStatus: '正常',
+    otherStatus: '正常',
+    hasAlarm: false
+  },
+  {
+    key: '3',
+    parkName: '丰台创新中心',
+    totalDevices: 124,
+    upsStatus: '正常',
+    airConditionStatus: '正常',
+    temperatureStatus: '正常',
+    otherStatus: '正常',
+    hasAlarm: false
+  },
+  {
+    key: '4',
+    parkName: '重庆产业大厦',
+    totalDevices: 92,
+    upsStatus: '正常',
+    airConditionStatus: '2个告警',
+    temperatureStatus: '正常',
+    otherStatus: '正常',
+    hasAlarm: true
+  },
+  {
+    key: '5',
+    parkName: '海南园区',
+    totalDevices: 78,
+    upsStatus: '正常',
+    airConditionStatus: '正常',
+    temperatureStatus: '正常',
+    otherStatus: '正常',
+    hasAlarm: false
+  },
+  {
+    key: '6',
+    parkName: '崇左地面站',
+    totalDevices: 64,
+    upsStatus: '正常',
+    airConditionStatus: '正常',
+    temperatureStatus: '正常',
+    otherStatus: '正常',
+    hasAlarm: false
+  },
+  {
+    key: '7',
+    parkName: '铜川地面站',
+    totalDevices: 58,
+    upsStatus: '正常',
+    airConditionStatus: '正常',
+    temperatureStatus: '正常',
+    otherStatus: '正常',
+    hasAlarm: false
+  },
+  {
+    key: '8',
+    parkName: '佳木斯地面站',
+    totalDevices: 72,
+    upsStatus: '正常',
+    airConditionStatus: '正常',
+    temperatureStatus: '正常',
+    otherStatus: '正常',
+    hasAlarm: false
+  },
+  {
+    key: '9',
+    parkName: '库尔勒地面站',
+    totalDevices: 68,
+    upsStatus: '正常',
+    airConditionStatus: '正常',
+    temperatureStatus: '正常',
+    otherStatus: '正常',
+    hasAlarm: false
+  },
+  {
+    key: '10',
+    parkName: '澄迈地面站',
+    totalDevices: 56,
+    upsStatus: '正常',
+    airConditionStatus: '正常',
+    temperatureStatus: '正常',
+    otherStatus: '正常',
+    hasAlarm: false
+  },
+  {
+    key: '11',
+    parkName: '文昌地面站',
+    totalDevices: 60,
+    upsStatus: '正常',
+    airConditionStatus: '正常',
+    temperatureStatus: '正常',
+    otherStatus: '正常',
+    hasAlarm: false
+  }
+]);
+
+// 更新日期时间
+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 = () => {
+  if (!alarmTrendChartRef.value) return;
+
+  alarmTrendChart = echarts.init(alarmTrendChartRef.value);
+
+  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: 25,
+      interval: 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: [
+            { name: '峰值1', coord: [2, 20] }, // 15日的告警峰值
+            { name: '峰值2', coord: [4, 21] }  // 25日的告警峰值
+          ]
+        }
+      }
+    ]
+  };
+
+  alarmTrendChart.setOption(option);
+};
+
+// 初始化设备类型分布饼图
+const initDeviceTypePieChart = () => {
+  if (!deviceTypePieChartRef.value) return;
+
+  deviceTypePieChart = echarts.init(deviceTypePieChartRef.value);
+
+  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: 实现详情页面跳转或弹窗
+};
+
+// 定时器
+let dateTimeTimer: number | null = null;
+
+// 组件挂载
+onMounted(() => {
+  // 更新日期时间
+  updateDateTime();
+  dateTimeTimer = window.setInterval(updateDateTime, 1000);
+
+  // 初始化图表
+  setTimeout(() => {
+    initAlarmTrendChart();
+    initDeviceTypePieChart();
+  }, 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,7 +3,8 @@
     <!-- 顶部标题栏 -->
     <div class="header-container">
       <div class="header-left">
-        <img class="back-img" @click="returnToHeadquarters" src="@/assets/images/screen/back_image.png" />
+        <img class="back-img" @click="returnToHeadquarters"
+             src="@/assets/images/screen/back_image.png"/>
         <div class="back-button" @click="openRegionSelector"> {{ selectedRegion }}
           <span>···</span>
         </div>
@@ -16,39 +17,44 @@
       </div>
     </div>
     <!-- 天气预报 -->
-    <WeatherWarning />
+    <WeatherWarning/>
     <!-- 主内容区 -->
     <div class="content-container">
       <div class="left-wrapper">
         <OverviewPanel :totalCount="dashboardData?.totalCount || 0"
-          :formalEmployeeCount="dashboardData?.formalEmployeeCount || 0"
+                       :formalEmployeeCount="dashboardData?.formalEmployeeCount || 0"
-          :externalStaffCount="dashboardData?.externalStaffCount || 0" :visitorCount="dashboardData?.visitorCount || 0"
+                       :externalStaffCount="dashboardData?.externalStaffCount || 0"
-          :parkStatistics="dashboardData?.parkStatistics" />
+                       :visitorCount="dashboardData?.visitorCount || 0"
-        <RiskStatisticsPanel :riskStatistics="riskStatistics" :dangerDetail="dangerDetail" :park="parkValue"
+                       :parkStatistics="dashboardData?.parkStatistics"/>
-          @tab-change="handleRiskTabChange" :campus_id="query.campus_id" />
+        <RiskStatisticsPanel :riskStatistics="riskStatistics" :dangerDetail="dangerDetail"
+                             :park="parkValue"
+                             @tab-change="handleRiskTabChange" :campus_id="query.campus_id"/>
       </div>
       <div class="right-wrapper">
-        <HighRiskAlertPanel :alertData="dashboardData?.alertData" :alertDetails="dashboardData?.alertData.details"
+        <HighRiskAlertPanel :alertData="dashboardData?.alertData"
-          :sourceIndex="sourceIndex" />
+                            :alertDetails="dashboardData?.alertData.details"
+                            :sourceIndex="sourceIndex"/>
         <TimeoutWorkOrderPanel :timeoutWorkOrders="dashboardData?.timeoutWorkOrders"
-          :alertDetails="dashboardData?.timeoutWorkOrders.details" :sourceIndex="sourceIndex" />
+                               :alertDetails="dashboardData?.timeoutWorkOrders.details"
+                               :sourceIndex="sourceIndex"/>
       </div>
-      <HiddenDangerPanel :hiddenDangerData="dashboardData?.hiddenDangerData" />
+      <HiddenDangerPanel :hiddenDangerData="dashboardData?.hiddenDangerData"/>
     </div>
   </div>
 
   <!-- 区域选择弹窗 -->
-  <RegionSelector v-model="regionSelectorVisible" :modelSelected="selectedPark" :regions="regionOption"
+  <RegionSelector v-model="regionSelectorVisible" :modelSelected="selectedPark"
-    @change="onRegionChange" />
+                  :regions="regionOption"
+                  @change="onRegionChange"/>
 </template>
 
 <script setup lang="ts">
-import { getTableList, getTableData } from './report'
+import {getTableList, getTableData} from './report'
-import { ref, onMounted, watch, onUnmounted } from 'vue'
+import {ref, onMounted, watch, onUnmounted} from 'vue'
-import { useRoute, useRouter } from 'vue-router'
+import {useRoute, useRouter} from 'vue-router'
 import RegionSelector from './components/RegionSelector.vue'
 import WeatherWarning from './components/WeatherWarning.vue'
-import { getDashboardData, getAlertDetails, type DashboardData } from '@/api/dashboard'
+import {getDashboardData, getAlertDetails, type DashboardData} from '@/api/dashboard'
 
 import OverviewPanel from './components/OverviewPanel.vue'
 import RiskStatisticsPanel from './components/RiskStatisticsPanel.vue'
@@ -225,7 +231,7 @@ onMounted(async () => {
   }
 
   try {
-    let { records } = await getTableList(
+    let {records} = await getTableList(
       'park_info_list'
     )
     // records = [
@@ -252,7 +258,9 @@ onMounted(async () => {
       // 去重region字段，使用Map来确保唯一性
       const regionMap = new Map()
       records.filter((el) => el.region_id == query.regionCode)
-        .map(el => { return el })
+        .map(el => {
+          return el
+        })
         .forEach(el => {
           if (!regionMap.has(el.park_name)) {
             regionMap.set(el.park_name, {
@@ -480,7 +488,16 @@ 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
+        // 安全指数另算，再起一个报表
+        // 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 => {
@@ -571,7 +588,7 @@ const handleRiskTabChange = async (tab: TabType) => {
       // 根据不同的tab请求不同的接口
       getTableList(
         code,
-        { ...query, activeTab: tab }
+        {...query, activeTab: tab}
       ).then(response => {
         // 更新风险统计数据 - 传递完整的数组数据用于饼图显示
         if (response.records && response.records.length > 0) {
@@ -620,7 +637,7 @@ const handleRiskTabChange = async (tab: TabType) => {
       // 根据不同的tab请求不同的接口
       getTableList(
         code,
-        { ...query, activeTab: tab }
+        {...query, activeTab: tab}
       ).then(response => {
         // 更新风险统计数据 - 传递完整的数组数据用于饼图显示
         if (response.records && response.records.length > 0) {
@@ -650,7 +667,7 @@ const onRegionChange = (item: RegionItem): void => {
   parkValue.value = item.code
   router.push({
     path: '/screen/company',
-    query: { parkName: item.name, parkCode: item.code }
+    query: {parkName: item.name, parkCode: item.code}
   })
 }
 
@@ -1219,23 +1236,20 @@ const timeOut1 = (): void => {
 
     .left-top {
       padding: 0 5px;
-      background-image:
+      background-image: url('@/assets/images/screen/left_top_img.png'),
-        url('@/assets/images/screen/left_top_img.png'),
+      url('@/assets/images/screen/left_center_img.png'),
-        url('@/assets/images/screen/left_center_img.png'),
+      url('@/assets/images/screen/left_bottom_img.png');
-        url('@/assets/images/screen/left_bottom_img.png');
+      background-position: top center,
-      background-position:
+      left center,
-        top center,
+      bottom center;
-        left center,
-        bottom center;
 
       /* 设置大小，注意中间的背景图应该覆盖整个容器 */
       background-repeat: no-repeat, no-repeat, no-repeat;
 
       /* 设置位置 */
-      background-size:
+      background-size: 100% 90px,
-        100% 90px,
+      cover,
-        cover,
+      100% 68px;
-        100% 68px;
       flex: 1;
 
       /* 设置重复方式 */
@@ -1396,23 +1410,20 @@ const timeOut1 = (): void => {
     }
 
     .left-bottom {
-      background-image:
+      background-image: url('@/assets/images/screen/left_top_2_img.png'),
-        url('@/assets/images/screen/left_top_2_img.png'),
+      url('@/assets/images/screen/left_center_img.png'),
-        url('@/assets/images/screen/left_center_img.png'),
+      url('@/assets/images/screen/left_bottom_img.png');
-        url('@/assets/images/screen/left_bottom_img.png');
+      background-position: top center,
-      background-position:
+      left center,
-        top center,
+      bottom center;
-        left center,
-        bottom center;
 
       /* 设置大小，注意中间的背景图应该覆盖整个容器 */
       background-repeat: no-repeat, no-repeat, no-repeat;
 
       /* 设置位置 */
-      background-size:
+      background-size: 100% 90px,
-        100% 90px,
+      cover,
-        cover,
+      100% 68px;
-        100% 68px;
       flex: 1;
 
       /* 设置重复方式 */
@@ -1462,8 +1473,6 @@ 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://10.28.117.100:48080',
+          target: 'http://10.28.117.48:48080',
           ws: false,
           changeOrigin: true,
           rewrite: (path) => path.replace(new RegExp(`^/admin-api`), ''),