zhulizhen1111 4 éve
szülő
commit
7b0bed00bf

+ 58 - 58
src/utils/plugins/components.js

@@ -27,12 +27,12 @@ var system = [
                         {
                             label: "配电室内",
                             id: "GDWB1",
-                            param: { classstructureid: "1592" },
+                            param: { tab_code: "1592" },
                         },
                         {
                             label: "配电室外",
                             id: "GDWB2",
-                            param: { classstructureid: "1593" },
+                            param: { tab_code: "1593" },
                         },
                     ],
                 },
@@ -43,12 +43,12 @@ var system = [
                         {
                             label: "配电室内",
                             id: "GDWX1",
-                            param: { classstructureid: "1592" },
+                            param: { tab_code: "1592" },
                         },
                         {
                             label: "配电室外",
                             id: "GDWX2",
-                            param: { classstructureid: "1593" },
+                            param: { tab_code: "1593" },
                         },
                     ],
                 },
@@ -59,12 +59,12 @@ var system = [
                         {
                             label: "专项维修",
                             id: "GDZW1",
-                            param: { classstructureid: "1592" },
+                            param: { tab_code: "1592" },
                         },
                         {
                             label: "其他事项",
                             id: "GDZW2",
-                            param: { classstructureid: "1593" },
+                            param: { tab_code: "1593" },
                         },
                     ],
                 },
@@ -88,22 +88,22 @@ var system = [
                         {
                             label: "空调系统原理图",
                             id: "NTYL1",
-                            param: { classstructureid: "1572" },
+                            param: { tab_code: "1572" },
                         },
                         {
                             label: "超市空调系统原理图",
                             id: "NTYL2",
-                            param: { classstructureid: "1512" },
+                            param: { tab_code: "1512" },
                         },
                         {
                             label: "分水器支路分布明细",
                             id: "NTYL3",
-                            param: { classstructureid: "1502" },
+                            param: { tab_code: "1502" },
                         },
                         {
                             label: "分水器支路分布图",
                             id: "NTYL4",
-                            param: { classstructureid: "1542" },
+                            param: { tab_code: "1542" },
                         },
                     ],
                 },
@@ -113,12 +113,12 @@ var system = [
                         {
                             label: "冷热源机房内",
                             id: "NTQD1",
-                            param: { classstructureid: "1572" },
+                            param: { tab_code: "nt01" },
                         },
                         {
                             label: "楼层末端",
                             id: "NTQD2",
-                            param: { classstructureid: "1593" },
+                            param: { tab_code: "nt02" },
                         },
                     ],
                     id: "NTQD",
@@ -129,12 +129,12 @@ var system = [
                         {
                             label: "冷源机房内",
                             id: "NTWB1",
-                            param: { classstructureid: "1592" },
+                            param: { tab_code: "1592" },
                         },
                         {
                             label: "冷源机房外",
                             id: "NTWB2",
-                            param: { classstructureid: "1593" },
+                            param: { tab_code: "1593" },
                         },
                     ],
                     id: "NTWB",
@@ -145,12 +145,12 @@ var system = [
                         {
                             label: "冷源机房内",
                             id: "NTWX1",
-                            param: { classstructureid: "1592" },
+                            param: { tab_code: "1592" },
                         },
                         {
                             label: "冷源机房外",
                             id: "NTWX2",
-                            param: { classstructureid: "1593" },
+                            param: { tab_code: "1593" },
                         },
                     ],
                     id: "NTWX",
@@ -161,12 +161,12 @@ var system = [
                         {
                             label: "专项维修",
                             id: "NTZW1",
-                            param: { classstructureid: "1592" },
+                            param: { tab_code: "1592" },
                         },
                         {
                             label: "其他事项",
                             id: "NTZW2",
-                            param: { classstructureid: "1593" },
+                            param: { tab_code: "1593" },
                         },
                     ],
                     id: "NTZW",
