Merge branch 'shenzhen-dev' of http://139.9.66.234:18023/yjlHub/zhgdlarge into bjxz-rain

.env.production

@@ -21,8 +21,8 @@ NODE_ENV = "production"
 # 七参数标准版(测试平台)
 # VITE_API_URL = 'http://182.90.224.237:15551'
 # agjt
-# VITE_API_URL = 'http://42.180.188.17:9809' #生产环境
+VITE_API_URL = 'http://42.180.188.17:9809' #生产环境
-VITE_API_URL = 'http://42.180.188.17:11211' #测试环境
+# VITE_API_URL = 'http://42.180.188.17:11211' #测试环境
 # 苏立信
 # VITE_API_URL = 'http://101.43.164.214:11111'
 

src/views/commandScreen/components/leftBottom.vue

@@ -27,7 +27,7 @@
                     <el-tab-pane :label="'整改人'" name="first"></el-tab-pane>
 					<el-tab-pane :label="'检查人'" name="second"></el-tab-pane>
 				</el-tabs>
-				<div class="tabList">
+				<!-- <div class="tabList">
 					<div>排名</div>
 					<div v-if="activeIndex === '0' || activeIndex === '1'">姓名</div>
 					<div v-if="activeIndex === '2'">分包单位</div>
@@ -52,6 +52,32 @@
 						<img src="@/assets/images/noData.png" alt="" />
 						<p>暂无数据</p>
 					</div>
+				</div> -->
+				<div class="tabList">
+					<div>排名</div>
+					<div v-if="activeIndex === '1' || activeIndex === '2'">姓名</div>
+					<div v-if="activeIndex === '0'">分包单位</div>
+					<div v-if="activeIndex === '0' || activeIndex === '2'">整改数量</div>
+					<div v-if="activeIndex === '1'">发起隐患数</div>
+					<div>整改率</div>
+					<div>及时整改率</div>
+				</div>
+				<div class="listBox">
+					<el-scrollbar>
+						<div v-for="(item, index) in tabList" :key="index" class="listStyle">
+							<div>{{ index + 1 }}</div>
+							<div v-if="activeIndex === '1' || activeIndex === '2'">{{ item.workerName }}</div>
+							<div v-if="activeIndex === '0'" :title="item.enterpriseName">{{ item.enterpriseName }}</div>
+							<div v-if="activeIndex === '0' || activeIndex === '2'">{{ item.createDangerNum || item.rectifiedNum}}</div>
+							<div v-if="activeIndex === '1'">{{ item.rectifiedNum }}</div>
+							<div>{{ item.rectifiedNumRatio }}</div>
+							<div>{{ item.rectifiedNumRatioTimely }}</div>
+						</div>
+					</el-scrollbar>
+					<div class="notoDta" v-if="tabList.length == 0">
+						<img src="@/assets/images/noData.png" alt="" />
+						<p>暂无数据</p>
+					</div>
 				</div>
 			</div>
 		</div>
@@ -214,14 +240,29 @@ const handleClick = (tab: TabsPaneContext, event: Event) => {
 	activeIndex.value = tab.index;
 	console.log(tab);
 	if (tab.index == "0") {
-		getMemberJobStatusFn();
-	} else if (tab.index == "1") {
-		getInspectManStatusFn();
-	} else if (tab.index == "2") {
 		getEnterpriseStatusFn();
+		// getMemberJobStatusFn();
+	} else if (tab.index == "1") {
+		getMemberJobStatusFn();
+		// getInspectManStatusFn();
+	} else if (tab.index == "2") {
+		getInspectManStatusFn();
+		// getEnterpriseStatusFn();
 	}
 	console.log("activeIndex", activeIndex.value);
 };
+// const handleClick = (tab: TabsPaneContext, event: Event) => {
+// 	activeIndex.value = tab.index;
+// 	console.log(tab);
+// 	if (tab.index == "0") {
+// 		getMemberJobStatusFn();
+// 	} else if (tab.index == "1") {
+// 		getInspectManStatusFn();
+// 	} else if (tab.index == "2") {
+// 		getEnterpriseStatusFn();
+// 	}
+// 	console.log("activeIndex", activeIndex.value);
+// };
 function Pie() {
 	let dataArr = [];
 	for (var i = 0; i < 150; i++) {
@@ -499,7 +540,8 @@ function drawEchart2() {
 	// })
 }
 onMounted(async () => {
-	getMemberJobStatusFn();
+	getEnterpriseStatusFn();
+	// getMemberJobStatusFn();
 	getPersonList();
 });
 </script>

src/views/commandScreen/dialogCompnnents/month-safe-score.vue

@@ -132,21 +132,21 @@ const refScrollbar = ref(null as any); // 绑定到滚动的盒子上
 const partyMemberList = ref({} as any);
 const value = ref({
 	隐患治理排查: {
-		隐患整改率: { name: "隐患整改率=已整改（除了待整改和已撤回）/隐患总数（不包含排查记录）/隐患总数x100%", value: "40%" },
+		隐患整改率: { name: "隐患整改率=已整改（除了待整改和已撤回）/隐患总数（不包含排查记录）x100%", value: "40%" },
 		隐患及时整改率: {
 			name: "及时整改率=状态是已整改（除了待整改和已撤回）的未超期整改的隐患记录数/状态是已整改（除了待整改和已撤回）的隐患总数x100%",
 			value: "30%"
 		},
 		隐患闭合率: { name: "隐患闭合率=状态是合格的隐患记录/隐患总数x100%", value: "30%" },
-		隐患自检数量: { name: "每周完成项目自检次数", value: "0%" }
+		项目自检数量: { name: "每周完成项目自检次数\n每周正常7次自检", value: "0%" }
 	},
 	危大工程: {
 		危大工程排查覆盖率: { name: "危大工程排查覆盖率=实际排查天数/应排查天数x100%(在施危大工程应每天排查)", value: "60%" },
-		旁站记录更新: { name: "每周至少针对在施危大工程完成旁站记录次数", value: "40%" }
+		旁站记录更新: { name: "实际旁站记录次数/应完成旁站记录x100%(在施危大工程应每天旁站)", value: "40%" }
 	},
 	风险管理: {
-		风险排查执行率: { name: "有排查记录的风险/生成待办任务的风险x100%", value: "99%" },
+		风险排查执行率: { name: "有排查记录不同的风险/生成待办任务不同的风险x100%", value: "99%" },
-		风险辨识数量: { name: "至少识别3个风险", value: "1%" }
+		风险辨识数量: { name: "排查和待办任务中至少识别3个不同的风险", value: "1%" }
 	},
 	安全教育: {
 		三级入场教育完成率: { name: "三级入场教育完成率=三级教育完成人数/所有在岗人数", value: "100%" }
@@ -223,6 +223,7 @@ onMounted(async () => {
 	display: flex;
 	align-items: center;
 }
+
 .political-outlook {
 	height: 97%;
 	margin: 0 60px;
@@ -238,7 +239,7 @@ onMounted(async () => {
 			color: white;
 			display: flex;
 			justify-content: space-between;
-			margin-top: 10px;
+			margin-top: 0px;
 		}
 		.all-title {
 			text-align: center;
@@ -281,7 +282,7 @@ onMounted(async () => {
 				}
 			}
 			.listBox {
-				height: 70%;
+				height: 73%;
 				.listStyle {
 					display: flex;
 					align-items: center;