Bladeren bron

三级菜单和对应路由以及目录结构修改

zhangyu 5 jaren geleden
bovenliggende
commit
1be061d7d7

File diff suppressed because it is too large
+ 114 - 6
src/assets/style/iconfont/iconfont.css


BIN
src/assets/style/iconfont/iconfont.eot


File diff suppressed because it is too large
+ 81 - 0
src/assets/style/iconfont/iconfont.svg


BIN
src/assets/style/iconfont/iconfont.ttf


BIN
src/assets/style/iconfont/iconfont.woff


+ 1 - 1
src/components/ledger/handsontables/system.vue

@@ -235,7 +235,7 @@ export default {
     toAddDevice() {
       if (this.addData.Category) {
         this.$router.push({
-          path: "/system/systemadd",
+          path: "/ledger/systemadd",
           query: this.addData
         });
       }

+ 19 - 106
src/data/menus.js

@@ -155,7 +155,7 @@ export default [
 				permission: 'system:role:query'
 			}]
 		},{
-			path: '/floor',
+			path: '/floor/data',
 			name: '现场数据整理',
 			icon: '',
 			children: [ {
@@ -190,7 +190,7 @@ export default [
 		}, {
 			path: '/floor/log',
 			name: '扫楼日志查看',
-			icon: 'el-icon-fa-user',
+			icon: '',
 			opts: [{
 				name: '查看',
 				basic: true,
@@ -276,7 +276,7 @@ export default [
 	},
 	// 关系维护
 	{
-		path: '/platform/user',
+		path: '/relation/maintain',
 		name: '关系维护',
 		icon: '',
 		opts: [{
@@ -287,7 +287,7 @@ export default [
 	},
 	// 全部关系总览
 	{
-		path: '/platform/role',
+		path: '/relation/overview',
 		name: '全部关系总览',
 		icon: '',
 		opts: [{
@@ -296,108 +296,21 @@ export default [
 			permission: 'system:role:query'
 		}]
 	},
+	/******************** 通用字典 ***************************/
 	{
-			path: '/proj',
-			name: '项目基础设置',
-			icon: 'el-icon-fa-bank',
-			children: [{
-							path: '/proj/collectsetting',
-							name: '项目需采集的信息点',
-							icon: 'el-icon-fa-user',
-							opts: [{
-									name: '查看',
-									basic: true,
-									permission: 'system:role:query'
-							}]
-					},
-					// {
-					//     path: '/proj/custominfo',
-					//     name: '自定义信息点',
-					//     icon: 'el-icon-fa-user',
-					//     opts: [
-					//         {
-					//             name: '查看',
-					//             basic: true,
-					//             permission: 'system:role:query'
-					//         }
-					//     ]
-					// }, 
-					{
-							path: '/proj/floorinfo',
-							name: '楼层信息管理',
-							icon: 'el-icon-fa-user',
-							opts: [{
-									name: '查看',
-									basic: true,
-									permission: 'system:role:query'
-							}]
-					},
-					{
-							path: '/floor/appuser',
-							name: '扫楼App用户管理',
-							icon: 'el-icon-fa-user',
-							opts: [{
-									name: '查看',
-									basic: true,
-									permission: 'system:role:query'
-							}]
-					}
-			]
+		path: '/dictionaries',
+		name: '通用字典',
+		disabled: true,
 	},
-	//业务相关
-	// {
-	// 		path: '/busgroup',
-	// 		name: '业务相关',
-	// 		disabled: true,
-	// },
-	//业务空间管理
-	// {
-	// 		path: '/business',
-	// 		name: '业务空间管理',
-	// 		icon: 'el-icon-fa-bank',
-	// 		children: [{
-	// 				path: '/business/spacelist',
-	// 				name: '业务空间清单',
-	// 				icon: 'el-icon-fa-user',
-	// 				opts: [{
-	// 						name: '查看',
-	// 						basic: true,
-	// 						permission: 'system:role:query'
-	// 				}]
-	// 		}, ]
-	// },
-	//租户管理
-	// {
-	// 		path: '/rent',
-	// 		name: '租户管理',
-	// 		icon: 'el-icon-fa-bank',
-	// 		children: [{
-	// 						path: '/rent/rentlist',
-	// 						name: '租户清单',
-	// 						icon: 'el-icon-fa-user',
-	// 						opts: [{
-	// 								name: '查看',
-	// 								basic: true,
-	// 								permission: 'system:role:query'
-	// 						}]
-	// 				}
-	// 		]
-	// },
-	//系统管理
-	// {
-	// 		path: '/system',
-	// 		name: '系统管理',
-	// 		icon: 'el-icon-fa-bank',
-	// 		children: [{
-	// 				path: '/system/list',
-	// 				name: '系统清单',
-	// 				icon: 'el-icon-fa-user',
-	// 				opts: [{
-	// 						name: '查看',
-	// 						basic: true,
-	// 						permission: 'system:role:query'
-	// 				}]
-	// 		}, ]
-	// },
-
+	// 厂家库
+	{
+		path: '/manufactor/supplier',
+		name: '厂家库',
+		icon: '',
+		opts: [{
+			name: '查看',
+			basic: true,
+			permission: 'system:role:query'
+		}]
+	}
 ]

src/data/test.js → src/data/old.js


+ 253 - 179
src/router/system.js

@@ -7,51 +7,65 @@ import UserList from '@/views/system/user/UserList'
 import RoleList from '@/views/system/role/RoleList'
 import ChangePwd from '@/views/system/pwd/ChangePwd'
 
-/**点位部分 */
-import pointConfig from '@/views/point/config_point'
-import editDataSouce from '@/views/point/config_point/edit_origin'
-import pointSteps from '@/views/point/config_point/steps'
+/**项目管理 */
+import projectAdm from '@/views/platfrom/project'
+import userAdm from '@/views/platfrom/user'
+import roleAdm from '@/views/platfrom/role'
 
-/**项目化配置 */
-import collectsetting from '@/views/project_setting/collection_setting/index'
+/**前期准备 */
+import buildFloor from '@/views/ready/buildfloor'
+import collectsetting from '@/views/ready/collectsetting'
+import buildUser from '@/views/ready/appuser'
 
 /**模型管理 */
-import  modelFile from '@/views/model/file/index'
+import modelFile from '@/views/model/file'
+import modelReport from '@/views/model/report'
 
-/** 业务空间 */
-import spacelist from '@/views/business_space/business_list'
+/**系统集成 */
+import pointConfig from '@/views/point/config_point'
+import editDataSouce from '@/views/point/config_point/edit_origin'
+import pointSteps from '@/views/point/config_point/steps'
+import objectData from '@/views/point/objectData'
+import numberView from '@/views/point/number'
+import integrateReport from '@/views/point/report'
 
-/** 扫楼数据整理 */
+/** 扫楼作业 */
+import buildTask from '@/views/data_admin/buildTask'
 import buildAssets from '@/views/data_admin/buildAssets'
 import buildLog from '@/views/data_admin/buildLog'
-import buildUser from '@/views/data_admin/buildUser'
 import buildData from '@/views/data_admin/buildData'
 import buildGraphy from '@/views/data_admin/buildGraphy'
 
-/**市场及商务 */
-const OwnerManage = () =>
-    import ('@/views/market/owner/manage')
-
 /**  台账管理 */
-import systemLedger from '@/views/ledger/system/index'
+import systemLedger from '@/views/ledger/system'
 import systemadd from '@/views/ledger/system/addsystem'
-import facilityLedger from '@/views/ledger/facility/index'
-import partsLedger from '@/views/ledger/facility/parts/index'
-import partsmanageLedger from '@/views/ledger/facility/partsmanage/index'
-import partsadd from '@/views/ledger/facility/partsmanage/addparts/index'
+import facilityLedger from '@/views/ledger/facility'
+import partsLedger from '@/views/ledger/facility/parts'
+import partsmanageLedger from '@/views/ledger/facility/partsmanage'
+import partsadd from '@/views/ledger/facility/partsmanage/addparts'
 import deviceadd from '@/views/ledger/facility/addfacility'
 import propertyadd from '@/views/ledger/property/addproperty'
-import propertyLedger from '@/views/ledger/property/index'
+import propertyLedger from '@/views/ledger/property'
+import spacelist from '@/views/ledger/spacelist'//业务空间台账
 import addPropertys from '@/views/ledger/property/addpropertys'//根据未关联资产的设备或部件批量创建设备
-import cenotelist from '@/views/ledger/cenotelist/index' //竖井清单
-import cenoteadd from '@/views/ledger/cenotelist/cenoteadd/index' //添加竖井
+import cenotelist from '@/views/ledger/cenotelist' //竖井清单
+import cenoteadd from '@/views/ledger/cenotelist/cenoteadd' //添加竖井
+import rentlist from '@/views/ledger/rentlist' //租户清单
+import rentadd from '@/views/ledger/rentlist/rentadd' //竖井清单
+import dataReport from '@/views/ledger/report'
 import auth from '@/views/system/auth'
 import noUser from '@/views/system/nouser'
 
-/** 租户管理 */
-import rentlist from '@/views/rent/rentlist/index'
-import rentadd from '@/views/rent/rentlist/rentadd/index'
+/**  关系维护并计算 */
+import maintain from '@/views/relation/maintain'
+import overView from '@/views/relation/overview'
+
+/**  厂家库 */
+import supplier from '@/views/manufactor/supplier'
 
+/**市场及商务 */
+const OwnerManage = () =>
+    import ('@/views/market/owner/manage')
 
 export default [
     { path: '/', name: '', component: LayoutMain, children: [{ path: '', name: 'blank', component: Dasboard }] },
@@ -59,7 +73,48 @@ export default [
     { path: '/auth', name: 'auth', component: auth },
     { path: '/noUser', name: 'noUser', component: noUser },
     // 平台管理
-    
+    {
+        path: '/platform',
+        name: 'LayoutMain',
+        component: LayoutMain,
+        children: [
+            { path: 'project', name: 'projectAdm', component: projectAdm, meta: { keepAlive: false, breadcrumbs: [{ label: '项目管理' }] }},
+            { path: 'user', name: 'userAdm', component: userAdm, meta: { keepAlive: false, breadcrumbs: [{ label: '人员管理' }] }},
+            { path: 'role', name: 'roleAdm', component: roleAdm, meta: { keepAlive: false, breadcrumbs: [{ label: '角色管理' }] }}
+        ] 
+    },
+    // 前期准备
+    {
+        path: '/ready',
+        name: 'LayoutMain',
+        component: LayoutMain,
+        children: [
+            { path: 'buildfloor', name: 'buildFloor', component: buildFloor, meta: { keepAlive: false, breadcrumbs: [{ label: '建筑楼层管理' }] }},
+            { path: 'collectsetting', name: 'collectsetting', component: collectsetting, meta: { keepAlive: false, breadcrumbs: [{ label: '需采集的信息点' }] }},
+            { path: 'appuser', name: 'buildUser', component: buildUser, meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼App用户管理' }] }}
+        ] 
+    },
+    //模型管理
+    {
+        path: '/model',
+        name: 'LayoutMain',
+        component: LayoutMain,
+        children: [
+            { path: '', name: 'modelFile', component: modelFile },
+            {
+                path: 'file',
+                name: 'modelFile',
+                component: modelFile,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理', path: '/model/file' }, { label: '模型文件管理' }] }
+            },
+            {
+                path: 'report',
+                name: 'modelReport',
+                component: modelReport,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理', path: '/model/file' }, { label: '模型质量报告' }] }
+            }
+        ]
+    },
     // 系统集成
     {
         path: '/point',
@@ -69,9 +124,9 @@ export default [
             { path: '', name: 'pointConfig', component: pointConfig },
             {
                 path: 'pointsetting',
-                name: 'Dasboard',
+                name: 'pointConfig',
                 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 },
@@ -79,73 +134,64 @@ export default [
                 path: 'dynamicdata',
                 name: 'dynamicdata',
                 component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成', path: '/point/pointsetting' }, { label: '动态数据关联' }] }
-            }
-        ]
-    },
-    //项目化配置
-    {
-        path: '/proj',
-        name: 'LayoutMain',
-        component: LayoutMain,
-        children: [
-            { path: '', name: 'Dasboard', component: Dasboard },
+                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成', path: '/point/pointsetting' }, { label: '配置动参从点位取值' }] }
+            },
             {
-                path: 'custominfo',
-                name: 'Dasboard',
-                component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置', path: '/proj/collectsetting' }, { label: '自定义信息点' }] }
+                path: 'objectdata',
+                name: 'objectData',
+                component: objectData,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成', path: '/point/pointsetting' }, { label: '配置动参从对象取值' }] }
             },
             {
-                path: 'collectsetting',
-                name: 'collectsetting',
-                component: collectsetting,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置', path: '/proj/collectsetting' }, { label: '项目需采集的信息点' }] }
+                path: 'number',
+                name: 'numberView',
+                component: numberView,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成', path: '/point/pointsetting' }, { label: '表号功能号总览' }] }
             },
             {
-                path: 'floorinfo',
-                name: 'Dasboard',
-                component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置', path: '/proj/collectsetting' }, { label: '楼层信息管理' }] }
+                path: 'report',
+                name: 'integrateReport',
+                component: integrateReport,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成', path: '/point/pointsetting' }, { label: '系统集成报告' }] }
             }
         ]
     },
-    //模型管理
+    //扫楼数据管理
     {
-        path: '/model',
+        path: '/floor',
         name: 'LayoutMain',
         component: LayoutMain,
         children: [
-            { path: '', name: 'Dasboard', component: Dasboard },
+            { path: '', name: 'buildData', component: buildData },
             {
-                path: 'file',
-                name: 'modelFile',
-                component: modelFile,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理', path: '/model/file' }, { label: '模型文件管理' }] }
+                path: 'task',
+                name: 'buildTask',
+                component: buildTask,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业', path: '/floor/task' }, { label: '现场任务管理' }] }
             },
             {
-                path: 'noentity',
-                name: 'collectsetting',
-                component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理', path: '/model/file' }, { label: '未实体化模型清单' }] }
+                path: 'data',
+                name: 'buildData',
+                component: buildData,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业', path: '/floor/task' }, { label: '现场数据整理', path: '/floor/data' }, { label: '信息点整理' }] }
             },
             {
-                path: 'beforemodel',
-                name: 'Dasboard',
-                component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理', path: '/model/file' }, { label: '待建模清单' }] }
+                path: 'plan',
+                name: 'buildGraphy',
+                component: buildGraphy,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业', path: '/floor/task' }, { label: '现场数据整理', path: '/floor/data' }, { label: '位置标签整理' }] }
             },
             {
-                path: 'modelrule',
-                name: 'Dasboard',
-                component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理', path: '/model/file' }, { label: '拓扑检查' }] }
+                path: 'abnormalprop',
+                name: 'buildAssets',
+                component: buildAssets,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业', path: '/floor/task' }, { label: '扫楼报告' }] }
             },
             {
-                path: 'beacon',
-                name: 'Dasboard',
-                component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理', path: '/model/file' }, { label: '信标清单' }] }
+                path: 'log',
+                name: 'buildLog',
+                component: buildLog,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业', path: '/floor/task' }, { label: '扫楼日志查看' }] }
             }
         ]
     },
@@ -160,7 +206,7 @@ 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: 'parts',
@@ -178,139 +224,186 @@ export default [
                 path: 'partsadd',
                 name: 'partsadd',
                 component: partsadd,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '设备清单', path: '/ledger/facility' }, { label: '添加部件' }] },
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '设备台账', path: '/ledger/facility' }, { label: '添加部件' }] },
             },
             {
                 path: 'deviceadd',
                 name: 'deviceadd',
                 component: deviceadd,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '设备清单', path: '/ledger/facility' }, { label: '添加设备' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '设备台账', path: '/ledger/facility' }, { label: '添加设备' }] }
             },
             {
                 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: 'propertyadd',
                 name: 'propertyadd',
                 component: propertyadd,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '资产清单', path: '/ledger/property' }, { label: '添加资产' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '资产台账', path: '/ledger/property' }, { label: '添加资产' }] }
             },
             {
                 path: 'addPropertys',
                 name: 'addPropertys',
                 component: addPropertys,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '资产清单', path: '/ledger/property' }, { label: '批量创建' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '资产台账', path: '/ledger/property' }, { label: '批量创建' }] }
