diff --git a/index.html b/index.html index b05047f..757950f 100644 --- a/index.html +++ b/index.html @@ -4,7 +4,7 @@ - 危化安全生产管理平台 + 安全生产信息化平台 diff --git a/src/assets/images/map/title.png b/src/assets/images/map/title.png index 313d274..3bdb0a4 100644 Binary files a/src/assets/images/map/title.png and b/src/assets/images/map/title.png differ diff --git a/src/assets/images/public/logo.png b/src/assets/images/public/logo.png index 0b4e264..2d041f0 100644 Binary files a/src/assets/images/public/logo.png and b/src/assets/images/public/logo.png differ diff --git a/src/components/hidden_view/index.vue b/src/components/hidden_view/index.vue index 3dfbab5..924e048 100644 --- a/src/components/hidden_view/index.vue +++ b/src/components/hidden_view/index.vue @@ -252,6 +252,39 @@ + @@ -288,6 +321,7 @@ const data = reactive({ rImgs: [], sImgs: [], pImgs: [], + yImgs: [], checkList: [], videoDialog: { src: "", @@ -315,6 +349,7 @@ const fnGetData = async () => { data.rImgs = resData.rImgs; data.sImgs = resData.sImgs; data.pImgs = resData.pImgs; + data.yImgs = resData.yImgs; emits("throw-data", data.info); }; watchEffect(() => { diff --git a/src/request/aggregation_management.js b/src/request/aggregation_management.js index c6d5611..30e67be 100644 --- a/src/request/aggregation_management.js +++ b/src/request/aggregation_management.js @@ -2,6 +2,8 @@ import { post } from "@/request/axios.js"; export const getGatheringAlarmRecordsList = (params) => post("/positAlarm/getAlarmRecordList", params); // 聚集告警记录列表 +export const getGatheringAlarmRecordViewList = (params) => + post("/positAlarm/alarmRecordgoEdit", params); // 聚集告警记录详情 export const getAggregationAlarmTrend = (params) => post("/positAlarm/aggregateAlarmTrends", params); // 聚集报警趋势 export const getAggregatedDataStatistics = (params) => diff --git a/src/request/continuous_improvement.js b/src/request/continuous_improvement.js index 24df9db..ba88424 100644 --- a/src/request/continuous_improvement.js +++ b/src/request/continuous_improvement.js @@ -20,7 +20,7 @@ export const getEnterpriseReport2 = (params) => export const getEnterpriseReport3 = (params) => post("/studytask/list?showCount=100¤tPage=1", params); export const getEnterpriseReport4 = (params) => - post("/confinedspace/getDiagnosis", params); + post("/eightWork/getDiagnosis", params); export const getEnterpriseReport5 = (params) => post("/performanceexamine_dept/listAll", params); export const getEnterpriseReport6 = (params) => diff --git a/src/views/aggregation_management/gathering_alarm_records/components/viewInfo.vue b/src/views/aggregation_management/gathering_alarm_records/components/viewInfo.vue new file mode 100644 index 0000000..d93e032 --- /dev/null +++ b/src/views/aggregation_management/gathering_alarm_records/components/viewInfo.vue @@ -0,0 +1,134 @@ + + + + + diff --git a/src/views/aggregation_management/gathering_alarm_records/index.vue b/src/views/aggregation_management/gathering_alarm_records/index.vue index e8a1061..9afcd4b 100644 --- a/src/views/aggregation_management/gathering_alarm_records/index.vue +++ b/src/views/aggregation_management/gathering_alarm_records/index.vue @@ -34,30 +34,56 @@ {{ serialNumber(pagination, $index) }} - - - - + + + + + + + diff --git a/src/views/hidden_danger_government/ledger/index.vue b/src/views/hidden_danger_government/ledger/index.vue index e723ee4..07be874 100644 --- a/src/views/hidden_danger_government/ledger/index.vue +++ b/src/views/hidden_danger_government/ledger/index.vue @@ -205,6 +205,7 @@ const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } = HIDDENLEVEL: "hiddenLevel0001", DISPOSESTATE: "-1", IS_SELF: "0", + STATE: 100, }, defaultSearchForm: { STATE }, }); diff --git a/src/views/hidden_danger_government/rectification/rectification.vue b/src/views/hidden_danger_government/rectification/rectification.vue index 5557ca1..c7f16c7 100644 --- a/src/views/hidden_danger_government/rectification/rectification.vue +++ b/src/views/hidden_danger_government/rectification/rectification.vue @@ -429,8 +429,8 @@ const fnGetData = async () => { data.form.DEPARTMENT_NAME = resData.deppd.NAME; data.form.USER_NAME = resData.userpd.USERNAME; await fnInspectDepartmentChange(data.defaultDepartmentId, 0); - data.form.acceptanceList[0].DEPARTMENT_ID = data.defaultDepartmentId; - data.form.acceptanceList[0].USER_ID = data.defaultUserId; + // data.form.acceptanceList[0].DEPARTMENT_ID = data.defaultDepartmentId; + // data.form.acceptanceList[0].USER_ID = data.defaultUserId; }; fnGetData(); const fnAddInspectedList = () => { diff --git a/src/views/large_screen_data_display/components/troubleshooting_type.vue b/src/views/large_screen_data_display/components/troubleshooting_type.vue index 7183e24..bf58268 100644 --- a/src/views/large_screen_data_display/components/troubleshooting_type.vue +++ b/src/views/large_screen_data_display/components/troubleshooting_type.vue @@ -29,17 +29,46 @@
现场排查数
-
+ + {{ typeList.filter((item) => item.NAME === "现场清单")[0].count }} +
基础排查数
-
+ + {{ typeList.filter((item) => item.NAME === "基础类清单")[0].count }} +
综合排查数
-
+ + {{ typeList.filter((item) => item.NAME === "综合类清单")[0].count }} +
@@ -47,18 +76,21 @@