wangpeng
/
integrated_traffic_vue
forked from integrated_whb/integrated_whb_vue
1
0
Fork 0
Code Pull Requests Activity

Merge remote-tracking branch 'origin/dev' into dev

pull/3/head
dearlin 2024-02-28 09:56:53 +08:00
parent 0ddaedd8bb fb94683b9b
commit aa529766d9
11 changed files with 91 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.html
View File

@ -4,7 +4,7 @@
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no" />
<title>危化安全生产管理平台</title>
<title>安全生产信息化平台</title>
</head>
<body>

BIN
src/assets/images/map/title.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 23 KiB

BIN
src/assets/images/public/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

35
src/components/hidden_view/index.vue
View File

@ -252,6 +252,39 @@
</el-descriptions>
</template>
</template>
<template v-if="(data.info.SOURCE === '4' || data.info.SOURCE === '5') && data.info.FINAL_CHECK">
<el-divider content-position="left">安全环保验收信息</el-divider>
<el-descriptions :column="1" border class="mt-10">
<el-descriptions-item label="验收描述">
{{ data.info.FINAL_CHECKDESCR }}
</el-descriptions-item>
<el-descriptions-item label="是否合格">
<span v-if="data.info.FINAL_CHECK === '1'"> 是 </span>
<span v-else-if="data.info.FINAL_CHECK === '0'"> 否 </span>
</el-descriptions-item>
<el-descriptions-item label="验收部门">
{{ data.info.FINAL_CHECKOR_NDEPTNAME }}
</el-descriptions-item>
<el-descriptions-item label="验收人">
{{ data.info.FINAL_CHECKOR_NAME }}
</el-descriptions-item>
<el-descriptions-item label="验收时间">
{{ data.info.FINAL_CHECKTIME }}
</el-descriptions-item>
<el-descriptions-item label="验收图片">
<img
v-for="item1 in data.yImgs"
:key="item1.IMGFILES_ID"
v-viewer
:src="VITE_FILE_URL + item1.FILEPATH"
alt=""
width="100"
height="100"
class="ml-10"
/>
</el-descriptions-item>
</el-descriptions>
</template>
</div>
</template>
@ -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(() => {

2
src/request/continuous_improvement.js
View File

@ -20,7 +20,7 @@ export const getEnterpriseReport2 = (params) =>
export const getEnterpriseReport3 = (params) =>
post("/studytask/list?showCount=100&currentPage=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) =>

1
src/views/hidden_danger_government/ledger/index.vue
View File

@ -205,6 +205,7 @@ const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } =
HIDDENLEVEL: "hiddenLevel0001",
DISPOSESTATE: "-1",
IS_SELF: "0",
STATE: 100,
},
defaultSearchForm: { STATE },
});

4
src/views/hidden_danger_government/rectification/rectification.vue
View File

