gongjiale
/
gangkou
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
gongjiale 2024-12-19 13:44:00 +08:00
parent bc552fe783
commit 161938f2d9
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
RuoYi-Vue-Oracle/src/main/resources/mybatis/oil/OilMonitorMapper.xml
View File

@ -95,7 +95,7 @@ select t.id,t. name,t.unit_no,t.system_no,t.status,t.sn,t.file_url,t.note,t.crea
<where>
<if test="id != null and id != ''">and t.id=#{id}</if>
<if test="monitorName != null and monitorName != ''">and t.name like concat('%', #{monitorName},'%') </if>
<if test="monitorName != null and monitorName != ''"> and t.name like concat(concat('%', #{monitorName}), '%') </if>
<if test="monitorNo != null and monitorNo != ''">and t.sn= #{monitorNo} </if>
<if test="deptId != null and deptId != ''">and t.dept_id= #{deptId} </if>
<if test="status != null ">and t.status= #{status} </if>
@ -342,7 +342,7 @@ select t.id,t. name,t.unit_no,t.system_no,t.status,t.sn,t.file_url,t.note,t.crea
<if test="startTime != null">and report_time >= #{startTime,jdbcType=TIMESTAMP}</if>
<if test="endTime != null">and report_time &lt;= #{endTime,jdbcType=TIMESTAMP}</if>
<if test="sn != null">and th_device_report.sn= #{sn}</if>
<if test="name != null">and t.name like concat('%', #{name}, '%')</if>
<if test="name != null"> and t.name like concat(concat('%', #{name}), '%')</if>
<if test="deptId != null and deptId != 228">and t.dept_id IN
(SELECT dept_id
FROM sys_dept START WITH dept_id = #{deptId}

12
ruoyi-ui/src/views/alarmMonitor/bound/index.vue
View File

@ -69,9 +69,9 @@
<el-table-column prop="isDeal" label="处理状态" header-align="center" align="center">
<template slot-scope="scope">
<span @click="openDetailWindows(scope.row)" v-if="scope.row.status == 1"
<span @click="openDetailWindows(scope.row)" v-if="scope.row.status == '1'"
style="color: orange;text-decoration: underline;cursor: pointer; "> 正在处理 </span>
<span @click="openDetailWindows(scope.row)" v-else-if="scope.row.status == 2"
<span @click="openDetailWindows(scope.row)" v-else-if="scope.row.status == '2'"
style="color: green;text-decoration: underline;cursor: pointer;"> 处理完成 </span>
<span v-else style="color: red"> 未处理 </span>
</template>
@ -115,14 +115,14 @@
<!-- 处理状态 -->
<el-form-item>
<h3>处理状态</h3>
<p>{{ detailParams.status === '1' ? '正在处理' : '处理完成' }}</p>
<p>{{ detailParams.status == '1' ? '正在处理' : '处理完成' }}</p>
</el-form-item>
<!-- 报警信息 -->
<el-form-item>
<h3>报警信息</h3>
<p>报警上报时间: <strong>{{ detailParams.reportTime }}</strong></p>
<p>报警值: <strong>{{ detailParams.ds }}</strong></p>
<p>报警值: <strong>{{ detailParams.ds }}mg/m³</strong></p>
</el-form-item>
<!-- 处理过程 -->
@ -132,7 +132,7 @@
</el-form-item>
<!-- 如果状态为 1 (正在处理) 展示处理人、备注 -->
<el-form-item v-if="detailParams.status === '1'">
<el-form-item v-if="detailParams.status == '1'">
<h3>处理信息</h3>
<p>处理人: <strong>{{ detailParams.dealUser }}</strong></p>
<p>备注: <strong>{{ detailParams.remark }}</strong></p>
@ -144,7 +144,7 @@
</el-form-item>
<!-- 如果状态为 2 (处理完成) 展示报警原因、处理人、处理方式 -->
<el-form-item v-if="detailParams.status === '2'">
<el-form-item v-if="detailParams.status == '2'">
<h3>处理结果</h3>
<p>报警原因: <strong>{{ detailParams.reason }}</strong></p>
<p>处理人: <strong>{{ detailParams.dealUser }}</strong></p>