zhangyu 5 years ago
parent
commit
675e8abb5a
41 changed files with 787 additions and 1028 deletions
  1. 1 1
      index.html
  2. 1 1
      src/api/framework.js
  3. 9 149
      src/assets/style/iconfont/iconfont.css
  4. BIN
      src/assets/style/iconfont/iconfont.eot
  5. 2 107
      src/assets/style/iconfont/iconfont.svg
  6. BIN
      src/assets/style/iconfont/iconfont.ttf
  7. BIN
      src/assets/style/iconfont/iconfont.woff
  8. 2 2
      src/assets/style/style.scss
  9. 1 1
      src/components/business_space/business/handsontable.vue
  10. 1 1
      src/components/business_space/graphy/business.vue
  11. 1 1
      src/components/config_point/data_origin.vue
  12. 1 1
      src/components/config_point/examine_main.vue
  13. 1 1
      src/components/config_point/find_keyword.vue
  14. 1 1
      src/components/config_point/select_one.vue
  15. 1 1
      src/components/config_point/step3_point/3_temps.vue
  16. 2 2
      src/components/ledger/handsontables/assets.vue
  17. 2 2
      src/components/ledger/handsontables/device.vue
  18. 2 2
      src/components/ledger/handsontables/system.vue
  19. 402 393
      src/data/menus.js
  20. 321 336
      src/data/test.js
  21. 12 6
      src/framework/layout/PageSidebar.vue
  22. 2 0
      src/router/system.js
  23. 0 1
      src/utils/handsontable/notShow.js
  24. 1 1
      src/views/data_admin/buildGraphy/graphyCanvas.vue
  25. 2 2
      src/views/data_admin/buildGraphy/graphyTabs.vue
  26. 1 1
      src/views/ledger/cenotelist/cenoteadd/index.vue
  27. 1 1
      src/views/ledger/cenotelist/index.vue
  28. 1 1
      src/views/ledger/facility/addfacility.vue
  29. 1 1
      src/views/ledger/facility/parts/index.vue
  30. 1 1
      src/views/ledger/facility/partsmanage/addparts/index.vue
  31. 1 1
      src/views/ledger/facility/partsmanage/index.vue
  32. 4 1
      src/views/ledger/property/addproperty.vue
  33. 1 1
      src/views/ledger/system/addsystem.vue
  34. 1 1
      src/views/point/config_point/index.vue
  35. 1 1
      src/views/point/config_point/steps/step1.vue
  36. 1 1
      src/views/point/config_point/steps/step2.vue
  37. 1 1
      src/views/point/config_point/steps/step3.vue
  38. 1 1
      src/views/project_setting/collection_setting/index.vue
  39. 1 1
      src/views/rent/rentlist/index.vue
  40. 1 1
      src/views/rent/rentlist/rentadd/index.vue
  41. 1 1
      src/views/rent/rentlist/rentadd/index_1.vue

+ 1 - 1
index.html

@@ -4,7 +4,7 @@
 <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
-    <link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/font_1112731_tq1523n9oo.css">
+    <link rel="stylesheet" type="text/css" href="//at.alicdn.com/t/font_1318214_i7toym6dora.css">
     <title>sagacloud-admin</title>
 </head>
 

+ 1 - 1
src/api/framework.js