+            },
+            {
+                path: 'list',
+                name: 'systemlist',
+                component: systemLedger,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '系统台账' }] }
+            },
+            {
+                path: 'systemadd',
+                name: 'systemadd',
+                component: systemadd,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '系统台账', path: '/ledger/list' }, { label: '添加系统' }] }
+            },
+            {
+                path: 'spacelist',
+                name: 'spacelist',
+                component: spacelist,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '业务空间台账' }] }
             },
             {
                 path: 'cenotelist',
                 name: 'cenotelist',
                 component: cenotelist,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '竖井清单' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '竖井台账' }] }
             },
             {
                 path: 'cenoteadd',
                 name: 'cenoteadd',
                 component: cenoteadd,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '竖井清单', path: '/ledger/cenotelist' }, { label: '添加竖井' }] }
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '竖井台账', path: '/ledger/cenotelist' }, { label: '添加竖井' }] }
             },
             {
-                path: 'dimension',
-                name: 'Dasboard',
-                component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '元空间管理' }] }
+                path: 'rentlist',
+                name: 'rentlist',
+                component: rentlist,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '租户台账' }] }
             },
             {
-                path: 'rubbish',
-                name: 'Dasboard',
-                component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '垃圾数据检查' }] }
+                path: 'rentadd',
+                name: 'rentadd',
+                component: rentadd,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '租户台账', path: '/ledger/rentlist' }, { label: '添加租户' }] }
             },
             {
-                path: 'updowncheck',
-                name: 'Dasboard',
-                component: Dasboard,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '上下级关系检查' }] }
+                path: 'datareport',
+                name: 'dataReport',
+                component: dataReport,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理', path: '/ledger/facility' }, { label: '数据质量报告' }] }
             }
         ]
     },