@@ -190,17 +190,17 @@ var system = [
                         {
                             label: "消防电系统原理示意图",
                             id: "XFYL1",
-                            param: { classstructureid: "1572" },
+                            param: { tab_code: "1572" },
                         },
                         {
                             label: "消防喷淋系统示意图",
                             id: "XFYL2",
-                            param: { classstructureid: "1552" },
+                            param: { tab_code: "1552" },
                         },
                         {
                             label: "消防窗喷系统示意图",
                             id: "XFYL3",
-                            param: { classstructureid: "1542" },
+                            param: { tab_code: "1542" },
                         },
                         {
                             label: "消防栓系统示意图",
@@ -225,12 +225,12 @@ var system = [
                         {
                             label: "中控室/消防泵房内",
                             id: "XFWB1",
-                            param: { classstructureid: "1573" },
+                            param: { tab_code: "1573" },
                         },
                         {
                             label: "中控室/消防泵房外",
                             id: "XFWB2",
-                            param: { classstructureid: "1572" },
+                            param: { tab_code: "1572" },
                         },
                     ],
                 },
@@ -241,12 +241,12 @@ var system = [
                         {
                             label: "中控室/消防泵房内",
                             id: "XFWX1",
-                            param: { classstructureid: "1573" },
+                            param: { tab_code: "1573" },
                         },
                         {
                             label: "中控室/消防泵房外",
                             id: "XFWX2",
-                            param: { classstructureid: "1572" },
+                            param: { tab_code: "1572" },
                         },
                     ],
                 },
@@ -257,12 +257,12 @@ var system = [
                         {
                             label: "专项维修",
                             id: "XFZW1",
-                            param: { classstructureid: "1576" },
+                            param: { tab_code: "1576" },
                         },
                         {
                             label: "其他事项",
                             id: "XFZW2",
-                            param: { classstructureid: "1572" },
+                            param: { tab_code: "1572" },
                         },
                     ],
                 },
@@ -285,17 +285,17 @@ var system = [
                         {
                             label: "视频监控系统原理图",
                             id: "RDYL1",
-                            param: { classstructureid: "1572" },
+                            param: { tab_code: "1572" },
                         },
                         {
                             label: "门禁管理系统原理图",
                             id: "RDYL2",
-                            param: { classstructureid: "1573" },
+                            param: { tab_code: "rd01" },
                         },
                         {
                             label: "BA楼宇智能化系统原理图",
                             id: "RDYL3",
-                            param: { classstructureid: "1574" },
+                            param: { tab_code: "1574" },
                         },
                     ],
                     id: "RDYL",
@@ -307,17 +307,17 @@ var system = [
                         {
                             label: "BA楼宇智能化",
                             id: "RDQD1",
-                            param: { classstructureid: "1572" },
+                            param: { tab_code: "rd03" },
                         },
                         {
                             label: "门禁管理",
                             id: "RDQD2",
-                            param: { classstructureid: "1622" },
+                            param: { tab_code: "rd01" },
                         },
                         {
                             label: "视频监控",
                             id: "RDQD3",
-                            param: { classstructureid: "1559" },
+                            param: { tab_code: "rd03" },
                         },
                     ],
                 },
@@ -328,12 +328,12 @@ var system = [
                         {
                             label: "慧云机房内",
                             id: "RDWB1",
-                            param: { classstructureid: "1592" },
+                            param: { tab_code: "1592" },
                         },
                         {
                             label: "慧云机房外",
                             id: "RDWB2",
-                            param: { classstructureid: "1593" },
+                            param: { tab_code: "1593" },
                         },
                     ],
                 },
@@ -344,12 +344,12 @@ var system = [
                         {
                             label: "慧云机房内",
                             id: "RDWX1",
-                            param: { classstructureid: "1592" },
+                            param: { tab_code: "1592" },
                         },
                         {
                             label: "慧云机房外",
                             id: "RDWX2",
-                            param: { classstructureid: "1593" },
+                            param: { tab_code: "1593" },
                         },
                     ],
                 },
@@ -360,12 +360,12 @@ var system = [
                         {
                             label: "专项维修",
                             id: "RDZW1",
-                            param: { classstructureid: "1592" },
+                            param: { tab_code: "1592" },
                         },
                         {
                             label: "其他事项",
                             id: "RDZW2",
-                            param: { classstructureid: "1593" },
+                            param: { tab_code: "1593" },
                         },
                     ],
                 },
@@ -389,12 +389,12 @@ var system = [
                         {
                             label: "给水系统原理示意图",
                             id: "GSYL1",
-                            param: { classstructureid: "1572" },
+                            param: { tab_code: "1572" },
                         },
                         {
                             label: "排水系统原理示意图",
                             id: "GSYL2",
-                            param: { classstructureid: "1542" },
+                            param: { tab_code: "1542" },
                         },
                     ],
                 },
