flx：修改项目看板 总览大屏样式问题

src/components/setVideoDialog.vue

@@ -20,8 +20,9 @@
 							ref="upload"
 							class="upload-demo"
 							:action="BASEURL + '/upload/image'"
-							:on-success="file => handleSuccess(file, index)"
+							:on-success="(file: any) => handleSuccess(file, index)"
 							:beforeUpload="handleBeforeUploadVideo"
+							:on-error="handleError"
 							name="files"
 							:show-file-list="false"
 						>
@@ -46,6 +47,7 @@ import { onMounted, reactive, ref } from "vue";
 import { UploadFilled } from "@element-plus/icons-vue";
 import { ElMessage } from "element-plus";
 import type { UploadInstance } from "element-plus";
+import { showFullScreenLoading, tryHideFullScreenLoading } from "@/config/serviceLoading";
 import { configWeekVideoSaveApi, configWeekVideoListApi } from "@/api/modules/agjtCommandApi";
 import { GlobalStore } from "@/stores";
 import moment from "moment";
@@ -139,6 +141,7 @@ function handleBeforeUploadVideo(file: any) {
 	console.log(file, "上传之前");
 	let fileType = file.type.split("/")[0];
 	if (fileType == "video") {
+		showFullScreenLoading();
 		return true;
 	} else {
 		ElMessage({
@@ -153,11 +156,17 @@ function handleBeforeUploadVideo(file: any) {
 function handleSuccess(file: any, index: number) {
 	if (file.code == 200 || file.status == "SUCCESS") {
 		console.log(file, "上传成功");
+		tryHideFullScreenLoading();
 		let url = file.data[0].imageUrl;
 		// this.imgUrl = url;
 		configWeekVideoEditFn(true, url, index);
 	}
 }
+// 视频上传成功
+function handleError() {
+	tryHideFullScreenLoading();
+}
+
 const closeDialog = () => {
 	dialogInfo.showDialog = false;
 	dialogInfo.postData = {};

src/config/config.ts

@@ -29,9 +29,9 @@ export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
 // export const COMPANY: string = "as"; //鞍山项目
 // export const COMPANY: string = "agjt"; //鞍钢集团
 // export const COMPANY: string = "agjtLive"; //鞍钢集团现场大屏
-// export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏
+export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏
 // export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏
-export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览
+// export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览
 // export const COMPANY: string = "zkjc"; //中科佳成项目
 // export const COMPANY: string = "cqna"; //重庆南岸项目
 // export const COMPANY: string = "slx"; //苏立信项目

src/routers/modules/staticRouter.ts

@@ -25,9 +25,9 @@ export const staticRouter: RouteRecordRaw[] = [
 		path: "/large",
 		name: "大屏",
 		// component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版
-		// component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏
+		component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏
 		// component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏
-		component: () => import("@/views/overviewScreen/indexCommand.vue"), //总览大屏
+		// component: () => import("@/views/overviewScreen/indexCommand.vue"), //总览大屏
 		// component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏
 		// component: () => import("@/views/sevenLargeScreen/indexL_syhy.vue"), // 只有一级路由(盘锦、嘉兴、鄱湖美湾医疗项目需切换至该首页)
 		children: [

src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightBottom.vue

@@ -1,16 +1,16 @@
 <template>
 	<div class="leftTop">
-		<Card title="安全质量隐患报告">
+		<Card title="安全隐患报告">
 			<div class="box-content">
 				<el-scrollbar class="list-box" ref="refScrollbar">
 					<div v-for="item in list" class="listStyle" :key="item.id">
 						<div>{{ item.dangerItemContent }}</div>
 						<div>
 							<span>整改结果：</span>
-							<span v-if="item.overTime" style="color: #e25f64">已逾期</span>
+							<span :style="{ color: item.status ? statusNameFilter(item.status).color : '' }">{{
-							<span v-else :style="{ color: item.status ? statusNameFilter(item.status).color : '' }">{{
 								item.status ? statusNameFilter(item.status).name : ""
 							}}</span>
+							<span v-if="item.overTime" style="color: #e25f64; margin-left: 6px">已逾期</span>
 						</div>
 						<div>
 							<div>
@@ -117,7 +117,8 @@ onMounted(async () => {
 				box-shadow: 0px 3px 4px 0px rgba(17, 141, 255, 0.5), inset 0px 0px 10px 0px #118dff;
 				border-radius: 0px 0px 0px 0px;
 				border: 1px solid;
-				opacity: 0.7;
+				// opacity: 0.7;
+				opacity: 0.9;
 				border-image: linear-gradient(359deg, rgba(17, 141, 255, 1), rgba(17, 141, 255, 0)) 1 1;
 				padding: 9px 13px;
 				margin-bottom: 10px;

src/views/agjtProjectKanban/comprehensiveManage/projectOverview/rightTop.vue

@@ -16,7 +16,7 @@
 				<div class="contentTop contentMiddle">
 					<div class="ctHead" @click="onEchartsSafeTab(1)">
 						<div>
-							质量重大隐患超期未整改<text>{{ overdueMajorDangerCount }}</text
+							安全重大隐患超期未整改<text>{{ overdueMajorDangerCount }}</text
 							>个，占比<text>{{ overdueMajorDangerRate }}%</text>
 						</div>
 					</div>

src/views/commandScreen/commandCenter/centerBottom.vue

@@ -199,7 +199,7 @@ const randerInfo = reactive({
 	titleInfo: {
 		titleLeft: "未来三天事故风险概率预测",
 		titleRight: "查看各企业应急事故风险概率预测",
-		percentage: 80
+		percentage: 0
 	},
 	workerFlag: true,
 	workerList: [] as any[]
@@ -257,7 +257,7 @@ const openDialogData = async () => {
 				titleInfo: {
 					titleLeft: "未来三天事故风险概率预测",
 					// titleRight: "查看各企业应急事故风险概率预测",
-					percentage: 80
+					percentage: item.area
 				},
 				workerFlag: true,
 				workerList: [
@@ -296,7 +296,14 @@ const getRiskTrendByProject = async (showLoading: boolean, val: number) => {
 			res.result.monthlySafetyScoreRate,
 			res.result.unclosedHiddenDangersRate
 		];
-		randerInfo.workerList = randerInfo.dataList[0].value;
+		randerInfo.workerList = [
+			res.result.severeWeatherRate,
+			res.result.totalPersonnelRiskRate,
+			res.result.totalSpecialOperationsRiskRate,
+			res.result.monthlySafetyScoreRate,
+			res.result.unclosedHiddenDangersRate
+		];
+		randerInfo.titleInfo.percentage = res.result.area;
 	}
 	activeIfo.activeIndex = val;
 };

src/views/commandScreen/commandCenter/leftBottom.vue

@@ -185,7 +185,7 @@ const randerInfo = reactive({
 	titleInfo: {
 		titleLeft: "未来三天人员风险概率预测",
 		titleRight: "查看各企业人员风险概率预测",
-		percentage: 1
+		percentage: 0
 	},
 	workerFlag: true,
 	workerList: [] as any[]

src/views/commandScreen/commandCenter/rightAll.vue

@@ -299,7 +299,7 @@ const randerInfo = reactive({
 	titleInfo: {
 		titleLeft: "未来三天安全隐患风险概率预测",
 		titleRight: "查看各企业安全隐患风险概率预测",
-		percentage: 80
+		percentage: 0
 	},
 	workerFlag: true,
 	workerList: [] as any[]
@@ -329,7 +329,7 @@ const randerInfo2 = reactive({
 	titleInfo: {
 		titleLeft: "未来三天特殊作业风险概率预测",
 		// titleRight: "查看各企业特殊作业风险概率预测",
-		percentage: 80
+		percentage: 0
 	},
 	workerFlag: true,
 	workerList: [] as any[]
@@ -402,6 +402,7 @@ const getSpecialTrend = async (showLoading: boolean, val: number, isRight?: bool
 			}
 		];
 		randerInfo2.workerList = randerInfo2.dataList[0].value;
+		randerInfo2.titleInfo.percentage = res.result.area;
 	}
 	activeInfo.activeIndex2 = val;
 	if (isRight) {

src/views/commandScreen/dialogCompnnents/data-dialog.vue

@@ -127,8 +127,8 @@ const tableTabInfo = reactive({
 	tableTabActive: "1"
 });
 const onClickTab = (item: any) => {
-	tableTabInfo.tableTabActive = item.enumType;
 	majorInfo.value.enumType = item.enumType;
+	tableTabInfo.tableTabActive = item.enumType;
 };
 
 const closeDialog = () => {

src/views/commandScreen/dialogCompnnents/major-hidder.vue

@@ -237,7 +237,7 @@ const getMemberCountList = async (tip: any) => {
 		idCard: searchForm.value.idCard, //身份证号
 		workerName: searchForm.value.name, //姓名
 		pageNo: tip == "search" ? 1 : pageNo.value,
-		pageSize: 100
+		pageSize: 10
 	};
 	if (props.tip == "实时") {
 		requestData.presence = 1;
@@ -841,7 +841,6 @@ function drawEchart3() {
 }
 
 const getStatsByEnterprise = async () => {
-
 	const res: any = await getStatsByEnterpriseApi({
 		pageNo: 1,
 		pageSize: 99999,
@@ -949,6 +948,8 @@ const onSupervise = async (row: any) => {
 watch(
 	() => props.majorInfo,
 	async newVal => {
+		pageNo.value = 1;
+		moreScroll.value = true;
 		await getStatsByEnterprise();
 		await getCountQualityInspectionRecordRegion();
 		await getStatsDangerType();
@@ -972,7 +973,8 @@ onMounted(async () => {
 		// 向上加载更多
 		if (scrollTop >= scrollHeight - clientHeight - 1) {
 			if (moreScroll.value) {
-				getMemberCountList("more");
+				// getMemberCountList("more");
+				getXzSecurityQualitylnspectionRecordlist("more");
 			}
 		}
 	});