소스 검색

Merge branch 'master' of http://120.26.64.82:3000/BFFE/CABaggageData2.0

zhongxiaoyu 2 년 전
부모
커밋
e741d2f323
3개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 2
      src/router/index.js
  2. 1 1
      src/views/BasicsData/views/deployNode/deployNodeChild.vue
  3. 1 1
      src/views/authorityManagement/components/authorityHome.vue

+ 2 - 2
src/router/index.js

@@ -70,7 +70,7 @@ export const constantRoutes = [
 // 动态路由
 export const asyncRoutes = []
 // 插入路由
-routesPush([...routesOne, ...routesTwo, ...routesThree, ...routesFileFour, ...routesFive, ...routesFileSix], asyncRoutes)
+routesPush([...routesOne, ...routesTwo, ...routesFileFour, ...routesFive, ...routesFileSix], asyncRoutes)
 // asyncRoutes.push({ path: '/', component: () => import('@/views/noPower'), hidden: true })
 asyncRoutes.push({
   path: '*',
@@ -88,7 +88,7 @@ const createRouter = () =>
 const router = createRouter()
 
 // Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
-export function resetRouter() {
+export function resetRouter () {
   const newRouter = createRouter()
   router.matcher = newRouter.matcher // reset router
 }

+ 1 - 1
src/views/BasicsData/views/deployNode/deployNodeChild.vue

@@ -7,7 +7,7 @@
         :rows="24"
         label-width="80px"
         :min-height="70"
-        width="400px"
+        width="450px"
       />
     </div>
   </div>

+ 1 - 1
src/views/authorityManagement/components/authorityHome.vue

@@ -46,7 +46,7 @@
               <template v-if="childrenData.length">
                 <el-row :gutter="24">
                   <el-col :span="6" v-for="data in childrenData" :key="data.auth_id">
-                    <div @click.stop="childrenClick(data)" class="account-left-content-teams">
+                    <div class="account-left-content-teams">
                       <div class="team">
                         <div class="bg" :class="data.auth_type == 1 ? 'status0' : data.auth_type == 2 ? 'status1' : 'status2'"></div>
                         <div class="list" :class="data.QueryTarget == 1 ? 'activeStatus' : ''">