立即前往，跳转传参，bug修复

src/store/modules/user.js

@@ -29,7 +29,6 @@ const mutations = {
      * @param {*} accessToken
      */
     setAccessToken(state, accessToken) {
-        console.log(state, accessToken)
         state.accessToken = accessToken
         setAccessToken(accessToken)
     },
@@ -151,7 +150,7 @@ const actions = {
      * @description 设置token
      */
     setAccessToken({ commit }, accessToken) {
-        console.log("11111111111111111111111", accessToken)
+        // console.log("11111111111111111111111", accessToken)
         commit('setAccessToken', accessToken)
     },
 }

src/views/powerQuality/realTimeMonitoring/loopMonitorComponent/descripDialog.vue

@@ -18,7 +18,7 @@
               <span>如果设备不勾选电能质量分析，该设备不参与电能质量分析</span>
             </div>
             <div class="desBlock">
-              <h3>【变量级配置】</h3>
+              <h3>【变量级配置】<a @click="goSiteVariableList">立即前往</a></h3>
               <p>请在 站点管理->变量列表中配置 或 联系运维管理员：配置下列变量，且需要指定变量的变量属性</p>
               <span>A/B/C相电压</span>
               <span>A/B/C相电流</span>
@@ -96,7 +96,6 @@ export default defineComponent({
     }
     function goSiteWatchDog(){
       store.state.goUrl=2
-      alert( store.state.goUrl)
       router.push({
     //传递参数使用query的话，指定path或者name都行，但使用params的话，只能使用name指定 
         path:'/siteManage',
@@ -106,6 +105,18 @@ export default defineComponent({
         }
       })
     }
+    function goSiteVariableList(){
+      store.state.goUrl=3
+      router.push({
+    //传递参数使用query的话，指定path或者name都行，但使用params的话，只能使用name指定 
+        path:'/siteManage',
+        query:{
+        activeName:'third',
+        siteId:store.state.siteId
+        }
+      })
+
+    }
    
 
     return {
@@ -117,7 +128,8 @@ export default defineComponent({
 
       handleClick,
       activeName,
-      goSiteWatchDog
+      goSiteWatchDog,
+      goSiteVariableList
     }
   },
 })

src/views/powerQuality/realTimeMonitoring/realScoreComponent/descripDialog.vue

@@ -46,19 +46,19 @@
           </el-tab-pane>
           <el-tab-pane label="配置内容" name="second">
             <div class="desBlock">
-              <h3>【站点级配置】</h3>
+              <h3>【站点级配置】<a @click="goSitePowerScore">立即前往</a></h3>
               <p>请在 站点管理->电能质量评分配置中配置 或 联系运维管理员：</p>
               <span>电能质量各要素权重、功率因数标准值</span>
             </div>
             <div class="desBlock">
-              <h3>【设备级配置】</h3>
+              <h3>【设备级配置】<a @click="goSiteWatchDog">立即前往</a></h3>
               <p>请在 站点管理->监控设备中配置 或 联系运维管理员：</p>
               <span>额定电压、额定电流、电流负载率门限、电能质量分析</span>
               <span>如果设备没有配置额定电压，电压/谐波畸变率分析项可能没有数据</span>
               <span>如果设备不勾选电能质量分析，该设备不参与电能质量分析</span>
             </div>
             <div class="desBlock">
-              <h3>【变量级配置】</h3>
+              <h3>【变量级配置】<a @click="goSiteVariableList">立即前往</a></h3>
               <p>请在 站点管理->变量列表中配置 或 联系运维管理员：配置下列变量，且需要指定变量的变量属性</p>
               <span>A/B/C相电压</span>
               <span>A/B/C相电流</span>
@@ -85,7 +85,9 @@
 </template>
 
 <script>
-// import { useStore } from 'vuex'
+import { useStore } from 'vuex'
+import {useRouter} from 'vue-router'
+
 import { defineComponent, ref, watchEffect } from 'vue'
 // import * as api from '@/api/siteManage/watchDog.js'
 // import { ElMessage } from 'element-plus'
@@ -100,7 +102,8 @@ export default defineComponent({
   },
   setup(props, context) {
     context
-    // const store = useStore()
+     let router = useRouter();
+    const store = useStore()
     const dialogVisible = ref(false)
 
     const activeName=ref('first')
@@ -130,9 +133,46 @@ export default defineComponent({
     function handleClick(tab, event) {
       console.log(tab, event)
     }
+
+     function goSiteWatchDog(){
+      store.state.goUrl=2
+      router.push({
+    //传递参数使用query的话，指定path或者name都行，但使用params的话，只能使用name指定 
+        path:'/siteManage',
+        query:{
+        activeName:'second',
+        siteId:store.state.siteId
+        }
+      })
+    }
+    function goSiteVariableList(){
+      store.state.goUrl=3
+      router.push({
+    //传递参数使用query的话，指定path或者name都行，但使用params的话，只能使用name指定 
+        path:'/siteManage',
+        query:{
+        activeName:'six',
+        siteId:store.state.siteId
+        }
+      })
+
+    }
+    function goSitePowerScore(){
+      store.state.goUrl=6
+      router.push({
+    //传递参数使用query的话，指定path或者name都行，但使用params的话，只能使用name指定 
+        path:'/siteManage',
+        query:{
+        activeName:'six',
+        siteId:store.state.siteId
+        }
+      })
+
+    }
    
 
     return {
+       store,
       closeDialog,
       dialogVisible,
     
@@ -140,6 +180,10 @@ export default defineComponent({
 
       handleClick,
       activeName,
+
+      goSitePowerScore,
+      goSiteWatchDog,
+      goSiteVariableList
     }
   },
 })
@@ -164,6 +208,10 @@ export default defineComponent({
   h3{
     margin:0 0 10px  0;
     position:relative;
+    a{
+      position:absolute;
+      right:0
+    }
     span{
       position:absolute;
       right:0;

src/views/siteManage/index.vue

@@ -118,7 +118,6 @@
           <variable-list
             :activeName="activeName"
             :siteId="siteId"
-            :labelCom="labelCom"
           ></variable-list>
         </el-tab-pane>
         <el-tab-pane label="摄像头" name="five">
@@ -418,24 +417,18 @@ export default defineComponent({
           data.value[0].children = jsonc
 
           if (route.query.activeName && route.query.siteId) {
-            alert(9999)
             flag2.value = true
             treeLevel.value = 3
             activeName.value = route.query.activeName
             siteId.value = route.query.siteId
-          
-            console.log(22222222222222111)
-            console.log(22222222222222111)
-            console.log(data.value[0].children)
-             console.log('siteId.value')
-            console.log(siteId.value)
-            var aa = data.value[0].children
-
-            var obj = aa.find(function (obj) {
-              return obj.id === siteId.value
+            var bb=[]
+            jsonc.forEach(function(item){
+              if(item.id==siteId.value){
+                bb.push(item)
+              }
             })
-            console.log('obj')
-            console.log(obj)
+            store.state.siteManageLabelCom=bb[0].label
+
           }
         } else {
           ElMessage.error(requset.msg)
@@ -444,14 +437,10 @@ export default defineComponent({
     }
 
     onMounted(() => {
-      //  console.log('tree.value')
-      // console.log(tree.value)
       siteTreeList()
     })
 
     nextTick(() => {
-      // defaultExpand.value = data.value[0].children.id
-      // tree.value.setCurrentKey(tree[0].node.id)
     })
 
     return {

src/views/siteManage/powerScore/index.vue

@@ -74,6 +74,8 @@
 import { defineComponent, ref, onMounted, watch } from 'vue'
 import * as api from '@/api/siteManage/powerScore'
 import { ElMessage } from 'element-plus'
+import { useStore } from 'vuex'
+
 
 export default defineComponent({
   name: 'PowerScore',
@@ -82,6 +84,8 @@ export default defineComponent({
     activeName: String,
   },
   setup(props) {
+    const store = useStore()
+    store
     const formInfo = ref(null)
     const formStatus = ref('')
     const ruleForm = ref({})
@@ -182,12 +186,18 @@ export default defineComponent({
     )
 
     onMounted(() => {
+
+       if (store.state.goUrl==6) {
+         resetForm()
+          powerQualityList()
+      }
       // powerQualityList()
       // console.log('props.siteId')
       // console.log(props.siteId)
     })
 
     return {
+      store,
       formInfo,
       ruleForm,
       rules: {

src/views/siteManage/variableList/index.vue

@@ -194,7 +194,7 @@ export default defineComponent({
   name: 'VariableList',
   props: {
     siteId: Number,
-    labelCom: String,
+    // labelCom: String,
     activeName: String,
   },
 
@@ -212,6 +212,7 @@ export default defineComponent({
 
     const select = ref(1)
     // const siteId = ref(1)
+    const labelCom = ref(store.state.siteManageLabelCom)
     const variableName = ref('')
     const showDialog = ref(false)
     const dialogTitle = ref('')
@@ -291,6 +292,7 @@ export default defineComponent({
     watch(
       () => props.siteId,
       () => {
+        labelCom.value = store.state.siteManageLabelCom
         if (props.activeName == 'third') {
           query()
         }
@@ -304,7 +306,11 @@ export default defineComponent({
         }
       }
     )
-    onMounted(() => {})
+    onMounted(() => {
+      if (store.state.goUrl==3) {
+         query()
+      }
+    })
 
      const handleSizeChange = (val) => {
       pageSize.value = val
@@ -344,15 +350,6 @@ export default defineComponent({
     }
     // 编辑操作
     const editRow = (row) => {
-      console.log('row')
-      console.log(row)
-      // tableItem.value = {
-      //   dataArea: row.dataArea.toString(),
-      //   monitoringEquipment: row.monitoringEquipment,
-      //   communicationEquipment: row.communicationEquipment,
-
-      // }
-
       tableItem.value = {
         deviceCode: row.deviceCode,
         variableName: row.variableName,
@@ -452,7 +449,8 @@ export default defineComponent({
       accessToken,
       handleProgress,
       handleUpAvatar,
-      handleError
+      handleError,
+      labelCom
     }
   },
 })

src/views/siteManage/watchDog/index.vue

@@ -381,27 +381,12 @@ export default defineComponent({
         }
       }
     )
-    watch(
-      () => store.state.goUrl,
-      (newVal) => {
-        // alert(1)
-        newVal
-
-        if (newVal == 'second') {
-          deviceNewsList()
-        }
-      }
-    )
+   
 
     onMounted(() => {
-      alert('store.state.goUrl')
-      alert(store.state.goUrl)
-      if (store.state.goUrl) {
-        labelCom.value = store.state.siteManageLabelCom
+      if (store.state.goUrl==2) {
         deviceNewsList()
       }
-      // console.log('props.siteId')
-      // console.log(props.siteId)
     })
 
     return {