Compare commits

...

3 Commits

Author SHA1 Message Date
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
8 changed files with 33 additions and 12 deletions

View File

@@ -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('下发成功')

View File

@@ -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: [

View File

@@ -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')
}
}
}

View File

@@ -235,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,

View File

@@ -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">

View File

@@ -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">

View File

@@ -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">

View File

@@ -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">