zhulizhen1111 hace 4 años
padre
commit
8a37d991e0

+ 3 - 3
src/api/login.js

@@ -1,12 +1,12 @@
 // 登录校验接口
-import httputils from '@/api/httputils'
+import httputils from "@/api/httputils"
 
 export function login(params) {
-    return httputils.getJson(`/data/auth/check`, params)
+    return httputils.getJson(`/data/data/auth/check`, params)
 }
 // 查询楼层清单
 export function queryFloor(params) {
-    return httputils.getJson(`/data/plaza/floor`, params)
+    return httputils.getJson(`/data/data/plaza/floor`, params)
 }
 export function queryfmapID(params) {
     return httputils.getJson(`/version`, params)

+ 2 - 2
src/api/overview.js

@@ -1,5 +1,5 @@
-import httputils from '@/api/httputils'
+import httputils from "@/api/httputils"
 // 查询广场概况
 export function queryFact({ getParams }) {
-    return httputils.getJson(`/data/plaza/fact`, getParams)
+    return httputils.getJson(`/data/data/plaza/fact`, getParams)
 }

+ 10 - 10
src/components/PicLarge/src/picLarge.vue

@@ -5,14 +5,14 @@
 */
 <template>
     <div class='tpyl'>
-        <el-dialog title='图片预览' width='90%' :visible.sync='dialogVisible' :close-on-click-modal='false' append-to-body>
+        <el-dialog title='图片预览' class='tpyl-1' width='90%' :visible.sync='dialogVisible' :close-on-click-modal='false' append-to-body>
             <div class='pic-list'>
                 <div class='pic-left'>
                     <ul v-for='(item,index) in imgUrl' :key='index'>
                         <li @click='getIndex(item.url)'>
                             <img :src='item.url' />
                         </li>
-                        <span>{{item.name}}</span>
+                        <!-- <span>{{item.name}}</span> -->
                     </ul>
                 </div>
                 <div class='pic-right'>
@@ -81,7 +81,7 @@ export default {
                 border: 4px solid rgba(245, 246, 247, 1);
                 img {
                     width: 100%;
-                    height: 100%;
+
                     border-radius: 4px;
                 }
             }
@@ -102,26 +102,26 @@ export default {
         flex: 1;
         background: rgba(245, 246, 247, 1);
         border-radius: 0px 0px 4px 0px;
-
         padding: 20px 50px;
         margin: auto auto;
+        display: flex;
+        justify-content: center;
+        align-items: center;
         .pic-right-img {
             width: 720px;
             height: 540px;
+            text-align: center;
             img {
                 width: 100%;
-                height: 100%;
             }
         }
     }
 }
 </style>
 <style lang="less">