@@ -410,12 +410,12 @@ var system = [
                         {
                             label: "给水系统",
                             id: "GSQD1",
-                            param: { classstructureid: "1592" },
+                            param: { tab_code: "1592" },
                         },
                         {
                             label: "排水系统",
                             id: "GSQD2",
-                            param: { classstructureid: "1593" },
+                            param: { tab_code: "1593" },
                         },
                     ],
                 },
@@ -426,12 +426,12 @@ var system = [
                         {
                             label: "给水系统",
                             id: "GSWX1",
-                            param: { classstructureid: "1592" },
+                            param: { tab_code: "1592" },
                         },
                         {
                             label: "排水系统",
                             id: "GSWX2",
-                            param: { classstructureid: "1593" },
+                            param: { tab_code: "1593" },
                         },
                     ],
                 },
@@ -442,17 +442,17 @@ var system = [
                         {
                             label: "给水系统专项维修",
                             id: "GSZW1",
-                            param: { classstructureid: "1592" },
+                            param: { tab_code: "1592" },
                         },
                         {
                             label: "排水系统专项维修",
                             id: "GSZW2",
-                            param: { classstructureid: "1593" },
+                            param: { tab_code: "1593" },
                         },
                         {
                             label: "其他事项",
                             id: "GSZW3",
-                            param: { classstructureid: "1594" },
+                            param: { tab_code: "1594" },
                         },
                     ],
                 },
@@ -475,12 +475,12 @@ var system = [
                         {
                             label: "扶梯原理图",
                             id: "DTYL1",
-                            param: { classstructureid: "1572" },
+                            param: { tab_code: "1572" },
                         },
                         {
                             label: "直梯原理图",
                             id: "DTYL2",
-                            param: { classstructureid: "1072" },
+                            param: { tab_code: "1072" },
                         },
                     ],
                     id: "DTYL",
@@ -548,12 +548,12 @@ var system = [
                         {
                             label: "维保事项",
                             id: "RQWX1",
-                            param: { classstructureid: "1592" },
+                            param: { tab_code: "1592" },
                         },
                         {
                             label: "维修事项",
                             id: "RQWX2",
-                            param: { classstructureid: "1593" },
+                            param: { tab_code: "1593" },
                         },
                     ],
                 },
@@ -564,12 +564,12 @@ var system = [
                         {
                             label: "专项维修",
                             id: "RQZW1",
-                            param: { classstructureid: "1592" },
+                            param: { tab_code: "1592" },
                         },
                         {
                             label: "其他事项",
                             id: "RQZW2",
-                            param: { classstructureid: "1593" },
+                            param: { tab_code: "1593" },
                         },
                     ],
                 },
@@ -616,12 +616,12 @@ var system = [
                         {
                             label: "维保事项",
                             id: "TJWB1",
-                            param: { classstructureid: "1592" },
+                            param: { tab_code: "1592" },
                         },
                         {
                             label: "维修事项",
                             id: "TJWB2",
-                            param: { classstructureid: "1593" },
+                            param: { tab_code: "1593" },
                         },
                     ],
                 },
@@ -632,12 +632,12 @@ var system = [
                         {
                             label: "专项维修",
                             id: "TJZW1",
-                            param: { classstructureid: "1592" },
+                            param: { tab_code: "1592" },
                         },
                         {
                             label: "其他事项",
                             id: "TJZW2",
-                            param: { classstructureid: "1593" },
+                            param: { tab_code: "1593" },
                         },
                     ],
                 },

+ 2 - 2
src/views/equipment/eqDialog.vue

@@ -15,7 +15,7 @@
                         v-for='(value,index) in dialogInfo.children'
                         :key='"u"+index'
                         :label='`${value.label}`'
-                        :name='`${value.param.classstructureid}`'
+                        :name='`${value.param.tab_code}`'
                     >
                         <div v-if='value.id.slice(2,4)=="YL"' style='width:100%;height:600px;overflow:hidden'>
                             <rotation :rotationImg='rotationImg'></rotation>