-    //业务空间管理
+    /******************** 关系维护并计算 ***************************/
+    //关系维护
     {
-        path: '/business',
+        path: '/relation',
         name: 'LayoutMain',
         component: LayoutMain,
         children: [
-            { path: '', name: 'Dasboard', component: Dasboard },
-            {
-                path: 'spacelist',
-                name: 'spacelist',
-                component: spacelist,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '业务空间管理', path: '/business/spacelist' }, { label: '业务空间清单' }] }
-            }
-        ]
+            { path: 'maintain', name: 'maintain', component: maintain, meta: { keepAlive: false, breadcrumbs: [{ label: '关系维护' }] }},
+            { path: 'overview', name: 'overView', component: overView, meta: { keepAlive: false, breadcrumbs: [{ label: '全部关系总览' }] }}
+        ] 
     },
-    //租户管理
+    /******************** 通用字典 ***************************/
+    //厂家库
     {
-        path: '/rent',
+        path: '/manufactor',
         name: 'LayoutMain',
         component: LayoutMain,
         children: [
-            { path: '', name: 'Dasboard', component: Dasboard },
-            {
-                path: 'rentlist',
-                name: 'rentlist',
-                component: rentlist,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '租户管理', path: '/rent/rentlist' }, { label: '租户清单' }] }
-            },
-            {
-                path: 'rentadd',
-                name: 'rentadd',
-                component: rentadd,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '租户管理', path: '/rent/rentlist' }, { label: '租户清单', path: '/rent/rentlist' }, { label: '添加租户' }] }
-            }
-        ]
-    },
-    //扫楼数据管理
-    {
-        path: '/floor',
-        name: 'LayoutMain',
-        component: LayoutMain,
-        children: [
-            { path: '', name: 'buildData', component: buildData },
-            {
-                path: 'data',
-                name: 'buildData',
-                component: buildData,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业', path: '/floor/data' }, { label: '扫楼数据管理' }] }
-            },
-            {
-                path: 'plan',
-                name: 'buildGraphy',
-                component: buildGraphy,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业', path: '/floor/data' }, { label: '楼层平面图管理' }] }
-            },
-            {
-                path: 'abnormalprop',
-                name: 'buildAssets',
-                component: buildAssets,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业', path: '/floor/data' }, { label: '异常资产清单' }] }
-            },
-            {
-                path: 'log',
-                name: 'buildLog',
-                component: buildLog,
-                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用户管理' }] }
-            }
-        ]
+            { path: 'supplier', name: 'supplier', component: supplier, meta: { keepAlive: false, breadcrumbs: [{ label: '厂家库' }] }}
+        ] 
     },
