NM-gaoshuguang
/
ZC-InfoQuery
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改部门编号，使用设备编号

Browse Source
main
gsy 1 month ago
parent 151dd5d70e
commit 7e40d6fe51
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File

18
ZcInfoQuery/src/main/java/com/nmgs/mapper/zdyh/HiddenDangerAreaInfoMapper.xml
Unescape Escape View File

@ -7,8 +7,8 @@
<select id="getHiddenDeptTop" resultType="java.util.Map"> <select id="getHiddenDeptTop" resultType="java.util.Map">
select select
departmentno, equipmentid,
departmentname, equipmentname,
sum(fatiguecount+ sum(fatiguecount+
severefatiguecount+ severefatiguecount+
speedcount+ speedcount+
@ -25,7 +25,7 @@
AND classdate &lt; STR_TO_DATE(#{params.classDateEndQuery}, '%Y-%m-%d %H:%i:%s') AND classdate &lt; STR_TO_DATE(#{params.classDateEndQuery}, '%Y-%m-%d %H:%i:%s')
</if> </if>
</where> </where>
GROUP BY departmentno,departmentname GROUP BY equipmentid,equipmentname
order by count desc order by count desc
<if test="params.queryLimit != null and params.queryLimit != '' and params.queryLimit == 5 "> <if test="params.queryLimit != null and params.queryLimit != '' and params.queryLimit == 5 ">
limit 5 limit 5
@ -38,8 +38,8 @@
<select id="getPiLaoTop" resultType="java.util.Map"> <select id="getPiLaoTop" resultType="java.util.Map">
select select
departmentno, equipmentid,
departmentname, equipmentname,
sum(fatiguecount) as count, sum(fatiguecount) as count,
sum(truckfatiguecount) as truckfatiguecount, sum(truckfatiguecount) as truckfatiguecount,
sum(dangerfatiguecount) as dangerfatiguecount, sum(dangerfatiguecount) as dangerfatiguecount,
@ -55,7 +55,7 @@
AND classdate &lt; STR_TO_DATE(#{params.classDateEndQuery}, '%Y-%m-%d %H:%i:%s') AND classdate &lt; STR_TO_DATE(#{params.classDateEndQuery}, '%Y-%m-%d %H:%i:%s')
</if> </if>
</where> </where>
GROUP BY departmentno,departmentname GROUP BY equipmentid,equipmentname
order by count desc order by count desc
<if test="params.queryLimit != null and params.queryLimit != '' and params.queryLimit == 5 "> <if test="params.queryLimit != null and params.queryLimit != '' and params.queryLimit == 5 ">
limit 5 limit 5
@ -70,8 +70,8 @@
select select
danger.fenceid, danger.fenceid,
danger.pilenumber, danger.pilenumber,
danger.departmentno, danger.equipmentid,
danger.departmentname, danger.equipmentname,
danger.speedcount, danger.speedcount,
danger.truckspeedcount, danger.truckspeedcount,
danger.dangerspeedcount, danger.dangerspeedcount,
@ -96,7 +96,7 @@
<select id="getDeptPointByDeptId" resultType="java.util.Map"> <select id="getDeptPointByDeptId" resultType="java.util.Map">
select * from zdyh_fence_info fen where fen.departmentno = #{departmentno} order by pilenumber select * from zdyh_fence_info fen where fen.equipmentid = #{equipmentid} order by pilenumber
</select> </select>
<select id="getSpeedPoint" resultType="java.util.Map"> <select id="getSpeedPoint" resultType="java.util.Map">

22
ZcInfoQueryView/src/views/ZDYH/hiddenDangerArea.vue
Unescape Escape View File

@ -51,7 +51,7 @@
<el-col style="display: flex;justify-content: space-between;"> <el-col style="display: flex;justify-content: space-between;">
<span>{{ index + 1 }}<span <span>{{ index + 1 }}<span
style="font-size: 14px;font-weight: bold;padding-left: 10px;">{{ style="font-size: 14px;font-weight: bold;padding-left: 10px;">{{
item.departmentname }}</span></span> item.equipmentname }}</span></span>
<el-icon> <el-icon>
<ArrowRight /> <ArrowRight />
</el-icon> </el-icon>
@ -132,10 +132,10 @@
<el-col style="margin-left: 2%;" :span="24"> <el-col style="margin-left: 2%;" :span="24">
<el-descriptions :column="1" :size="size"> <el-descriptions :column="1" :size="size">
<el-descriptions-item label="部门编号">{{ <el-descriptions-item label="部门编号">{{
nowPilaoArea.departmentno }}</el-descriptions-item> nowPilaoArea.equipmentid }}</el-descriptions-item>
<el-descriptions-item label="所属部门">{{ <el-descriptions-item label="所属部门">{{
nowPilaoArea.departmentname }}</el-descriptions-item> nowPilaoArea.equipmentname }}</el-descriptions-item>
</el-descriptions> </el-descriptions>
</el-col> </el-col>
<el-row style="margin-left: 2%;"> <el-row style="margin-left: 2%;">
@ -174,10 +174,10 @@
<el-col style="margin-left: 2%;" :span="24"> <el-col style="margin-left: 2%;" :span="24">
<el-descriptions :column="2" :size="size"> <el-descriptions :column="2" :size="size">
<el-descriptions-item :span="2" label="部门编号">{{ <el-descriptions-item :span="2" label="部门编号">{{
nowSpeedArea.departmentno }}</el-descriptions-item> nowSpeedArea.equipmentid }}</el-descriptions-item>
<el-descriptions-item :span="2" label="所属部门">{{ <el-descriptions-item :span="2" label="所属部门">{{
nowSpeedArea.departmentname }}</el-descriptions-item> nowSpeedArea.equipmentname }}</el-descriptions-item>
<el-descriptions-item :span="2" label="桩号">{{ <el-descriptions-item :span="2" label="桩号">{{
nowSpeedArea.pilenumber }}</el-descriptions-item> nowSpeedArea.pilenumber }}</el-descriptions-item>
@ -294,7 +294,7 @@ function getHiddenDate() {
let datasxAxis = []; let datasxAxis = [];
let datasxseries = []; let datasxseries = [];
for (let item of deptsData) { for (let item of deptsData) {
datasxAxis.push(item.departmentname); datasxAxis.push(item.equipmentname);
datasxseries.push(item.count); datasxseries.push(item.count);
} }
hiddenDeptEachers(datasxAxis, datasxseries); hiddenDeptEachers(datasxAxis, datasxseries);
@ -305,7 +305,7 @@ function getHiddenDate() {
let datasxAxis = []; let datasxAxis = [];
let datasxseries = []; let datasxseries = [];
for (let item of piLaoList.value) { for (let item of piLaoList.value) {
datasxAxis.push(item.departmentname); datasxAxis.push(item.equipmentname);
datasxseries.push(item.count); datasxseries.push(item.count);
} }
piLaoEachers(datasxAxis, datasxseries); piLaoEachers(datasxAxis, datasxseries);
@ -346,7 +346,7 @@ function reloadDate() {
let datasxAxis = []; let datasxAxis = [];
let datasxseries = []; let datasxseries = [];
for (let item of deptsData) { for (let item of deptsData) {
datasxAxis.push(item.departmentname); datasxAxis.push(item.equipmentname);
datasxseries.push(item.count); datasxseries.push(item.count);
} }
hiddenDeptEachers(datasxAxis, datasxseries); hiddenDeptEachers(datasxAxis, datasxseries);
@ -357,7 +357,7 @@ function reloadDate() {
let datasxAxis = []; let datasxAxis = [];
let datasxseries = []; let datasxseries = [];
for (let item of piLaoList.value) { for (let item of piLaoList.value) {
datasxAxis.push(item.departmentname); datasxAxis.push(item.equipmentname);
datasxseries.push(item.count); datasxseries.push(item.count);
} }
piLaoEachers(datasxAxis, datasxseries); piLaoEachers(datasxAxis, datasxseries);
@ -428,7 +428,7 @@ function addPonit() {
let deptFill = []; let deptFill = [];
let deptLinePoint = []; let deptLinePoint = [];
for (let item of piLaoList.value) { for (let item of piLaoList.value) {
let deptPoint = pilaoDeptAreaPointDate.value[item.departmentno]; let deptPoint = pilaoDeptAreaPointDate.value[item.equipmentid];
if (null != deptPoint) { if (null != deptPoint) {
for (let point of deptPoint) { for (let point of deptPoint) {
deptFill.push({ deptFill.push({
@ -820,7 +820,7 @@ function showPiLaoDetil(item) {
nowPilaoArea.value = item; nowPilaoArea.value = item;
let matchFill = ["match", ["get", "gid"]]; let matchFill = ["match", ["get", "gid"]];
let matchPoint = ["match", ["get", "gid"]]; let matchPoint = ["match", ["get", "gid"]];
let deptPoint = pilaoDeptAreaPointDate.value[item.departmentno]; let deptPoint = pilaoDeptAreaPointDate.value[item.equipmentid];
//计算区域中间下标作为中心点位 //计算区域中间下标作为中心点位
let index = deptPoint.length > 1 ? Math.floor(deptPoint.length / 2) - 1 : 0; let index = deptPoint.length > 1 ? Math.floor(deptPoint.length / 2) - 1 : 0;
//设置中心点位 //设置中心点位

Write Preview
Loading…
Cancel
Save