feat(screen): 更新区域大屏安全指数获取逻辑并优化界面布局

- 在 mainScreen.vue 和 regionScreen.vue 中新增安全指数独立报表获取逻辑 - 修复 regionScreen.vue 中的模板标签格式和属性换行问题-优化 regionScreen.vue 中的 CSS 背景图片设置和布局结构 - 移除 mainScreen.vue 中未使用的 echarts 日志导入 - 调整多个组件标签的属性排列以提高可读性 -优化 regionScreen.vue 中的数据处理逻辑和查询参数传递方式- 清理 regionScreen.vue 中多余的空行和样式代码
feat(screen): 隐藏隐患排查治理标题并调整子标题
2025-11-06 11:56:15 +08:00 · 2025-10-31 14:58:49 +08:00 · 2025-10-30 17:12:03 +08:00 · 2025-10-30 17:11:59 +08:00 · 2025-10-30 15:22:30 +08:00 · 2025-10-27 11:42:55 +08:00
17 changed files with 426 additions and 99 deletions
--- a/src/components/BpmTaskAssign/TaskSelectAssigneeForm.vue
+++ b/src/components/BpmTaskAssign/TaskSelectAssigneeForm.vue
@@ -0,0 +1,105 @@
+<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="taskAssignRule.taskDefinitionName+'候选人'"
+                      :prop="taskAssignRule.taskDefinitionKey"
+                      label-width="200">
+          <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>
--- a/src/components/LowDesign/src/LowTable/index.vue
+++ b/src/components/LowDesign/src/LowTable/index.vue
@@ -483,10 +483,10 @@ const props = withDefaults(defineProps<Props>(), {
  }
 })
 const handleSetFormData = (key, val) => {
-  console.log(key);
-  console.log(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=' + val, {
+  useFun.requestApi('get', '/jeelowcode/outsidePerson/importOutside?tableId='+props.tableId+'&ids=' + cleaned, {
  }).then(res => {
    if (res.length > 0) {
        message.success('下发成功')
@@ -548,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('下发成功')
--- a/src/components/LowDesign/src/shareControl/UserSelect.vue
+++ b/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'> //扩展显示列
--- a/src/components/LowDesign/src/utils/controlOption.ts
+++ b/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' }],
  customControlType: [{ label: '未全局注册', value: false }, { label: '已全局注册', value: true }],
  regionType: [{ label: '全球-国家', value: 'gj' }, { label: '中国-省市区', value: 'ssq' }, { label: '中国-省市', value: 'ss' }, { label: '中国-省', value: 's' }],
  dictTextFormatter: [
--- a/src/components/LowDesign/src/utils/formUtil.ts
+++ b/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')
          }
        }
      }
--- a/src/views/bpm/processInstance/detail/TaskCCDialogForm.vue
+++ b/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
--- a/src/views/bpm/processInstance/detail/index.vue
+++ b/src/views/bpm/processInstance/detail/index.vue
@@ -41,6 +41,7 @@
            <Icon icon="ep:close" />
            不通过
          </el-button>
+          <!--
          <el-button type="primary" @click="openTaskUpdateAssigneeForm(item.id)">
            <Icon icon="ep:edit" />
            转办
@@ -53,6 +54,7 @@
            <Icon icon="ep:plus" />
            加签
          </el-button>
+          -->
          <el-button type="warning" @click="handleBack(item)">
            <Icon icon="ep:back" />
            回退
@@ -233,6 +235,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,
--- a/src/views/bpm/processInstance/index.vue
+++ b/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
@@ -39,7 +39,8 @@
      </template>
      <template #menu-left>
        <el-button type="primary" v-hasPermi="['bpm:process-instance:query']" @click="handleCreate">
-          <Icon icon="ep:plus" class="mr-5px" /> 发起流程
+          <Icon icon="ep:plus" class="mr-5px"/>
+          发起流程
        </el-button>
      </template>
      <!-- 自定义操作栏 -->
@@ -52,7 +53,7 @@
        >
          详情
        </el-button>
-        <!-- <el-button
+        <el-button
          link
          type="danger"
          v-if="row.result === 1"
@@ -60,21 +61,21 @@
          @click="handleCancel(row)"
        >
          取消
-        </el-button> -->
+        </el-button>
      </template>
    </avue-crud>
  </ContentWrap>
 </template>
 <script lang="ts" setup>
-import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
-import { dateFormatter, getSearchDate } from '@/utils/formatTime'
+import {DICT_TYPE, getIntDictOptions} from '@/utils/dict'
+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 { getCurrPermi } = useCrudPermi()
+const {t} = useI18n() // 国际化
+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]*$/, // 判断非空，且非空格
--- a/src/views/bpm/task/copy/index.vue
+++ b/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>
--- a/src/views/bpm/task/todo/index.vue
+++ b/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" />
--- a/src/views/bpm/taskAssignRule/index.vue
+++ b/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 { useLowStoreWithOut } from '@/store/modules/low'
+import {setUserAndDeptName} from '@/components/LowDesign/src/utils/getName'
+import {useLowStoreWithOut} from '@/store/modules/low'

 const message = useMessage() // 消息弹窗
-const { t } = useI18n() // 国际化
-const { getCurrPermi } = useCrudPermi()
+const {t} = useI18n() // 国际化
+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 },
-    taskDefinitionKey: { label: '任务标识', disabled: true },
+    taskDefinitionName: {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 },
-          deptIds: { display: false },
-          postIds: { display: false },
-          userIds: { display: false },
-          userGroupIds: { display: false },
-          scripts: { display: false }
+          roleIds: {display: false},
+          deptIds: {display: false},
+          postIds: {display: false},
+          userIds: {display: false},
+          userGroupIds: {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)
  })
 }
