From 26649347e0eb56d7294c345e157e73343c8501f5 Mon Sep 17 00:00:00 2001 From: Vce Date: Fri, 5 Jul 2024 21:01:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=8C=87=E6=8C=A5?= =?UTF-8?q?=E9=83=A8=E5=A4=A7=E5=B1=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/agjtCommandApi.ts | 3 + .../dialogCompnnents/safe-info.vue | 66 +- .../dialogCompnnents/weather-info copy 2.vue | 2343 +++++++++++++++++ .../dialogCompnnents/weather-info.vue | 55 +- 4 files changed, 2431 insertions(+), 36 deletions(-) create mode 100644 src/views/commandScreen/dialogCompnnents/weather-info copy 2.vue diff --git a/src/api/modules/agjtCommandApi.ts b/src/api/modules/agjtCommandApi.ts index 65e544f..76f75c5 100644 --- a/src/api/modules/agjtCommandApi.ts +++ b/src/api/modules/agjtCommandApi.ts @@ -229,6 +229,9 @@ export const selectHierarchyEnterpriseListApi = (params: {}) => { export const getXzParentChildTaskListApi = (params: {}) => { return http.post(BASEURL + `/xmgl/xzTaskProgress/getParentChildList`, params, { headers: { noLoading: true } }); }; +export const getXzMilestoneListApi = (params: {}) => { + return http.post(BASEURL + `/xmgl/xzMilestone/list`, params, { headers: { noLoading: true } }); +}; // 甘特图接口结束位置 diff --git a/src/views/commandScreen/dialogCompnnents/safe-info.vue b/src/views/commandScreen/dialogCompnnents/safe-info.vue index ea8f4cc..6ac65fe 100644 --- a/src/views/commandScreen/dialogCompnnents/safe-info.vue +++ b/src/views/commandScreen/dialogCompnnents/safe-info.vue @@ -101,7 +101,11 @@ {{ item.name || '--' }} -
{{ item.subjectName || '--' }}
+
+ + {{ item.subjectName || '--' }} + +
{{ item.title || '--' }} @@ -126,7 +130,11 @@
{{'<<'}}返回
-
+
+ 姓名 + +
+
序号
姓名
@@ -136,7 +144,7 @@
开始学习时间
结束学习时间
- +
{{ index + 1 }}
{{ item.workerName || '--' }}
@@ -162,7 +170,11 @@
-
+
+ 姓名 + +
+
序号
姓名
@@ -177,14 +189,18 @@
考得分
剩余重考次数
- +
{{ index + 1 }}
{{ item.workerName || '--' }}
-
{{ item.subjectName || '--' }}
- - {{ item.examPaperName || '--' }} + + {{ eduPlanItem.subjectName || '--' }} + +
+
+ + {{ eduPlanItem.paperName || '--' }}
@@ -208,7 +224,11 @@
-
+
+ 姓名 + +
+
序号
姓名
@@ -217,7 +237,7 @@
科目类型
课程名称
- +
{{ index + 1 }}
{{ item.workerName || '--' }}
@@ -242,7 +262,11 @@
-
+
+ 姓名 + +
+
序号
姓名
@@ -251,7 +275,7 @@
科目类型
考试名称
- +
{{ index + 1 }}
{{ item.workerName || '--' }}
@@ -328,18 +352,21 @@ const handleOpenDetail = async(item: any) => { const handleCloseDetail = async() => { activeIndex.value = 0 activeName.value = 'first' + workerName.value = '' isDetail.value = false } //详情tab const handleDetailTab = async (tab: TabsPaneContext, event: Event) => { if(tab.index == activeIndex.value) return; activeIndex.value = tab.index + workerName.value = '' getStudyExamData() } const getStudyExamData = async() => { let data:any = { projectSn: store.sn, - trainId: eduPlanItem.value.id + trainId: eduPlanItem.value.id, + workerName: workerName.value } if(activeIndex.value == 0){ data.number = 1; @@ -376,6 +403,7 @@ const getStudyExamData = async() => { } const eduPlanName = ref(''as any) +const workerName = ref(''as any) const partyMemberList = ref({} as any); //获取数据 const getMemberCountList = async (tip: any) => { @@ -420,6 +448,12 @@ const handleInput = async () => { pageNo.value = 1 getMemberCountList('search') } +//培训计划详情记录搜索 +const handleInput2 = async () => { + partyMemberList.value = [] + pageNo.value = 1 + getStudyExamData() +} onMounted(async () => { await getMemberCountList("search"); @@ -442,6 +476,12 @@ onMounted(async () => { display: flex; align-items: center; } +.searchInner{ + color:#fff; + position: absolute; + top:0%; + left:0%; +} .political-outlook { height: 97%; margin: 0 60px; diff --git a/src/views/commandScreen/dialogCompnnents/weather-info copy 2.vue b/src/views/commandScreen/dialogCompnnents/weather-info copy 2.vue new file mode 100644 index 0000000..2adccc0 --- /dev/null +++ b/src/views/commandScreen/dialogCompnnents/weather-info copy 2.vue @@ -0,0 +1,2343 @@ + + + + + diff --git a/src/views/commandScreen/dialogCompnnents/weather-info.vue b/src/views/commandScreen/dialogCompnnents/weather-info.vue index 1fa9b19..3c5baaf 100644 --- a/src/views/commandScreen/dialogCompnnents/weather-info.vue +++ b/src/views/commandScreen/dialogCompnnents/weather-info.vue @@ -241,9 +241,10 @@ :style="gantt" v-for="(gantt, index) in child.gantts" :key="index" - @mouseenter="e => handleHover(e, child)" - @mouseleave="handleLeave" + :title="child.taskName + ' ' + headerList[child.status].label" >
+
@@ -293,9 +294,10 @@ :style="gantt" v-for="(gantt, index) in second.gantts" :key="index" - @mouseenter="e => handleHover(e, second)" - @mouseleave="handleLeave" + :title="child.taskName + ' ' + headerList[child.status].label" >
+
@@ -345,9 +347,10 @@ :style="gantt" v-for="(gantt, index) in third.gantts" :key="index" - @mouseenter="e => handleHover(e, third)" - @mouseleave="handleLeave" + :title="child.taskName + ' ' + headerList[child.status].label" >
+
@@ -397,9 +400,10 @@ :style="gantt" v-for="(gantt, index) in fouth.gantts" :key="index" - @mouseenter="e => handleHover(e, fouth)" - @mouseleave="handleLeave" + :title="child.taskName + ' ' + headerList[child.status].label" >
+
@@ -448,9 +452,10 @@ :style="gantt" v-for="(gantt, index) in fifth.gantts" :key="index" - @mouseenter="e => handleHover(e, fifth)" - @mouseleave="handleLeave" + :title="child.taskName + ' ' + headerList[child.status].label" >
+
@@ -499,9 +504,10 @@ :style="gantt" v-for="(gantt, index) in sixth.gantts" :key="index" - @mouseenter="e => handleHover(e, sixth)" - @mouseleave="handleLeave" + :title="child.taskName + ' ' + headerList[child.status].label" >
+ @@ -556,9 +562,10 @@ :style="gantt" v-for="(gantt, index) in seventh.gantts" :key="index" - @mouseenter="e => handleHover(e, seventh)" - @mouseleave="handleLeave" + :title="child.taskName + ' ' + headerList[child.status].label" > + @@ -609,9 +616,10 @@ :style="gantt" v-for="(gantt, index) in eighth.gantts" :key="index" - @mouseenter="e => handleHover(e, eighth)" - @mouseleave="handleLeave" + :title="child.taskName + ' ' + headerList[child.status].label" > + @@ -683,9 +691,11 @@ function handleChangeTab(val: any){ partyMemberList.value = [] pageNo.value = 1 }else{ + treeData.value = '' + selectVal.value = ''; getHierarchyEnterpriseList() - getCountFn() - getDataList() + // getCountFn() + // getDataList() } } @@ -850,12 +860,11 @@ const getHierarchyEnterpriseList = async() => { level1CompanyData.value = res.result; if (level1CompanyData.value && level1CompanyData.value.length > 0) { nextTick(() => { - treeData.value = level1CompanyData.value[0]; - selectVal.value = level1CompanyData.value[0].enterpriseName - // tree.value.setCurrentKey(level1CompanyData.value[0].id);//换掉tree - groupTree.value.setCurrentKey(level1CompanyData.value[0].id); + // treeData.value = level1CompanyData.value[0]; + // selectVal.value = level1CompanyData.value[0].enterpriseName + // groupTree.value.setCurrentKey(level1CompanyData.value[0].id); getDataList();//123 - // getCountFn();//123 + getCountFn();//123 }); } // this.enterpriseTreeData = res.result