Merge branch 'master' of http://47.111.81.118:3000/xf15575941817/admin-fiveFollowing

src/views/alarmManage/alarmTotal.vue

@@ -3,7 +3,7 @@
     <!-- 返回start -->
     <div class="siteTitle">
       <el-button class="goBack" @click="goBack">返回</el-button>
-      站点【上海新时达电气股份有限公司】{{
+      站点【{{alarmGradeList.siteName}}】{{
         alarmGradeList.type == 0
           ? '总数'
           : alarmGradeList.type == 1

src/views/alarmManage/index.vue

@@ -69,7 +69,7 @@
               width:
                 (scope.row.totalGrade / allMaxData.totalNumMax) * 100 + '%',
             }"
-            @click="goAlarmTotal(0)"
+            @click="goAlarmTotal(0,scope.row.siteName)"
           >
             {{ scope.row.totalGrade }}
           </span>
@@ -84,7 +84,7 @@
               width:
                 (scope.row.oneGrade / allMaxData.oneAlarmingMax) * 100 + '%',
             }"
-            @click="goAlarmTotal(1)"
+            @click="goAlarmTotal(1,scope.row.siteName)"
           >
             {{ scope.row.oneGrade }}
           </span>
@@ -99,7 +99,7 @@
               width:
                 (scope.row.twoGrade / allMaxData.twoAlarmingMax) * 100 + '%',
             }"
-            @click="goAlarmTotal(2)"
+            @click="goAlarmTotal(2,scope.row.siteName)"
           >
             {{ scope.row.twoGrade }}
           </span>
@@ -114,7 +114,7 @@
             :style="{
               width: (scope.row.otherGrade / allMaxData.otherMax) * 100 + '%',
             }"
-            @click="goAlarmTotal(3)"
+            @click="goAlarmTotal(3,scope.row.siteName)"
           >
             {{ scope.row.otherGrade }}
           </span>
@@ -207,7 +207,7 @@ export default defineComponent({
       // this.$router.push({ name:'variableList'})
     }
 
-    const goAlarmTotal = (val) => {
+    const goAlarmTotal = (val,val1) => {
       pageShow.value = !pageShow.value
       store.commit('TimeAll_function', dateValue.value)
       if (val != undefined) {
@@ -215,6 +215,7 @@ export default defineComponent({
           startTime: store.state.Time_Data[0],
           endTime: store.state.Time_Data[1],
           type: val,
+          siteName: val1,
         }
       }
     }