--- a/src/views/screen/companyScreen.vue
+++ b/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">
--- a/src/views/screen/components/HiddenDangerPanel.vue
+++ b/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">
--- a/src/views/screen/mainScreen.vue
+++ b/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 => {
--- a/src/views/screen/mainScreenV1.vue
+++ b/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">
--- a/src/views/screen/parkScreen.vue
+++ b/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">
--- a/src/views/screen/regionScreen.vue
+++ b/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"
-          :externalStaffCount="dashboardData?.externalStaffCount || 0" :visitorCount="dashboardData?.visitorCount || 0"
-          :parkStatistics="dashboardData?.parkStatistics" />
-        <RiskStatisticsPanel :riskStatistics="riskStatistics" :dangerDetail="dangerDetail" :park="parkValue"
-          @tab-change="handleRiskTabChange" :campus_id="query.campus_id" />
+                       :formalEmployeeCount="dashboardData?.formalEmployeeCount || 0"
+                       :externalStaffCount="dashboardData?.externalStaffCount || 0"
+                       :visitorCount="dashboardData?.visitorCount || 0"
+                       :parkStatistics="dashboardData?.parkStatistics"/>
+        <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"
-          :sourceIndex="sourceIndex" />
+        <HighRiskAlertPanel :alertData="dashboardData?.alertData"
+                            :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"
-    @change="onRegionChange" />
+  <RegionSelector v-model="regionSelectorVisible" :modelSelected="selectedPark"
+                  :regions="regionOption"
+                  @change="onRegionChange"/>
 </template>

 <script setup lang="ts">
-import { getTableList, getTableData } from './report'
-import { ref, onMounted, watch, onUnmounted } from 'vue'
-import { useRoute, useRouter } from 'vue-router'
+import {getTableList, getTableData} from './report'
+import {ref, onMounted, watch, onUnmounted} from 'vue'
+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:
-        url('@/assets/images/screen/left_top_img.png'),
-        url('@/assets/images/screen/left_center_img.png'),
-        url('@/assets/images/screen/left_bottom_img.png');
-      background-position:
-        top center,
-        left center,
-        bottom center;
+      background-image: url('@/assets/images/screen/left_top_img.png'),
+      url('@/assets/images/screen/left_center_img.png'),
+      url('@/assets/images/screen/left_bottom_img.png');
+      background-position: top center,
+      left center,
+      bottom center;

      /* 设置大小，注意中间的背景图应该覆盖整个容器 */
      background-repeat: no-repeat, no-repeat, no-repeat;

      /* 设置位置 */
-      background-size:
-        100% 90px,
-        cover,
-        100% 68px;
+      background-size: 100% 90px,
+      cover,
+      100% 68px;
      flex: 1;

      /* 设置重复方式 */
@@ -1396,23 +1410,20 @@ const timeOut1 = (): void => {
    }

    .left-bottom {
-      background-image:
-        url('@/assets/images/screen/left_top_2_img.png'),
-        url('@/assets/images/screen/left_center_img.png'),
-        url('@/assets/images/screen/left_bottom_img.png');
-      background-position:
-        top center,
-        left center,
-        bottom center;
+      background-image: url('@/assets/images/screen/left_top_2_img.png'),
+      url('@/assets/images/screen/left_center_img.png'),
+      url('@/assets/images/screen/left_bottom_img.png');
+      background-position: top center,
+      left center,
+      bottom center;

      /* 设置大小，注意中间的背景图应该覆盖整个容器 */
      background-repeat: no-repeat, no-repeat, no-repeat;

      /* 设置位置 */
-      background-size:
-        100% 90px,
-        cover,
-        100% 68px;
+      background-size: 100% 90px,
+      cover,
+      100% 68px;
      flex: 1;

      /* 设置重复方式 */
@@ -1462,8 +1473,6 @@ const timeOut1 = (): void => {
    row-gap: 1rem;


-
-
  }

  .center-container {
Author	SHA1	Message	Date
yang chen	59843de257	feat(screen): 更新区域大屏安全指数获取逻辑并优化界面布局 - 在 mainScreen.vue 和 regionScreen.vue 中新增安全指数独立报表获取逻辑 - 修复 regionScreen.vue 中的模板标签格式和属性换行问题-优化 regionScreen.vue 中的 CSS 背景图片设置和布局结构 - 移除 mainScreen.vue 中未使用的 echarts 日志导入 - 调整多个组件标签的属性排列以提高可读性 -优化 regionScreen.vue 中的数据处理逻辑和查询参数传递方式- 清理 regionScreen.vue 中多余的空行和样式代码	2025-11-06 11:56:15 +08:00
yang chen	20680032bc	feat(screen): 隐藏隐患排查治理标题并调整子标题 - 在 companyScreen.vue 中隐藏“隐患排查治理”标题 - 在 HiddenDangerPanel.vue 中将“分类风险”更改为“隐患等级” - 在 mainScreenV1.vue 中同步修改标题和子标题显示逻辑 - 在 parkScreen.vue 中隐藏“隐患排查治理”标题	2025-10-31 14:58:49 +08:00
李奋勇	aa5f1f5b9b	Merge branch 'dev' of http://120.46.213.136:9528/isoftstone/lc_frontend into dev	2025-10-30 17:12:03 +08:00
李奋勇	6f4be5956e	部门选择外协单位选项优化	2025-10-30 17:11:59 +08:00
yang chen	5d07ca6d0e	feat(bpm): 新增任务分配规则支持自定义用户选择 - 在任务分配规则中增加 userSelects 类型支持 - 新增 TaskSelectAssigneeForm 组件用于选择任务候选人 - 更新 UserSelect 组件导出 Column 接口- 调整任务分配表单逻辑以适配新的用户选择类型- 优化任务分配规则获取与展示逻辑	2025-10-30 15:22:30 +08:00
yang chen	5a1567dc34	feat(bpm): 隐藏流程实例详情中的转办和加签按钮 - 注释掉了任务转办功能按钮 - 注释掉了任务加签功能按钮 -保留了其他操作按钮的功能逻辑	2025-10-27 11:42:55 +08:00
yang chen	bc9fd221a5	Merge branch 'dev-bpm' into dev	2025-10-27 11:33:44 +08:00
yang chen	256edf264e	feat(bpm): 添加抄送任务流程查看功能 - 在抄送任务列表中增加“流程”按钮，跳转至流程实例详情页 - 调整流程编号字段显示逻辑，默认展示并支持搜索 -优化抄送时间字段格式化方式，并调整搜索类型为时间范围选择 - 禁用规则类型下拉框编辑状态，并默认选中固定值30- 设置任务名称、ID及流程实例名称回填逻辑	2025-10-27 10:37:57 +08:00
yang chen	7328df959d	Revert "放开抄送" This reverts commit `bea6e51eea`.	2025-10-23 17:44:30 +08:00
李奋勇	bea6e51eea	放开抄送	2025-10-23 16:46:20 +08:00
yang chen	d01ce5d4a4	feat(bpm): 新增抄送任务页面并优化流程实例界面 - 新增抄送任务页面，支持查看抄送我的流程任务 -优化流程实例页面UI细节，调整按钮布局和间距 - 完善表单验证规则，确保必填字段校验正确 -修复流程取消功能，支持输入取消原因- 调整代码格式，统一导入语句和对象属性写法- 启用任务抄送按钮，完善审批操作栏功能	2025-10-23 16:29:23 +08:00