Bladeren bron

设备清单、资产清单、及系统清单已修改成路由

wyf 5 jaren geleden
bovenliggende
commit
d19d9fe117

+ 2 - 0
src/components/dialogs/addDialog/dialogDevice.vue

@@ -4,6 +4,8 @@
 
 <template>
   <div v-if="dialog.addDevice">
+    <!-- <router-link to="/ledger/facility/addfacility"></router-link>
+    <router-view></router-view> -->
     <el-dialog
       :title="title"
       :center="isCenter"

+ 2 - 0
src/components/ledger/addDialog/dialogAssets.vue

@@ -4,6 +4,8 @@
 
 <template>
   <div v-if="dialog.addDevice">
+    <router-view></router-view>
+    <router-link to="/system/list/addsystem"></router-link>
     <el-dialog
       :title="title"
       :center="isCenter"

+ 2 - 0
src/components/ledger/addDialog/dialogSystem.vue

@@ -4,6 +4,8 @@
 
 <template>
   <div>
+    <router-view></router-view>
+    <router-link to="/leader/property/addproperty"></router-link>
     <el-dialog
       :title="title"
       :center="isCenter"

+ 48 - 26
src/router/system.js

@@ -29,9 +29,14 @@ import buildGraphy from '@/views/data_admin/buildGraphy'
 const OwnerManage = () => import('@/views/market/owner/manage')
 
 /**  台账管理 */
-import systemLedger from '@/views/ledger/system'
-import facilityLedger from '@/views/ledger/facility'
-import propertyLedger from '@/views/ledger/property'
+import systemLedger from '@/views/ledger/system/index'
+import dialogAssets from '@/views/ledger/system/addsystem'
+import facilityLedger from '@/views/ledger/facility/index'
+import dialogDevice from '@/views/ledger/facility/addfacility'
+import propertyLedger from '@/views/ledger/property/index'
+import dialogSystem from '@/views/ledger/property/addproperty'
+
+
 
 export default [
     { path: '/', name: '', component: LayoutMain, children: [{ path: '', name: 'blank', component: Dasboard }] },
@@ -47,7 +52,7 @@ export default [
                 path: 'pointsetting',
                 name: 'Dasboard',
                 component: pointConfig,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成',path: '/point/pointsetting' }, { label: '点位表配置工具' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成', path: '/point/pointsetting' }, { label: '点位表配置工具' }] }
             },
             { path: 'editDataSouce', name: 'editDataSouce', component: editDataSouce },
             { path: 'pointSteps', name: 'pointSteps', component: pointSteps },
@@ -55,7 +60,7 @@ export default [
                 path: 'dynamicdata',
                 name: 'dynamicdata',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成',path: '/point/pointsetting' }, { label: '动态数据关联' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成', path: '/point/pointsetting' }, { label: '动态数据关联' }] }
             }
         ]
     },
@@ -70,19 +75,19 @@ export default [
                 path: 'custominfo',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置' ,path: '/proj/collectsetting'}, { label: '自定义信息点' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置', path: '/proj/collectsetting' }, { label: '自定义信息点' }] }
             },
             {
                 path: 'collectsetting',
                 name: 'collectsetting',
                 component: collectsetting,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置',path: '/proj/collectsetting' }, { label: '项目需采集的信息点' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置', path: '/proj/collectsetting' }, { label: '项目需采集的信息点' }] }
             },
             {
                 path: 'floorinfo',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置',path: '/proj/collectsetting' }, { label: '楼层信息管理' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置', path: '/proj/collectsetting' }, { label: '楼层信息管理' }] }
             }
         ]
     },
@@ -97,31 +102,31 @@ export default [
                 path: 'file',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理',path: '/model/file' }, { label: '模型文件管理' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理', path: '/model/file' }, { label: '模型文件管理' }] }
             },
             {
                 path: 'noentity',
                 name: 'collectsetting',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理',path: '/model/file' }, { label: '未实体化模型清单' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理', path: '/model/file' }, { label: '未实体化模型清单' }] }
             },
             {
                 path: 'beforemodel',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理',path: '/model/file' }, { label: '待建模清单' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理', path: '/model/file' }, { label: '待建模清单' }] }
             },
             {
                 path: 'modelrule',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理',path: '/model/file' }, { label: '拓扑检查' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理', path: '/model/file' }, { label: '拓扑检查' }] }
             },
             {
                 path: 'beacon',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理',path: '/model/file' }, { label: '信标清单' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理', path: '/model/file' }, { label: '信标清单' }] }
             }
         ]
     },
