diff --git a/src/api/modules/agjtCommandApi.ts b/src/api/modules/agjtCommandApi.ts index b98f095..9720ee7 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 f55ce3c..93ddf33 100644 --- a/src/views/commandScreen/dialogCompnnents/safe-info.vue +++ b/src/views/commandScreen/dialogCompnnents/safe-info.vue @@ -124,10 +124,14 @@ {{ item.name || "--" }} -
{{ item.subjectName || "--" }}
-
- - {{ item.title || "--" }} +
+ + {{ item.subjectName || '--' }} + +
+
+ + {{ item.title || '--' }}
{{ item.trainBeginTime || "--" }} - {{ item.trainEndTime || "--" }}
@@ -166,8 +170,12 @@
-
-
+
+ 姓名 + +
+
+
序号
姓名
课程名称
@@ -176,8 +184,8 @@
开始学习时间
结束学习时间
- -
+ +
{{ index + 1 }}
{{ item.workerName || "--" }}
@@ -214,8 +222,12 @@
-
-
+
+ 姓名 + +
+
+
序号
姓名
科目名称
@@ -229,20 +241,18 @@
考得分
剩余重考次数
- -
+ +
{{ index + 1 }}
-
{{ item.workerName || "--" }}
-
{{ item.subjectName || "--" }}
+
{{ item.workerName || '--' }}
- - {{ item.examPaperName || "--" }} + + {{ eduPlanItem.subjectName || '--' }} + +
+
+ + {{ eduPlanItem.paperName || '--' }}
@@ -274,8 +284,12 @@
-
-
+
+ 姓名 + +
+
+
序号
姓名
身份证号
@@ -283,8 +297,8 @@
科目类型
课程名称
- -
+ +
{{ index + 1 }}
{{ item.workerName || "--" }}
{{ item.workerCard || "--" }}
@@ -320,8 +334,12 @@
-
-
+
+ 姓名 + +
+
+
序号
姓名
身份证号
@@ -329,8 +347,8 @@
科目类型
考试名称
- -
+ +
{{ index + 1 }}
{{ item.workerName || "--" }}
{{ item.workerCard || "--" }}
@@ -416,18 +434,24 @@ const activeName = ref("first" as any); const studyExamRecord = ref("" as any); //进入详情页面 const handleOpenDetail = async (item: any) => { + activeIndex.value = 0 + activeName.value = 'first' isDetail.value = true; + workerName.value = '' eduPlanItem.value = item; getStudyExamData(); }; const handleCloseDetail = async () => { - // activeIndex.value = 0; + 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(); }; let total = ref(0 as any); @@ -445,6 +469,7 @@ const getStudyExamData = async () => { let data: any = { projectSn: store.sn, trainId: eduPlanItem.value.id, + workerName: workerName.value, pageNo: pageNo1.value, pageSize: 10 }; @@ -486,7 +511,8 @@ const getStudyExamData = async () => { } }; -const eduPlanName = ref("" as any); +const eduPlanName = ref(''as any) +const workerName = ref(''as any) const partyMemberList = ref({} as any); //获取数据 const getMemberCountList = async (tip: any) => { @@ -529,10 +555,16 @@ const getMemberCountList = async (tip: any) => { }; //培训计划搜索 const handleInput = async () => { - partyMemberList.value = []; - pageNo.value = 1; - getMemberCountList("search"); -}; + partyMemberList.value = [] + pageNo.value = 1 + getMemberCountList('search') +} +//培训计划详情记录搜索 +const handleInput2 = async () => { + partyMemberList.value = [] + pageNo.value = 1 + getStudyExamData() +} onMounted(async () => { await getMemberCountList("search"); @@ -555,6 +587,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 04a9f30..402786d 100644 --- a/src/views/commandScreen/dialogCompnnents/weather-info.vue +++ b/src/views/commandScreen/dialogCompnnents/weather-info.vue @@ -253,9 +253,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" >
+
@@ -305,9 +306,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" >
+
@@ -357,9 +359,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" >
+
@@ -409,9 +412,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" >
+
@@ -460,9 +464,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" >
+
@@ -511,9 +516,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" >
+
@@ -568,9 +574,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" >
+
@@ -621,9 +628,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" >
+
@@ -694,9 +702,11 @@ function handleChangeTab(val: any) { partyMemberList.value = []; pageNo.value = 1; } else { + selectVal.value = '' + treeData.value = '' getHierarchyEnterpriseList(); - getCountFn(); - getDataList(); + // getCountFn(); + // getDataList(); } } @@ -872,12 +882,12 @@ 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; + // 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); + // groupTree.value.setCurrentKey(level1CompanyData.value[0].id); getDataList(); //123 - // getCountFn();//123 + getCountFn();//123 }); } // this.enterpriseTreeData = res.result