bug修复，新需求补充

src/App.vue

@@ -1,6 +1,41 @@
 <template>
   <router-view />
 </template>
+<script>
+import { defineComponent, watchEffect } from 'vue'
+import {useRouter} from 'vue-router'
+
+import store from '@/store'
+
+export default defineComponent({
+  setup() {
+    let hasToken = store.getters['user/accessToken']
+    let router = useRouter();
+
+    watchEffect((fn, options) => {
+      fn, options
+      if (!hasToken) {
+        // alert('跳转到登录页')
+        router.push({
+          path: '/login',
+        })
+      } else {
+        // alert('token不失效')
+      }
+    })
+    return {
+      store,
+    }
+  },
+})
+// export default {
+//     mounted(){
+//     console.log(111111)
+
+//   }
+// }
+</script>
+
 <style lang="less">
-  @import '~@/vab/styles/vab.less';
+@import '~@/vab/styles/vab.less';
 </style>

src/config/default/setting.config.js

@@ -44,7 +44,7 @@ const setting = {
     //token存储位置localStorage sessionStorage cookie
     storage: 'localStorage',
     //token失效回退到登录页时是否记录本次的路由
-    recordRoute: true,
+    recordRoute: false,
     //是否显示logo，不显示时设置false，显示时请填写remixIcon图标名称，暂时只支持设置remixIcon
     // logo: 'vuejs-fill',
     //语言类型zh、en

src/vab/plugins/permissions.js

@@ -12,7 +12,7 @@ import {
     routesWhiteList,
 } from '@/config'
 
-router.beforeEach(async (to, from, next) => {
+router.beforeEach(async(to, from, next) => {
     let hasToken = store.getters['user/accessToken']
 
     if (!loginInterception) hasToken = true
@@ -46,7 +46,7 @@ router.beforeEach(async (to, from, next) => {
                     accessRoutes.forEach((item) => {
                         router.addRoute(item)
                     })
-                    next({ ...to, replace: true })
+                    next({...to, replace: true })
                 } catch {
                     await store.dispatch('user/resetAll')
                     if (recordRoute)
@@ -60,9 +60,11 @@ router.beforeEach(async (to, from, next) => {
             }
         }
     } else {
+
         if (routesWhiteList.indexOf(to.path) !== -1) {
             next()
         } else {
+            // next({ path: '/login', replace: true })
             if (recordRoute)
                 next({ path: '/login', query: { redirect: to.path }, replace: true })
             else next({ path: '/login', replace: true })

src/views/index/index.vue

@@ -8,5 +8,7 @@
 export default {
   name: 'Index',
   components: {},
+
 }
+
 </script>

src/views/powerQuality/asseReport/loopReport.vue

@@ -40,12 +40,22 @@
 
           <div class="filter-item">
             日期：
-            <el-date-picker
-              v-model="value4"
+            <!-- <el-date-picker
+              v-model="dateTime"
               type="dates"
               placeholder="请选择"
               style="width: 200px"
-            ></el-date-picker>
+            ></el-date-picker> -->
+
+            <el-date-picker
+            v-model="dateTime"
+            :type="dateType"
+            placeholder="请选择"
+            style="width: 150px;margin-left:20px"
+            :clearable="false"
+            :editable="false"
+          ></el-date-picker>
+
           </div>
 
           <el-button type="primary" class="search-button">搜索</el-button>
@@ -476,6 +486,7 @@ export default defineComponent({
     
     const deviceList = ref([])
     const deviceCode = ref('')
+    const dateTime=ref(new Date())
 
     function linkDevice(){
       deviceSelect()
@@ -503,7 +514,7 @@ export default defineComponent({
       deviceCode,
       linkDevice,
       deviceSelect,
-      value4: '请选择',
+      dateTime,
       region: '',
      
     }

src/views/powerQuality/asseReport/scoreReport.vue

@@ -22,7 +22,7 @@
             </el-select>
           </div>
 
-          <el-button
+          <!-- <el-button
             class="search-button timeTab"
             @click="num = 0"
             :type="num == 0 ? 'primary' : ''"
@@ -36,17 +36,25 @@
             style="margin-left: 0 !important; margin-right: 20px"
           >
             按月
-          </el-button>
+          </el-button> -->
 
-          <div class="filter-item">
-            日期：
-            <el-date-picker
-              v-model="value4"
-              type="dates"
-              placeholder="请选择"
-              style="width: 200px"
-            ></el-date-picker>
-          </div>
+          <el-radio-group
+            v-model="listTabPosition"
+            @change="listTabsChange(listTabPosition)"
+            style="display: inline-block; position: relative; top: -3px"
+          >
+            <el-radio-button label="dayValue">按日</el-radio-button>
+            <el-radio-button label="monthValue">按月</el-radio-button>
+          </el-radio-group>
+
+          <el-date-picker
+            v-model="dateTime"
+            :type="dateType"
+            placeholder="请选择"
+            style="width: 150px;margin-left:20px"
+            :clearable="false"
+            :editable="false"
+          ></el-date-picker>
 
           <el-button type="primary" class="search-button">搜索</el-button>
         </div>
@@ -168,9 +176,9 @@
 
 <script>
 import { useStore } from 'vuex'
-import { defineComponent, onMounted } from 'vue'
-import radarChart from "./scoreReportComponent/radarChart.vue";
-import pieChart from "./scoreReportComponent/pieChart.vue";
+import { defineComponent, onMounted, ref } from 'vue'
+import radarChart from './scoreReportComponent/radarChart.vue'
+import pieChart from './scoreReportComponent/pieChart.vue'
 
 export default defineComponent({
   name: 'ScoreReport',
@@ -180,43 +188,47 @@ export default defineComponent({
   },
   setup() {
     const store = useStore()
+    const listTabPosition = ref('dayValue')
+    const dateType = ref('date')
+    const dateTime = ref(new Date())
 
     function headCellStyle({ row, column, rowIndex, columnIndex }) {
-      row,column
+      row, column
       if (columnIndex !== 0 && columnIndex !== 1 && rowIndex === 0) {
-        return `text-align:center`;
+        return `text-align:center`
       } else {
-        return "";
+        return ''
       }
     }
-   
-    onMounted(() => {
-    
-      
-    })
+    const listTabsChange = (value) => {
+      value == 'dayValue'
+        ? (dateType.value = 'date')
+        : (dateType.value = 'month')
+    }
+
+    onMounted(() => {})
     return {
       store,
       headCellStyle,
+      listTabPosition,
       num: 0,
-      value4: "",
+      value4: '',
+      listTabsChange,
+      dateType,
+      dateTime,
       tableData: [
         {
-          huilv: "/HZ183",
-          gongLv: "合格",
-          dianLiu: "不合格",
-          dianYa: "合格",
-          name: "合格",
-          city: "不合格",
+          huilv: '/HZ183',
+          gongLv: '合格',
+          dianLiu: '不合格',
+          dianYa: '合格',
+          name: '合格',
+          city: '不合格',
         },
       ],
-    };
-     
-    
+    }
   },
 })
-
-
-
 </script>
  
 <style scoped lang="scss">

src/views/siteManage/index.vue

@@ -417,18 +417,20 @@ export default defineComponent({
           data.value[0].children = jsonc
 
           if (route.query.activeName && route.query.siteId) {
+            setTimeout(() => {
+              tree.value.setCurrentKey(route.query.siteId)
+            }, 1000)
             flag2.value = true
             treeLevel.value = 3
             activeName.value = route.query.activeName
             siteId.value = route.query.siteId
-            var bb=[]
-            jsonc.forEach(function(item){
-              if(item.id==siteId.value){
+            var bb = []
+            jsonc.forEach(function (item) {
+              if (item.id == siteId.value) {
                 bb.push(item)
               }
             })
-            store.state.siteManageLabelCom=bb[0].label
-
+            store.state.siteManageLabelCom = bb[0].label
           }
         } else {
           ElMessage.error(requset.msg)
@@ -440,8 +442,7 @@ export default defineComponent({
       siteTreeList()
     })
 
-    nextTick(() => {
-    })
+    nextTick(() => {})
 
     return {
       showDialog,

src/views/systemManage/userManage/dialogComponent.vue

@@ -76,6 +76,25 @@
         </el-select>
       </el-form-item>
 
+      <!-- <el-form-item label="所属站点：" prop="roleName">
+         <el-select
+              v-model="value2"
+              placeholder="请选择"
+              clearable
+               multiple
+              filterable
+               @change="linkChange()"
+            >
+              <el-option
+                v-for="site in store.state.siteList"
+                :key="site"
+                :label="site.siteName"
+                :value="site.id"
+              ></el-option>
+            </el-select>
+      </el-form-item> -->
+
+
       <br />
       <br />
       <br />
@@ -99,6 +118,7 @@ import { defineComponent, ref, onMounted, watchEffect } from 'vue'
 import * as api from '@/api/systemManage/userManage.js'
 import { ElMessage } from 'element-plus'
 import { parseTime, validatorPhone } from '@/utils'
+import { useStore } from 'vuex'
 
 export default defineComponent({
   name: 'DialogComponent',
@@ -110,7 +130,8 @@ export default defineComponent({
   },
   setup(props, context) {
     context
-
+    const store = useStore()
+    // const value2 = ref([])
     const dialogVisible = ref(false)
     const formInfo = ref(null)
     const isDisable = ref(false)
@@ -120,6 +141,7 @@ export default defineComponent({
 
     // open(): Dialog弹窗打开之前做的事
     const open = () => {
+      // value2.value=[]
       form.value = props.itemInfo.value
    
     }
@@ -231,12 +253,19 @@ export default defineComponent({
     function resetForm() {
       formInfo.value.resetFields()
     }
+    // function linkChange(){
+    //   console.log('value2.value')
+    //   alert(value2.value)
+
+    // }
 
     onMounted(() => {
       optionselect()
     })
 
     return {
+      store,
+      // linkChange,
       closeDialog,
       dialogVisible,
       options,
@@ -248,6 +277,7 @@ export default defineComponent({
       submitForm,
       resetForm,
       isDisable,
+      // value2,
       rules: {
         nickName: [
           { required: true, message: '请输入用户名', trigger: 'blur' },

src/views/systemManage/userManage/index.vue

@@ -256,6 +256,7 @@ export default defineComponent({
     // 关闭操作
     const closeDialog = () => {
       showDialog.value = false
+      
       list()
     }