Ver código fonte

updated 解决readmine#759 readmine#760

GuoYuFu123 5 anos atrás
pai
commit
5b97ed11be

+ 1 - 1
src/components/config_point/step3_edit/index.vue

@@ -88,7 +88,7 @@
                     v-else-if='form.DataRuleType == "需按公式转换"'
                     :formulaHandleShow='formulaHandleShow'
                 ></formula-handle>
-                <split-handle ref='splitHandle' v-else :splitHandleShow='splitHandleShow'></split-handle>
+                <split-handle ref='splitHandle' v-else-if='form.DataRuleType == "需拆分处理"' :splitHandleShow='splitHandleShow'></split-handle>
             </el-form>
             <div class='btn-box'>
                 <el-button type='primary' @click='save'>保存</el-button>

+ 1 - 1
src/components/dialogs/addDialog/dialogDevice.vue

@@ -22,7 +22,7 @@
                 style="width:20px;float:left;display:block;height:20px;cursor: pointer;"
                 @click="changeAssetsFalg"
               >
-                <i class="iconfont icon-xiaolian"></i>
+                <i class="el-icon-fa  el-icon-fa-compass"></i>
               </span>
               <span>当前选择的设备族:{{deviceType.facility}}</span>
               <!-- 增加 -->

+ 102 - 17
src/router/system.js

@@ -84,7 +84,12 @@ export default [
             },
             { path: 'editDataSouce', name: 'editDataSouce', component: editDataSouce },
             { path: 'pointSteps', name: 'pointSteps', component: pointSteps },
-            { path: 'dynamicdata', name: 'dynamicdata', component: Dasboard }
+            {
+                path: 'dynamicdata',
+                name: 'dynamicdata',
+                component: Dasboard,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '系统集成' }, { label: '动态数据关联' }] }
+            }
         ]
     },
     //项目化配置
@@ -94,9 +99,24 @@ export default [
         component: LayoutMain,
         children: [
             { path: '', name: 'Dasboard', component: Dasboard },
-            { path: 'custominfo', name: 'Dasboard', component: Dasboard },
-            { path: 'collectsetting', name: 'collectsetting', component: collectsetting },
-            { path: 'floorinfo', name: 'Dasboard', component: Dasboard }
+            {
+                path: 'custominfo',
+                name: 'Dasboard',
+                component: Dasboard,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置' }, { label: '自定义信息点' }] }
+            },
+            {
+                path: 'collectsetting',
+                name: 'collectsetting',
+                component: collectsetting,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置' }, { label: '项目需采集的信息点' }] }
+            },
+            {
+                path: 'floorinfo',
+                name: 'Dasboard',
+                component: Dasboard,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '项目基础设置' }, { label: '楼层信息管理' }] }
+            }
         ]
     },
     //模型管理
@@ -106,11 +126,36 @@ export default [
         component: LayoutMain,
         children: [
             { path: '', name: 'Dasboard', component: Dasboard },
-            { path: 'file', name: 'Dasboard', component: Dasboard },
-            { path: 'noentity', name: 'collectsetting', component: Dasboard },
-            { path: 'beforemodel', name: 'Dasboard', component: Dasboard },
-            { path: 'modelrule', name: 'Dasboard', component: Dasboard },
-            { path: 'beacon', name: 'Dasboard', component: Dasboard }
+            {
+                path: 'file',
+                name: 'Dasboard',
+                component: Dasboard,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理' }, { label: '模型文件管理' }] }
+            },
+            {
+                path: 'noentity',
+                name: 'collectsetting',
+                component: Dasboard,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理' }, { label: '未实体化模型清单' }] }
+            },
+            {
+                path: 'beforemodel',
+                name: 'Dasboard',
+                component: Dasboard,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理' }, { label: '待建模清单' }] }
+            },
+            {
+                path: 'modelrule',
+                name: 'Dasboard',
+                component: Dasboard,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理' }, { label: '拓扑检查' }] }
+            },
+            {
+                path: 'beacon',
+                name: 'Dasboard',
+                component: Dasboard,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '模型管理' }, { label: '信标清单' }] }
+            }
         ]
     },
     //台账管理
@@ -132,10 +177,30 @@ export default [
                 component: propertyLedger,
                 meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理' }, { label: '资产清单' }] }
             },
-            { path: 'cenotelist', name: 'Dasboard', component: Dasboard },
-            { path: 'dimension', name: 'Dasboard', component: Dasboard },
-            { path: 'rubbish', name: 'Dasboard', component: Dasboard },
-            { path: 'updowncheck', name: 'Dasboard', component: Dasboard }
+            {
+                path: 'cenotelist',
+                name: 'Dasboard',
+                component: Dasboard,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理' }, { label: '竖井清单' }] }
+            },
+            {
+                path: 'dimension',
+                name: 'Dasboard',
+                component: Dasboard,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理' }, { label: '元空间管理' }] }
+            },
+            {
+                path: 'rubbish',
+                name: 'Dasboard',
+                component: Dasboard,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理' }, { label: '垃圾数据检查' }] }
+            },
+            {
+                path: 'updowncheck',
+                name: 'Dasboard',
+                component: Dasboard,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '台账管理' }, { label: '上下级关系检查' }] }
+            }
         ]
     },
     //业务空间管理
@@ -145,7 +210,12 @@ export default [
         component: LayoutMain,
         children: [
             { path: '', name: 'Dasboard', component: Dasboard },
-            { path: 'spacelist', name: 'spacelist', component: spacelist }
+            {
+                path: 'spacelist',
+                name: 'spacelist',
+                component: spacelist,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '业务空间管理' }, { label: '业务空间清单' }] }
+            }
         ]
     },
     //租户管理
@@ -155,7 +225,12 @@ export default [
         component: LayoutMain,
         children: [
             { path: '', name: 'Dasboard', component: Dasboard },
-            { path: 'rentlist', name: 'Dasboard', component: Dasboard }
+            {
+                path: 'rentlist',
+                name: 'Dasboard',
+                component: Dasboard,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '租户管理' }, { label: '租户清单' }] }
+            }
         ]
     },
     //扫楼数据管理
@@ -165,8 +240,18 @@ export default [
         component: LayoutMain,
         children: [
             { path: '', name: 'buildData', component: buildData },
-            { path: 'data', name: 'buildData', component: buildData },
-            { path: 'plan', name: 'buildGraphy', component: buildGraphy },
+            {
+                path: 'data',
+                name: 'buildData',
+                component: buildData,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业' }, { label: '扫楼数据管理' }] }
+            },
+            {
+                path: 'plan',
+                name: 'buildGraphy',
+                component: buildGraphy,
+                meta: { keepAlive: false, breadcrumbs: [{ label: '扫楼作业' }, { label: '楼层平面图管理' }] }
+            },
             {
                 path: 'abnormalprop',
                 name: 'buildAssets',