no message

2025-11-25 10:50:52 +08:00
28 changed files with 255 additions and 788 deletions
--- a/.env.dev
+++ b/.env.dev
@@ -4,7 +4,7 @@ VITE_NODE_ENV=development
 VITE_DEV=true

 # 请求路径 注：/api 正常不需要 当前是访问演示环境nginx转发用
-VITE_BASE_URL='https://demo.jeelowcode.com/api'
+VITE_BASE_URL='http://10.28.117.100'

 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
 VITE_UPLOAD_TYPE=server
--- a/src/App.vue
+++ b/src/App.vue
@@ -63,7 +63,7 @@ watch(
 </script>
 <template>
  <ConfigGlobal :size="currentSize">
-    <div class="h-100% w-100%" style="overflow-y: auto;" :class="greyMode ? `${prefixCls}-grey-mode` : ''">
+    <div class="h-100% w-100%" :class="greyMode ? `${prefixCls}-grey-mode` : ''">
      <RouterView />
    </div>
    <routerSearch />
--- a/src/api/design/table/index.ts
+++ b/src/api/design/table/index.ts
@@ -1,6 +1,5 @@
 import request from '@/config/axios'
 import { encryptAES } from '@/components/LowDesign/src/utils/aes'
-import download from '@/utils/download'

 //获取表单开发列表
 export const getDbList = (data) => {
@@ -159,11 +158,6 @@ export const exportExcelData = (tableId, data) => {
  return request.download({ url: `/jeelowcode/excel/exportExcel/${tableId}`, method: 'POST', data })
 }

-//导出Excel表数据
-export const exportExcelDataCustom = (explain,tableId, data) => {
-  return request.download({ url: `/jeelowcode/excel/exportExcelCustom/${tableId}`, method: 'POST', data }).then((data) => download.excel(data, explain, 'xlsx'))
-}
-
 //下载导入模板
 export const downloadImportTemplate = (tableId) => {
  return request.download({ url: `/jeelowcode/excel/exportExcelTemplate/${tableId}` })
--- a/src/components/BpmTaskAssign/TaskSelectAssigneeForm.vue
+++ b/src/components/BpmTaskAssign/TaskSelectAssigneeForm.vue
@@ -1,107 +0,0 @@
-<template>
-  <ContentWrap>
-    <el-form ref="formRef" :model="formData" :rules="formRules" label-width="80px">
-      <div v-for="taskAssignRule in props?.taskAssignRules" :key="taskAssignRule.taskDefinitionKey">
-        <el-divider content-position="left">审批节点：{{ taskAssignRule?.taskDefinitionName }}</el-divider>
-        <el-form-item :label="taskAssignRule.taskDefinitionName+'候选人'"
-                      :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>
-
-
--- a/src/components/LowDesign/src/LowTable/index.vue
+++ b/src/components/LowDesign/src/LowTable/index.vue
@@ -18,18 +18,6 @@
          v-bind="userVBind"
          class="w-100%"
        ></userSelect>
-   </span>
-      <span prop="delegateDictId" style="display:none">
-    
-    <DicTableSelect
-    id="costomDictSelect"
-      :column="distSelectColumn"
-      size="default"
-      type="add"
-      prop="fields_7897245"
-      :scope="dictSelectScope"
-      @set-form-data="handleSetFormData"
-    ></DicTableSelect>
   </span>
    <!-- 顶部统计 -->
    <div
@@ -395,108 +383,12 @@ interface Props {
  dicRowKey?: string //dicTable模式 行数据的 Key
 }

-const dictSelectScope = {
-        "key": 0,
-        "value": "",
-        "column": {
-            "type": "dicTableSelect",
-            "controlType": "select",
-            "label": "表格选择框",
-            // "fixedSearch":{
-            //   "approveStatusName":"已审批"
-            // },
-            "separator": " | ",
-            "multiple": true,
-            "display": true,
-            "span": 12,
-            "disabled": false,
-            "required": false,
-            "hideLabel": false,
-            "i18nCode": "fields_7897245",
-            "dictTable": "1959187451673116674",
-            "dictCode": "id",
-            "dictText": "personName",
-            "dictTableColumn": [
-              "personName",
-              "personAge",
-              "personSex",
-              "mobile",
-              "approveStatusName"
-            ],
-            "prop": "fields_7897245",
-            "dataType": "string",
-            "className": "control-dicTableSelect control-fields_7897245 ",
-            "props": {
-                "lable": "personName",
-                "value": "id"
-            },
-            "rules": [
-
-            ]
-        },
-        "size": "default",
-        "disabled": false
-    }
-
-const distSelectColumn = {
-        "type": "dicTableSelect",
-        "controlType": "select",
-        "multiple": true,
-        "label": "表格选择框",
-        "separator": " | ",
-        "display": true,
-        "span": 12,
-        "disabled": false,
-        // "fixedSearch":{
-        //       "approveStatusName":"已审批"
-        //     },
-        "required": false,
-        "hideLabel": false,
-        "i18nCode": "fields_7897245",
-        "dictTable": "1959187451673116674",
-        "dictCode": "id",
-        "dictText": "personName",
-        "dictTableColumn": [
-          "personName",
-          "personAge",
-          "personSex",
-          "mobile",
-          "approveStatusName"
-          ]
-        ,
-        "prop": "fields_7897245",
-        "dataType": "string",
-        "className": "control-dicTableSelect control-fields_7897245 ",
-        "props": {
-            "lable": "personName",
-            "value": "id"
-        },
-        "rules": [
-
-        ]
-    }
-
 const props = withDefaults(defineProps<Props>(), {
  model: 'default',
  fixedSearch: () => {
    return {}
  }
 })
-const handleSetFormData = (key, val) => {
-  const cleaned = val.split('|').map(s => s.trim()).join(','); // "1975577437793124352 | 1965778349088899074"
-  console.log(cleaned);
-  // 在这里添加其他处理逻辑
-  useFun.requestApi('get', '/jeelowcode/outsidePerson/importOutside?tableId='+props.tableId+'&ids=' + cleaned, {
-  }).then(res => {
-    if (res.length > 0) {
-        message.success('下发成功')
-        useFun.refreshChange()
-    } else {
-      message.error(res.message)
-    }
-  })
-};
-
 const userVBind = {
  prop: 'delegateUserId',
  type: 'edit',
@@ -548,17 +440,6 @@ const userVBind = {
    }else if(props.tableId=='1968562717683908610'){ // 考试计划
        useFun.requestApi('get', '/jeelowcode/examIssus/addRecord?tableId='+props.tableId+'&ids=' + ids+'&userIds='+resultValue, {
          
-        }).then(res => {
-          if (res.length > 0) {
-             message.success('下发成功')
-             useFun.refreshChange()
-          } else {
-            message.error(res.message)
-          }
-        })
-    }else if(props.tableId=='1983351353033953281'){ // 工作事项
-        useFun.requestApi('get', '/jeelowcode/itemIssus/addResult?tableId='+props.tableId+'&ids=' + ids+'&userIds='+resultValue, {
-          
        }).then(res => {
          if (res.length > 0) {
             message.success('下发成功')
--- a/src/components/LowDesign/src/shareControl/DicTableSelect.vue
+++ b/src/components/LowDesign/src/shareControl/DicTableSelect.vue
@@ -1,6 +1,5 @@
 <template>
  <div class="dic-table-select-box w-100%">
-    {{ JSON.stringify(props) }}
    <div
      class="table-input pos-relative"
      :class="[{ disabled }, type, size]"
@@ -274,9 +273,9 @@ const getCurrTableSelect = (type?) => {
  const dicObj = {}
  const textList: string[] = []
  const ids = tableRef.value.tableSelect.map((item) => {
-    if (item[props.column.dictCode]) {
-      dicObj[item[dicCode.value]] = item[props.column.dictCode]
-      textList.push(item[props.column.dictCode])
+    if (item[props.column.dictText]) {
+      dicObj[item[dicCode.value]] = item[props.column.dictText]
+      textList.push(item[props.column.dictText])
    }
    return item[dicCode.value]
  })
--- 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 所有下级
 */

-export interface Column {
+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' }, { label: '外协单位', value: 'out' }, { label: '内部单位', value: 'internal' }],
+  deptFindType: [{ label: '全部部门', value: 'all' }, { label: '本级部门', value: 'now' }, { label: '本级及下级部门', value: 'sub' }],
  customControlType: [{ label: '未全局注册', value: false }, { label: '已全局注册', value: true }],
  regionType: [{ label: '全球-国家', value: 'gj' }, { label: '中国-省市区', value: 'ssq' }, { label: '中国-省市', value: 'ss' }, { label: '中国-省', value: 's' }],
  dictTextFormatter: [
--- a/src/components/LowDesign/src/utils/defaultUseUtil.ts
+++ b/src/components/LowDesign/src/utils/defaultUseUtil.ts
@@ -7,7 +7,6 @@ import { encryptAES, decryptAES } from '@/components/LowDesign/src/utils/aes'
 import { useUserStoreWithOut } from '@/store/modules/user'
 import { useI18n } from '@/hooks/web/useI18n';
 import router from '@/router/index'
-import {exportExcelDataCustom} from '@/api/design/table'

 const message = useMessage() // 消息弹窗

@@ -19,7 +18,6 @@ export default {
   * @param options 请求配置 如：{ params:{ text:'测试' } }
  */
  requestApi: (Method, url, options) => callApiFun(Method, url, options),
-  exportExcelCustom: (tableId, data) => exportExcelDataCustom(tableId, data),
  cloneDeep, //深拷贝
  listToTree,//列表转树结构
  formatDate,//时间格式化
--- a/src/components/LowDesign/src/utils/formUtil.ts
+++ b/src/components/LowDesign/src/utils/formUtil.ts
@@ -546,15 +546,13 @@ export const formDataFormatting = (formOption, formData, formType) => {
          echoObj[dicKey].push(...data[key].split(','))
        }
      } else echoObj[type].push(...data[key].split(','))
-    } else if (column[key]?.controlType == 'date'||key=='create_time') {
-      
+    } else if (column[key]?.controlType == 'date') {
      if (data[key]) {
        if (typeof data[key] == 'number' || typeof data[key] == 'string') {
          data[key] = data[key] + ''
          if (!(/[-|\/]/g.test(data[key]))) {
            //如果是时间戳强制转换
-            const timestamp = parseInt(data[key], 10)
-            data[key] = formatDate(new Date(timestamp), column[key].valueFormat || 'YYYY-MM-DD HH:mm:ss')
+            data[key] = formatDate(new Date(data[key]), column[key].valueFormat || 'YYYY-MM-DD HH:mm:ss')
          }
        }
      }
--- a/src/components/Verifition/src/Verify/VerifyPoints.vue
+++ b/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') {
-    pointBackImgBase.value = res.repData.originalImageBase64
-    backToken.value = res.repData.token
-    secretKey.value = res.repData.secretKey
-    poinTextList.value = res.repData.wordList
-    text.value = t('captcha.point') + '【' + poinTextList.value.join(',') + '】'
+  if (res?.repCode == '0000') {
+    pointBackImgBase.value = res?.repData?.originalImageBase64
+    backToken.value = res?.repData?.token
+    secretKey.value = res?.repData?.secretKey
+    poinTextList.value = res?.repData?.wordList || []
+    text.value = t('captcha.point') + '【' + poinTextList.value?.join(',') + '】'
  } else {
-    text.value = res.repMsg
+    text.value = res?.repMsg
  }
 }
 //坐标转换函数
--- a/src/components/Verifition/src/Verify/VerifySlide.vue
+++ b/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') {
-    backImgBase.value = res.repData.originalImageBase64
-    blockBackImgBase.value = res.repData.jigsawImageBase64
-    backToken.value = res.repData.token
-    secretKey.value = res.repData.secretKey
+  if (res?.repCode == '0000') {
+    backImgBase.value = res?.repData?.originalImageBase64
+    blockBackImgBase.value = res?.repData?.jigsawImageBase64
+    backToken.value = res?.repData?.token
+    secretKey.value = res?.repData?.secretKey
  } else {
-    tipWords.value = res.repMsg
+    tipWords.value = res?.repMsg
  }
 }
 </script>
--- a/src/views/Login/components/LoginForm.vue
+++ b/src/views/Login/components/LoginForm.vue
@@ -1,14 +1,6 @@
 <template>
-  <el-form
-    v-show="getShow"
-    ref="formLogin"
-    :model="loginData.loginForm"
-    :rules="LoginRules"
-    class="login-form login-form-default"
-    label-position="top"
-    label-width="120px"
-    size="large"
-  >
+  <el-form v-show="getShow" ref="formLogin" :model="loginData.loginForm" :rules="LoginRules"
+    class="login-form login-form-default" label-position="top" label-width="120px" size="large">
    <el-row style="margin-right: -10px; margin-left: -10px">
      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
        <el-form-item>
@@ -17,40 +9,23 @@
      </el-col>
      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
        <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
-          <el-input
-            v-model="loginData.loginForm.tenantName"
-            :placeholder="t('login.tenantNamePlaceholder')"
-            :prefix-icon="iconHouse"
-            link
-            type="primary"
-          />
+          <el-input v-model="loginData.loginForm.tenantName" :placeholder="t('login.tenantNamePlaceholder')"
+            :prefix-icon="iconHouse" link type="primary" />
        </el-form-item>
      </el-col>
      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
        <el-form-item prop="username">
-          <el-input
-            v-model="loginData.loginForm.username"
-            :placeholder="t('login.usernamePlaceholder')"
-            :prefix-icon="iconAvatar"
-          />
+          <el-input v-model="loginData.loginForm.username" :placeholder="t('login.usernamePlaceholder')"
+            :prefix-icon="iconAvatar" />
        </el-form-item>
      </el-col>
      <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
        <el-form-item prop="password">
-          <el-input
-            v-model="loginData.loginForm.password"
-            :placeholder="t('login.passwordPlaceholder')"
-            :prefix-icon="iconLock"
-            show-password
-            type="password"
-            @keyup.enter="getCode()"
-          />
+          <el-input v-model="loginData.loginForm.password" :placeholder="t('login.passwordPlaceholder')"
+            :prefix-icon="iconLock" show-password type="password" @keyup.enter="getCode()" />
        </el-form-item>
      </el-col>
-      <el-col
-        :span="24"
-        style="padding-right: 10px; padding-left: 10px; margin-top: -20px; margin-bottom: -20px"
-      >
+      <el-col :span="24" style="padding-right: 10px; padding-left: 10px; margin-top: -20px; margin-bottom: -20px">
        <el-form-item>
          <el-row justify="space-between" style="width: 100%">
            <el-col :span="6">
@@ -66,13 +41,8 @@
      </el-col>
      <el-col :span="24" style="padding-right: 10px; padding-left: 10px" class="login-btn-col">
        <el-form-item>
-          <XButton
-            :loading="loginLoading"
-            :title="t('login.login')"
-            class="w-[100%]"
-            type="primary"
-            @click="getCode()"
-          />
+          <XButton :loading="loginLoading" :title="t('login.login')" class="w-[100%]" type="primary"
+            @click="getCode()" />
          <div v-if="loginType == 'easy'" class="w-100% mt-6px flex justify-end">
            <el-dropdown @command="easyCommand">
              <div class="mt--2px cursor-pointer">
@@ -95,13 +65,8 @@
          </div>
        </el-form-item>
      </el-col>
-      <Verify
-        ref="verify"
-        :captchaType="captchaType"
-        :imgSize="{ width: '400px', height: '200px' }"
-        mode="pop"
-        @success="handleLogin"
-      />
+      <Verify ref="verify" :captchaType="captchaType" :imgSize="{ width: '400px', height: '200px' }" mode="pop"
+        @success="handleLogin" />
      <template v-if="!loginType">
        <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
          <!-- <el-form-item>
@@ -127,15 +92,8 @@
        <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
          <el-form-item>
            <div class="w-[100%] flex justify-center">
-              <Icon
-                v-for="(item, key) in socialList"
-                :key="key"
-                :icon="item.icon"
-                :size="50"
-                class="anticon cursor-pointer"
-                color="#999"
-                @click="doSocialLogin(item.type)"
-              />
+              <Icon v-for="(item, key) in socialList" :key="key" :icon="item.icon" :size="50"
+                class="anticon cursor-pointer" color="#999" @click="doSocialLogin(item.type)" />
            </div>
          </el-form-item>
        </el-col>
@@ -269,11 +227,13 @@ const getCookie = () => {
 // 根据域名，获得租户信息
 const getTenantByWebsite = async () => {
  const website = location.host
+  try {
    const res = await LoginApi.getTenantByWebsite(website)
    if (res) {
      loginData.loginForm.tenantName = res.name
      authUtil.setTenantId(res.id)
    }
+  } catch (e) { }
 }
 const loading = ref() // ElLoading.service 返回的实例
 // 登录
--- 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%" disabled>
+        <el-select v-model="formData.type" clearable style="width: 100%">
          <el-option
            v-for="dict in getIntDictOptions(DICT_TYPE.BPM_TASK_ASSIGN_RULE_TYPE)"
            :key="dict.value"
@@ -165,7 +165,7 @@ const open = async (row) => {
  resetForm()
  // 2. 再设置表单
  if (row != null) {
-    formData.value.type = 30
+    formData.value.type = undefined as unknown as number
    formData.value.taskName = row.name
    formData.value.taskId = row.id
    formData.value.processInstanceName = row.processInstance.name
--- a/src/views/bpm/processInstance/detail/index.vue
+++ b/src/views/bpm/processInstance/detail/index.vue
@@ -41,7 +41,6 @@
            <Icon icon="ep:close" />
            不通过
          </el-button>
-          <!--
          <el-button type="primary" @click="openTaskUpdateAssigneeForm(item.id)">
            <Icon icon="ep:edit" />
            转办
@@ -54,7 +53,6 @@
            <Icon icon="ep:plus" />
            加签
          </el-button>
-          -->
          <el-button type="warning" @click="handleBack(item)">
            <Icon icon="ep:back" />
            回退
@@ -175,8 +173,6 @@ const handleAudit = async (task, pass) => {
  getDetail()
 }

-
-
 const printPage = async () => {
 
 const { href } = router.resolve({ name: 'BpmProcessInstanceInfo', 
@@ -235,10 +231,6 @@ const getProcessInstance = async () => {
    if (processDefinition.formType === 10) {
      detailForm.value.formId = processDefinition.formId
      detailForm.value.optionsData = JSON.parse(processDefinition.formConf)
-      if (data.formVariables.jeelowcode_subtable_data) {
-        data.formVariables = { ...data.formVariables, ...data.formVariables.jeelowcode_subtable_data }
-        delete data.formVariables.jeelowcode_subtable_data
-      }
      detailForm.value.defaultData = data.formVariables
      // setConfAndFields2(
      //   detailForm,
--- a/src/views/bpm/processInstance/index.vue
+++ b/src/views/bpm/processInstance/index.vue
@@ -38,9 +38,8 @@
        />
      </template>
      <template #menu-left>
-        <el-button type="primary" v-hasPermi="['bpm:process-instance:create']" @click="handleCreate">
-          <Icon icon="ep:plus" class="mr-5px"/>
-          发起流程
+        <el-button type="primary" v-hasPermi="['bpm:process-instance:query']" @click="handleCreate">
+          <Icon icon="ep:plus" class="mr-5px" /> 发起流程
        </el-button>
      </template>
      <!-- 自定义操作栏 -->
@@ -48,20 +47,20 @@
        <el-button
          link
          type="primary"
-          v-hasPermi="['bpm:process-instance:query']"
+          v-hasPermi="['bpm:process-instance:cancel']"
          @click="handleDetail(row)"
        >
          详情
        </el-button>
-        <el-button
+        <!-- <el-button
          link
          type="danger"
-          v-if="row.result === 1|| row.result === 2"
-          v-hasPermi="['bpm:process-instance:cancel']"
+          v-if="row.result === 1"
+          v-hasPermi="['bpm:process-instance:query']"
          @click="handleCancel(row)"
        >
          取消
-        </el-button>
+        </el-button> -->
      </template>
    </avue-crud>
  </ContentWrap>
@@ -204,8 +203,7 @@ const searchChange = (params, done) => {

 /** 清空按钮操作 */
 const resetChange = () => {
-  searchChange({}, () => {
-  })
+  searchChange({}, () => {})
 }

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

@@ -201,7 +198,7 @@ const rowUpdate = async (form, index, done, loading) => {
  const delKey = ['roleIds', 'deptIds', 'postIds', 'userIds', 'userGroupIds', 'scripts']
  if (key) {
    if (typeof form[key] == 'number') form[key] = form[key] + ''
-    const value = key === 'userSelects' ? '' : form[key]
+    const value = form[key]
    form.options = typeof value == 'string' ? value.split(',') : value
  }
  delKey.forEach((prop) => delete form[prop])
--- a/src/views/document/TabsCardDocument.vue
+++ b/src/views/document/TabsCardDocument.vue
@@ -61,13 +61,6 @@ const tabsPaneList = ref([
    calcHeight: 200,
    fixedSearch: {file_main_type: 4}
  },
-  {
-    label: '工作档案',
-    name: 'workArchive',
-    formId: '1966386366515343361',
-    calcHeight: 200,
-    fixedSearch: {file_main_type: 5}
-  },
 ])

 // 定义点击tab的事件动作
--- a/src/views/lowdesign/tableDesign/index.vue
+++ b/src/views/lowdesign/tableDesign/index.vue
@@ -86,17 +86,6 @@
            <Icon :size="14" icon="hugeicons:java" />
            <span class="ml-3px!">JAVA增强</span>
          </el-button>
-          <!-- 批量同步 -->
-          <el-button
-            type="primary"
-            :size="size"
-            @click="handleBatchSync"
-            v-hasPermi="['jeelowcode:dbform:sync']"
-          >
-            <Icon :size="14" icon="simple-icons:oracle"/>
-            <span class="ml-3px!">批量同步</span>
-          </el-button>
-
        </template>
        <template #menu="{ size, row }">
          <div class="flex justify-center flex-items-center">
@@ -201,8 +190,7 @@
                  @click="openDataOrigin"
                  :disabled="!tableForm.dataOrigin"
                >
-                  <Icon :size="14" icon="lucide:text-search"></Icon>
-                  <span>数据源SQL配置</span>
+                  <Icon :size="14" icon="lucide:text-search"></Icon> <span>数据源SQL配置</span>
                </el-button>
                <el-button
                  type="primary"
@@ -223,12 +211,10 @@
                  <span>表格扩展配置</span>
                </el-button>
                <el-button @click="sortPopup = true">
-                  <Icon :size="14" icon="mdi:sort"></Icon>
-                  <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>
@@ -431,8 +417,7 @@
                size="small"
                type="primary"
                @click="copySampleStr(key)"
-              >点击复制
-              </el-button
+                >点击复制</el-button
              >
            </div>
          </div>
@@ -1539,8 +1524,7 @@ const searchChange = (params, done) => {

 /** 清空按钮操作 */
 const resetChange = () => {
-  searchChange({}, () => {
-  })
+  searchChange({}, () => {})
 }

 const sizeChange = (pageSize) => {
@@ -1754,35 +1738,13 @@ const rowDel = async (form) => {
    message.success(t('common.delSuccess'))
    // 刷新列表
    await getTableData()
-  } catch {
-  }
+  } catch {}
 }

 const beforeUnload = (event) => {
  if (isUnload.value) return (event.returnValue = '您确定要关闭页面吗？')
 }

-/** 批量同步 **/
-const handleBatchSync = async () => {
-  // 首先需要查询有没有需要同步的表单，如果没有则提示消息并结束，如果有则打开弹窗
-  let searchObj = {
-    isDbSync: 'N',
-    pageNo: tablePage.value.currentPage,
-    pageSize: -1
-  }
-  const data = await TableApi.getDbList(searchObj)
-  if (data?.records?.length > 0) {
-    // 将data.records取出来，每个记录的id作为row.id，并且发起普通同步
-    const promises = data.records.map((row) => TableApi.asyncDbData(row.id, 'default'))
-    await Promise.all(promises).catch(() => message.alert('同步失败'))
-    // 刷新列表
-    getTableData()
-  } else {
-    // 没有需要同步的表单，提示信息并结束方法
-    message.info('没有需要同步的表单')
-  }
-}
-
 /** 初始化 **/
 onMounted(async () => {
  window.addEventListener('beforeunload', beforeUnload)
--- a/src/views/screen/companyScreen.vue
+++ b/src/views/screen/companyScreen.vue
@@ -70,8 +70,7 @@
          </div>
          <div class="bottom-card">
            <div class="bottom-card-title">
-              <!-- 隐患排查治理 标题需要隐藏 2025-10-31 -->
-              <span></span>
+              <span>隐患排查治理</span>
              <img width="50%" style="margin: 8px 0" src="@/assets/images/line_1.png" />
            </div>
            <div class="type-wrapper">
--- a/src/views/screen/components/HiddenDangerPanel.vue
+++ b/src/views/screen/components/HiddenDangerPanel.vue
@@ -1,10 +1,9 @@
 <template>
  <div class="center-container">
    <div class="center-content">
-      <!-- 隐患排查治理 这个标题需要隐藏 2025-10-31 -->
-      <span class="title"></span>
+      <span class="title">隐患排查治理</span>
      <img class="bottom-border-line" src="@/assets/images/title_border_line_1.png" />
-      <span class="sub-title">隐患等级</span>
+      <span class="sub-title">分类风险</span>
      <img width="50%" src="@/assets/images/line_1.png" />

      <div class="type-wrapper">
--- a/src/views/screen/mainScreen.vue
+++ b/src/views/screen/mainScreen.vue
@@ -60,7 +60,6 @@ import RiskStatisticsPanel from './components/RiskStatisticsPanel.vue'
 import HighRiskAlertPanel from './components/HighRiskAlertPanel.vue'
 import TimeoutWorkOrderPanel from './components/TimeoutWorkOrderPanel.vue'
 import HiddenDangerPanel from './components/HiddenDangerPanel.vue'
-import {error} from "echarts/types/src/util/log";

 // 类型定义
 interface AlertItem {
@@ -485,16 +484,7 @@ const handleHiddenDangerPannelData = (query) => {
        _data2.general = Number(res.records[0].general)
        _data2.major = Number(res.records[0].major)

-        // 安全指数另算，再起一个报表
-        // dashboardData.value.hiddenDangerData.safetyIndex = res.records[0].safetyIndex
-        // 在这里添加获取安全指数的逻辑
-        getTableList('hidden_danger_safety_index', query).then(res => {
-          if (res.records && res.records.length > 0) {
        dashboardData.value.hiddenDangerData.safetyIndex = res.records[0].safetyIndex
-          }
-        }).catch(error => {
-          console.error('获取隐患排查治理数据失败:', error)
-        })

        // 获取隐患排查治理处理进度数据
        getTableList('hidden_danger_process_progress', query).then(res => {
--- a/src/views/screen/mainScreenV1.vue
+++ b/src/views/screen/mainScreenV1.vue
@@ -33,10 +33,9 @@

      <div class="center-container">
        <div class="center-content">
-          <!-- 隐患排查治理 -->
-          <span class="title"></span>
+          <span class="title">隐患排查治理</span>
          <img class="bottom-border-line" src="@/assets/images/title_border_line_1.png" />
-          <span class="sub-title">隐患等级</span>
+          <span class="sub-title">分类风险</span>
          <img width="50%" src="@/assets/images/line_1.png" />
          <div class="type-wrapper">
            <div class="type-item">
--- a/src/views/screen/parkScreen.vue
+++ b/src/views/screen/parkScreen.vue
@@ -60,8 +60,7 @@
          </div>
          <div class="bottom-card">
            <div class="bottom-card-title">
-              <!--隐患排查治理-->
-              <span></span>
+              <span>隐患排查治理</span>
              <img width="50%" style="margin: 8px 0" src="@/assets/images/line_1.png" />
            </div>
            <div class="type-wrapper">
--- a/src/views/screen/regionScreen.vue
+++ b/src/views/screen/regionScreen.vue
@@ -3,8 +3,7 @@
    <!-- 顶部标题栏 -->
    <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>
@@ -23,28 +22,23 @@
      <div class="left-wrapper">
        <OverviewPanel :totalCount="dashboardData?.totalCount || 0"
          :formalEmployeeCount="dashboardData?.formalEmployeeCount || 0"
-                       :externalStaffCount="dashboardData?.externalStaffCount || 0"
-                       :visitorCount="dashboardData?.visitorCount || 0"
+          :externalStaffCount="dashboardData?.externalStaffCount || 0" :visitorCount="dashboardData?.visitorCount || 0"
          :parkStatistics="dashboardData?.parkStatistics" />
-        <RiskStatisticsPanel :riskStatistics="riskStatistics" :dangerDetail="dangerDetail"
-                             :park="parkValue"
+        <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" :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" />
    </div>
  </div>

  <!-- 区域选择弹窗 -->
-  <RegionSelector v-model="regionSelectorVisible" :modelSelected="selectedPark"
-                  :regions="regionOption"
+  <RegionSelector v-model="regionSelectorVisible" :modelSelected="selectedPark" :regions="regionOption"
    @change="onRegionChange" />
 </template>

@@ -258,9 +252,7 @@ onMounted(async () => {
      // 去重region字段，使用Map来确保唯一性
      const regionMap = new Map()
      records.filter((el) => el.region_id == query.regionCode)
-        .map(el => {
-          return el
-        })
+        .map(el => { return el })
        .forEach(el => {
          if (!regionMap.has(el.park_name)) {
            regionMap.set(el.park_name, {
@@ -488,16 +480,7 @@ const handleHiddenDangerPannelData = (query) => {
        _data2.general = Number(res.records[0].general)
        _data2.major = Number(res.records[0].major)

-        // 安全指数另算，再起一个报表
-        // dashboardData.value.hiddenDangerData.safetyIndex = res.records[0].safetyIndex
-        // 在这里添加获取安全指数的逻辑
-        getTableList('hidden_danger_safety_index', query).then(res => {
-          if (res.records && res.records.length > 0) {
        dashboardData.value.hiddenDangerData.safetyIndex = res.records[0].safetyIndex
-          }
-        }).catch(error => {
-          console.error('获取隐患排查治理数据失败:', error)
-        })

        // 获取隐患排查治理处理进度数据
        getTableList('hidden_danger_process_progress', query).then(res => {
@@ -1236,10 +1219,12 @@ const timeOut1 = (): void => {

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

@@ -1247,7 +1232,8 @@ const timeOut1 = (): void => {
      background-repeat: no-repeat, no-repeat, no-repeat;

      /* 设置位置 */
-      background-size: 100% 90px,
+      background-size:
+        100% 90px,
        cover,
        100% 68px;
      flex: 1;
@@ -1410,10 +1396,12 @@ const timeOut1 = (): void => {
    }

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

@@ -1421,7 +1409,8 @@ const timeOut1 = (): void => {
      background-repeat: no-repeat, no-repeat, no-repeat;

      /* 设置位置 */
-      background-size: 100% 90px,
+      background-size:
+        100% 90px,
        cover,
        100% 68px;
      flex: 1;
@@ -1473,6 +1462,8 @@ const timeOut1 = (): void => {
    row-gap: 1rem;


+
+
  }

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