Merge remote-tracking branch 'origin/master'

gassafetyprogress-admin/src/main/java/com/zehong/web/controller/supervise/THiddenTroubleInfoSController.java

@@ -101,6 +101,11 @@ public class THiddenTroubleInfoSController extends BaseController
     @PutMapping
     public AjaxResult edit(@RequestBody THiddenTroubleInfo tHiddenTroubleInfo)
     {
+        //查询燃气信息是否有修改 如果有值证明没有修改  如果没有值证明已经修改
+        THiddenTroubleInfo tHiddenTroubleInfo1 = tHiddenTroubleInfoService.selectDetails(tHiddenTroubleInfo);
+        if (tHiddenTroubleInfo1==null){
+            tHiddenTroubleInfo.setHiddenTroubleDealStatus("1");
+        }
         return toAjax(tHiddenTroubleInfoService.updateTHiddenTroubleInfo(tHiddenTroubleInfo));
     }
 

gassafetyprogress-system/src/main/java/com/zehong/system/mapper/THiddenTroubleInfoMapper.java

@@ -65,4 +65,11 @@ public interface THiddenTroubleInfoMapper
      * @return
      */
     List<THiddenTroubleInfo> selectTHiddenTroubleInfoExcelList(THiddenTroubleInfo tHiddenTroubleInfo);
+
+    /**
+     * 查询燃气信息是否有修改
+     * @param tHiddenTroubleInfo
+     * @return
+     */
+    THiddenTroubleInfo selectDetails(THiddenTroubleInfo tHiddenTroubleInfo);
 }

gassafetyprogress-system/src/main/java/com/zehong/system/service/ITHiddenTroubleInfoService.java

@@ -65,4 +65,11 @@ public interface ITHiddenTroubleInfoService
      * @return
      */
     List<THiddenTroubleInfo> selectTHiddenTroubleInfoExcelList(THiddenTroubleInfo tHiddenTroubleInfo);
+
+    /**
+     * 查询燃气信息是否有修改
+     * @param tHiddenTroubleInfo
+     * @return
+     */
+    THiddenTroubleInfo selectDetails(THiddenTroubleInfo tHiddenTroubleInfo);
 }

gassafetyprogress-system/src/main/java/com/zehong/system/service/impl/THiddenTroubleInfoServiceImpl.java

@@ -102,4 +102,14 @@ public class THiddenTroubleInfoServiceImpl implements ITHiddenTroubleInfoService
     public List<THiddenTroubleInfo> selectTHiddenTroubleInfoExcelList(THiddenTroubleInfo tHiddenTroubleInfo) {
         return tHiddenTroubleInfoMapper.selectTHiddenTroubleInfoExcelList(tHiddenTroubleInfo);
     }
+
+    /**
+     * 查询燃气信息是否有修改
+     * @param tHiddenTroubleInfo
+     * @return
+     */
+    @Override
+    public THiddenTroubleInfo selectDetails(THiddenTroubleInfo tHiddenTroubleInfo) {
+        return tHiddenTroubleInfoMapper.selectDetails(tHiddenTroubleInfo);
+    }
 }

gassafetyprogress-system/src/main/resources/mapper/system/THiddenTroubleInfoMapper.xml

@@ -75,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         group by hidden_trouble_id desc
     </select>
 
+
     <insert id="insertTHiddenTroubleInfo" parameterType="THiddenTroubleInfo" useGeneratedKeys="true" keyProperty="hiddenTroubleId">
         insert into t_hidden_trouble_info
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -145,4 +146,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             #{hiddenTroubleId}
         </foreach>
     </update>
+
+    <!--查询燃气信息是否有修改-->
+    <select id="selectDetails" resultMap="THiddenTroubleInfoResult" parameterType="THiddenTroubleInfo">
+        <include refid="selectTHiddenTroubleInfoVo"/>
+       where hidden_trouble_id=#{hiddenTroubleId}
+        <if test="hiddenTroubleName != null">
+         and hidden_trouble_name = #{hiddenTroubleName}
+        </if>
+        <if test="hiddenTroubleLevel != null">
+            and hidden_trouble_level = #{hiddenTroubleLevel}
+        </if>
+        <if test="hiddenTroubleType != null">
+            and hidden_trouble_type = #{hiddenTroubleType}
+        </if>
+        <if test="hiddenTroubleDescribe != null">
+            and hidden_trouble_describe = #{hiddenTroubleDescribe}
+        </if>
+        <if test="longitude != null">
+            and longitude = #{longitude}
+        </if>
+        <if test="latitude != null">
+            and latitude = #{latitude}
+        </if>
+        <if test="pictureUrl != null">
+            and  picture_url= #{pictureUrl}
+        </if>
+    </select>
 </mapper>

