瀏覽代碼

Merge branch 'develop' of git.sagacloud.cn:web/wanda-bm-guide into develop

guoxiaohuan 4 年之前
父節點
當前提交
3895b278ed

+ 25 - 16
src/components/Legend/src/legend.vue

@@ -59,7 +59,7 @@
                 <!-- </p> -->
             </el-tooltip>
             <!-- 新增分布图 -->
-            <el-tooltip effect='dark' content='新增分布图' placement='left' v-if='floorSelect.length!=floors.length && type==0'>
+            <el-tooltip effect='dark' content='新增分布图1' placement='left' v-if='floorSelect.length!=floors.length && type==0'>
                 <p class='tltk' style='margin-left: -5px;' @click='addFloor'>
                     <img src='@/assets/imgs/bjj.png' alt />
                 </p>
@@ -330,29 +330,38 @@ export default {
         },
         /**
          * @name goToEditer
-         * @description t跳转editer编辑器
+         * @description 跳转editer编辑器
          */
         goToEditer() {
-            if (this.floor) {
-                this.floorSelect.forEach(el => {
-                    if (el.id == this.floor) {
-                        this.floorName = el.name
-                    }
-                })
-            }
+            // let FloorID = this.floor ? this.floor : this.$cookie.get('floorMapId') || 'f1'
+            // let categoryId = this.categoryId ? this.categoryId : this.$cookie.get('categoryId')
+            // let floorName = this.floorName ? this.floorName : this.$cookie.get('floorNow')
+            // let seq = this.$cookie.get('currentFloorId')
 
-            let FloorID = this.floor ? this.floor : this.$cookie.get('floorMapId') || 'f1'
-            let categoryId = this.categoryId ? this.categoryId : this.$cookie.get('categoryId')
-            const { conf } = window.__systemConf
-            const editerUrl = conf[process.env.NODE_ENV + '_editerUrl']
-            let floorName = this.floorName ? this.floorName : this.$cookie.get('floorNow')
+            //主页面(楼层功能,设备设置中的)legend, 楼层参数参数处理
+            let FloorID = this.$cookie.get('floorMapId')
+            let floorName = this.$cookie.get('floorNow')
             let seq = this.$cookie.get('currentFloorId')
-            // 弹窗组件内传入floorInfo,使用其楼层id
-            if (this.floorInfo.gname) {
+            let categoryId = this.$cookie.get('categoryId') //系统
+
+            // 弹窗组件内传入floorInfo, 楼层参数处理
+            if (this.floorInfo.gname && !this.floor) {
                 FloorID = this.floorInfo.gname
                 floorName = this.floorInfo.code
                 seq = this.floorInfo.seq
+                categoryId = this.categoryId
+            }
+            //弹窗组件点击新增楼层,确认的楼层 楼层字段处理
+            if (this.floor) {
+                // 从store中筛选出选中的楼层信息
+                let floorInfo = this.$store.state.floorsArr.filter(item => item.gname === this.floor)[0]
+                FloorID = this.floor
+                floorName = floorInfo.code
+                seq = floorInfo.seq
+                categoryId = this.categoryId
             }
+            const { conf } = window.__systemConf
+            const editerUrl = conf[process.env.NODE_ENV + '_editerUrl']
             let data = `categoryId=${categoryId}&projectId=${this.plazaId}&BuildingID=1&FloorID=${FloorID}&FloorName=${floorName}&fmapID=${this.fmapID}&seq=${seq}&token=${this.ssoToken}`
             let url = editerUrl + 'editer?' + encodeURIComponent(data)
             window.open(url)

+ 2 - 2
src/store/index.js

@@ -14,9 +14,9 @@ import router from '../router'
 Vue.use(Vuex)
 export default new Vuex.Store({
     state: {
-        // ssoToken: 'admin:chuyushu',
+        ssoToken: 'admin:chuyushu',
         // ssoToken: '',
-        ssoToken: null,
+        // ssoToken: null,
         plazaName: '',
         isPreview: false,
         lastRoute: '',

文件差異過大導致無法顯示
+ 764 - 751
src/views/analysis/GanttChart.vue


+ 14 - 2
src/views/equipment/table/djspTable.vue

@@ -22,7 +22,7 @@
                 clearable
                 style='width:192px;margin-right:12px'
             ></el-input>
-            <Select @change='getList' v-model='floor' width='180' tipPlace='top' caption='楼层 :' :selectdata='floorSelect'></Select>
+            <Select @change='getList' v-model='floor' width='180' tipPlace='top' caption='楼层 :' :selectdata='floorAllSelect'></Select>
         </div>
         <el-table :data='tableData' :span-method='objectSpanMethod' :border='true' style='width: 100%' @row-click='innerVisible = true'>
             <el-table-column prop='floor' label='楼层' width='50'>
@@ -55,7 +55,8 @@ export default {
             floor: '',
             innerVisible: false, //详情弹框
             shopsnum: '',
-            welldes: ''
+            welldes: '',
+            floorAllSelect: []
         }
     },
     computed: {
@@ -127,6 +128,16 @@ export default {
                     return n
                 })
             })
+        },
+        getFloorAllSelect() {
+            this.floorAllSelect = []
+            this.floorAllSelect.push({
+                name: '全部',
+                id: ''
+            })
+            this.floorSelect.forEach(el => {
+                this.floorAllSelect.push(el)
+            })
         }
     },
     watch: {
@@ -154,6 +165,7 @@ export default {
         // this.floor = this.$cookie.get('floorMapId')
         console.log(this.floor)
         this.getList()
+        this.getFloorAllSelect()
     }
 }
 </script>

