Merge branch 'develop_jzl'

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