@ -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 = () => {

120
src/views/large_screen_data_display/components/troubleshooting_type.vue
View File

@ -29,17 +29,46 @@
<div>
<div class="dunpai1" />
<div class="bottom_title">现场排查数</div>
<div id="main1" />
<el-progress
:percentage="
typeList.filter((item) => item.NAME === '现场清单')[0].percentage
"
color="#ec2c26"
text-inside
:stroke-width="20"
>
{{ typeList.filter((item) => item.NAME === "现场清单")[0].count }}
</el-progress>
</div>
<div>
<div class="dunpai2" />
<div class="bottom_title">基础排查数</div>
<div id="main2" />
<el-progress
:percentage="
typeList.filter((item) => item.NAME === '基础类清单')[0]
.percentage
"
color="#ea4e26"
text-inside
:stroke-width="20"
>
{{ typeList.filter((item) => item.NAME === "基础类清单")[0].count }}
</el-progress>
</div>
<div>
<div class="dunpai3" />
<div class="bottom_title">综合排查数</div>
<div id="main3" />
<el-progress
:percentage="
typeList.filter((item) => item.NAME === '综合类清单')[0]
.percentage
"
color="#ea6e27"
text-inside
:stroke-width="20"
>
{{ typeList.filter((item) => item.NAME === "综合类清单")[0].count }}
</el-progress>
</div>
</div>
</div>
@ -47,18 +76,21 @@
</template>
<script setup>
import { onMounted, ref } from "vue";
import { ref } from "vue";
import {
getTroubleshootingTypeEcharts,
getTroubleshootingTypeNumber,
} from "@/request/large_screen_data_display.js";
import { sumBy } from "lodash-es";
import { arrayObjectDeduplication } from "@/assets/js/utils.js";
import * as echarts from "echarts";
import CountTo from "vue-countup-v3";
const info = ref({});
const typeList = ref([
{ count: 0, percentage: 0, NAME: "现场清单" },
{ count: 0, percentage: 0, NAME: "基础类清单" },
{ count: 0, percentage: 0, NAME: "综合类清单" },
]);
const fnGetData = async () => {
const resDataNumber = await getTroubleshootingTypeNumber();
resDataNumber.typeList.forEach((item) => {
@ -66,73 +98,15 @@ const fnGetData = async () => {
});
const resDataEcharts = await getTroubleshootingTypeEcharts();
const total = sumBy(resDataEcharts.typeList, (item) => item.count);
const key = {
现场清单: { color: "#ec2c26", el: "#main1" },
基础类清单: { color: "#ea4e26", el: "#main2" },
综合类清单: { color: "#ea6e27", el: "#main3" },
};
const typeList = [
...resDataEcharts.typeList,
{ count: 0, NAME: "现场清单" },
{ count: 0, NAME: "基础类清单" },
{ count: 0, NAME: "综合类清单" },
];
arrayObjectDeduplication(typeList, "NAME").forEach((item) => {
fnInitEcharts(item.count, total, key[item.NAME].color, key[item.NAME].el);
resDataEcharts.typeList.forEach((item) => {
item.percentage = (item.count / total) * 100;
});
typeList.value = arrayObjectDeduplication(
[...resDataEcharts.typeList, ...typeList.value],
"NAME"
);
};
onMounted(() => {
fnGetData();
});
const fnInitEcharts = (count, total, color, el) => {
const myChart = echarts.init(document.querySelector(el));
const option = {
grid: {
left: "10%",
right: "0%",
bottom: "0%",
top: "100%",
containLabel: true,
},
xAxis: {
show: false,
type: "value",
},
yAxis: {
type: "category",
show: false,
},
series: [
{
name: "次数",
type: "bar",
zlevel: 1,
itemStyle: {
barBorderRadius: 0,
color,
},
label: {
show: true,
position: "inside",
},
barWidth: 15,
data: [count],
},
{
name: "背景",
type: "bar",
barWidth: 15,
barGap: "-100%",
data: [total],
itemStyle: {
color: "#101f48",
barBorderRadius: 0,
},
},
],
};
myChart.setOption(option);
};
</script>
<style scoped lang="scss">
@ -199,11 +173,9 @@ const fnInitEcharts = (count, total, color, el) => {
}
}
#main1,
#main2,
#main3 {
.el-progress {
margin-left: 10px;
flex: 1;
height: 20px;
}
}
}

2
src/views/login/index.vue
View File

@ -1,7 +1,7 @@
<template>
<div class="login">
<div class="main">
<div class="title">危化安全生产管理平台</div>
<div class="title">安全生产信息化平台</div>
<div class="form">
<el-form
ref="formRef"

3
src/views/safety_environmental_management/hazard_assignment_acceptance/hidden_list.vue
View File

@ -87,9 +87,10 @@ const stateList = [
{ ID: "101", NAME: "待指派整改人" },
{ ID: "1", NAME: "待整改" },
{ ID: "2", NAME: "待验收" },
{ ID: "3", NAME: "隐患待验收" },
{ ID: "10", NAME: "验收打回" },
{ ID: "4", NAME: "已验收" },
{ ID: "-2", NAME: "已指派确认人" },
{ ID: "-2", NAME: "已指派整改人" },
{ ID: "8", NAME: "特殊处置通过" },
{ ID: "16", NAME: "确认打回" },
];

1
src/views/safety_environmental_management/hazard_management/index.vue
View File

@ -161,6 +161,7 @@ const hiddenStatusList = [
{ ID: "-2", NAME: "待确认" },
{ ID: "1", NAME: "未整改" },
{ ID: "2", NAME: "已整改" },
{ ID: "3", NAME: "隐患待验收" },
{ ID: "4", NAME: "已验收" },
{ ID: "10", NAME: "验收打回" },
{ ID: "7", NAME: "待处理的特殊隐患" },