@@ -136,37 +141,49 @@ export default [
                 path: 'facility',
                 name: 'facilityLedger',
                 component: facilityLedger,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理',path:'/ledger/facility' }, { label: '设备清单' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '设备清单' }] },
+            },
+            {
+                path: 'facility/addfacility',
+                name: 'dialogDevice',
+                component: dialogDevice,
             },
+
             {
                 path: 'property',
                 name: 'propertyLedger',
                 component: propertyLedger,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理',path:'/ledger/facility' }, { label: '资产清单' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '资产清单' }] }
+            },
+            {
+                path: 'property/addproperty',
+                name: 'dialogSystem',
+                component: dialogSystem,
             },
+
             {
                 path: 'cenotelist',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理',path:'/ledger/facility' }, { label: '竖井清单' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '竖井清单' }] }
             },
             {
                 path: 'dimension',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理',path:'/ledger/facility' }, { label: '元空间管理' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '元空间管理' }] }
             },
             {
                 path: 'rubbish',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理',path:'/ledger/facility' }, { label: '垃圾数据检查' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '垃圾数据检查' }] }
             },
             {
                 path: 'updowncheck',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理',path:'/ledger/facility' }, { label: '上下级关系检查' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '上下级关系检查' }] }
             }
         ]
     },
@@ -196,7 +213,7 @@ export default [
                 path: 'rentlist',
                 name: 'Dasboard',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '租户管理',path: '/rent/rentlist' }, { label: '租户清单' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '租户管理', path: '/rent/rentlist' }, { label: '租户清单' }] }
             }
         ]
     },
@@ -211,31 +228,31 @@ export default [
                 path: 'data',
                 name: 'buildData',
                 component: buildData,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业', path:'/floor/data' }, { label: '扫楼数据管理' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业', path: '/floor/data' }, { label: '扫楼数据管理' }] }
             },
             {
                 path: 'plan',
                 name: 'buildGraphy',
                 component: buildGraphy,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业', path:'/floor/data' }, { label: '楼层平面图管理' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业', path: '/floor/data' }, { label: '楼层平面图管理' }] }
             },
             {
                 path: 'abnormalprop',
                 name: 'buildAssets',
                 component: buildAssets,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业', path:'/floor/data' }, { label: '异常资产清单' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业', path: '/floor/data' }, { label: '异常资产清单' }] }
             },
             {
                 path: 'log',
                 name: 'buildLog',
                 component: buildLog,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业', path:'/floor/data' }, { label: '扫楼日志查看' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业', path: '/floor/data' }, { label: '扫楼日志查看' }] }
             },
             {
                 path: 'appuser',
                 name: 'buildUser',
                 component: buildUser,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置' ,path: '/proj/collectsetting' }, { label: '扫楼App用户管理' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置', path: '/proj/collectsetting' }, { label: '扫楼App用户管理' }] }
             }
         ]
     },
@@ -270,7 +287,12 @@ export default [
                 name: 'systemlist',
                 component: systemLedger,
                 meta: { keepAlive: false, breadcrumbs: [{ label: '系统管理', path: '/system/list' }, { label: '系统清单' }] }
-            }
+            },
+            {
+                path: '/system/list/addsystem',
+                name: 'dialogAssets',
+                component: dialogAssets,
+            },
         ]
     }
 ]

+ 18 - 0
src/views/ledger/facility/addfacility.vue

@@ -0,0 +1,18 @@
+<template>
+    <div>
+        11111111111111
+    </div>
+</template>
+
+<script>
+export default {
+    
+}
+</script>
+
+
+<style>
+
+</style>
+
+

+ 2 - 0
src/views/ledger/facility/index.vue

@@ -1,5 +1,7 @@
 <template>
     <div id="deviceList">
+    <router-link to="/ledger/facility/addfacility"></router-link>
+    <router-view></router-view>
     <saga-title :mess="mess"></saga-title>
     <div class="table-main">
       <div class="search-header">

+ 15 - 0
src/views/ledger/property/addproperty.vue

@@ -0,0 +1,15 @@
+<template>
+    <div>22222222222222</div>
+</template>
+
+
+<script>
+export default {
+    
+}
+</script>
+
+
+<style>
+
+</style>

+ 13 - 0
src/views/ledger/system/addsystem.vue

@@ -0,0 +1,13 @@
+<template>
+    <div>33333333333333</div>
+</template>
+
+<script>
+export default {
+    
+}
+</script>
+
+<style>
+
+</style>