From a8150b29f733dd9dd646b1ca2031b5413b3df223 Mon Sep 17 00:00:00 2001 From: weibl Date: Fri, 21 Nov 2025 16:16:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=A0=B7=E5=BC=8F=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/data/data.ts | 2 +- src/assets/styles/common.scss | 33 +++++++++++++ src/assets/styles/main.scss | 3 +- src/components/project/projectInfoDialog.vue | 40 ++++++---------- src/main.ts | 1 + .../creation/components/configPage.vue | 1 + .../projectDetail/components/loadcase.vue | 5 ++ src/views/task/projectList/index.vue | 47 +++++-------------- 8 files changed, 70 insertions(+), 62 deletions(-) create mode 100644 src/assets/styles/common.scss diff --git a/src/api/data/data.ts b/src/api/data/data.ts index fb91e772..ee248d66 100644 --- a/src/api/data/data.ts +++ b/src/api/data/data.ts @@ -93,7 +93,7 @@ export const getCSVDataApi = (params: any) => { }; // 获取文件预览地址 export const getKKFileViewURLFromMinioApi = (params: any) => { - return get(`${PREFIX}getKKFileViewURLFromMinio`, params); + return get(`${PREFIX}data/getKKFileViewURLFromMinio`, params); }; /** diff --git a/src/assets/styles/common.scss b/src/assets/styles/common.scss new file mode 100644 index 00000000..5edafae3 --- /dev/null +++ b/src/assets/styles/common.scss @@ -0,0 +1,33 @@ + + + +.dot-success { + background-color: #00A870; +} +.dot-refuse { + background-color: #E34D59; +} +.dot-default { + background-color: #999999; +} +.dot-in-precess { + background-color: #0366FF; +} +.dot-approving { + background-color: #FF7D00; +} +.dot { + /* 1. 设为内联块，才能设置宽高 */ + display: inline-block; + /* 2. 宽高相等，控制圆点大小 */ + width: 8px; + height: 8px; + /* 3. 圆角 50% 变成圆形 */ + border-radius: 50%; + /* 4. 背景色（根据需求调整） */ + // background-color: #42b983; + /* 可选：间距调整（与文字对齐） */ + // margin: 0 4px; + margin-right: var(--margin-small); + vertical-align: middle; +} diff --git a/src/assets/styles/main.scss b/src/assets/styles/main.scss index 6a366d13..eb683920 100644 --- a/src/assets/styles/main.scss +++ b/src/assets/styles/main.scss @@ -5,7 +5,8 @@ margin: 0; border: 0; box-sizing: border-box; - font-family: Inter, Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB, Microsoft YaHei, 微软雅黑, Arial, sans-serif; + // font-family: Regular, -apple-system, BlinkMacSystemFont, PingFang SC, Hiragino Sans GB, Microsoft YaHei, SimSun, sans-serif; + font-family: Regular; } /* 自定义滚动条样式 */ ::-webkit-scrollbar { diff --git a/src/components/project/projectInfoDialog.vue b/src/components/project/projectInfoDialog.vue index 689fdd94..3eb7cf80 100644 --- a/src/components/project/projectInfoDialog.vue +++ b/src/components/project/projectInfoDialog.vue @@ -106,13 +106,20 @@ const emits = defineEmits(['update:modelValue', 'update:currentProjectBaseInfo', const addOrEditProject = async () => { console.log('tableFormRef.value', tableFormRef.value); if (await tableFormRef.value.validateFun()) { - if (hasSameValue()) return; loadingInterface.value = true; + console.log('projectForm', tableFormRef.value.getFormDataFun()); + const projectForm = tableFormRef.value.getFormDataFun(); + + if (projectForm.planTime) { + projectForm.beginTime = projectForm.planTime[0]; + projectForm.endTime = projectForm.planTime[1]; + } + if (!props?.projectId) { - await createProject(); + await createProject(projectForm); } else { // console.log('编辑项目', projectForm); - await editNode(); + await editNode(projectForm); emits('update:currentProjectBaseInfo', { ...tableFormRef.value.getFormDataFun() }); } loadingInterface.value = false; @@ -121,30 +128,12 @@ const addOrEditProject = async () => { closeFun(); } }; -const hasSameValue = () => { - const projectForm = tableFormRef.value.getFormDataFun(); - for (let index = 0; index < props.nodeLevel1List.length; index++) { - if ( props.nodeLevel1List[index].id !== projectForm.id) { - if (props.nodeLevel1List[index].nodeName === projectForm.nodeName) { - ElMessage.error('项目名称有重复！'); - return true; - } - if (props.nodeLevel1List[index].nodeCode === projectForm.nodeCode) { - ElMessage.error('项目编码有重复！'); - return true; - } - } - } - return false; -}; -const createProject = async() => { +const createProject = async(projectForm:any) => { // console.log('projectForm', projectForm); // const memberList = projectForm.memberList.map((item: any) => { // return JSON.parse(item); // }); - console.log('projectForm', tableFormRef.value.getFormDataFun()); - const projectForm = tableFormRef.value.getFormDataFun(); // if (projectForm.memberList) { // projectForm.memberList = projectForm.memberList.map((item: any) => { // return { @@ -168,11 +157,10 @@ const createProject = async() => { } }; -const editNode = async() => { +const editNode = async(projectForm:any) => { // const memberList = projectForm.memberList.map((item: any) => { // return JSON.parse(item); // }); - const projectForm = tableFormRef.value.getFormDataFun(); // if (projectForm.memberList) { // projectForm.memberList = projectForm.memberList.map((item: any) => { // return { @@ -248,8 +236,8 @@ const getNodeDetailFun = async() => { for (const key in res.data) { projectInfo[key] = res.data[key]; } - console.log('123', { ...projectInfo, memberList: getMemberListStr(projectInfo.memberList) }); - tableFormRef.value.setFormDataFun({ ...projectInfo, memberList: getMemberListStr(projectInfo.memberList) }); + console.log('123', { ...projectInfo, planTime: [projectInfo.beginTime, projectInfo.endTime], memberList: getMemberListStr(projectInfo.memberList) }); + tableFormRef.value.setFormDataFun({ ...projectInfo, planTime: [projectInfo.beginTime, projectInfo.endTime], memberList: getMemberListStr(projectInfo.memberList) }); } } } diff --git a/src/main.ts b/src/main.ts index d514d1cb..2ba3d5f1 100644 --- a/src/main.ts +++ b/src/main.ts @@ -8,6 +8,7 @@ import * as ElementPlusIconsVue from '@element-plus/icons-vue'; import 'element-plus/dist/index.css'; import 'element-plus/theme-chalk/dark/css-vars.css'; import '@/assets/styles/main.scss'; +import '@/assets/styles/common.scss'; import VxeUIAll from 'vxe-pc-ui'; import 'vxe-pc-ui/es/style.css'; import VxeTable, { VxeUI } from 'vxe-table'; diff --git a/src/views/simulation/creation/components/configPage.vue b/src/views/simulation/creation/components/configPage.vue index 8ae5372e..fc5df2a6 100644 --- a/src/views/simulation/creation/components/configPage.vue +++ b/src/views/simulation/creation/components/configPage.vue @@ -100,6 +100,7 @@ onMounted(() => { .el-tabs__item { // width: 200px; padding: 0 60px; + font-weight: 600; } } diff --git a/src/views/task/projectDetail/components/loadcase.vue b/src/views/task/projectDetail/components/loadcase.vue index d26d4c72..7d90f766 100644 --- a/src/views/task/projectDetail/components/loadcase.vue +++ b/src/views/task/projectDetail/components/loadcase.vue @@ -132,8 +132,13 @@ const updatePhaseUuid = async (value: string) => { tableLoading.value = false; }; +const treeTableRef = ref(); + const getTaskTreeList = async () => { tableList.value = await getTaskTreeFun(props.projectUuid, phaseUuid.value); + setTimeout(() => { + treeTableRef.value.loadcaseTableRef.TreeTableRef.treeTableRef.setAllTreeExpand(true); + }, 200); }; const phaseListOptions = ref([]); diff --git a/src/views/task/projectList/index.vue b/src/views/task/projectList/index.vue index 123134b6..0ee39512 100644 --- a/src/views/task/projectList/index.vue +++ b/src/views/task/projectList/index.vue @@ -21,40 +21,6 @@ {{ project.nodeName }} {{ PROJECT_EXE_STATUS.O[project.exeStatus ] }} - @@ -75,6 +41,18 @@ {{ row?.creatorObj?.nickname }}