-.tpyl {
-    .el-dialog {
-        height: 80% !important;
-        margin-top: 5vh !important;
-    }
+.tpyl-1 {
+    height: 90% !important;
+    margin-top: 5vh !important;
     .el-dialog__body {
         padding: 0;
     }

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 360 - 360
src/utils/plugins/components.js


+ 44 - 63
src/views/equipment/eqDialog.vue

@@ -36,7 +36,6 @@
                         :key='"u"+index'
                         :label='`${value.label}`'
                         :name='`${value.param.tab_code}`'
-                        @click='tabClick(value)'
                     >
                         <!-- 有tab的原理图 -->
                         <div v-if='value.id.slice(2,4)=="YL"' style='width:100%;height:600px;overflow:hidden'>
@@ -46,29 +45,11 @@
                         <tableList v-else-if='value.id.slice(0,4)=="RDQD"' :param='param' ref='list1' major='弱电'></tableList>
                         <tableList v-else-if='value.id.slice(0,4)=="NTQD"' :param='param' ref='list2' major='暖通'></tableList>
                         <!-- 维保表格 -->
-                        <wb-table
-                            v-else-if='value.id.slice(2,4)=="WB"'
-                            :smsxt='smsxt'
-                            :tabLabel='tabLabel'
-                            :difference='difference'
-                            :major='dialogInfo.id'
-                        ></wb-table>
+                        <wb-table v-else-if='value.id.slice(2,4)=="WB"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='diff' :major='dialogInfo.id'></wb-table>
                         <!-- 维修的表格 -->
-                        <wx-table
-                            v-else-if='value.id.slice(2,4)=="WX"'
-                            :smsxt='smsxt'
-                            :tabLabel='tabLabel'
-                            :difference='difference'
-                            :major='dialogInfo.id'
-                        ></wx-table>
+                        <wx-table v-else-if='value.id.slice(2,4)=="WX"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='diff' :major='dialogInfo.id'></wx-table>
                         <!-- 专维 -->
-                        <zw-table
-                            v-else-if='value.id.slice(2,4)=="ZW"'
-                            :smsxt='smsxt'
-                            :tabLabel='tabLabel'
-                            :difference='difference'
-                            :major='dialogInfo.id'
-                        ></zw-table>
+                        <zw-table v-else-if='value.id.slice(2,4)=="ZW"' :smsxt='smsxt' :tabLabel='tabLabel' :diff='diff' :major='dialogInfo.id'></zw-table>
                         <!-- 其他 -->
                         <other-table v-else-if='value.id.slice(2,4)=="QT"' ref='qtList' :tabLabel='tabLabel' :smsxt='smsxt' :major='dialogInfo.id'></other-table>
                     </el-tab-pane>
@@ -100,20 +81,15 @@ export default {
             dialogInfo: {},
             param: '', //区分清单tab
             typecode: '', //区分原理图的tab
-            difference: '', //区分给水排水
+            diff: '', //区分给水排水
             rotationImg: [],
-            tabLabel: ''
+            tabLabel: '',
+            tabCount: []
         }
     },
     mounted() {},
     components: { tableList, tjTable, wbTable, zwTable, lookPage, standTable, otherTable, wxTable, recordDialog, djspTable },
     methods: {
-        modalClose() {
-            this.visible = false
-        },
-        modalConfirm() {
-            //console.log('alertConfirm')
-        },
         //打开弹窗
         showModal(item) {
             console.log(item)
@@ -122,7 +98,7 @@ export default {
             if (Object.keys(this.dialogInfo).length > 0 && this.dialogInfo.children.length > 0) {
                 this.activeName = this.dialogInfo.children[0].param.tab_code
                 this.typecode = this.dialogInfo.children[0].param.type_code
-                this.difference = this.dialogInfo.children[0].param.difference
+                this.diff = this.dialogInfo.children[0].param.diff
                 if (this.dialogInfo.children[0].id.slice(2, 4) == 'YL') {
                     this.isShowTab()
                     this.initImage(this.typecode)
@@ -149,16 +125,13 @@ export default {
             //原理图的tab怎么传typecode
             if (this.dialogInfo.children.length > 0) {
                 this.typecode = this.dialogInfo.children[`${tab.index}`].param.type_code
-                this.difference = this.dialogInfo.children[`${tab.index}`].param.difference
+                this.diff = this.dialogInfo.children[`${tab.index}`].param.diff
             }
             if (this.dialogInfo.children[0].id.slice(2, 4) == 'YL') {
                 this.initImage(this.typecode)
             }
             this.tabLabel = tab.label
         },
-        // tabClick(e) {
-        //     //console.log(e.label, e.name, '-----.')
-        // },
         visibalBox() {
             this.$refs.Dialog.open(this.dialogInfo.id)
         },
@@ -167,38 +140,38 @@ export default {
             let getParams = {
                 plazaId: this.$store.state.plazaId,
                 // system: this.systemName.slice(0, 2),
-                system: this.systemName,
-                siteid: '1000423',
+                // system: this.systemName,
+                plazaId: this.$store.state.plazaId,
                 module: '1002',
                 neTypename: '位置布置图',
                 typecode: typecode
             }
-            // switch (this.systemName) {
-            //     case '暖通系统':
-            //         getParams.system = '1002'
-            //         break
-            //     case '消防系统':
-            //         getParams.system = '1003'
-            //         break
-            //     case '弱电系统':
-            //         getParams.system = '1004'
-            //         break
-            //     case '电梯系统':
-            //         getParams.system = '1006'
-            //         break
-            //     case '燃气系统':
-            //         getParams.system = '1007'
-            //         break
-            //     case '土建系统':
-            //         getParams.system = '1008'
-            //         break
-            // }
-            // if (this.systemName == '给排水系统') {
-            //     getParams.system = '1005'
-            // }
-            // if (this.systemName == '供电系统') {
-            //     getParams.system = '1001'
-            // }
+            switch (this.systemName) {
+                case '暖通系统':
+                    getParams.system = '1002'
+                    break
+                case '消防系统':
+                    getParams.system = '1003'
+                    break
+                case '弱电系统':
+                    getParams.system = '1004'
+                    break
+                case '电梯系统':
+                    getParams.system = '1006'
+                    break
+                case '燃气系统':
+                    getParams.system = '1007'
+                    break
+                case '土建系统':
+                    getParams.system = '1008'
+                    break
+            }
+            if (this.systemName == '给排水系统') {
+                getParams.system = '1005'
+            }
+            if (this.systemName == '供电系统') {
+                getParams.system = '1001'
+            }
             console.log(getParams)
             queryPic({ getParams }).then(res => {
                 this.rotationImg = res.data || []
@@ -231,7 +204,15 @@ export default {
                 })
             }
             queryTab({ data, postParams }).then(res => {
+                this.tabCount = []
                 console.log('res', res)
+                let data = res.data || []
+                data.forEach(el => {
+                    this.tabCount.push({
+                        count: el.count,
+                        typecode: el.params.typecode
+                    })
+                })
             })
         }
     }

+ 5 - 4
src/views/equipment/table/djspTable.vue

@@ -82,11 +82,10 @@ export default {
         },
         getList() {
             let getParams = {
-                page: 1,
-                size: 10
+                orderBy: `floor,0;welldesm,1;meterbox,1;`
             }
             if (this.floor) {
-                getParams.floor = this.floorSelect
+                getParams.floor = this.floor
             }
             getParams.keyword = ''
             if (this.welldes) {
@@ -103,10 +102,12 @@ export default {
                 this.tableData = []
                 let floor = {}
                 res.data.forEach(i => {
+                    console.log(i)
                     Object.keys(i).forEach(key => (floor[key] = 0)) // 初始化每一楼层个数为0
                     Object.values(i).forEach(j => {
                         Object.values(j).forEach(k => {
-                            this.tableData.push(...k)
+                            console.log(k)
+                            this.tableData.push(k)
                         })
                     })
                 })

+ 1 - 1
src/views/equipment/table/recordDialog.vue

@@ -1,7 +1,7 @@
 <template>
     <!-- 记录事项 -->
     <div class='detail-dialog'>
-        <el-dialog :title='`${major}${tabName}记录事项`' :visible.sync='visible' style='height:900px;overflow-y:scroll;'>
+        <el-dialog :title='`${major}${tabName}记录事项`' width='70%' :visible.sync='visible' style='height:900px;overflow-y:scroll;'>
             <div class='bottom-table' style='height:520px'>
                 <el-table :data='tableData' height='500' :border='true' style='width: 100%;margin-bottom:12px;' :span-method='objectSpanMethod'>
                     <el-table-column label='位置' prop width='140' show-overflow-tooltip resizable>

+ 1 - 1
src/views/equipment/table/standTable.vue

@@ -65,7 +65,7 @@
             ></el-pagination>
         </div>
         <!-- 标准表格详情钻取表 -->
-        <el-dialog width='1260px' style='height:900px;overflow: hidden;' title='标准设备展开清单' :visible.sync='innerVisible' append-to-body>
+        <el-dialog width='90%' style='height:900px;overflow: hidden;' title='标准设备展开清单' :visible.sync='innerVisible' append-to-body>
             <eq-detail ref='qdDialog' :row='row' :major='major'></eq-detail>
         </el-dialog>
     </div>

+ 3 - 3
src/views/equipment/table/wbTable.vue

@@ -158,7 +158,7 @@ export default {
             matters: ''
         }
     },
-    props: ['smsxt', 'major', 'difference', 'tabLabel'],
+    props: ['smsxt', 'major', 'diff', 'tabLabel'],
     computed: {
         ...mapGetters(['floorSelect'])
     },
@@ -176,7 +176,7 @@ export default {
             let getParams = {
                 data: {
                     smsxt: this.smsxt,
-                    difference: this.difference,
+                    diff: this.diff,
                     plazaId: this.$store.state.plazaId,
                     page: this.currentPage,
                     size: this.size,
@@ -231,7 +231,7 @@ export default {
         }
     },
     watch: {
-        difference(newV, oldV) {
+        diff(newV, oldV) {
             if (newV !== oldV) {
                 this.getList()
             }

+ 3 - 3
src/views/equipment/table/wxTable.vue

@@ -169,7 +169,7 @@ export default {
     computed: {
         ...mapGetters(['floorSelect'])
     },
-    props: ['smsxt', 'major', 'difference', 'tabLabel'],
+    props: ['smsxt', 'major', 'diff', 'tabLabel'],
     methods: {
         //多余输入框监听
         confirm(wonum) {
@@ -184,7 +184,7 @@ export default {
             let getParams = {
                 data: {
                     smsxt: this.smsxt,
-                    difference: this.difference,
+                    diff: this.diff,
                     plazaId: this.$store.state.plazaId,
                     page: this.currentPage,
                     size: this.size,
@@ -238,7 +238,7 @@ export default {
         }
     },
     watch: {
-        difference(newV, oldV) {
+        diff(newV, oldV) {
             if (newV !== oldV) {
                 this.getList()
             }

+ 3 - 3
src/views/equipment/table/zwTable.vue

@@ -146,7 +146,7 @@ export default {
     computed: {
         ...mapGetters(['floorSelect'])
     },
-    props: ['smsxt', 'major', 'difference', 'tabLabel'],
+    props: ['smsxt', 'major', 'diff', 'tabLabel'],
     methods: {
         //多余输入框监听
         confirm(status, yssjwcsj) {
@@ -233,7 +233,7 @@ export default {
                     smsxt: this.smsxt,
                     plazaId: this.$store.state.plazaId,
                     page: this.currentPage,
-                    difference: this.difference,
+                    diff: this.diff,
                     size: this.size
                 }
             }
@@ -278,7 +278,7 @@ export default {
         }
     },
     watch: {
-        difference(newV, oldV) {
+        diff(newV, oldV) {
             if (newV !== oldV) {
                 this.tabFind()
                 this.getList()