@@ -11,7 +11,7 @@ function toLogin() {
 }
 
 function checkMenu(menu, ps) {
-    let result = { name: menu.name, icon: menu.icon, path: menu.path }
+    let result = { name: menu.name, icon: menu.icon, path: menu.path, disabled: menu.disabled }
     if (menu.children) {
         // 如果有下级菜单权限,则自动拥有上级菜单权限
         result.children = []

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


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


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


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


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


+ 2 - 2
src/assets/style/style.scss

@@ -1,8 +1,8 @@
-.iconwushuju {
+.icon-wushuju {
     display: block;
     width: 100px;
     height: 100px;
-    font-size: 50px;
+    font-size: 50px !important;
     margin: auto;
 }
 

+ 1 - 1
src/components/business_space/business/handsontable.vue

@@ -13,7 +13,7 @@
     </el-row>
     <div v-show="main &&main.length" :id="id"></div>
     <div class="center" v-show="!main || !main.length" style="height: 400px;padding-top:140px;box-sizing:border-box;">
-      <i class="iconwushuju iconfont"></i>
+      <i class="icon-wushuju iconfont"></i>
       暂无数据
     </div>
     <!-- <add-business :buildMess="buildMess" :dialog="dialog"></add-business> -->

+ 1 - 1
src/components/business_space/graphy/business.vue

@@ -89,7 +89,7 @@
       class="center"
       style="height: 400px;padding-top:200px;box-sizing:border-box;"
     >
-        <i class="iconwushuju iconfont"></i>
+        <i class="icon-wushuju iconfont"></i>
         {{!!buildMess ? '请初始化平面图' : '请选择楼层'}}
     </div>
     <el-dialog title="提示" :visible.sync="dialogVisible" :before-close="clearDimension" width="30%">

+ 1 - 1
src/components/config_point/data_origin.vue

@@ -10,7 +10,7 @@
         <div class="doughnut-view">
             <doughnut v-if="renderData.Sum" type="type" width="200" height="200" :sum="renderData.Sum" :name="renderData.Name" :renderData="echartsData" :id="id"></doughnut>
             <div v-else class="center">
-                <i class="iconwushuju iconfont"></i>
+                <i class="icon-wushuju iconfont"></i>
                 暂无数据
             </div>
         </div>

+ 1 - 1
src/components/config_point/examine_main.vue

@@ -17,7 +17,7 @@
                 </div>
             </div>
             <div v-else class="center">
-                <i class="iconwushuju iconfont"></i>
+                <i class="icon-wushuju iconfont"></i>
                 暂无数据
             </div>
         </div>

+ 1 - 1
src/components/config_point/find_keyword.vue

@@ -26,7 +26,7 @@
             <div class="left-view saga-border">
                 <doughnut v-if="!!sum" :sum="sum" type="left" :name="dataName" width="200" height="200" :renderData="echartsData"></doughnut>
                 <div v-else class="center">
-                    <i class="iconwushuju iconfont"></i>
+                    <i class="icon-wushuju iconfont"></i>
                     暂无数据
                 </div>
             </div>

+ 1 - 1
src/components/config_point/select_one.vue

@@ -22,7 +22,7 @@
             </li>
         </ul>
         <div v-else class="center" style="padding-top: 50px;box-sizing:border-box;">
-            <i class="iconwushuju iconfont"></i> 暂无数据
+            <i class="icon-wushuju iconfont"></i> 暂无数据
         </div>
     </div>
 </template>

+ 1 - 1
src/components/config_point/step3_point/3_temps.vue

@@ -59,7 +59,7 @@
         <handsontable-component ref="handsontable"></handsontable-component>
       </div>
       <div v-if="!renderData.length" class="center" style="padding: 50px 0;box-sizing:border-box;">
-        <i class="iconwushuju iconfont"></i> 暂无数据
+        <i class="icon-wushuju iconfont"></i> 暂无数据
       </div>
       <div class="center">
         <el-button @click="undo">上一步</el-button>

+ 2 - 2
src/components/ledger/handsontables/assets.vue

@@ -29,13 +29,13 @@
     <pic-dialog :read="onlyRead ? true : false" :dialog="myDialog" :keysArr="picsArr" @change="changePics" ></pic-dialog>
     <div class="center middle_sty" style="height: 91%" v-show="!mess.deviceId && (!tableData || !tableData.length)">
         <p>
-          <i class="iconwushuju iconfont"></i>
+          <i class="icon-wushuju iconfont"></i>
         请选择设备族
         </p>
     </div>
     <div class="center middle_sty" style="height: 91%" v-show="mess.deviceId && (!tableData || !tableData.length)">
         <p>
-          <i class="iconwushuju iconfont"></i>
+          <i class="icon-wushuju iconfont"></i>
         暂无数据
         </p>
     </div>

+ 2 - 2
src/components/ledger/handsontables/device.vue

@@ -36,14 +36,14 @@
     <pic-dialog :read="onlyRead ? true : false" :dialog="myDialog" :keysArr="picsArr" @change="changePics"></pic-dialog>
     <div class=" middle_sty" style="height: 91%; text-align:center" v-show="!mess.deviceId && (!tableData || !tableData.length)">
       <p>
-        <i class="iconwushuju iconfont"></i>
+        <i class="icon-wushuju iconfont"></i>
         请选择设备族
       </p>
     </div>
 
     <div class="center middle_sty" style="height: 91%" v-show="mess.deviceId && (!tableData || !tableData.length)">
       <p>
-        <i class="iconwushuju iconfont"></i>
+        <i class="icon-wushuju iconfont"></i>
         暂无数据
       </p>
     </div>

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

@@ -19,10 +19,10 @@
     <upload-img-dialog @changeFile="imgChange" :keysArr="imgsArr" :dialog="myDialog"></upload-img-dialog>
     <pic-dialog :dialog="myDialog" :keysArr="picsArr" @change="changePics"></pic-dialog>
     <div class="center middle_sty" style="height: 91%" v-show="!mess.deviceId && (!tableData || !tableData.length)">
-      <p><i class="iconwushuju iconfont"></i>请选择系统类型</p>
+      <p><i class="icon-wushuju iconfont"></i>请选择系统类型</p>
     </div>
     <div class="center middle_sty" style="height: 91%" v-show="mess.deviceId && (!tableData || !tableData.length)">
-      <p><i class="iconwushuju iconfont"></i>暂无数据</p>
+      <p><i class="icon-wushuju iconfont"></i>暂无数据</p>
     </div>
     <div v-show="mess.deviceId && tableData && tableData.length" v-loading="loading" id="handsontable" ref="handsontable"></div>
     <div v-show="mess.deviceId && tableData && tableData.length" class="right">

+ 402 - 393
src/data/menus.js

@@ -1,394 +1,403 @@
-export default [    
-    //数字化交付相关
-    {
-        path: '/projgroup',
-        name: '数字化交付相关',
-        disabled: true,
-    },
-    // 项目化配置
-    {
-        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: '/model',
-        name: '模型管理',
-        icon: 'el-icon-fa-bank',
-        children: [
-            {
-                path: '/model/file',
-                name: '模型文件管理',
-                icon: 'el-icon-fa-user',
-                opts: [
-                    {
-                        name: '查看',
-                        basic: true,
-                        permission: 'system:role:query'
-                    }
-                ]
-            }, {
-                path: '/model/noentity',
-                name: '未实体化模型清单',
-                icon: 'el-icon-fa-user',
-                opts: [
-                    {
-                        name: '查看',
-                        basic: true,
-                        permission: 'system:role:query'
-                    }
-                ]
-            }, {
-                path: '/model/beforemodel',
-                name: '待建模清单',
-                icon: 'el-icon-fa-user',
-                opts: [
-                    {
-                        name: '查看',
-                        basic: true,
-                        permission: 'system:role:query'
-                    }
-                ]
-            }, {
-                path: '/model/modelrule',
-                name: '拓扑检查',
-                icon: 'el-icon-fa-user',
-                opts: [
-                    {
-                        name: '查看',
-                        basic: true,
-                        permission: 'system:role:query'
-                    }
-                ]
-            }, {
-                path: '/model/beacon',
-                name: '信标清单',
-                icon: 'el-icon-fa-user',
-                opts: [
-                    {
-                        name: '查看',
-                        basic: true,
-                        permission: 'system:role:query'
-                    }
-                ]
-            }
-        ]
-    },
-        // 系统集成
-        {
-            path: '/point',
-            name: '系统集成',
-            icon: 'el-icon-fa-bank',
-            children: [
-                {
-                    path: '/point/pointsetting',
-                    name: '点位表配置工具',
-                    icon: 'el-icon-fa-user',
-                    opts: [
-                        {
-                            name: '查看',
-                            basic: true,
-                            permission: 'system:role:query'
-                        }
-                    ]
-                }, {
-                    path: '/point/dynamicdata',
-                    name: '动态数据关联',
-                    icon: 'el-icon-fa-user',
-                    opts: [
-                        {
-                            name: '查看',
-                            basic: true,
-                            permission: 'system:role:query'
-                        }
-                    ]
-                }
-            ]
-        },
-    //扫楼作业
-    {
-        path: '/floor',
-        name: '扫楼作业',
-        icon: 'el-icon-fa-bank',
-        children: [
-            {
-                path: '/floor/data',
-                name: '扫楼数据管理',
-                icon: 'el-icon-fa-user',
-                opts: [
-                    {
-                        name: '查看',
-                        basic: true,
-                        permission: 'system:role:query'
-                    }
-                ]
-            },
-            {
-                path: '/floor/plan',
-                name: '楼层平面图管理',
-                icon: 'el-icon-fa-user',
-                opts: [
-                    {
-                        name: '查看',
-                        basic: true,
-                        permission: 'system:role:query'
-                    }
-                ]
-            },
-            {
-                path: '/floor/abnormalprop',
-                name: '异常资产清单',
-                icon: 'el-icon-fa-user',
-                opts: [
-                    {
-                        name: '查看',
-                        basic: true,
-                        permission: 'system:role:query'
-                    }
-                ]
-            },
-            {
-                path: '/floor/log',
-                name: '扫楼日志查看',
-                icon: 'el-icon-fa-user',
-                opts: [
-                    {
-                        name: '查看',
-                        basic: true,
-                        permission: 'system:role:query'
-                    }
-                ]
-            }
-        ]
-    },
-        //台账管理
-        {
-            path: '/ledger',
-            name: '台账管理',
-            icon: 'el-icon-fa-bank',
-            children: [
-                {
-                    path: '/ledger/facility',
-                    name: '设备清单',
-                    icon: 'el-icon-fa-user',
-                    opts: [
-                        {
-                            name: '查看',
-                            basic: true,
-                            permission: 'system:role:query'
-                        }
-                    ]
-                },
-                {
-                    path: '/ledger/property',
-                    name: '资产清单',
-                    icon: 'el-icon-fa-user',
-                    opts: [
-                        {
-                            name: '查看',
-                            basic: true,
-                            permission: 'system:role:query'
-                        }
-                    ]
-                },
-                {
-                    path: '/ledger/cenotelist',
-                    name: '竖井清单',
-                    icon: 'el-icon-fa-user',
-                    opts: [
-                        {
-                            name: '查看',
-                            basic: true,
-                            permission: 'system:role:query'
-                        }
-                    ]
-                },
-                {
-                    path: '/ledger/dimension',
-                    name: '元空间管理',
-                    icon: 'el-icon-fa-user',
-                    opts: [
-                        {
-                            name: '查看',
-                            basic: true,
-                            permission: 'system:role:query'
-                        }
-                    ]
-                }, 
-                {
-                    path: '/ledger/rubbish',
-                    name: '垃圾数据检查',
-                    icon: 'el-icon-fa-user',
-                    opts: [
-                        {
-                            name: '查看',
-                            basic: true,
-                            permission: 'system:role:query'
-                        }
-                    ]
-                }, 
-                {
-                    path: '/ledger/updowncheck',
-                    name: '上下级关系检查',
-                    icon: 'el-icon-fa-user',
-                    opts: [
-                        {
-                            name: '查看',
-                            basic: true,
-                            permission: 'system:role:query'
-                        }
-                    ]
-                }                
-                
-            ]
-        },
-    //业务相关
-    {
-        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: '/ren',
-                //     name: '二级页面',
-                //     icon: 'el-icon-fa-user',
-                //     children: [
-                //         {
-                //             path: '/fewfewgf',
-                //             name: '三级页面1-1',
-                //             icon: '',
-                //             opts: [
-                //                 {
-                //                     name: '查看',
-                //                     basic: true,
-                //                     permission: 'system:role:query'
-                //                 }
-                //             ]
-                //         },
-                //         {
-                //             path: '/ledger/cenoteadd',
-                //             name: '三级页面1-2',
-                //             icon: '',
-                //             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'
-                        }
-                    ]
-                },
-            ]
-        },
-   
+export default [
+	/******************** 平台管理 ***************************/
+	{
+		path: '/platform',
+		name: '平台管理',
+		disabled: true,
+	},
+	// 项目管理
+	{
+		path: '/platform/project',
+		name: '项目管理',
+		icon: ''
+	},
+	// 人员管理
+	{
+		path: '/platform/user',
+		name: '人员管理',
+		icon: '',
+		opts: [{
+			name: '查看',
+			basic: true,
+			permission: 'system:user:query'
+		}]
+	},
+	// 角色管理
+	{
+		path: '/platform/role',
+		name: '角色管理',
+		icon: '',
+		opts: [{
+			name: '查看',
+			basic: true,
+			permission: 'system:role:query'
+		}]
+	},
+	/******************** 前期准备 ***************************/
+	{
+		path: '/ready',
+		name: '前期准备',
+		disabled: true,
+	},
+	// 建筑楼层管理
+	{
+		path: '/ready/buildfloor',
+		name: '建筑楼层管理',
+		icon: ''
+	},
+	// 需采集的信息点
+	{
+		path: '/ready/collectsetting',
+		name: '需采集的信息点',
+		icon: ''
+	},
+	// 扫楼App用户管理
+	{
+		path: '/ready/appuser',
+		name: '扫楼App用户管理',
+		icon: ''
+	},
+	/******************** 信息收集 ***************************/
+	{
+		path: '/information',
+		name: '信息收集',
+		disabled: true,
+	},
+	// 模型管理
+	{
+		path: '/model',
+		name: '模型管理',
+		icon: '',
+		children: [{
+			path: '/model/file',
+			name: '模型文件管理',
+			icon: '',
+			opts: [{
+				name: '查看',
+				basic: true,
+				permission: 'system:role:query'
+			}]
+		}, {
+			path: '/model/report',
+			name: '模型质量报告',
+			icon: '',
+			opts: [{
+				name: '查看',
+				basic: true,
+				permission: 'system:role:query'
+			}]
+		}]
+	},
+	// 系统集成
+	{
+		path: '/point',
+		name: '系统集成',
+		icon: '',
+		children: [{
+			path: '/point/pointsetting',
+			name: '子系统点表整理工具',
+			icon: '',
+			opts: [{
+				name: '查看',
+				basic: true,
+				permission: 'system:role:query'
+			}]
+		}, {
+			path: '/point/dynamicdata',
+			name: '配置动参从点位取值',
+			icon: '',
+			opts: [{
+				name: '查看',
+				basic: true,
+				permission: 'system:role:query'
+			}]
+		}, {
+			path: '/point/objectdata',
+			name: '配置动参从对象取值',
+			icon: '',
+			opts: [{
+				name: '查看',
+				basic: true,
+				permission: 'system:role:query'
+			}]
+		}, {
+			path: '/point/number',
+			name: '表号功能号总览',
+			icon: '',
+			opts: [{
+				name: '查看',
+				basic: true,
+				permission: 'system:role:query'
+			}]
+		}, {
+			path: '/point/report',
+			name: '系统集成报告',
+			icon: '',
+			opts: [{
+				name: '查看',
+				basic: true,
+				permission: 'system:role:query'
+			}]
+		}]
+	},
+	// 扫楼作业
+	{
+		path: '/floor',
+		name: '扫楼作业',
+		icon: '',
+		children: [{
+			path: '/floor/task',
+			name: '现场任务管理',
+			icon: '',
+			opts: [{
+				name: '查看',
+				basic: true,
+				permission: 'system:role:query'
+			}]
+		},{
+			path: '/floor',
+			name: '现场数据整理',
+			icon: '',
+			children: [ {
+				path: '/floor/data',
+				name: '信息点整理',
+				icon: '',
+				opts: [{
+					name: '查看',
+					basic: true,
+					permission: 'system:role:query'
+				}]
+			},
+			{
+				path: '/floor/plan',
+				name: '位置标签整理',
+				icon: '',
+				opts: [{
+					name: '查看',
+					basic: true,
+					permission: 'system:role:query'
+				}]
+			}]
+		}, {
+			path: '/floor/abnormalprop',
+			name: '扫楼报告',
+			icon: '',
+			opts: [{
+				name: '查看',
+				basic: true,
+				permission: 'system:role:query'
+			}]
+		}, {
+			path: '/floor/log',
+			name: '扫楼日志查看',
+			icon: 'el-icon-fa-user',
+			opts: [{
+				name: '查看',
+				basic: true,
+				permission: 'system:role:query'
+			}]
+		}]
+	},
+	// 台账管理
+	{
+		path: '/ledger',
+		name: '台账管理',
+		icon: '',
+		children: [{
+			path: '/ledger/facility',
+			name: '设备台账',
+			icon: '',
+			opts: [{
+				name: '查看',
+				basic: true,
+				permission: 'system:role:query'
+			}]
+		}, {
+			path: '/ledger/property',
+			name: '资产台账',
+			icon: '',
+			opts: [{
+				name: '查看',
+				basic: true,
+				permission: 'system:role:query'
+			}]
+		}, {
+			path: '/ledger/list',
+			name: '系统台账',
+			icon: '',
+			opts: [{
+				name: '查看',
+				basic: true,
+				permission: 'system:role:query'
+			}]
+		}, {
+			path: '/ledger/spacelist',
+			name: '业务空间台账',
+			icon: '',
+			opts: [{
+				name: '查看',
+				basic: true,
+				permission: 'system:role:query'
+			}]
+		}, {
+				path: '/ledger/cenotelist',
+				name: '竖井台账',
+				icon: '',
+				opts: [{
+					name: '查看',
+					basic: true,
+					permission: 'system:role:query'
+				}]
+		},{
+			path: '/ledger/rentlist',
+			name: '租户台账',
+			icon: '',
+			opts: [{
+				name: '查看',
+				basic: true,
+				permission: 'system:role:query'
+			}]
+		}, {
+			path: '/ledger/datareport',
+			name: '数据质量报告',
+			icon: '',
+			opts: [{
+				name: '查看',
+				basic: true,
+				permission: 'system:role:query'
+			}]
+		}]
+	},
+	/******************** 关系维护并计算 ***************************/
+	{
+		path: '/relation',
+		name: '关系维护并计算',
+		disabled: true,
+	},
+	// 关系维护
+	{
+		path: '/platform/user',
+		name: '关系维护',
+		icon: '',
+		opts: [{
+			name: '查看',
+			basic: true,
+			permission: 'system:user:query'
+		}]
+	},
+	// 全部关系总览
+	{
+		path: '/platform/role',
+		name: '全部关系总览',
+		icon: '',
+		opts: [{
+			name: '查看',
+			basic: true,
+			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: '/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'
+	// 				}]
+	// 		}, ]
+	// },
+
 ]

+ 321 - 336
src/data/test.js

@@ -1,98 +1,28 @@
-export default [
-    //平台管理
+export default [    
+    //数字化交付相关
     {
-        path: '/platform',
-        name: '平台管理',
+        path: '/projgroup',
+        name: '数字化交付相关',
         disabled: true,
     },
-    // 项目管理
-    {
-        path: '/projectadm',
-        name: '平台管理',
-        icon: 'el-icon-fa-bank',
-        children: [{
-                path: '/platform/project',
-                name: '项目管理',
-                icon: 'el-icon-fa-user',
-                opts: [{
-                    name: '查看',
-                    basic: true,
-                    permission: 'system:role:query'
-                }]
-            },
-            {
-                path: '/platform/personnel',
-                name: '人员管理',
-                icon: 'el-icon-fa-user',
-                opts: [{
-                    name: '查看',
-                    basic: true,
-                    permission: 'system:role:query'
-                }]
-            },
-            {
-                path: '/platform/role',
-                name: '角色管理',
-                icon: 'el-icon-fa-user',
-                opts: [{
-                    name: '查看',
-                    basic: true,
-                    permission: 'system:role:query'
-                }]
-            }
-        ]
-    },
-    // 前期准备
-    {
-        path: '/ready',
-        name: '平台管理',
-        icon: 'el-icon-fa-bank',
-        children: [{
-                path: '/platform/project',
-                name: '项目管理',
-                icon: 'el-icon-fa-user',
-                opts: [{
-                    name: '查看',
-                    basic: true,
-                    permission: 'system:role:query'
-                }]
-            },
-            {
-                path: '/platform/personnel',
-                name: '人员管理',
-                icon: 'el-icon-fa-user',
-                opts: [{
-                    name: '查看',
-                    basic: true,
-                    permission: 'system:role:query'
-                }]
-            },
-            {
-                path: '/platform/role',
-                name: '角色管理',
-                icon: 'el-icon-fa-user',
-                opts: [{
-                    name: '查看',
-                    basic: true,
-                    permission: 'system:role:query'
-                }]
-            }
-        ]
-    },
+    // 项目化配置
     {
         path: '/proj',
         name: '项目基础设置',
         icon: 'el-icon-fa-bank',
-        children: [{
+        children: [           
+            {
                 path: '/proj/collectsetting',
                 name: '项目需采集的信息点',
                 icon: 'el-icon-fa-user',
-                opts: [{
-                    name: '查看',
-                    basic: true,
-                    permission: 'system:role:query'
-                }]
-            },
+                opts: [
+                    {
+                        name: '查看',
+                        basic: true,
+                        permission: 'system:role:query'
+                    }
+                ]
+            }, 
             // {
             //     path: '/proj/custominfo',
             //     name: '自定义信息点',
@@ -109,21 +39,25 @@ export default [
                 path: '/proj/floorinfo',
                 name: '楼层信息管理',
                 icon: 'el-icon-fa-user',
-                opts: [{
-                    name: '查看',
-                    basic: true,
-                    permission: 'system:role:query'
-                }]
+                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'
-                }]
+                opts: [
+                    {
+                        name: '查看',
+                        basic: true,
+                        permission: 'system:role:query'
+                    }
+                ]
             }
         ]
     },
@@ -132,278 +66,329 @@ export default [
         path: '/model',
         name: '模型管理',
         icon: 'el-icon-fa-bank',
-        children: [{
-            path: '/model/file',
-            name: '模型文件管理',
-            icon: 'el-icon-fa-user',
-            opts: [{
-                name: '查看',
-                basic: true,
-                permission: 'system:role:query'
-            }]
-        }, {
-            path: '/model/noentity',
-            name: '未实体化模型清单',
-            icon: 'el-icon-fa-user',
-            opts: [{
-                name: '查看',
-                basic: true,
-                permission: 'system:role:query'
-            }]
-        }, {
-            path: '/model/beforemodel',
-            name: '待建模清单',
-            icon: 'el-icon-fa-user',
-            opts: [{
-                name: '查看',
-                basic: true,
-                permission: 'system:role:query'
-            }]
-        }, {
-            path: '/model/modelrule',
-            name: '拓扑检查',
-            icon: 'el-icon-fa-user',
-            opts: [{
-                name: '查看',
-                basic: true,
-                permission: 'system:role:query'
-            }]
-        }, {
-            path: '/model/beacon',
-            name: '信标清单',
-            icon: 'el-icon-fa-user',
-            opts: [{
-                name: '查看',
-                basic: true,
-                permission: 'system:role:query'
-            }]
-        }]
-    },
-    // 系统集成
-    {
-        path: '/point',
-        name: '系统集成',
-        icon: 'el-icon-fa-bank',
-        children: [{
-            path: '/point/pointsetting',
-            name: '点位表配置工具',
-            icon: 'el-icon-fa-user',
-            opts: [{
-                name: '查看',
-                basic: true,
-                permission: 'system:role:query'
-            }]
-        }, {
-            path: '/point/dynamicdata',
-            name: '动态数据关联',
-            icon: 'el-icon-fa-user',
-            opts: [{
-                name: '查看',
-                basic: true,
-                permission: 'system:role:query'
-            }]
-        }]
+        children: [
+            {
+                path: '/model/file',
+                name: '模型文件管理',
+                icon: 'el-icon-fa-user',
+                opts: [
+                    {
+                        name: '查看',
+                        basic: true,
+                        permission: 'system:role:query'
+                    }
+                ]
+            }, {
+                path: '/model/noentity',
+                name: '未实体化模型清单',
+                icon: 'el-icon-fa-user',
+                opts: [
+                    {
+                        name: '查看',
+                        basic: true,
+                        permission: 'system:role:query'
+                    }
+                ]
+            }, {
+                path: '/model/beforemodel',
+                name: '待建模清单',
+                icon: 'el-icon-fa-user',
+                opts: [
+                    {
+                        name: '查看',
+                        basic: true,
+                        permission: 'system:role:query'
+                    }
+                ]
+            }, {
+                path: '/model/modelrule',
+                name: '拓扑检查',
+                icon: 'el-icon-fa-user',
+                opts: [
+                    {
+                        name: '查看',
+                        basic: true,
+                        permission: 'system:role:query'
+                    }
+                ]
+            }, {
+                path: '/model/beacon',
+                name: '信标清单',
+                icon: 'el-icon-fa-user',
+                opts: [
+                    {
+                        name: '查看',
+                        basic: true,
+                        permission: 'system:role:query'
+                    }
+                ]
+            }
+        ]
     },
+        // 系统集成
+        {
+            path: '/point',
+            name: '系统集成',
+            icon: 'el-icon-fa-bank',
+            children: [
+                {
+                    path: '/point/pointsetting',
+                    name: '点位表配置工具',
+                    icon: 'el-icon-fa-user',
+                    opts: [
+                        {
+                            name: '查看',
+                            basic: true,
+                            permission: 'system:role:query'
+                        }
+                    ]
+                }, {
+                    path: '/point/dynamicdata',
+                    name: '动态数据关联',
+                    icon: 'el-icon-fa-user',
+                    opts: [
+                        {
+                            name: '查看',
+                            basic: true,
+                            permission: 'system:role:query'
+                        }
+                    ]
+                }
+            ]
+        },
     //扫楼作业
     {
         path: '/floor',
         name: '扫楼作业',
         icon: 'el-icon-fa-bank',
-        children: [{
+        children: [
+            {
                 path: '/floor/data',
                 name: '扫楼数据管理',
                 icon: 'el-icon-fa-user',
-                opts: [{
-                    name: '查看',
-                    basic: true,
-                    permission: 'system:role:query'
-                }]
+                opts: [
+                    {
+                        name: '查看',
+                        basic: true,
+                        permission: 'system:role:query'
+                    }
+                ]
             },
             {
                 path: '/floor/plan',
                 name: '楼层平面图管理',
                 icon: 'el-icon-fa-user',
-                opts: [{
-                    name: '查看',
-                    basic: true,
-                    permission: 'system:role:query'
-                }]
+                opts: [
+                    {
+                        name: '查看',
+                        basic: true,
+                        permission: 'system:role:query'
+                    }
+                ]
             },
             {
                 path: '/floor/abnormalprop',
                 name: '异常资产清单',
                 icon: 'el-icon-fa-user',
-                opts: [{
-                    name: '查看',
-                    basic: true,
-                    permission: 'system:role:query'
-                }]
+                opts: [
+                    {
+                        name: '查看',
+                        basic: true,
+                        permission: 'system:role:query'
+                    }
+                ]
             },
             {
                 path: '/floor/log',
                 name: '扫楼日志查看',
                 icon: 'el-icon-fa-user',
-                opts: [{
-                    name: '查看',
-                    basic: true,
-                    permission: 'system:role:query'
-                }]
+                opts: [
+                    {
+                        name: '查看',
+                        basic: true,
+                        permission: 'system:role:query'
+                    }
+                ]
             }
         ]
     },
-    //台账管理
-    {
-        path: '/ledger',
-        name: '台账管理',
-        icon: 'el-icon-fa-bank',
-        children: [{
-                path: '/ledger/facility',
-                name: '设备清单',
-                icon: 'el-icon-fa-user',
-                opts: [{
-                    name: '查看',
-                    basic: true,
-                    permission: 'system:role:query'
-                }]
-            },
-            {
-                path: '/ledger/property',
-                name: '资产清单',
-                icon: 'el-icon-fa-user',
-                opts: [{
-                    name: '查看',
-                    basic: true,
-                    permission: 'system:role:query'
-                }]
-            },
-            {
-                path: '/ledger/cenotelist',
-                name: '竖井清单',
-                icon: 'el-icon-fa-user',
-                opts: [{
-                    name: '查看',
-                    basic: true,
-                    permission: 'system:role:query'
-                }]
-            },
-            {
-                path: '/ledger/dimension',
-                name: '元空间管理',
-                icon: 'el-icon-fa-user',
-                opts: [{
-                    name: '查看',
-                    basic: true,
-                    permission: 'system:role:query'
-                }]
-            },
-            {
-                path: '/ledger/rubbish',
-                name: '垃圾数据检查',
-                icon: 'el-icon-fa-user',
-                opts: [{
-                    name: '查看',
-                    basic: true,
-                    permission: 'system:role:query'
-                }]
-            },
-            {
-                path: '/ledger/updowncheck',
-                name: '上下级关系检查',
-                icon: 'el-icon-fa-user',
-                opts: [{
-                    name: '查看',
-                    basic: true,
-                    permission: 'system:role:query'
-                }]
-            }
-
-        ]
-    },
+        //台账管理
+        {
+            path: '/ledger',
+            name: '台账管理',
+            icon: 'el-icon-fa-bank',
+            children: [
+                {
+                    path: '/ledger/facility',
+                    name: '设备清单',
+                    icon: 'el-icon-fa-user',
+                    opts: [
+                        {
+                            name: '查看',
+                            basic: true,
+                            permission: 'system:role:query'
+                        }
+                    ]
+                },
+                {
+                    path: '/ledger/property',
+                    name: '资产清单',
+                    icon: 'el-icon-fa-user',
+                    opts: [
+                        {
+                            name: '查看',
+                            basic: true,
+                            permission: 'system:role:query'
+                        }
+                    ]
+                },
+                {
+                    path: '/ledger/cenotelist',
+                    name: '竖井清单',
+                    icon: 'el-icon-fa-user',
+                    opts: [
+                        {
+                            name: '查看',
+                            basic: true,
+                            permission: 'system:role:query'
+                        }
+                    ]
+                },
+                {
+                    path: '/ledger/dimension',
+                    name: '元空间管理',
+                    icon: 'el-icon-fa-user',
+                    opts: [
+                        {
+                            name: '查看',
+                            basic: true,
+                            permission: 'system:role:query'
+                        }
+                    ]
+                }, 
+                {
+                    path: '/ledger/rubbish',
+                    name: '垃圾数据检查',
+                    icon: 'el-icon-fa-user',
+                    opts: [
+                        {
+                            name: '查看',
+                            basic: true,
+                            permission: 'system:role:query'
+                        }
+                    ]
+                }, 
+                {
+                    path: '/ledger/updowncheck',
+                    name: '上下级关系检查',
+                    icon: 'el-icon-fa-user',
+                    opts: [
+                        {
+                            name: '查看',
+                            basic: true,
+                            permission: 'system:role:query'
+                        }
+                    ]
+                }                
+                
+            ]
+        },
     //业务相关
     {
         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: '/ren',
-            //     name: '二级页面',
-            //     icon: 'el-icon-fa-user',
-            //     children: [
-            //         {
-            //             path: '/fewfewgf',
-            //             name: '三级页面1-1',
-            //             icon: '',
-            //             opts: [
-            //                 {
-            //                     name: '查看',
-            //                     basic: true,
-            //                     permission: 'system:role:query'
-            //                 }
-            //             ]
-            //         },
-            //         {
-            //             path: '/ledger/cenoteadd',
-            //             name: '三级页面1-2',
-            //             icon: '',
-            //             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: '/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: '/ren',
+                //     name: '二级页面',
+                //     icon: 'el-icon-fa-user',
+                //     children: [
+                //         {
+                //             path: '/fewfewgf',
+                //             name: '三级页面1-1',
+                //             icon: '',
+                //             opts: [
+                //                 {
+                //                     name: '查看',
+                //                     basic: true,
+                //                     permission: 'system:role:query'
+                //                 }
+                //             ]
+                //         },
+                //         {
+                //             path: '/ledger/cenoteadd',
+                //             name: '三级页面1-2',
+                //             icon: '',
+                //             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'
+                        }
+                    ]
+                },
+            ]
+        },
+   
 ]

+ 12 - 6
src/framework/layout/PageSidebar.vue

@@ -17,30 +17,30 @@
             <template v-for='menu in menus'>
                 <el-submenu v-if='menu.children' :index='menu.path' :key='menu.path' class='sidebar-menu-submenu'>
                     <template slot='title'>
-                        <i v-if='menu.icon' :class='"el-icon-fa "+ menu.icon'></i>
+                        <i v-if='menu.icon' :class='"iconfont "+ menu.icon'></i>
                         <span>{{menu.name}}</span>
                     </template>
                     <template v-for='submenu in menu.children'>
                         <el-submenu v-if='submenu.children' :index='submenu.path' :key='submenu.path' class='sidebar-menu-submenu'>
                             <template slot='title'>
-                                <i v-if='submenu.icon' :class='"el-icon-fa "+ submenu.icon'></i>
+                                <i v-if='submenu.icon' :class='"iconfont "+ submenu.icon'></i>
                                 <span>{{submenu.name}}</span>
                             </template>
                             <template v-for='threemenu in submenu.children'>
                                 <el-menu-item :index='threemenu.path' :key='threemenu.path' class='sidebar-menu-item'>
-                                    <i v-if='threemenu.icon' :class='"el-icon-fa "+ threemenu.icon'></i>
+                                    <i v-if='threemenu.icon' :class='"iconfont "+ threemenu.icon'></i>
                                     <span slot='title'>{{threemenu.name}}</span>
                                 </el-menu-item>
                             </template>
                         </el-submenu>
                         <el-menu-item v-else :index='submenu.path' :key='submenu.path' class='sidebar-menu-item'>
-                            <i v-if='submenu.icon' :class='"el-icon-fa "+ submenu.icon'></i>
+                            <i v-if='submenu.icon' :class='"iconfont "+ submenu.icon'></i>
                             <span slot='title'>{{submenu.name}}</span>
                         </el-menu-item>
                     </template>
                 </el-submenu>
-                <el-menu-item v-else :index='menu.path' :key='menu.path' class='sidebar-menu-item' disabled>
-                    <i v-if='menu.icon' :class='"el-icon-fa "+ menu.icon'></i>
+                <el-menu-item v-else :index='menu.path' :key='menu.path' class='sidebar-menu-item' :disabled="menu.disabled">
+                    <i v-if='menu.icon' :class='"iconfont "+ menu.icon'></i>
                     <span slot='title'>{{menu.name}}</span>
                 </el-menu-item>
             </template>
@@ -88,4 +88,10 @@ export default {
     components: {}
 }
 </script>
+<style>
+.el-menu-item, .el-submenu__title {
+    height: 46px;
+    line-height: 46px;
+}
+</style>
 

+ 2 - 0
src/router/system.js

@@ -58,6 +58,8 @@ export default [
     //{ path: '/login', name: 'Login', component: Login },
     { path: '/auth', name: 'auth', component: auth },
     { path: '/noUser', name: 'noUser', component: noUser },
+    // 平台管理
+    
     // 系统集成
     {
         path: '/point',

+ 0 - 1
src/utils/handsontable/notShow.js

@@ -314,7 +314,6 @@ const showTools = {
                 }
             }
         })
