Explorar el Código

分级导航内容

shaun-sheep hace 4 años
padre
commit
0f4a3ea2fd

+ 3 - 2
public/systemConf.js

@@ -27,7 +27,8 @@ var __systemConf = {
         // TODO: 修改为对应的地址
         // editerUrl: 'http://192.168.200.1:9910/wandaEditer/',
         editerUrl: 'http://192.168.200.89:8081/wandaEditer/',
-        wandaBmGuideUrl: 'http://192.168.200.89:8080/wandaBmGuide',
+        // wandaBmGuideUrl: 'http://192.168.200.89:8080/wandaBmGuide',
+        wandaBmGuideUrl: 'http://192.168.200.100:8080/wandaBmGuide',
     },
 }
-window.__systemConf = __systemConf
+window.__systemConf = __systemConf

+ 6 - 0
src/api/legendLibrary.js

@@ -11,6 +11,12 @@ export function createLegend({
 }) {
     return httputils.postJson(`/serve/topology-wanda/graphElement/create`, postParams)
 }
+// 图例库-新增
+// export function createLegend({
+//     postParams
+// }) {
+//     return httputils.postJson(`/serve/topology-wanda/graphElement/create`, postParams)
+// }
 //图例库-更新
 export function updateLegend({
     postParams

BIN
src/assets/imgs/logo_tu.png


BIN
src/assets/imgs/menu.png


+ 13 - 3
src/views/legendLibrary/addForm.vue

@@ -102,10 +102,8 @@
                     <TreeSelect
                         tipPlace='top'
                         width='200'
-                        class='aaaaa'
                         style=' margin-right:48px;'
-                        :notNull='true'
-                        :returnParentNode='false'
+                        :returnParentNode='true'
                         :isShowAllChoice='true'
                         :choseArea='true'
                         :data='deviceList'
@@ -399,6 +397,18 @@ export default {
         //位置/设备
         treeConfirmDevice(id, info) {
             // this.$set(this.ruleForm, 'InfoLocal', data)
+            let InfoSystem = []
+            let InfoLocal = []
+            for (let i = 0; i < info.length; i++) {
+                let type = info[i]
+                if (type.name.includes('/')) {
+                    InfoLocal.push(type)
+                    this.$set(this.ruleForm, 'InfoLocal', InfoLocal)
+                } else {
+                    InfoSystem.push(type)
+                    this.$set(this.ruleForm, 'InfoSystem', InfoSystem)
+                }
+            }
         },
         focusChange(status) {
             // console.log('focusChange', status)

+ 12 - 12
src/views/legendLibrary/addLegend.vue

@@ -41,9 +41,9 @@ export default {
                 Url: '',
                 LineWidth: '',
                 LineDash: '',
-                InfoTypeId: [] //铺位可视化typeid
-                // InfoLocal: [], //工程信息化位置与设备分类
-                // InfoSystem: [] //工程信息化专业/系统
+                InfoTypeId: [], //铺位可视化typeid
+                InfoLocal: [], //工程信息化位置与设备分类
+                InfoSystem: [] //工程信息化专业/系统
             },
             title: '',
             GraphCategoryId: 'DTXT',
@@ -72,9 +72,9 @@ export default {
                     FillColor: '#ffffff',
                     Color: '#ffffff',
                     Url: '',
-                    InfoTypeId: [] //铺位可视化typeid
-                    // InfoLocal: [], //工程信息化位置与设备分类
-                    // InfoSystem: [] //工程信息化专业/系统
+                    InfoTypeId: [], //铺位可视化typeid
+                    InfoLocal: [], //工程信息化位置与设备分类
+                    InfoSystem: [] //工程信息化专业/系统
                 }
             } else if (title == '添加图例库') {
                 this.dialogVisible = true
@@ -85,9 +85,9 @@ export default {
                     FillColor: '#ffffff',
                     Color: '#ffffff',
                     Url: '',
-                    InfoTypeId: [] //铺位可视化typeid
-                    // InfoLocal: [], //工程信息化位置与设备分类
-                    // InfoSystem: [] //工程信息化专业/系统
+                    InfoTypeId: [], //铺位可视化typeid
+                    InfoLocal: [], //工程信息化位置与设备分类
+                    InfoSystem: [] //工程信息化专业/系统
                 }
             } else if (title == '修改图例库') {
                 this.dialogVisible = true
@@ -112,9 +112,9 @@ export default {
                 FillColor: '#ffffff',
                 Color: '#ffffff',
                 Url: '',
-                InfoTypeId: [] //铺位可视化typeid
-                // InfoLocal: [], //工程信息化位置与设备分类
-                // InfoSystem: [] //工程信息化专业/系统
+                InfoTypeId: [], //铺位可视化typeid
+                InfoLocal: [], //工程信息化位置与设备分类
+                InfoSystem: [] //工程信息化专业/系统
             }
             this.$refs.add.fileList = []
         },

+ 41 - 8
src/views/legendLibrary/index.vue

@@ -1,5 +1,14 @@
 <template>
     <div class='legend-library'>
+        <div class='nav'>
+            <img class='img-menu' src='@/assets/imgs/menu.png' alt />
+            <el-divider direction='vertical'></el-divider>
+            <img class='img-logo' src='@/assets/imgs/logo_tu.png' alt />
+            <span style='color:#1F2329'>万达管理说明书</span>
+            <span class='circular'></span>
+            <span style='color:#1F2329'>图例库管理</span>
+            <i class='el-icon-caret-bottom'></i>
+        </div>
         <div class='legend-library-top'>
             图例库管理
             <span class='library-btn'>
@@ -39,7 +48,7 @@
                         width='280'
                         style='margin:0 12px'
                         :isShowAllChoice='true'
-                        :returnParentNode='true'
+                        :returnParentNode='false'
                         :choseArea='true'
                         :data='deviceList'
                         :hideClear='true'
@@ -345,15 +354,18 @@ export default {
         //位置/设备
         treeConfirmDevice(id, info) {
             // console.log(id, info)
-
-            // id.forEach(i => {
-            //     let id = i.substring(0, 4)
-            //     // 1 位置 2 设备
-            //     if (i[i.length - 1] == 1) {
-            //         this.InfoLocals = id
+            // var a = []
+            // var d = []
+            // for (let i = 0; i < info.length; i++) {
+            //     let type = info[i]
+            //     if (type.name.includes('/')) {
+            //         a.push(type)
             //     } else {
+            //         d.push(type)
             //     }
-            // })
+            // }
+            // console.log('a:', a, 'd:', d)
+
             this.InfoLocals = id
             this.getTableList()
         },
@@ -380,6 +392,27 @@ export default {
     display: flex;
     flex-direction: column;
     height: 100%;
+    .nav {
+        height: 48px;
+        line-height: 48px;
+        width: 100%;
+        background: #fff;
+        margin-left: 17px;
+        .img-menu {
+            margin-right: 9px;
+        }
+        .img-logo {
+            margin: 0 9px;
+        }
+        .circular {
+            display: inline-block;
+            width: 4px;
+            height: 4px;
+            background: rgba(195, 198, 203, 1);
+            border-radius: 50%;
+            margin: 0 8px 3px 8px;
+        }
+    }
     .legend-library-top {
         height: 48px;
         background: rgba(247, 249, 250, 1);

+ 2 - 1
vue.config.js

@@ -18,6 +18,7 @@ module.exports = {
             },
             '/serve': {
                 target: 'http://192.168.200.87:8088',
+                // target: 'http://192.168.200.83:8085',
                 changeOrigin: true,
                 pathRewrite: {
                     '^/serve': '',
@@ -54,4 +55,4 @@ module.exports = {
     outputDir: 'wandaBmGuide',
     // 放置生成的静态资源 (js、css、img、fonts) 的 (相对于 outputDir 的) 目录
     assetsDir: 'static',
-}
+}