+ 24 - 2
src/views/equipment/table/eqDetaileDialog.vue

@@ -42,7 +42,7 @@
                 tipPlace='top'
                 caption='楼层:'
                 size='small'
-                :selectdata='floorSelect'
+                :selectdata='floorAllSelect'
                 @change='queryTableList'
             ></Select>
             <el-input
@@ -138,7 +138,8 @@ export default {
             fws: '',
             sbglgs: '',
             sbglgsOption: [],
-            statusOption: []
+            statusOption: [],
+            floorAllSelect: []
         }
     },
     components: {
@@ -152,6 +153,7 @@ export default {
     mounted() {
         this.queryTableList()
         this.tabFind()
+        this.getFloorAllSelect()
     },
     methods: {
         //序号的方法
@@ -199,7 +201,15 @@ export default {
                 let sb_status = res.data.data.sms_asset.sb_status
                 let sbglgs = res.data.data.sms_asset.sbglgs
                 this.sbglgsOption = []
+                this.sbglgsOption.push({
+                    name: '全部',
+                    id: ''
+                })
                 this.statusOption = []
+                this.statusOption.push({
+                    name: '全部',
+                    id: ''
+                })
                 sb_status.forEach(el => {
                     this.statusOption.push({
                         name: el.value,
@@ -281,12 +291,24 @@ export default {
                 this.tableData = res.data.data
                 this.total = res.data.count
             })
+        },
+        getFloorAllSelect() {
+            this.floorAllSelect = []
+            this.floorAllSelect.push({
+                id: '',
+                name: '全部'
+            })
+            this.floorSelect.forEach(el => {
+                this.floorAllSelect.push(el)
+            })
+            console.log(this.floorAllSelect)
         }
     },
     watch: {
         row: {
             handler(newV, oldV) {
                 this.queryTableList()
+                this.getFloorAllSelect()
                 this.tabFind()
             },
             deep: true

+ 15 - 2
src/views/equipment/table/eqListTable.vue

@@ -30,7 +30,7 @@
                 width='160'
                 tipPlace='top'
                 caption='楼层 :'
-                :selectdata='floorSelect'
+                :selectdata='floorAllSelect'
             ></Select>
             <el-input
                 placeholder='搜索生产厂商'
@@ -114,7 +114,8 @@ export default {
             row: {},
             floor: '',
             tableMaxHeight: 0,
-            type_name: ''
+            type_name: '',
+            floorAllSelect: []
         }
     },
     computed: {
@@ -167,6 +168,16 @@ export default {
                 this.tableData = res.data.data
                 this.total = res.data.count
             })
+        },
+        getFloorAllSelect() {
+            this.floorAllSelect = []
+            this.floorAllSelect.push({
+                name: '全部',
+                id: ''
+            })
+            this.floorSelect.forEach(el => {
+                this.floorAllSelect.push(el)
+            })
         }
     },
     watch: {
@@ -178,6 +189,7 @@ export default {
                     // 页面渲染完成后的回调
                     this.tableMaxHeight = this.$refs.tableBox.offsetHeight
                 })
+                 this.getFloorAllSelect()
             }
         },
         /* floor(newV, oldV) {
@@ -202,6 +214,7 @@ export default {
             // 页面渲染完成后的回调
             this.tableMaxHeight = this.$refs.tableBox.offsetHeight
         })
+        this.getFloorAllSelect()
     }
 }
 </script>

+ 4 - 0
src/views/equipment/table/otherTable.vue

@@ -189,6 +189,10 @@ export default {
                 //console.log(res)
                 let handleresults = res.data.data.sms_qtsx.handleresults
                 this.handleOption = []
+                this.handleOption.push({
+                    id:"",
+                    name:'全部'
+                })
                 handleresults.forEach(el => {
                     this.handleOption.push({
                         name: el.value,

+ 16 - 2
src/views/equipment/table/standTable.vue

@@ -30,7 +30,7 @@
                 width='160'
                 tipPlace='top'
                 caption='楼层 :'
-                :selectdata='floorSelect'
+                :selectdata='floorAllSelect'
             ></Select>
             <el-input
                 clearable
@@ -106,7 +106,8 @@ export default {
             sbjc: '',
             manufacturer: '',
             type_name: '',
-            tableMaxHeight: 0
+            tableMaxHeight: 0,
+            floorAllSelect: []
         }
     },
     props: ['major', 'param', 'InfoName'],
@@ -172,6 +173,17 @@ export default {
                 this.tableData = res.data.data
                 this.total = res.data.count
             })
+        },
+        getFloorAllSelect() {
+            this.floorAllSelect = []
+            this.floorAllSelect.push({
+                name: '全部',
+                id: ''
+            })
+            this.floorSelect.forEach(el => {
+                this.floorAllSelect.push(el)
+            })
+            console.log(this.floorAllSelect)
         }
     },
     watch: {
@@ -182,6 +194,7 @@ export default {
                     // 页面渲染完成后的回调
                     this.tableMaxHeight = this.$refs.tableBox.offsetHeight
                 })
+                this.getFloorAllSelect()
             }
         },
         /* floor(newV, oldV) {
@@ -205,6 +218,7 @@ export default {
             // 页面渲染完成后的回调
             this.tableMaxHeight = this.$refs.tableBox.offsetHeight
         })
+        this.getFloorAllSelect()
     }
 }
 </script>

+ 4 - 0
src/views/equipment/table/wbTable.vue

@@ -156,6 +156,10 @@ export default {
             number_format,
             changeOption: [
                 {
+                    id:'',
+                    name:"全部"
+                },
+                {
                     id: '1',
                     name: '是'
                 },

+ 4 - 0
src/views/equipment/table/wxTable.vue

@@ -159,6 +159,10 @@ export default {
             imgUrl: [],
             changeOption: [
                 {
+                    id:'',
+                    name:"全部"
+                },
+                {
                     id: '1',
                     name: '是'
                 },

+ 16 - 0
src/views/equipment/table/zwTable.vue

@@ -219,9 +219,25 @@ export default {
                 let sxjd = res.data.data.sms_zw.sxjd
                 let status = res.data.data.sms_zw.status
                 this.lbOption = []
+                this.lbOption.push({
+                    name: '全部',
+                    id: ''
+                })
                 this.xmOption = []
+                this.xmOption.push({
+                    id: '',
+                    name: '全部'
+                })
                 this.sxjdOption = []
+                this.sxjdOption.push({
+                    id: '',
+                    name: '全部'
+                })
                 this.statusOption = []
+                this.statusOption.push({
+                    id: '',
+                    name: '全部'
+                })
                 sxjd.forEach(el => {
                     this.sxjdOption.push({
                         name: el.value,

+ 1 - 1
src/views/room/room4.vue

@@ -14,7 +14,7 @@
                 <el-table-column prop label='设备名称' show-overflow-tooltip resizable min-width='360'>
                     <template slot-scope='{row}'>{{row.sbmc||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='设备内' show-overflow-tooltip resizable width='80'>
+                <el-table-column prop label='设备内' show-overflow-tooltip resizable width='80'>
                     <template slot-scope='{row}'>{{row.location||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='事项类型' show-overflow-tooltip resizable min-width='120'>

+ 1 - 1
src/views/room/room5.vue

@@ -14,7 +14,7 @@
                 <el-table-column prop label='设备名称' show-overflow-tooltip resizable min-width='150'>
                     <template slot-scope='{row}'>{{row.sbmc||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='设备内' :show-overflow-tooltip='true' width='80'>
+                <el-table-column prop label='设备内' :show-overflow-tooltip='true' width='80'>
                     <template slot-scope='{row}'>{{row.assetnum||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='核心维保事项记录' :show-overflow-tooltip='true' min-width='150'>