diff --git a/.env.production b/.env.production
index 27e0b0f..262ceb0 100644
--- a/.env.production
+++ b/.env.production
@@ -21,7 +21,7 @@ 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://101.43.164.214:11111'
@@ -30,7 +30,7 @@ NODE_ENV = "production"
# 中科佳成
# VITE_API_URL = 'http://1.13.185.209:8089'
# 合肥启程(乌丹)
-VITE_API_URL = 'http://192.168.100.4:9809'
+# VITE_API_URL = 'http://192.168.100.4:9809'
# 打包
VITE_ULD_API_URL = 'http://jxj.zhgdyun.com:8012/onlinePreview?url='
diff --git a/src/config/config.ts b/src/config/config.ts
index dee2ee6..9711206 100644
--- a/src/config/config.ts
+++ b/src/config/config.ts
@@ -23,13 +23,13 @@ export const BAIDU_MAP_KEY: string = "";
export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL;
// 项目环境标识配置 部署时需更改对应的项目
-export const COMPANY: string = ""; //标准版
+// export const COMPANY: string = ""; //标准版
// export const COMPANY: string = "zhzrf"; //中海·臻如府
// export const COMPANY: string = "zsbf"; //中水北方
// 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 = "zkjc"; //中科佳成项目
diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts
index 653623e..e5431c1 100644
--- a/src/routers/modules/staticRouter.ts
+++ b/src/routers/modules/staticRouter.ts
@@ -24,8 +24,8 @@ export const staticRouter: RouteRecordRaw[] = [
{
path: "/large",
name: "大屏",
- component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版
- // component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏
+ // component: () => import("@/views/sevenLargeScreen/indexL.vue"), //七参数标准版
+ component: () => import("@/views/commandScreen/indexCommand.vue"), //指挥部大屏
// component: () => import("@/views/agjtLiveScreen/indexLive.vue"), //鞍钢现场大屏
// component: () => import("@/views/overviewScreen/indexCommand.vue"), //总览大屏
// component: () => import("@/views/agjtProjectKanban/indexL.vue"), //鞍钢集团项目看板大屏
diff --git a/src/views/commandScreen/dialogCompnnents/month-safe-score.vue b/src/views/commandScreen/dialogCompnnents/month-safe-score.vue
index f3f10ac..c0dd952 100644
--- a/src/views/commandScreen/dialogCompnnents/month-safe-score.vue
+++ b/src/views/commandScreen/dialogCompnnents/month-safe-score.vue
@@ -14,11 +14,13 @@
考核分类
-
考核指标
-
指标说明
-
单模块权重
-
模块权重
-
模块得分
+
考核指标
+
指标说明
+
单模块权重
+
单模块得分
+
扣除分数
+
模块权重
+
模块得分
@@ -35,6 +37,12 @@
{{ item.value }}
+
+ {{ item.score }}
+
+
+ {{ item.deduction }}
+
@@ -47,7 +55,7 @@
{{ countData.hiddenDangerScore || 0 }}
{{ countData.dangerEngScore || 0 }}
{{ countData.riskscore || 0 }}
- 25
+ 30
@@ -63,6 +71,12 @@
100%
+
+ {{ countData.aiScore || 0 }}
+
+
+ {{ countData.aiDeScore || 0 }}
+
@@ -130,28 +144,7 @@ let pageNo = ref(1 as any);
let moreScroll = ref(true as any);
const refScrollbar = ref(null as any); // 绑定到滚动的盒子上
const partyMemberList = ref({} as any);
-const value = ref({
- 隐患治理排查: {
- 隐患整改率: { name: "隐患整改率=已整改（除了待整改和已撤回）/隐患总数（不包含排查记录）x100%", value: "40%" },
- 隐患及时整改率: {
- name: "及时整改率=状态是已整改（除了待整改和已撤回）的未超期整改的隐患记录数/状态是已整改（除了待整改和已撤回）的隐患总数x100%",
- value: "30%"
- },
- 隐患闭合率: { name: "隐患闭合率=状态是合格的隐患记录/隐患总数x100%", value: "30%" },
- 项目自检数量: { name: "每周完成项目自检次数\n每周正常7次自检", value: "0%" }
- },
- 危大工程: {
- 危大工程排查覆盖率: { name: "危大工程排查覆盖率=实际排查天数/应排查天数x100%(在施危大工程应每天排查)", value: "60%" },
- 旁站记录更新: { name: "实际旁站记录次数/应完成旁站记录x100%(在施危大工程应每天旁站)", value: "40%" }
- },
- 风险管理: {
- 风险排查执行率: { name: "有排查记录不同的风险/生成待办任务不同的风险x100%", value: "99%" },
- 风险辨识数量: { name: "排查和待办任务中至少识别3个不同的风险", value: "1%" }
- },
- 安全教育: {
- 三级入场教育完成率: { name: "三级入场教育完成率=三级教育完成人数/所有在岗人数", value: "100%" }
- }
-});
+const value = ref({});
const countData = ref({} as any);
const projectData = ref({} as any);
//获取项目信息
@@ -166,6 +159,70 @@ const getStatScoreFn = async () => {
};
const res: any = await getStatScoreApi(requestData);
countData.value = res.result;
+ value.value = {
+ 隐患治理排查: {
+ 隐患整改率: {
+ name: "隐患整改率=已整改（除了待整改和已撤回）/隐患总数（不包含排查记录）x100%",
+ value: "40%",
+ score: res.result.hiddenDangerScoreClz.zgl ? res.result.hiddenDangerScoreClz.zgl : 0,
+ deduction: res.result.hiddenDangerScoreClz.zglkf ? res.result.hiddenDangerScoreClz.zglkf : 0
+ },
+ 隐患及时整改率: {
+ name: "及时整改率=状态是已整改（除了待整改和已撤回）的未超期整改的隐患记录数/状态是已整改（除了待整改和已撤回）的隐患总数x100%",
+ value: "30%",
+ score: res.result.hiddenDangerScoreClz.jszgl ? res.result.hiddenDangerScoreClz.jszgl : 0,
+ deduction: res.result.hiddenDangerScoreClz.jszglkf ? res.result.hiddenDangerScoreClz.jszglkf : 0
+ },
+ 隐患闭合率: {
+ name: "隐患闭合率=状态是合格的隐患记录/隐患总数x100%",
+ value: "30%",
+ score: res.result.hiddenDangerScoreClz.bhl ? res.result.hiddenDangerScoreClz.bhl : 0,
+ deduction: res.result.hiddenDangerScoreClz.bhlkf ? res.result.hiddenDangerScoreClz.bhlkf : 0
+ },
+ 项目自检数量: {
+ name: "每周完成项目自检次数\n每周正常7次自检",
+ value: "0%",
+ score: res.result.hiddenDangerScoreClz.zj ? res.result.hiddenDangerScoreClz.zj : 0,
+ deduction: res.result.hiddenDangerScoreClz.zjkf ? res.result.hiddenDangerScoreClz.zjkf : 0
+ }
+ },
+ 危大工程: {
+ 危大工程排查覆盖率: {
+ name: "危大工程排查覆盖率=实际排查天数/应排查天数x100%(在施危大工程应每天排查)",
+ value: "60%",
+ score: res.result.dangerEngScoreClz.pcfgl ? res.result.dangerEngScoreClz.pcfgl : 0,
+ deduction: res.result.dangerEngScoreClz.pcfglkf ? res.result.dangerEngScoreClz.pcfglkf : 0
+ },
+ 旁站记录更新: {
+ name: "实际旁站记录次数/应完成旁站记录x100%(在施危大工程应每天旁站)",
+ value: "40%",
+ score: res.result.dangerEngScoreClz.pzjl ? res.result.dangerEngScoreClz.pzjl : 0,
+ deduction: res.result.dangerEngScoreClz.pzjlkf ? res.result.dangerEngScoreClz.pzjlkf : 0
+ }
+ },
+ 风险管理: {
+ 风险排查执行率: {
+ name: "有排查记录不同的风险/生成待办任务不同的风险x100%",
+ value: "99%",
+ score: res.result.riskScoreClz.fxpczxl ? res.result.riskScoreClz.fxpczxl : 0,
+ deduction: res.result.riskScoreClz.fxpczxlkf ? res.result.riskScoreClz.fxpczxlkf : 0
+ },
+ 风险辨识数量: {
+ name: "排查和待办任务中至少识别3个不同的风险",
+ value: "1%",
+ score: res.result.riskScoreClz.fxbsull ? res.result.riskScoreClz.fxbsull : 0,
+ deduction: res.result.riskScoreClz.fxbsullkf ? res.result.riskScoreClz.fxbsullkf : 0
+ }
+ },
+ 安全教育: {
+ 三级入场教育完成率: {
+ name: "三级入场教育完成率=三级教育完成人数/所有在岗人数",
+ value: "100%",
+ score: res.result.edu ? res.result.edu : 0,
+ deduction: res.result.eduDe ? res.result.eduDe : 0
+ }
+ }
+ };
};
//获取数据