提交代码

yanzhu-bigscreen/src/views/safety/powerIot.vue

@@ -191,9 +191,9 @@
                     </div>
                     <div class="afoot-content">
                         <div class="afoot-overflow process-afoot-overflow" style="height: 530px" id="afootOverflow" @mouseout="listMinMouseout" @mouseover="listMinMouseover">
-                            <div v-if="warningData.length == 0" class="not-data">暂无预警数据</div>
-                            <template v-if="warningData.length > 0">
-                                <div :key="i" :class="forIndex == i ? 'afoot-con-for active' : 'afoot-con-for '" v-for="(item, i) in warningData">
+                            <div v-if="warningDataList.length == 0" class="not-data">暂无预警数据</div>
+                            <template v-if="warningDataList.length > 0">
+                                <div :key="i" :class="forIndex == i ? 'afoot-con-for active' : 'afoot-con-for '" v-for="(item, i) in warningDataList">
                                     <div class="afoot-machinery-nam" v-cloak>{{ item.warningType }}</div>
                                     <div class="afoot-machinery-info">
                                         <div class="afoot-machinery-data">
@@ -258,7 +258,7 @@ export default {
         },
         init() {
             if (!this.selProject) {
-                return
+                return false;
             }
             this.$api.powerIot.findProAllConfigPoint(this.selProject.id).then((res) => {
                 if (res.data.length > 0) {

yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/flowable/FlowDeployMapper.xml

@@ -4,10 +4,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yanzhu.flowable.mapper.FlowDeployMapper">
 
-
     <select id="selectDeployList" resultType="FlowProcDefDto">
-
-        SELECT
+        select
             rp.id_ as id,
             rp.deployment_id_ as deploymentId,
             rd.name_ as name,
@@ -20,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sd.dept_name as deptName,
             pi.id as projectId,
             pi.project_name as projectName
-        FROM
+        from
             act_re_procdef rp
                 LEFT JOIN act_re_deployment rd ON rp.deployment_id_ = rd.id_
                 LEFT JOIN act_re_procdef_dept rpd ON rpd.PROCDEF_ID_ = rp.ID_