isoftstone/lc_frontend
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: isoftstone:ec1c68dbc87baec7a9df7f3bf09340c0315b400d
Branches Tags
isoftstone:main isoftstone:dev isoftstone:dev-dataScreen
..
compare: isoftstone:main
Branches Tags
isoftstone:dev isoftstone:dev-dataScreen isoftstone:main

1 Commits
ec1c68dbc8 ... main

Author SHA1 Message Date
chenlin
93ecebcb2e no message 2025-11-25 10:50:52 +08:00
28 changed files with 255 additions and 786 deletions
Expand all files Collapse all files

2
.env.dev
View File

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

2
src/App.vue
View File

@@ -63,7 +63,7 @@ watch(
</script> </script>
<template> <template>
<ConfigGlobal :size="currentSize"> <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 /> <RouterView />
</div> </div>
<routerSearch /> <routerSearch />

6
src/api/design/table/index.ts
View File

@@ -1,6 +1,5 @@
import request from '@/config/axios' import request from '@/config/axios'
import { encryptAES } from '@/components/LowDesign/src/utils/aes' import { encryptAES } from '@/components/LowDesign/src/utils/aes'
import download from '@/utils/download'
//获取表单开发列表 //获取表单开发列表
export const getDbList = (data) => { export const getDbList = (data) => {
@@ -159,11 +158,6 @@ export const exportExcelData = (tableId, data) => {
return request.download({ url: `/jeelowcode/excel/exportExcel/${tableId}`, method: 'POST', 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) => { export const downloadImportTemplate = (tableId) => {
return request.download({ url: `/jeelowcode/excel/exportExcelTemplate/${tableId}` }) return request.download({ url: `/jeelowcode/excel/exportExcelTemplate/${tableId}` })

105
src/components/BpmTaskAssign/TaskSelectAssigneeForm.vue
View File

@@ -1,105 +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="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>

119
src/components/LowDesign/src/LowTable/index.vue
View File

@@ -18,18 +18,6 @@
v-bind="userVBind" v-bind="userVBind"
class="w-100%" class="w-100%"
></userSelect> ></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> </span>
<!-- 顶部统计 --> <!-- 顶部统计 -->
<div <div
@@ -395,108 +383,12 @@ interface Props {
dicRowKey?: string //dicTable模式 行数据的 Key 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>(), { const props = withDefaults(defineProps<Props>(), {
model: 'default', model: 'default',
fixedSearch: () => { fixedSearch: () => {
return {} 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 = { const userVBind = {
prop: 'delegateUserId', prop: 'delegateUserId',
type: 'edit', type: 'edit',
@@ -548,17 +440,6 @@ const userVBind = {
}else if(props.tableId=='1968562717683908610'){ // 考试计划 }else if(props.tableId=='1968562717683908610'){ // 考试计划
useFun.requestApi('get', '/jeelowcode/examIssus/addRecord?tableId='+props.tableId+'&ids=' + ids+'&userIds='+resultValue, { 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 => { }).then(res => {
if (res.length > 0) { if (res.length > 0) {
message.success('下发成功') message.success('下发成功')

7
src/components/LowDesign/src/shareControl/DicTableSelect.vue
View File

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

2
src/components/LowDesign/src/shareControl/UserSelect.vue
View File

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

2
src/components/LowDesign/src/utils/controlOption.ts
View File

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

2
src/components/LowDesign/src/utils/defaultUseUtil.ts
View File

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

6
src/components/LowDesign/src/utils/formUtil.ts
View File

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

16
src/components/Verifition/src/Verify/VerifyPoints.vue
View File

@@ -171,7 +171,7 @@ const canvasClick = (e) => {
token: backToken.value token: backToken.value
} }
reqCheck(data).then((res) => { reqCheck(data).then((res) => {
if (res.repCode == '0000') { if (res?.repCode == '0000') {
barAreaColor.value = '#4cae4c' barAreaColor.value = '#4cae4c'
barAreaBorderColor.value = '#5cb85c' barAreaBorderColor.value = '#5cb85c'
text.value = t('captcha.success') text.value = t('captcha.success')
@@ -228,14 +228,14 @@ const getPictrue = async () => {
captchaType: captchaType.value captchaType: captchaType.value
} }
const res = await getCode(data) 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 { } else {
text.value = res.repMsg text.value = res?.repMsg
} }
} }
//坐标转换函数 //坐标转换函数

14
src/components/Verifition/src/Verify/VerifySlide.vue
View File

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

132
src/views/Login/components/LoginForm.vue
View File

@@ -1,56 +1,31 @@
<template> <template>
<el-form <el-form v-show="getShow" ref="formLogin" :model="loginData.loginForm" :rules="LoginRules"
v-show="getShow" class="login-form login-form-default" label-position="top" label-width="120px" size="large">
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-row style="margin-right: -10px; margin-left: -10px">
<el-col :span="24" style="padding-right: 10px; padding-left: 10px"> <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item> <el-form-item>
<LoginFormTitle style="width: 100%"/> <LoginFormTitle style="width: 100%" />
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px"> <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName"> <el-form-item v-if="loginData.tenantEnable === 'true'" prop="tenantName">
<el-input <el-input v-model="loginData.loginForm.tenantName" :placeholder="t('login.tenantNamePlaceholder')"
v-model="loginData.loginForm.tenantName" :prefix-icon="iconHouse" link type="primary" />
:placeholder="t('login.tenantNamePlaceholder')"
:prefix-icon="iconHouse"
link
type="primary"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px"> <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item prop="username"> <el-form-item prop="username">
<el-input <el-input v-model="loginData.loginForm.username" :placeholder="t('login.usernamePlaceholder')"
v-model="loginData.loginForm.username" :prefix-icon="iconAvatar" />
:placeholder="t('login.usernamePlaceholder')"
:prefix-icon="iconAvatar"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px"> <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item prop="password"> <el-form-item prop="password">
<el-input <el-input v-model="loginData.loginForm.password" :placeholder="t('login.passwordPlaceholder')"
v-model="loginData.loginForm.password" :prefix-icon="iconLock" show-password type="password" @keyup.enter="getCode()" />
:placeholder="t('login.passwordPlaceholder')"
:prefix-icon="iconLock"
show-password
type="password"
@keyup.enter="getCode()"
/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col <el-col :span="24" style="padding-right: 10px; padding-left: 10px; margin-top: -20px; margin-bottom: -20px">
:span="24"
style="padding-right: 10px; padding-left: 10px; margin-top: -20px; margin-bottom: -20px"
>
<el-form-item> <el-form-item>
<el-row justify="space-between" style="width: 100%"> <el-row justify="space-between" style="width: 100%">
<el-col :span="6"> <el-col :span="6">
@@ -66,26 +41,21 @@
</el-col> </el-col>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px" class="login-btn-col"> <el-col :span="24" style="padding-right: 10px; padding-left: 10px" class="login-btn-col">
<el-form-item> <el-form-item>
<XButton <XButton :loading="loginLoading" :title="t('login.login')" class="w-[100%]" type="primary"
:loading="loginLoading" @click="getCode()" />
:title="t('login.login')"
class="w-[100%]"
type="primary"
@click="getCode()"
/>
<div v-if="loginType == 'easy'" class="w-100% mt-6px flex justify-end"> <div v-if="loginType == 'easy'" class="w-100% mt-6px flex justify-end">
<el-dropdown @command="easyCommand"> <el-dropdown @command="easyCommand">
<div class="mt--2px cursor-pointer"> <div class="mt--2px cursor-pointer">
<el-text type="primary"> <el-text type="primary">
<span class="text-14px">{{ t('login.otherLogin') }}</span> <span class="text-14px">{{ t('login.otherLogin') }}</span>
<Icon :size="16" icon="iconamoon:arrow-down-2-light"/> <Icon :size="16" icon="iconamoon:arrow-down-2-light" />
</el-text> </el-text>
</div> </div>
<template #dropdown> <template #dropdown>
<el-dropdown-menu> <el-dropdown-menu>
<template v-for="item in easyDropdownList" :key="item.label"> <template v-for="item in easyDropdownList" :key="item.label">
<el-dropdown-item :command="item"> <el-dropdown-item :command="item">
<Icon :size="16" :icon="item.icon"/> <Icon :size="16" :icon="item.icon" />
<span>{{ item.label }}</span> <span>{{ item.label }}</span>
</el-dropdown-item> </el-dropdown-item>
</template> </template>
@@ -95,13 +65,8 @@
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
<Verify <Verify ref="verify" :captchaType="captchaType" :imgSize="{ width: '400px', height: '200px' }" mode="pop"
ref="verify" @success="handleLogin" />
:captchaType="captchaType"
:imgSize="{ width: '400px', height: '200px' }"
mode="pop"
@success="handleLogin"
/>
<template v-if="!loginType"> <template v-if="!loginType">
<el-col :span="24" style="padding-right: 10px; padding-left: 10px"> <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<!-- <el-form-item> <!-- <el-form-item>
@@ -123,19 +88,12 @@
</el-row> </el-row>
</el-form-item> --> </el-form-item> -->
</el-col> </el-col>
<el-divider content-position="center">{{ t('login.otherLogin') }}</el-divider> <el-divider content-position="center">{{ t('login.otherLogin') }}</el-divider>
<el-col :span="24" style="padding-right: 10px; padding-left: 10px"> <el-col :span="24" style="padding-right: 10px; padding-left: 10px">
<el-form-item> <el-form-item>
<div class="w-[100%] flex justify-center"> <div class="w-[100%] flex justify-center">
<Icon <Icon v-for="(item, key) in socialList" :key="key" :icon="item.icon" :size="50"
v-for="(item, key) in socialList" class="anticon cursor-pointer" color="#999" @click="doSocialLogin(item.type)" />
:key="key"
:icon="item.icon"
:size="50"
class="anticon cursor-pointer"
color="#999"
@click="doSocialLogin(item.type)"
/>
</div> </div>
</el-form-item> </el-form-item>
</el-col> </el-col>
@@ -144,18 +102,18 @@
</el-form> </el-form>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import {ElLoading} from 'element-plus' import { ElLoading } from 'element-plus'
import LoginFormTitle from './LoginFormTitle.vue' import LoginFormTitle from './LoginFormTitle.vue'
import type {RouteLocationNormalizedLoaded} from 'vue-router' import type { RouteLocationNormalizedLoaded } from 'vue-router'
import {useIcon} from '@/hooks/web/useIcon' import { useIcon } from '@/hooks/web/useIcon'
import * as authUtil from '@/utils/auth' import * as authUtil from '@/utils/auth'
import {usePermissionStore} from '@/store/modules/permission' import { usePermissionStore } from '@/store/modules/permission'
import * as LoginApi from '@/api/login' import * as LoginApi from '@/api/login'
import {LoginStateEnum, useFormValid, useLoginState} from './useLogin' import { LoginStateEnum, useFormValid, useLoginState } from './useLogin'
defineOptions({name: 'LoginForm'}) defineOptions({ name: 'LoginForm' })
interface Props { interface Props {
loginType?: 'easy' loginType?: 'easy'
@@ -163,15 +121,15 @@ interface Props {
const props = defineProps<Props>() const props = defineProps<Props>()
const {t} = useI18n() const { t } = useI18n()
const message = useMessage() const message = useMessage()
const iconHouse = useIcon({icon: 'ep:house'}) const iconHouse = useIcon({ icon: 'ep:house' })
const iconAvatar = useIcon({icon: 'ep:avatar'}) const iconAvatar = useIcon({ icon: 'ep:avatar' })
const iconLock = useIcon({icon: 'ep:lock'}) const iconLock = useIcon({ icon: 'ep:lock' })
const formLogin = ref() const formLogin = ref()
const {validForm} = useFormValid(formLogin) const { validForm } = useFormValid(formLogin)
const {setLoginState, getLoginState} = useLoginState() const { setLoginState, getLoginState } = useLoginState()
const {currentRoute, push} = useRouter() const { currentRoute, push } = useRouter()
const permissionStore = usePermissionStore() const permissionStore = usePermissionStore()
const redirect = ref<string>('') const redirect = ref<string>('')
const loginLoading = ref(false) const loginLoading = ref(false)
@@ -203,7 +161,7 @@ const socialList = [
// { icon: 'ant-design:dingtalk-circle-filled', type: 20 }, // { icon: 'ant-design:dingtalk-circle-filled', type: 20 },
// { icon: 'ant-design:github-filled', type: 0 }, // { icon: 'ant-design:github-filled', type: 0 },
// { icon: 'ant-design:alipay-circle-filled', type: 0 }, // { icon: 'ant-design:alipay-circle-filled', type: 0 },
{icon: 'bx:planet', type: 100}, { icon: 'bx:planet', type: 100 },
] ]
const easyDropdownList = [ const easyDropdownList = [
@@ -219,15 +177,15 @@ const easyDropdownList = [
type: LoginStateEnum.QR_CODE, type: LoginStateEnum.QR_CODE,
code: 'page' code: 'page'
}, },
{label: t('login.btnWechat'), icon: 'ant-design:wechat-filled', type: 30, code: 'url'}, { label: t('login.btnWechat'), icon: 'ant-design:wechat-filled', type: 30, code: 'url' },
{ {
label: t('login.btnDingtalk'), label: t('login.btnDingtalk'),
icon: 'ant-design:dingtalk-circle-filled', icon: 'ant-design:dingtalk-circle-filled',
type: 20, type: 20,
code: 'url' code: 'url'
}, },
{label: t('login.btnGitHub'), icon: 'ant-design:github-filled', type: 0, code: 'url'}, { label: t('login.btnGitHub'), icon: 'ant-design:github-filled', type: 0, code: 'url' },
{label: t('login.btnAlipay'), icon: 'ant-design:alipay-circle-filled', type: 0, code: 'url'} { label: t('login.btnAlipay'), icon: 'ant-design:alipay-circle-filled', type: 0, code: 'url' }
] ]
const easyCommand = (row) => { const easyCommand = (row) => {
@@ -269,11 +227,13 @@ const getCookie = () => {
// 根据域名，获得租户信息 // 根据域名，获得租户信息
const getTenantByWebsite = async () => { const getTenantByWebsite = async () => {
const website = location.host const website = location.host
const res = await LoginApi.getTenantByWebsite(website) try {
if (res) { const res = await LoginApi.getTenantByWebsite(website)
loginData.loginForm.tenantName = res.name if (res) {
authUtil.setTenantId(res.id) loginData.loginForm.tenantName = res.name
} authUtil.setTenantId(res.id)
}
} catch (e) { }
} }
const loading = ref() // ElLoading.service 返回的实例 const loading = ref() // ElLoading.service 返回的实例
// 登录 // 登录
@@ -308,7 +268,7 @@ const handleLogin = async (params) => {
if (redirect.value.indexOf('sso') !== -1) { if (redirect.value.indexOf('sso') !== -1) {
window.location.href = window.location.href.replace('/login?redirect=', '') window.location.href = window.location.href.replace('/login?redirect=', '')
} else { } else {
push({path: redirect.value || permissionStore.addRouters[0].path}) push({ path: redirect.value || permissionStore.addRouters[0].path })
} }
} finally { } finally {
loginLoading.value = false loginLoading.value = false
@@ -327,7 +287,7 @@ const doSocialLogin = async (type: number) => {
await getTenantId() await getTenantId()
// 如果获取不到，则需要弹出提示，进行处理 // 如果获取不到，则需要弹出提示，进行处理
if (!authUtil.getTenantId()) { if (!authUtil.getTenantId()) {
await message.prompt('请输入租户名称', t('common.reminder')).then(async ({value}) => { await message.prompt('请输入租户名称', t('common.reminder')).then(async ({ value }) => {
const res = await LoginApi.getTenantIdByName(value) const res = await LoginApi.getTenantIdByName(value)
authUtil.setTenantId(res) authUtil.setTenantId(res)
}) })
@@ -356,7 +316,7 @@ watch(
} }
) )
onMounted(() => { onMounted(() => {
if(redirect.value && import.meta.env.VITE_DEFAULT_SSO =='true'){ if (redirect.value && import.meta.env.VITE_DEFAULT_SSO == 'true') {
//默认 //默认
doSocialLogin(100) doSocialLogin(100)
} }

4
src/views/bpm/processInstance/detail/TaskCCDialogForm.vue
View File

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

8
src/views/bpm/processInstance/detail/index.vue
View File

@@ -41,7 +41,6 @@
<Icon icon="ep:close" /> <Icon icon="ep:close" />
不通过 不通过
</el-button> </el-button>
<!--
<el-button type="primary" @click="openTaskUpdateAssigneeForm(item.id)"> <el-button type="primary" @click="openTaskUpdateAssigneeForm(item.id)">
<Icon icon="ep:edit" /> <Icon icon="ep:edit" />
转办 转办
@@ -54,7 +53,6 @@
<Icon icon="ep:plus" /> <Icon icon="ep:plus" />
加签 加签
</el-button> </el-button>
-->
<el-button type="warning" @click="handleBack(item)"> <el-button type="warning" @click="handleBack(item)">
<Icon icon="ep:back" /> <Icon icon="ep:back" />
回退 回退
@@ -175,8 +173,6 @@ const handleAudit = async (task, pass) => {
getDetail() getDetail()
} }
const printPage = async () => { const printPage = async () => {
const { href } = router.resolve({ name: 'BpmProcessInstanceInfo', const { href } = router.resolve({ name: 'BpmProcessInstanceInfo',
@@ -235,10 +231,6 @@ const getProcessInstance = async () => {
if (processDefinition.formType === 10) { if (processDefinition.formType === 10) {
detailForm.value.formId = processDefinition.formId detailForm.value.formId = processDefinition.formId
detailForm.value.optionsData = JSON.parse(processDefinition.formConf) 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 detailForm.value.defaultData = data.formVariables
// setConfAndFields2( // setConfAndFields2(
// detailForm, // detailForm,

38
src/views/bpm/processInstance/index.vue
View File

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

175
src/views/bpm/task/copy/index.vue
View File

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

2
src/views/bpm/task/todo/index.vue
View File

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

41
src/views/bpm/taskAssignRule/index.vue
View File

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

7
src/views/document/TabsCardDocument.vue
View File

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

214
src/views/lowdesign/tableDesign/index.vue
View File

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

3
src/views/screen/companyScreen.vue
View File

@@ -70,8 +70,7 @@
</div> </div>
<div class="bottom-card"> <div class="bottom-card">
<div class="bottom-card-title"> <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" /> <img width="50%" style="margin: 8px 0" src="@/assets/images/line_1.png" />
</div> </div>
<div class="type-wrapper"> <div class="type-wrapper">

5
src/views/screen/components/HiddenDangerPanel.vue
View File

@@ -1,10 +1,9 @@
<template> <template>
<div class="center-container"> <div class="center-container">
<div class="center-content"> <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" /> <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" /> <img width="50%" src="@/assets/images/line_1.png" />
<div class="type-wrapper"> <div class="type-wrapper">

12
src/views/screen/mainScreen.vue
View File

@@ -60,7 +60,6 @@ import RiskStatisticsPanel from './components/RiskStatisticsPanel.vue'
import HighRiskAlertPanel from './components/HighRiskAlertPanel.vue' import HighRiskAlertPanel from './components/HighRiskAlertPanel.vue'
import TimeoutWorkOrderPanel from './components/TimeoutWorkOrderPanel.vue' import TimeoutWorkOrderPanel from './components/TimeoutWorkOrderPanel.vue'
import HiddenDangerPanel from './components/HiddenDangerPanel.vue' import HiddenDangerPanel from './components/HiddenDangerPanel.vue'
import {error} from "echarts/types/src/util/log";
// 类型定义 // 类型定义
interface AlertItem { interface AlertItem {
@@ -485,16 +484,7 @@ const handleHiddenDangerPannelData = (query) => {
_data2.general = Number(res.records[0].general) _data2.general = Number(res.records[0].general)
_data2.major = Number(res.records[0].major) _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 => { getTableList('hidden_danger_process_progress', query).then(res => {

5
src/views/screen/mainScreenV1.vue
View File

@@ -33,10 +33,9 @@
<div class="center-container"> <div class="center-container">
<div class="center-content"> <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" /> <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" /> <img width="50%" src="@/assets/images/line_1.png" />
<div class="type-wrapper"> <div class="type-wrapper">
<div class="type-item"> <div class="type-item">

3
src/views/screen/parkScreen.vue
View File

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

107
src/views/screen/regionScreen.vue
View File

@@ -3,8 +3,7 @@
<!-- 顶部标题栏 --> <!-- 顶部标题栏 -->
<div class="header-container"> <div class="header-container">
<div class="header-left"> <div class="header-left">
<img class="back-img" @click="returnToHeadquarters" <img class="back-img" @click="returnToHeadquarters" src="@/assets/images/screen/back_image.png" />
src="@/assets/images/screen/back_image.png"/>
<div class="back-button" @click="openRegionSelector"> {{ selectedRegion }} <div class="back-button" @click="openRegionSelector"> {{ selectedRegion }}
<span>···</span> <span>···</span>
</div> </div>
@@ -17,44 +16,39 @@
</div> </div>
</div> </div>
<!-- 天气预报 --> <!-- 天气预报 -->
<WeatherWarning/> <WeatherWarning />
<!-- 主内容区 --> <!-- 主内容区 -->
<div class="content-container"> <div class="content-container">
<div class="left-wrapper"> <div class="left-wrapper">
<OverviewPanel :totalCount="dashboardData?.totalCount || 0" <OverviewPanel :totalCount="dashboardData?.totalCount || 0"
:formalEmployeeCount="dashboardData?.formalEmployeeCount || 0" :formalEmployeeCount="dashboardData?.formalEmployeeCount || 0"
:externalStaffCount="dashboardData?.externalStaffCount || 0" :externalStaffCount="dashboardData?.externalStaffCount || 0" :visitorCount="dashboardData?.visitorCount || 0"
:visitorCount="dashboardData?.visitorCount || 0" :parkStatistics="dashboardData?.parkStatistics" />
:parkStatistics="dashboardData?.parkStatistics"/> <RiskStatisticsPanel :riskStatistics="riskStatistics" :dangerDetail="dangerDetail" :park="parkValue"
<RiskStatisticsPanel :riskStatistics="riskStatistics" :dangerDetail="dangerDetail" @tab-change="handleRiskTabChange" :campus_id="query.campus_id" />
:park="parkValue"
@tab-change="handleRiskTabChange" :campus_id="query.campus_id"/>
</div> </div>
<div class="right-wrapper"> <div class="right-wrapper">
<HighRiskAlertPanel :alertData="dashboardData?.alertData" <HighRiskAlertPanel :alertData="dashboardData?.alertData" :alertDetails="dashboardData?.alertData.details"
:alertDetails="dashboardData?.alertData.details" :sourceIndex="sourceIndex" />
:sourceIndex="sourceIndex"/>
<TimeoutWorkOrderPanel :timeoutWorkOrders="dashboardData?.timeoutWorkOrders" <TimeoutWorkOrderPanel :timeoutWorkOrders="dashboardData?.timeoutWorkOrders"
:alertDetails="dashboardData?.timeoutWorkOrders.details" :alertDetails="dashboardData?.timeoutWorkOrders.details" :sourceIndex="sourceIndex" />
:sourceIndex="sourceIndex"/>
</div> </div>
<HiddenDangerPanel :hiddenDangerData="dashboardData?.hiddenDangerData"/> <HiddenDangerPanel :hiddenDangerData="dashboardData?.hiddenDangerData" />
</div> </div>
</div> </div>
<!-- 区域选择弹窗 --> <!-- 区域选择弹窗 -->
<RegionSelector v-model="regionSelectorVisible" :modelSelected="selectedPark" <RegionSelector v-model="regionSelectorVisible" :modelSelected="selectedPark" :regions="regionOption"
:regions="regionOption" @change="onRegionChange" />
@change="onRegionChange"/>
</template> </template>
<script setup lang="ts"> <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 RegionSelector from './components/RegionSelector.vue'
import WeatherWarning from './components/WeatherWarning.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 OverviewPanel from './components/OverviewPanel.vue'
import RiskStatisticsPanel from './components/RiskStatisticsPanel.vue' import RiskStatisticsPanel from './components/RiskStatisticsPanel.vue'
@@ -231,7 +225,7 @@ onMounted(async () => {
} }
try { try {
let {records} = await getTableList( let { records } = await getTableList(
'park_info_list' 'park_info_list'
) )
// records = [ // records = [
@@ -258,9 +252,7 @@ onMounted(async () => {
// 去重region字段，使用Map来确保唯一性 // 去重region字段，使用Map来确保唯一性
const regionMap = new Map() const regionMap = new Map()
records.filter((el) => el.region_id == query.regionCode) records.filter((el) => el.region_id == query.regionCode)
.map(el => { .map(el => { return el })
return el
})
.forEach(el => { .forEach(el => {
if (!regionMap.has(el.park_name)) { if (!regionMap.has(el.park_name)) {
regionMap.set(el.park_name, { regionMap.set(el.park_name, {
@@ -488,16 +480,7 @@ const handleHiddenDangerPannelData = (query) => {
_data2.general = Number(res.records[0].general) _data2.general = Number(res.records[0].general)
_data2.major = Number(res.records[0].major) _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 => { getTableList('hidden_danger_process_progress', query).then(res => {
@@ -588,7 +571,7 @@ const handleRiskTabChange = async (tab: TabType) => {
// 根据不同的tab请求不同的接口 // 根据不同的tab请求不同的接口
getTableList( getTableList(
code, code,
{...query, activeTab: tab} { ...query, activeTab: tab }
).then(response => { ).then(response => {
// 更新风险统计数据 - 传递完整的数组数据用于饼图显示 // 更新风险统计数据 - 传递完整的数组数据用于饼图显示
if (response.records && response.records.length > 0) { if (response.records && response.records.length > 0) {
@@ -637,7 +620,7 @@ const handleRiskTabChange = async (tab: TabType) => {
// 根据不同的tab请求不同的接口 // 根据不同的tab请求不同的接口
getTableList( getTableList(
code, code,
{...query, activeTab: tab} { ...query, activeTab: tab }
).then(response => { ).then(response => {
// 更新风险统计数据 - 传递完整的数组数据用于饼图显示 // 更新风险统计数据 - 传递完整的数组数据用于饼图显示
if (response.records && response.records.length > 0) { if (response.records && response.records.length > 0) {
@@ -667,7 +650,7 @@ const onRegionChange = (item: RegionItem): void => {
parkValue.value = item.code parkValue.value = item.code
router.push({ router.push({
path: '/screen/company', path: '/screen/company',
query: {parkName: item.name, parkCode: item.code} query: { parkName: item.name, parkCode: item.code }
}) })
} }
@@ -1236,20 +1219,23 @@ const timeOut1 = (): void => {
.left-top { .left-top {
padding: 0 5px; padding: 0 5px;
background-image: url('@/assets/images/screen/left_top_img.png'), background-image:
url('@/assets/images/screen/left_center_img.png'), url('@/assets/images/screen/left_top_img.png'),
url('@/assets/images/screen/left_bottom_img.png'); url('@/assets/images/screen/left_center_img.png'),
background-position: top center, url('@/assets/images/screen/left_bottom_img.png');
left center, background-position:
bottom center; top center,
left center,
bottom center;
/* 设置大小，注意中间的背景图应该覆盖整个容器 */ /* 设置大小，注意中间的背景图应该覆盖整个容器 */
background-repeat: no-repeat, no-repeat, no-repeat; background-repeat: no-repeat, no-repeat, no-repeat;
/* 设置位置 */ /* 设置位置 */
background-size: 100% 90px, background-size:
cover, 100% 90px,
100% 68px; cover,
100% 68px;
flex: 1; flex: 1;
/* 设置重复方式 */ /* 设置重复方式 */
@@ -1410,20 +1396,23 @@ const timeOut1 = (): void => {
} }
.left-bottom { .left-bottom {
background-image: url('@/assets/images/screen/left_top_2_img.png'), background-image:
url('@/assets/images/screen/left_center_img.png'), url('@/assets/images/screen/left_top_2_img.png'),
url('@/assets/images/screen/left_bottom_img.png'); url('@/assets/images/screen/left_center_img.png'),
background-position: top center, url('@/assets/images/screen/left_bottom_img.png');
left center, background-position:
bottom center; top center,
left center,
bottom center;
/* 设置大小，注意中间的背景图应该覆盖整个容器 */ /* 设置大小，注意中间的背景图应该覆盖整个容器 */
background-repeat: no-repeat, no-repeat, no-repeat; background-repeat: no-repeat, no-repeat, no-repeat;
/* 设置位置 */ /* 设置位置 */
background-size: 100% 90px, background-size:
cover, 100% 90px,
100% 68px; cover,
100% 68px;
flex: 1; flex: 1;
/* 设置重复方式 */ /* 设置重复方式 */
@@ -1473,6 +1462,8 @@ const timeOut1 = (): void => {
row-gap: 1rem; row-gap: 1rem;
} }
.center-container { .center-container {

2
vite.config.ts
View File

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