Browse Source

中间页联动实现

ming 3 years ago
parent
commit
019f5c9028

+ 10 - 2
src/main.js

@@ -59,8 +59,16 @@ router.beforeEach((to) => {
         console.log(to.meta.title)
         store.commit('getAuthorities', to.meta.title)
         store.commit('getMiddleConfig')
-        console.log('store.state.authorities')
-        console.log(store.state.authorities)
+
+        // console.log('store.state.authorities')
+        // console.log(store.state.authorities)
+
+
+
+
+
+
+        // next()
 
 
     }

+ 2 - 2
src/store/index.js

@@ -35,7 +35,7 @@ export default createStore({
         homeLogo: '',
         homeTitle: '永天智慧电力平台',
         largeScreenUrl: '',
-        middle_status: 1,
+        middleStatus: 1,
 
         Time_Data: [], //公共api请求参数->Time_Data
         timearr: [], //公共处理开始时间和结束时间中的时间段天数 值存储
@@ -162,7 +162,7 @@ export default createStore({
                         state.homeLogo = requset.data[0].homeLogo
                         state.homeTitle = requset.data[0].middleTitle
                         state.largeScreenUrl = requset.data[0].largeScreenUrl
-                        state.middle_status = requset.data[0].middle_status
+                        state.middleStatus = requset.data[0].middleStatus
                     } else {
                         ElMessage.error(requset.msg)
                     }

+ 21 - 9
src/vab/plugins/permissions.js

@@ -62,21 +62,33 @@ router.beforeEach(async(to, from, next) => {
                         router.addRoute(item)
                     })
 
-                    if (accessRoutes[1].path != '/') {
+                    console.log('accessRoutes')
+                    console.log(accessRoutes)
 
-                        next('/middle')
-                            // next(accessRoutes[1].path)
 
-                    } else {
-                        // router.push({
-                        //     path: '/middle'
-                        // })
+                    console.log('store.state.middleStatus')
+                    console.log(store.state.middleStatus)
 
+                    if (store.state.middleStatus == 1) {
                         next('/middle')
+                    } else {
+                        next(accessRoutes[0].children[0].path)
+                    }
 
-                        // next({...to, replace: true })
+                    // if (accessRoutes[1].path != '/') {
 
-                    }
+                    //     next('/middle')
+                    //         // next(accessRoutes[0].children.path)
+                    // } else {
+                    //     // router.push({
+                    //     //     path: '/middle'
+                    //     // })
+
+                    //     next('/middle')
+
+                    //     // next({...to, replace: true })
+
+                    // }
 
                 } catch {
                     await store.dispatch('user/resetAll')

+ 1 - 1
src/views/tenantManage/tenantUnit/dialogComponent.vue

@@ -24,7 +24,7 @@
 
           <el-form-item label="有效期限:" prop="tenantTerm">
             <el-radio-group v-model="form.tenantTerm">
-              <el-radio :label="3" value="3">永久有效</el-radio>
+              <el-radio :label="3" value="3">2090-01-01</el-radio>
               <el-radio :label="4" value="4">
                 <el-date-picker
                   :min-time="nowDate"

+ 8 - 1
src/views/tenantManage/tenantUnit/index.vue

@@ -143,7 +143,14 @@
         prop="tenantTerm"
         label="到期时间"
         min-width="110px"
-      ></el-table-column>
+      >
+       <template #default="scope">
+          <span>
+            {{ scope.row.tenantTerm === '永久有效' ? '2090-01-01' : scope.row.tenantTerm }}
+          </span>
+        </template>
+      
+      </el-table-column>
       <!-- <el-table-column
         prop="geoPosition"
         label="地理位置"