@@ -60,7 +60,7 @@ export default {
             this.visible = true
             this.dialogInfo = item
             if (Object.keys(this.dialogInfo).length > 0 && this.dialogInfo.children.length > 0) {
-                this.activeName = this.dialogInfo.children[0].param.classstructureid
+                this.activeName = this.dialogInfo.children[0].param.tab_code
             }
         },
         handleClick(tab) {

+ 3 - 3
src/views/equipment/index.vue

@@ -46,7 +46,7 @@ import eqDialog from './eqDialog'
 import bottomLayer from './bottomLayer'
 import editList from '@/components/edit.vue'
 import { system, floors } from '@/utils/plugins/components.js'
-import { getFloorList } from '@/api/public.js'
+// import { getFloorList } from '@/api/public.js'
 import { querySelect, queryTab } from '@/api/public.js'
 export default {
     data() {
@@ -73,7 +73,7 @@ export default {
                 {
                     columnName: { brand: 'brand', manufacturer: 'manufacturer' }, //列名称
                     params: {
-                        // classstructureid: '1572'
+                        // tab_code: '1572'
                     },
                     tableName: 'glsms_asset' //视图名称
                 }
@@ -92,7 +92,7 @@ export default {
             let postParams = [
                 {
                     params: {
-                        classstructureid: '1593'
+                        tab_code: '1593'
                     },
                     tableName: 'glsms_asset' //视图名称
                 }

+ 8 - 1
src/views/equipment/table/eqListTable.vue

@@ -34,7 +34,7 @@
 import Select from '@/components/Select/Select.vue'
 import { queryEquipmentList } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
-
+import { querySelect } from '@/api/public.js'
 export default {
     components: { Select },
     data() {
@@ -63,6 +63,12 @@ export default {
             this.size = size
             this.getList()
         },
+        getSelect() {
+            let postParams = {}
+            querySelect({ postParams }).then(res => {
+                console.log(res)
+            })
+        },
         init() {
             this.floorSelect = []
             if (this.floorsArr.length > 0) {
@@ -102,6 +108,7 @@ export default {
     mounted() {
         this.init()
         this.getList()
+        this.getSelect()
     }
 }
 </script>

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

@@ -23,6 +23,7 @@
                     tipPlace='top'
                     caption='说明书位置:'
                     v-model='position'
+                    multiple
                     :selectdata='positionSelect'
                     :placeholder='"请选择"'
                     style='margin:0 12px'
@@ -59,7 +60,7 @@
                 ></Select>
                 <a-input-search placeholder v-model='keyword' style='width: 192px;height:34px' @search='getTableList' />
             </div>
-            <el-table :data='tableData' style='width: 100%'>
+            <el-table :data='tableData' :border='true' style='width: 100%'>
                 <el-table-column prop='Name' label='图例名称'>
                     <template slot-scope='{row}'>{{row.Name || '--'}}</template>
                 </el-table-column>
@@ -75,13 +76,15 @@
                 <el-table-column prop='position' label='对应广场说明书的位置'>
                     <template slot-scope='{row}'>{{row.Unit || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='type' label='位置/设备分类' width='240'>
-                    <template slot-scope='{row}'>{{row.InfoLocal || '--'}}</template>
+                <el-table-column label='对应工程信息化' align='center'>
+                    <el-table-column prop='type' label='位置/设备分类' width='240'>
+                        <template slot-scope='{row}'>{{row.InfoLocal || '--'}}</template>
+                    </el-table-column>
+                    <el-table-column prop='system' label='专业'>
+                        <template slot-scope='{row}'>{{row.InfoSystem || '--'}}</template>
+                    </el-table-column>
                 </el-table-column>
-                <el-table-column prop='system' label='专业'>
-                    <template slot-scope='{row}'>{{row.InfoSystem || '--'}}</template>
-                </el-table-column>
-                <el-table-column prop='typeId' label='铺位可视化typeid'>
+                <el-table-column prop='typeId' resizable label='铺位可视化typeid' width='140'>
                     <template slot-scope='{row}'>{{row.InfoSystem || '--'}}</template>
                 </el-table-column>
                 <el-table-column label='操作' width='100' v-if='state==1'>
@@ -153,7 +156,7 @@ export default {
             total: 1,
             currentPage: 1,
             state: 1,
-            position: '',
+            position: [],
             positionSelect: [
                 { id: '1', name: '供电系统-楼层分布' },
                 { id: '2', name: '暖通空调-原理图' },