gassafetyprogress-web/src/components/bigWindow/Cz.vue

@@ -76,7 +76,7 @@
           >
             {{ deviceData.stationAddr || "-" }}
           </div>
-          <div v-else>-</div>
+          <div v-else class="right last zzz">-</div>
         </div>
       </div>
       <div class="top-right">
@@ -237,7 +237,7 @@ export default {
   background-color: rgba(9, 18, 32, 0.6);
   padding: 10px;
   position: relative;
-  width: 600px;
+  width: 500px;
   .title {
     // padding-top: 10px;
     // padding-left: 10px;
@@ -258,7 +258,7 @@ export default {
     border: 1px solid #cccccc;
     box-sizing: border-box;
     .top-left {
-      flex: 1;
+      flex: 1.8;
       .group {
         height: 40px;
         flex: 1;
@@ -283,6 +283,9 @@ export default {
           text-align: right;
           background-color: rgba(255, 255, 255, 0.1);
         }
+        .right {
+          flex:2;
+        }
       }
     }
     .top-right {

gassafetyprogress-web/src/components/bigWindow/Device.vue

@@ -220,7 +220,7 @@ export default {
   background-color: rgba(9, 18, 32, 0.6);
   padding: 10px;
   position: relative;
-  width: 600px;
+  width: 500px;
   .title {
     // padding-top: 10px;
     // padding-left: 10px;
@@ -241,7 +241,7 @@ export default {
     border: 1px solid #cccccc;
     box-sizing: border-box;
     .top-left {
-      flex: 1;
+      flex: 1.8;
       .group {
         height: 40px;
         flex: 1;
@@ -266,6 +266,9 @@ export default {
           text-align: right;
           background-color: rgba(255, 255, 255, 0.1);
         }
+        .right {
+          flex:2;
+        }
       }
     }
     .top-right {

gassafetyprogress-web/src/permission.js

@@ -14,12 +14,14 @@ router.beforeEach((to, from, next) => {
   NProgress.start();
   // 如果cookie里有token
   if (getToken()) {
+
     /* has token*/
     // 如果要去login，就直接去默认页面
     if (to.path === "/login") {
       next({ path: "/" });
       NProgress.done();
     } else {
+      console.log("有");
       // 如果没有获得当前用户的所有信息
       if (store.getters.roles.length === 0) {
         // 判断当前用户是否已拉取完user_info信息

gassafetyprogress-web/src/views/operationMonitor/monitorData/component/charsData/TopCard.vue

 <!--
  * @Author: your name
  * @Date: 2022-03-25 13:46:23
- * @LastEditTime: 2022-03-25 17:18:05
+ * @LastEditTime: 2022-04-09 10:38:14
  * @LastEditors: Please set LastEditors
  * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  * @FilePath: /gassafety-progress/gassafetyprogress-web/src/views/operationMonitor/monitorData/component/charsData.vue
@@ -30,15 +30,27 @@
 
         <div class="middle flex">
           <div class="first">正常</div>
-          <div>高爆</div>
-          <div>低爆</div>
+          <!-- 2是探测器，探测器只有报警，没有高低报 -->
+          <template v-if="index != 2">
+            <div>高报</div>
+            <div>低报</div>
+          </template>
+          <template v-else>
+            <div>报警</div>
+          </template>
           <div class="last">离线数</div>
         </div>
 
         <div class="bottom flex">
           <div class="first">1234</div>
-          <div>1234</div>
-          <div>1231</div>
+          <!-- 2是探测器，探测器只有报警，没有高低报 -->
+          <template v-if="index != 2">
+            <div>123321</div>
+            <div>12321</div>
+          </template>
+          <template v-else>
+            <div>12312</div>
+          </template>
           <div class="last">534534</div>
         </div>
       </div>
@@ -49,10 +61,10 @@
 <script>
 export default {
   name: "charsData",
-  props:{
-    cardList:{
-      type:Array,
-    }
+  props: {
+    cardList: {
+      type: Array,
+    },
   },
   data() {
     return {
@@ -63,9 +75,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 .top-card {
-  margin-bottom:22px;
+  margin-bottom: 22px;
   & > div {
     flex: 1;
     margin-right: 20px;
@@ -141,6 +152,4 @@ export default {
   display: flex;
   justify-content: space-between;
 }
-
-
 </style>
\ No newline at end of file