+
+    //业务空间管理
+    // {
+    //     path: '/business',
+    //     name: 'LayoutMain',
+    //     component: LayoutMain,
+    //     children: [
+    //         { path: '', name: 'Dasboard', component: Dasboard },
+    //         {
+    //             path: 'spacelist',
+    //             name: 'spacelist',
+    //             component: spacelist,
+    //             meta: { keepAlive: false, breadcrumbs: [{ label: '业务空间管理', path: '/business/spacelist' }, { label: '业务空间清单' }] }
+    //         }
+    //     ]
+    // },
+    //租户管理
+    // {
+    //     path: '/rent',
+    //     name: 'LayoutMain',
+    //     component: LayoutMain,
+    //     children: [
+    //         { path: '', name: 'Dasboard', component: Dasboard },
+    //         {
+    //             path: 'rentlist',
+    //             name: 'rentlist',
+    //             component: rentlist,
+    //             meta: { keepAlive: false, breadcrumbs: [{ label: '租户管理', path: '/rent/rentlist' }, { label: '租户清单' }] }
+    //         },
+    //         {
+    //             path: 'rentadd',
+    //             name: 'rentadd',
+    //             component: rentadd,
+    //             meta: { keepAlive: false, breadcrumbs: [{ label: '租户管理', path: '/rent/rentlist' }, { label: '租户清单', path: '/rent/rentlist' }, { label: '添加租户' }] }
+    //         }
+    //     ]
+    // },
+    //系统管理
+    // {
+    //     path: '/system',
+    //     name: 'LayoutMain',
+    //     component: LayoutMain,
+    //     children: [{
+    //             path: 'list',
+    //             name: 'systemlist',
+    //             component: systemLedger,
+    //             meta: { keepAlive: false, breadcrumbs: [{ label: '系统管理', path: '/system/list' }, { label: '系统清单' }] }
+    //         },
+    //         {
+    //             path: 'systemadd',
+    //             name: 'systemadd',
+    //             component: systemadd,
+    //             meta: { keepAlive: false, breadcrumbs: [{ label: '系统管理', path: '/system/list' }, { label: '系统清单', path: '/system/list' }, { label: '添加系统' }] }
+    //         },
+    //     ]
+    // },
+    //项目化配置
+    // {
+    //     path: '/proj',
+    //     name: 'LayoutMain',
+    //     component: LayoutMain,
+    //     children: [
+    //         { path: '', name: 'Dasboard', component: Dasboard },
+    //         {
+    //             path: 'custominfo',
+    //             name: 'Dasboard',
+    //             component: Dasboard,
+    //             meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置', path: '/proj/collectsetting' }, { label: '自定义信息点' }] }
+    //         },
+    //         {
+    //             path: 'collectsetting',
+    //             name: 'collectsetting',
+    //             component: collectsetting,
+    //             meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置', path: '/proj/collectsetting' }, { label: '项目需采集的信息点' }] }
+    //         },
+    //         {
+    //             path: 'floorinfo',
+    //             name: 'Dasboard',
+    //             component: Dasboard,
+    //             meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置', path: '/proj/collectsetting' }, { label: '楼层信息管理' }] }
+    //         }
+    //     ]
+    // },
     //环境调节
     {
         path: '/environment',
@@ -330,24 +423,5 @@ export default [
             { path: '', name: 'Dasboard', component: Dasboard },
             { path: 'own', name: 'Dasboard', component: OwnerManage }
         ]
-    },
-    //系统管理
-    {
-        path: '/system',
-        name: 'LayoutMain',
-        component: LayoutMain,
-        children: [{
-                path: 'list',
-                name: 'systemlist',
-                component: systemLedger,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '系统管理', path: '/system/list' }, { label: '系统清单' }] }
-            },
-            {
-                path: 'systemadd',
-                name: 'systemadd',
-                component: systemadd,
-                meta: { keepAlive: false, breadcrumbs: [{ label: '系统管理', path: '/system/list' }, { label: '系统清单', path: '/system/list' }, { label: '添加系统' }] }
-            },
-        ]
     }
 ]

