Merge branch 'cjw-dev' into shenzhen-dev

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 } });
+};
 
 
 // 甘特图接口结束位置

src/views/commandScreen/dialogCompnnents/safe-info.vue

@@ -124,10 +124,14 @@
 									<span>{{ item.name || "--" }}</span>
 								</el-tooltip>
 							</div>
-							<div>{{ item.subjectName || "--" }}</div>
+							<div>
+								<el-tooltip class="box-item" style="text-align:center" effect="dark" :content="item.subjectName" placement="top-start">
+									<span>{{ item.subjectName || '--' }}</span>
+								</el-tooltip>
+							</div>
 							<div style="width:180px">
 								<el-tooltip class="box-item" style="text-align:center" effect="dark" :content="item.title" placement="top-start">
-									<span>{{ item.title || "--" }}</span>
+									<span>{{ item.title || '--' }}</span>
 								</el-tooltip>
 							</div>
 							<div style="width: 350px">{{ item.trainBeginTime || "--" }} - {{ item.trainEndTime || "--" }}</div>
@@ -166,7 +170,11 @@
 				</div>
 				<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleDetailTab">
 					<el-tab-pane :label="'学习记录'" name="first">
-						<div class="table-one" style="transform: translateY(-20px)">
+						<div class="searchInner">
+							<span style="margin-right:5px">姓名</span>
+							<el-input v-model="workerName" clearable size="small" style="width: 150px" @input="handleInput2" placeholder="请输入姓名" />
+						</div>
+						<div class="table-one" style="transform:translateY(10px)">
 							<div class="tabList" style="justify-content:space-around">
 								<div>序号</div>
 								<div>姓名</div>
@@ -176,7 +184,7 @@
 								<div>开始学习时间</div>
 								<div>结束学习时间</div>
 							</div>
-							<el-scrollbar class="listBox" ref="refScrollbar" style="height: 370px">
+							<el-scrollbar class="listBox" ref="refScrollbar" style="height:370px;">
 								<div v-for="(item, index) in studyExamRecord" class="listStyle" :key="item" style="justify-content:space-around">
 									<div>{{ index + 1 }}</div>
 									<div>{{ item.workerName || "--" }}</div>
@@ -214,7 +222,11 @@
 						</div>
 					</el-tab-pane>
 					<el-tab-pane :label="'考试记录'" name="second">
-						<div class="table-one" style="transform: translateY(-20px)">
+						<div class="searchInner">
+							<span style="margin-right:5px">姓名</span>
+							<el-input v-model="workerName" clearable size="small" style="width: 150px" @input="handleInput2" placeholder="请输入姓名" />
+						</div>
+						<div class="table-one" style="transform:translateY(10px)">
 							<div class="tabList" style="justify-content:space-around">
 								<div>序号</div>
 								<div>姓名</div>
@@ -232,17 +244,15 @@
 							<el-scrollbar class="listBox" ref="refScrollbar" style="height:370px">
 								<div v-for="(item, index) in studyExamRecord" class="listStyle" :key="item" style="justify-content:space-around">
 									<div>{{ index + 1 }}</div>
-									<div>{{ item.workerName || "--" }}</div>
-									<div>{{ item.subjectName || "--" }}</div>
+									<div>{{ item.workerName || '--' }}</div>
 									<div>
-										<el-tooltip
-											class="box-item"
-											style="text-align: center"
-											effect="dark"
-											:content="item.examPaperName"
-											placement="top-start"
-										>
-											<span>{{ item.examPaperName || "--" }}</span>
+										<el-tooltip class="box-item" style="text-align:center" effect="dark" :content="eduPlanItem.subjectName" placement="top-start">
+											<span>{{ eduPlanItem.subjectName || '--' }}</span>
+										</el-tooltip>
+									</div>
+									<div>
+										<el-tooltip class="box-item" style="text-align:center" effect="dark" :content="eduPlanItem.paperName" placement="top-start">
+											<span>{{ eduPlanItem.paperName || '--' }}</span>
 										</el-tooltip>
 									</div>
 									<div style="width: 140px">
@@ -274,7 +284,11 @@
 						</div>
 					</el-tab-pane>
 					<el-tab-pane :label="'未学习记录'" name="third">
-						<div class="table-one" style="transform: translateY(-20px)">
+						<div class="searchInner">
+							<span style="margin-right:5px">姓名</span>
+							<el-input v-model="workerName" clearable size="small" style="width: 150px" @input="handleInput2" placeholder="请输入姓名" />
+						</div>
+						<div class="table-one" style="transform:translateY(10px);">
 							<div class="tabList" style="justify-content:space-around">
 								<div>序号</div>
 								<div>姓名</div>
@@ -320,7 +334,11 @@
 						</div>
 					</el-tab-pane>
 					<el-tab-pane :label="'未考试记录'" name="four">
-						<div class="table-one" style="transform: translateY(-20px)">
+						<div class="searchInner">
+							<span style="margin-right:5px">姓名</span>
+							<el-input v-model="workerName" clearable size="small" style="width: 150px" @input="handleInput2" placeholder="请输入姓名" />
+						</div>
+						<div class="table-one" style="transform:translateY(10px)">
 							<div class="tabList" style="justify-content:space-around">
 								<div>序号</div>
 								<div>姓名</div>
@@ -329,7 +347,7 @@
 								<div>科目类型</div>
 								<div>考试名称</div>
 							</div>
-							<el-scrollbar class="listBox" ref="refScrollbar" style="height: 370px">
+							<el-scrollbar class="listBox" ref="refScrollbar" style="height:370px;">
 								<div v-for="(item, index) in studyExamRecord" class="listStyle" :key="item" style="justify-content:space-around">
 									<div>{{ index + 1 }}</div>
 									<div>{{ item.workerName || "--" }}</div>
@@ -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;

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"
 										></div>
+											<!-- @mouseenter="e => handleHover(e, child)"
+											@mouseleave="handleLeave" -->
 									</div>
 
 									<!-- 第三层 -->
@@ -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"
 											></div>
+												<!-- @mouseenter="e => handleHover(e, second)"
+												@mouseleave="handleLeave" -->
 										</div>
 
 										<!-- 第四层 -->
@@ -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"
 												></div>
+													<!-- @mouseenter="e => handleHover(e, third)"
+													@mouseleave="handleLeave" -->
 											</div>
 
 											<!-- 第五层 -->
@@ -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"
 													></div>
+														<!-- @mouseenter="e => handleHover(e, fouth)"
+														@mouseleave="handleLeave" -->
 												</div>
 
 												<!-- 第六层 -->
@@ -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"
 														></div>
+															<!-- @mouseenter="e => handleHover(e, fifth)"
+															@mouseleave="handleLeave" -->
 													</div>
 
 													<!-- 第七层 -->
@@ -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"
 															></div>
+																<!-- @mouseenter="e => handleHover(e, sixth)"
+																@mouseleave="handleLeave" -->
 														</div>
 
 														<!-- 第八层 -->
@@ -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"
 																></div>
+																	<!-- @mouseenter="e => handleHover(e, seventh)"
+																	@mouseleave="handleLeave" -->
 															</div>
 
 															<!-- 第九层 -->
@@ -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"
 																	></div>
+																		<!-- @mouseenter="e => handleHover(e, eighth)"
+																		@mouseleave="handleLeave" -->
 																</div>
 															</div>
 														</div>
@@ -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