-        debugger
         return arr
     },
     changeTypes(arr, onlyRead, isWatch, allMess, falg = false, taizhang = false) {

+ 1 - 1
src/views/data_admin/buildGraphy/graphyCanvas.vue

@@ -1,7 +1,7 @@
 <template>
     <div ref="graphyMain" class="canvasGraphy">
         <div v-if="type != 3" class="center" style="height: 400px;padding-top: 315px; box-sizing:border-box;">
-            <i class="iconwushuju iconfont"></i>
+            <i class="icon-wushuju iconfont"></i>
             <p>{{type == 1 ? '请选择楼层' : '当前楼层尚无平面图,请去空间管理根据模型生成'}}</p>
         </div>
         <div style="width:100%;" v-else>

+ 2 - 2
src/views/data_admin/buildGraphy/graphyTabs.vue

@@ -16,7 +16,7 @@ getLocation 定位
                     </div>
                 </div>
                 <div v-if="!pointData.length" class="center" style="height: 400px;padding-top: 260px; box-sizing:border-box;">
-                    <i class="iconwushuju iconfont"></i>
+                    <i class="icon-wushuju iconfont"></i>
                     {{pointParam.FloorId ? "数据为空" : "请选择楼层"}}
                 </div>
       </el-tab-pane>
@@ -34,7 +34,7 @@ getLocation 定位
             </div>
             </div>
             <div v-if="!pointNoData.length" class="center" style="height: 400px;padding-top: 260px; box-sizing:border-box;">
-                <i class="iconwushuju iconfont"></i>
+                <i class="icon-wushuju iconfont"></i>
                 {{pointParam.FloorId ? "数据为空" : "请选择楼层"}}
             </div>
         </el-tab-pane>

+ 1 - 1
src/views/ledger/cenotelist/cenoteadd/index.vue

@@ -10,7 +10,7 @@
     <div class="tableBox">
       <div class="center middle_sty" style="flex:2;" v-show="tableData && !tableData.length">
         <p>
-          <i class="iconwushuju iconfont"></i>
+          <i class="icon-wushuju iconfont"></i>
           暂无数据
         </p>
       </div>

+ 1 - 1
src/views/ledger/cenotelist/index.vue

@@ -18,7 +18,7 @@
     <div class="tableBox">
       <div class="center middle_sty" style="flex:2;" v-show="tableData && !tableData.length">
         <p>
-          <i class="iconwushuju iconfont"></i>
+          <i class="icon-wushuju iconfont"></i>
           暂无数据
         </p>
       </div>

+ 1 - 1
src/views/ledger/facility/addfacility.vue

@@ -17,7 +17,7 @@
     <div class="tableBox">
       <div class="center middle_sty" style="flex:2;" v-show="tableData && !tableData.length">
         <p>
-          <i class="iconwushuju iconfont"></i>
+          <i class="icon-wushuju iconfont"></i>
           暂无数据
         </p>
       </div>

+ 1 - 1
src/views/ledger/facility/parts/index.vue

@@ -19,7 +19,7 @@
     <div class="tableBox">
       <div class="center middle_sty" v-show="tableData && !tableData.length" style="flex:2;">
         <p>
-          <i class="iconwushuju iconfont"></i>
+          <i class="icon-wushuju iconfont"></i>
           暂无数据
         </p>
       </div>

+ 1 - 1
src/views/ledger/facility/partsmanage/addparts/index.vue

@@ -18,7 +18,7 @@
     <div class="tableBox">
       <div class="center middle_sty" style="flex:2;" v-show="tableData && !tableData.length">
         <p>
-          <i class="iconwushuju iconfont"></i>
+          <i class="icon-wushuju iconfont"></i>
           暂无数据
         </p>
       </div>

+ 1 - 1
src/views/ledger/facility/partsmanage/index.vue

@@ -27,7 +27,7 @@
     <div class="tableBox">
       <div class="center middle_sty" v-show="tableData && !tableData.length">
         <p>
-          <i class="iconwushuju iconfont"></i>
+          <i class="icon-wushuju iconfont"></i>
           暂无数据
         </p>
       </div>

+ 4 - 1
src/views/ledger/property/addproperty.vue

@@ -14,7 +14,7 @@
     <div class="tableBox">
       <div class="center middle_sty" style="flex:2;" v-show="tableData && !tableData.length">
         <p>
-          <i class="iconwushuju iconfont"></i>
+          <i class="icon-wushuju iconfont"></i>
           暂无数据
         </p>
       </div>
@@ -195,6 +195,9 @@ export default {
     // 添加行
     handleAddTableRow() {
       let addRowLength = this.addNum
+      for(let i = 0; i < addRowLength; i++){
+        this.tableData.push({})
+      }
       this.initTable()
       this.formaTableData()
     },

+ 1 - 1
src/views/ledger/system/addsystem.vue

@@ -17,7 +17,7 @@
     <div class="tableBox">
       <div class="center middle_sty" style="flex:2;" v-show="tableData && !tableData.length">
         <p>
-          <i class="iconwushuju iconfont"></i>
+          <i class="icon-wushuju iconfont"></i>
           暂无数据
         </p>
       </div>

+ 1 - 1
src/views/point/config_point/index.vue

@@ -18,7 +18,7 @@
                     </data-origin>
                 </div>
                 <div v-if="!list.length" class="center" style="margin-top: 260px;">
-                    <i class="iconwushuju iconfont"></i>
+                    <i class="icon-wushuju iconfont"></i>
                     暂无数据
                 </div>
                 <!-- <div class="disIne saga-list-item margin5 center pointer" @click="addItem">

+ 1 - 1
src/views/point/config_point/steps/step1.vue

@@ -12,7 +12,7 @@
         <div id="handsontableSteps1" class="middle_sty" v-loading="isLoading">
             <handsontable-component v-if="!!allData.length" @delete="delePoint" ref="handsontable" @mouseDown="clickTable" @change="changeHand"></handsontable-component>
             <div v-else class="center">
-                <i class="iconwushuju iconfont"></i>
+                <i class="icon-wushuju iconfont"></i>
                 暂无数据
             </div>
         </div>

+ 1 - 1
src/views/point/config_point/steps/step2.vue

@@ -13,7 +13,7 @@
         <div id="handsontableSteps1" class="middle_sty" v-loading="isLoading">
             <handsontable-component v-if="!!pages.total" @delete="delePoint" @mouseDown="clickTable" @change="changeHand" ref="handsontable"></handsontable-component>
             <div v-else class="center">
-                <i class="iconwushuju iconfont"></i> 暂无数据
+                <i class="icon-wushuju iconfont"></i> 暂无数据
             </div>
         </div>
         <div class="right">

+ 1 - 1
src/views/point/config_point/steps/step3.vue

@@ -8,7 +8,7 @@
         <div id="handsontableSteps1" class="middle_sty" v-loading="isLoading">
             <handsontable-component v-if="pages.total" @mouseDown="clickEdit" ref="handsontable"></handsontable-component>
             <div v-else class="center">
-                <i class="iconwushuju iconfont"></i> 暂无数据
+                <i class="icon-wushuju iconfont"></i> 暂无数据
             </div>
         </div>
         <div v-if="pages.total" class="right">

+ 1 - 1
src/views/project_setting/collection_setting/index.vue

@@ -56,7 +56,7 @@
                     </el-tab-pane>
                 </el-tabs>
                 <div v-else class="center" style="margin-top:260px;">
-                    <i class="iconwushuju iconfont"></i> 请选择设备族
+                    <i class="icon-wushuju iconfont"></i> 请选择设备族
                 </div>
             </div>
         </main>

+ 1 - 1
src/views/rent/rentlist/index.vue

@@ -32,7 +32,7 @@
     <div class="tableBox">
       <div class="center middle_sty" style="flex:2;" v-show="tableData && !tableData.length">
         <p>
-          <i class="iconwushuju iconfont"></i>
+          <i class="icon-wushuju iconfont"></i>
           暂无数据
         </p>
       </div>

+ 1 - 1
src/views/rent/rentlist/rentadd/index.vue

@@ -10,7 +10,7 @@
     <div class="tableBox">
       <div class="center middle_sty" style="flex:2;" v-show="tableData && !tableData.length">
         <p>
-          <i class="iconwushuju iconfont"></i>
+          <i class="icon-wushuju iconfont"></i>
           暂无数据
         </p>
       </div>

+ 1 - 1
src/views/rent/rentlist/rentadd/index_1.vue

@@ -10,7 +10,7 @@
     <div class="tableBox">
       <div class="center middle_sty" style="flex:2;" v-show="tableData && !tableData.length">
         <p>
-          <i class="iconwushuju iconfont"></i>
+          <i class="icon-wushuju iconfont"></i>
           暂无数据
         </p>
       </div>