+ 2 - 2
src/utils/authutils.js

@@ -55,12 +55,12 @@ export default {
                     store.dispatch('setBreadcrumb', to.meta.breadcrumbs)
                 }
                 if(
-                    (from.path == "/rent/rentadd" && session.get("rentAddData") && session.get("rentAddData").length) ||
+                    (from.path == "/ledger/rentadd" && session.get("rentAddData") && session.get("rentAddData").length) ||
                     (from.path == "/ledger/cenoteadd" && session.get("cenoteAddData") && session.get("cenoteAddData").length) ||
                     (from.path == "/ledger/deviceadd" && session.get("deviceAddData") && session.get("deviceAddData").length) ||
                     (from.path == "/ledger/propertyadd" && session.get("propertyAddData") && session.get("propertyAddData").length) ||
                     (from.path == "/ledger/partsadd" && session.get("partsAddData") && session.get("partsAddData").length) ||
-                    (from.path == "/system/systemadd" && session.get("systemAddData") && session.get("systemAddData").length)
+                    (from.path == "/ledger/systemadd" && session.get("systemAddData") && session.get("systemAddData").length)
                 ) { //判断新增信息是否保存
                     MessageBox.confirm("新增信息未保存,离开将丢失新增信息,是否继续?", "提示", {
                         confirmButtonText: '确定',

+ 36 - 0
src/views/data_admin/buildTask/index.vue

@@ -0,0 +1,36 @@
+<template>
+    <div>
+      <das-board>
+        <template v-slot:plan>
+          <span>{{plan?plan:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:finish>
+          <span>{{finish?finish:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:onLine>
+          <span>{{onLine?onLine:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:explain>
+          <span>{{explain?explain:"yyyy-mm-dd"}}</span>
+        </template>
+      </das-board>
+    </div>
+</template>
+
+<script>
+import dasBoard from "@/views/dasboard/index";
+export default {
+    components: {
+      dasBoard
+    },
+    data() {
+        return {
+          plan: "2019-08-21",
+          finish: "2019-09-06",
+          onLine: "2019-09-30",
+          explain: "现场任务的创建和修改;v1.2:任务完成情况的查看"
+        }
+    },
+    mounted() {}
+}
+</script>

src/views/rent/rentlist/index.vue → src/views/ledger/rentlist/index.vue


src/views/rent/rentlist/rentadd/index.vue → src/views/ledger/rentlist/rentadd/index.vue


src/views/rent/rentlist/rentadd/index_1.vue → src/views/ledger/rentlist/rentadd/index_1.vue


+ 36 - 0
src/views/ledger/report/index.vue

@@ -0,0 +1,36 @@
+<template>
+    <div>
+      <das-board>
+        <template v-slot:plan>
+          <span>{{plan?plan:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:finish>
+          <span>{{finish?finish:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:onLine>
+          <span>{{onLine?onLine:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:explain>
+          <span>{{explain?explain:"yyyy-mm-dd"}}</span>
+        </template>
+      </das-board>
+    </div>
+</template>
+
+<script>
+import dasBoard from "@/views/dasboard/index";
+export default {
+    components: {
+      dasBoard
+    },
+    data() {
+        return {
+          plan: "2019-10-30",
+          finish: "2019-10-30",
+          onLine: "2019-10-30",
+          explain: "照岗位和资产数据统计报告"
+        }
+    },
+    mounted() {}
+}
+</script>

src/views/business_space/business_list/index.vue → src/views/ledger/spacelist/index.vue


+ 36 - 0
src/views/manufactor/supplier/index.vue

@@ -0,0 +1,36 @@
+<template>
+    <div>
+      <das-board>
+        <template v-slot:plan>
+          <span>{{plan?plan:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:finish>
+          <span>{{finish?finish:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:onLine>
+          <span>{{onLine?onLine:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:explain>
+          <span>{{explain?explain:"yyyy-mm-dd"}}</span>
+        </template>
+      </das-board>
+    </div>
+</template>
+
+<script>
+import dasBoard from "@/views/dasboard/index";
+export default {
+    components: {
+      dasBoard
+    },
+    data() {
+        return {
+          plan: "2019-10-01",
+          finish: "2019-10-15",
+          onLine: "2019-10-30",
+          explain: "查看和维护相关厂家信息(包含:厂家,供应商,维护,保险等)"
+        }
+    },
+    mounted() {}
+}
+</script>

+ 36 - 0
src/views/model/report/index.vue

@@ -0,0 +1,36 @@
+<template>
+    <div>
+      <das-board>
+        <template v-slot:plan>
+          <span>{{plan?plan:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:finish>
+          <span>{{finish?finish:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:onLine>
+          <span>{{onLine?onLine:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:explain>
+          <span>{{explain?explain:"yyyy-mm-dd"}}</span>
+        </template>
+      </das-board>
+    </div>
+</template>
+
+<script>
+import dasBoard from "@/views/dasboard/index";
+export default {
+    components: {
+      dasBoard
+    },
+    data() {
+        return {
+          plan: "2019-09-04",
+          finish: "2019-10-17",
+          onLine: "2019-10-30",
+          explain: "模型校验后的数据报告,用于查看上传模型的相关情况。"
+        }
+    },
+    mounted() {}
+}
+</script>

+ 36 - 0
src/views/platfrom/project/index.vue

@@ -0,0 +1,36 @@
+<template>
+    <div>
+      <das-board>
+        <template v-slot:plan>
+          <span>{{plan?plan:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:finish>
+          <span>{{finish?finish:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:onLine>
+          <span>{{onLine?onLine:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:explain>
+          <span>{{explain?explain:"yyyy-mm-dd"}}</span>
+        </template>
+      </das-board>
+    </div>
+</template>
+
+<script>
+import dasBoard from "@/views/dasboard/index";
+export default {
+    components: {
+      dasBoard
+    },
+    data() {
+        return {
+          plan: "2019-10-18",
+          finish: "2019-10-25",
+          onLine: "2019-10-30",
+          explain: "对物理世界的项目信息进行管理。以及与项目相关人员的管理。(admin账户页面)"
+        }
+    },
+    mounted() {}
+}
+</script>

+ 36 - 0
src/views/platfrom/role/index.vue

@@ -0,0 +1,36 @@
+<template>
+    <div>
+      <das-board>
+        <template v-slot:plan>
+          <span>{{plan?plan:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:finish>
+          <span>{{finish?finish:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:onLine>
+          <span>{{onLine?onLine:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:explain>
+          <span>{{explain?explain:"yyyy-mm-dd"}}</span>
+        </template>
+      </das-board>
+    </div>
+</template>
+
+<script>
+import dasBoard from "@/views/dasboard/index";
+export default {
+    components: {
+      dasBoard
+    },
+    data() {
+        return {
+          plan: "2019-10-18",
+          finish: "2019-10-25",
+          onLine: "2019-10-30",
+          explain: "角色创建,权限维护。(admin账户页面)"
+        }
+    },
+    mounted() {}
+}
+</script>

+ 36 - 0
src/views/platfrom/user/index.vue

@@ -0,0 +1,36 @@
+<template>
+    <div>
+      <das-board>
+        <template v-slot:plan>
+          <span>{{plan?plan:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:finish>
+          <span>{{finish?finish:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:onLine>
+          <span>{{onLine?onLine:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:explain>
+          <span>{{explain?explain:"yyyy-mm-dd"}}</span>
+        </template>
+      </das-board>
+    </div>
+</template>
+
+<script>
+import dasBoard from "@/views/dasboard/index";
+export default {
+    components: {
+      dasBoard
+    },
+    data() {
+        return {
+          plan: "2019-10-18",
+          finish: "2019-10-25",
+          onLine: "2019-10-30",
+          explain: "使用运维平台的人员维护,以及对人员进行项目权限和角色权限分配。(admin账户页面)"
+        }
+    },
+    mounted() {}
+}
+</script>

+ 36 - 0
src/views/point/number/index.vue

@@ -0,0 +1,36 @@
+<template>
+    <div>
+      <das-board>
+        <template v-slot:plan>
+          <span>{{plan?plan:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:finish>
+          <span>{{finish?finish:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:onLine>
+          <span>{{onLine?onLine:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:explain>
+          <span>{{explain?explain:"yyyy-mm-dd"}}</span>
+        </template>
+      </das-board>
+    </div>
+</template>
+
+<script>
+import dasBoard from "@/views/dasboard/index";
+export default {
+    components: {
+      dasBoard
+    },
+    data() {
+        return {
+          plan: "2019-8-5",
+          finish: "2019-9-24",
+          onLine: "2019-10-31",
+          explain: "表号功能号检索查看,点位信息维护"
+        }
+    },
+    mounted() {}
+}
+</script>

+ 36 - 0
src/views/point/objectData/index.vue

@@ -0,0 +1,36 @@
+<template>
+    <div>
+      <das-board>
+        <template v-slot:plan>
+          <span>{{plan?plan:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:finish>
+          <span>{{finish?finish:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:onLine>
+          <span>{{onLine?onLine:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:explain>
+          <span>{{explain?explain:"yyyy-mm-dd"}}</span>
+        </template>
+      </das-board>
+    </div>
+</template>
+
+<script>
+import dasBoard from "@/views/dasboard/index";
+export default {
+    components: {
+      dasBoard
+    },
+    data() {
+        return {
+          plan: "2019-10-4",
+          finish: "2019-10-11",
+          onLine: "2019-10-30",
+          explain: "维护对象实例运行参数,以及取值位置"
+        }
+    },
+    mounted() {}
+}
+</script>

+ 36 - 0
src/views/point/report/index.vue

@@ -0,0 +1,36 @@
+<template>
+    <div>
+      <das-board>
+        <template v-slot:plan>
+          <span>{{plan?plan:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:finish>
+          <span>{{finish?finish:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:onLine>
+          <span>{{onLine?onLine:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:explain>
+          <span>{{explain?explain:"yyyy-mm-dd"}}</span>
+        </template>
+      </das-board>
+    </div>
+</template>
+
+<script>
+import dasBoard from "@/views/dasboard/index";
+export default {
+    components: {
+      dasBoard
+    },
+    data() {
+        return {
+          plan: "2019-8-5",
+          finish: "2019-9-6",
+          onLine: "2019-9-30",
+          explain: "系统集成信息的展示查看"
+        }
+    },
+    mounted() {}
+}
+</script>

src/views/data_admin/buildUser/Edit.vue → src/views/ready/appuser/Edit.vue


src/views/data_admin/buildUser/index.vue → src/views/ready/appuser/index.vue


src/views/data_admin/buildUser/index1.vue → src/views/ready/appuser/index1.vue


+ 36 - 0
src/views/ready/buildfloor/index.vue

@@ -0,0 +1,36 @@
+<template>
+    <div>
+      <das-board>
+        <template v-slot:plan>
+          <span>{{plan?plan:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:finish>
+          <span>{{finish?finish:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:onLine>
+          <span>{{onLine?onLine:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:explain>
+          <span>{{explain?explain:"yyyy-mm-dd"}}</span>
+        </template>
+      </das-board>
+    </div>
+</template>
+
+<script>
+import dasBoard from "@/views/dasboard/index";
+export default {
+    components: {
+      dasBoard
+    },
+    data() {
+        return {
+          plan: "2019-08",
+          finish: "2019-08",
+          onLine: "2019-08",
+          explain: "建筑楼层管理"
+        }
+    },
+    mounted() {}
+}
+</script>

src/views/project_setting/collection_setting/index.vue → src/views/ready/collectsetting/index.vue


+ 36 - 0
src/views/relation/maintain/index.vue

@@ -0,0 +1,36 @@
+<template>
+    <div>
+      <das-board>
+        <template v-slot:plan>
+          <span>{{plan?plan:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:finish>
+          <span>{{finish?finish:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:onLine>
+          <span>{{onLine?onLine:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:explain>
+          <span>{{explain?explain:"yyyy-mm-dd"}}</span>
+        </template>
+      </das-board>
+    </div>
+</template>
+
+<script>
+import dasBoard from "@/views/dasboard/index";
+export default {
+    components: {
+      dasBoard
+    },
+    data() {
+        return {
+          plan: "2019-10-30",
+          finish: "2019-10-30",
+          onLine: "2019-10-30",
+          explain: "各种关系的展示和维护"
+        }
+    },
+    mounted() {}
+}
+</script>

+ 36 - 0
src/views/relation/overview/index.vue

@@ -0,0 +1,36 @@
+<template>
+    <div>
+      <das-board>
+        <template v-slot:plan>
+          <span>{{plan?plan:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:finish>
+          <span>{{finish?finish:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:onLine>
+          <span>{{onLine?onLine:"yyyy-mm-dd"}}</span>
+        </template>
+        <template v-slot:explain>
+          <span>{{explain?explain:"yyyy-mm-dd"}}</span>
+        </template>
+      </das-board>
+    </div>
+</template>
+
+<script>
+import dasBoard from "@/views/dasboard/index";
+export default {
+    components: {
+      dasBoard
+    },
+    data() {
+        return {
+          plan: "2019-10-30",
+          finish: "2019-10-30",
+          onLine: "2019-10-30",
+          explain: "所有关系的检索查看以及维护(查看方式包含:列表,平面图,拓扑图等)"
+        }
+    },
+    mounted() {}
+}
+</script>