Quellcode durchsuchen

Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

zhangyu vor 4 Jahren
Ursprung
Commit
11f3589589

+ 0 - 4
src/components/Legend/src/legend.vue

@@ -390,7 +390,6 @@ export default {
             this.floorInfo.gname && (data.floorId = this.floorInfo.gname)
             queryStatis({ data, postParams }).then(res => {
                 this.$store.commit('SETPLANNUM', '')
-                this.$store.commit('SETTYPENUM', '')
                 this.loading = false
                 let viewTable = []
                 viewTable = res.data.Data ? res.data.Data : []
@@ -400,9 +399,6 @@ export default {
                         if (el.Name == '主要设备房') {
                             this.$store.commit('SETPLANNUM', el.Num)
                         }
-                        if (el.Type == 'Image' && el.Num > 1) {
-                            this.$store.commit('SETTYPENUM', el.Num)
-                        }
                     })
                     if (this.remarksText) {
                         this.$store.commit('SETREMARKSTEXT', this.remarksText)

+ 24 - 12
src/components/floorMap/index.vue

@@ -193,6 +193,15 @@ export default {
                         console.log(arr)
                         this.$store.commit('SETSCPZTABLE', arr)
                     }
+                    if (data.Data[0].Elements.Nodes.length > 0) {
+                        this.$store.commit('SETTYPENUM', '')
+                        let Lengd = data.Data[0].Elements.Nodes
+                        Lengd.forEach(el => {
+                            if (el.Type == 'Image' && el.Num > 1) {
+                                this.$store.commit('SETTYPENUM', el.Num)
+                            }
+                        })
+                    }
                     // 放到后边 $cookie graphId
                     this.$cookie.set('graphId', data.Data[0].ID, 3)
                     if (this.$cookie.get('graphId')) {
@@ -390,10 +399,11 @@ export default {
         },
         getEvent() {
             bus.$on('changeShow', res => {
-                this.topologyParser && this.topologyParser.zoneLegendList.forEach(t => {
-                    let id = t.data.GraphElementId
-                    t.maskFlag = !(res.indexOf(id) > -1)
-                })
+                this.topologyParser &&
+                    this.topologyParser.zoneLegendList.forEach(t => {
+                        let id = t.data.GraphElementId
+                        t.maskFlag = !(res.indexOf(id) > -1)
+                    })
                 // this.topologyParser.textMarkerList.forEach(t => {
                 //     let id = t.data.GraphElementId
                 //     t.maskFlag = !(res.indexOf(id) > -1)
@@ -406,14 +416,16 @@ export default {
                 //     let id = t.data.GraphElementId
                 //     t.maskFlag = !(res.indexOf(id) > -1)
                 // })
-                this.topologyParser && this.topologyParser.imageLegendList.forEach(t => {
-                    let id = t.data.GraphElementId
-                    t.maskFlag = !(res.indexOf(id) > -1)
-                })
-                this.topologyParser && this.topologyParser.relationList.forEach(t => {
-                    let id = t.data.GraphElementId || t.data.GraphElementID
-                    t.maskFlag = !(res.indexOf(id) > -1)
-                })
+                this.topologyParser &&
+                    this.topologyParser.imageLegendList.forEach(t => {
+                        let id = t.data.GraphElementId
+                        t.maskFlag = !(res.indexOf(id) > -1)
+                    })
+                this.topologyParser &&
+                    this.topologyParser.relationList.forEach(t => {
+                        let id = t.data.GraphElementId || t.data.GraphElementID
+                        t.maskFlag = !(res.indexOf(id) > -1)
+                    })
             })
         }
     },

+ 4 - 0
src/utils/format.js

@@ -3,6 +3,9 @@ const formatTime = (time) => {
     return time > 10 ? time : "0" + time
 }
 const formatter = (date) => {
+    return moment.unix(date / 1000).format("YYYY.MM.DD")
+}
+const formatterTime = (date) => {
     return moment.unix(date / 1000).format("YYYY.MM.DD hh:mm")
 }
 const number_format = (number, decimals, dec_point, thousands_sep) => {
@@ -39,5 +42,6 @@ const number_format = (number, decimals, dec_point, thousands_sep) => {
 module.exports = {
     formatTime,
     formatter,
+    formatterTime,
     number_format,
 }

+ 12 - 1
src/views/equipment/table/eqDetaileDialog.vue

@@ -58,7 +58,7 @@
             <!-- 多余的筛选 -->
             <input-dialog :type='1' @confirm='confirm'></input-dialog>
         </div>
-        <el-table :data='tableData' :border='true' style='width: 100%;amrgin-bottom:30px'>
+        <el-table @row-click='innerTable' :data='tableData' :border='true' style='width: 100%;amrgin-bottom:30px'>
             <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
             <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable width='230'>
                 <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
@@ -156,6 +156,12 @@ export default {
         this.getFloorAllSelect()
     },
     methods: {
+        innerTable(row) {
+            console.log(row)
+            if (row.assetuid) {
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=assetdevic&uniqueid=${row.assetuid}`)
+            }
+        },
         //序号的方法
         indexMethod(index) {
             return (this.page - 1) * this.size + index + 1
@@ -352,4 +358,9 @@ export default {
 }
 </style>
 <style lang="less">
+.gdqd-dialog {
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
+}
 </style>

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

@@ -107,10 +107,10 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop='reportdate' label='填报时间' width='140'>
-                    <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate):'--'}}</template>
+                    <template slot-scope='{row}'>{{row.reportdate?formatterTime(row.reportdate):'--'}}</template>
                 </el-table-column>
                 <el-table-column prop='sjjssj' label='验收时间' width='140'>
-                    <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj): '--'}}</template>
+                    <template slot-scope='{row}'>{{row.sjjssj?formatterTime(row.sjjssj): '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='wonum' label='任务编号' show-overflow-tooltip resizable width='90'>
                     <template slot-scope='{row}'>
@@ -139,7 +139,7 @@ import { queryWbsms } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 import { Select } from 'meri-design'
 import inputDialog from './inputDIalog'
-import { formatter, number_format } from '@/utils/format.js'
+import { formatterTime, number_format } from '@/utils/format.js'
 export default {
     components: { Select, inputDialog },
     data() {
@@ -152,7 +152,7 @@ export default {
             reportdate: '',
             ischange: '2',
             sbjc: '',
-            formatter,
+            formatterTime,
             number_format,
             changeOption: [
                 {

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

@@ -107,10 +107,10 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop='reportdate' label='填报时间' width='140'>
-                    <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate): '--'}}</template>
+                    <template slot-scope='{row}'>{{row.reportdate?formatterTime(row.reportdate): '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='sjjssj' label='验收时间' width='140'>
-                    <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj): '--'}}</template>
+                    <template slot-scope='{row}'>{{row.sjjssj?formatterTime(row.sjjssj): '--'}}</template>
                 </el-table-column>
                 <el-table-column prop='wonum' label='工单编号' show-overflow-tooltip resizable width='80'>
                     <template slot-scope='{row}'>
@@ -139,7 +139,7 @@ import { queryWx } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 import inputDialog from './inputDIalog'
 import { Select } from 'meri-design'
-import { formatter, number_format } from '@/utils/format.js'
+import { formatterTime, number_format } from '@/utils/format.js'
 export default {
     components: { Select, inputDialog },
     data() {
@@ -154,7 +154,7 @@ export default {
             sbjc: '',
             matters: '',
             wonum: '',
-            formatter,
+            formatterTime,
             number_format,
             imgUrl: [],
             changeOption: [

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

@@ -275,7 +275,7 @@ export default {
                     smsxt: this.smsxt,
                     plazaId: this.$store.state.plazaId,
                     page: this.currentPage,
-                    diff: this.diff,
+                    difference: this.diff,
                     size: this.size
                 }
             }

+ 6 - 0
src/views/legendLibrary/addForm.vue

@@ -520,12 +520,18 @@ export default {
 
         //位置/设备
         treeConfirmDevice(id, info) {
+            console.log('%ctreeConfirmDevice=============','color:blue')
+            console.log(id, info)
+            console.log('%ctreeConfirmDevice=============','color:blue')
             let InfoSystem = [],
                 InfoSystems = [],
                 InfoLocal = []
             this.deviceList.forEach(i => {
                 i.children.length > 0 &&
                     i.children.forEach(j => {
+                          console.log('%this.deviceList.forEach=============','color:blue')
+                          console.log(id)
+                          console.log('%this.deviceList.forEach=============','color:blue')
                         if (id.includes(j.id)) {
                             InfoSystems.push(i)
                         }

+ 3 - 3
src/views/other/gcfz1.vue

@@ -13,14 +13,14 @@
         <el-table-column prop label='楼层' :show-overflow-tooltip='true' resizable>
             <template slot-scope='{row}'>{{row.floor||'--'}}</template>
         </el-table-column>
-        <el-table-column prop='beforekf' :show-overflow-tooltip='true' label='总间数'>
-            <template slot-scope='{row}'>{{row.beforekf||'--'}}</template>
+        <el-table-column prop='afterkf' :show-overflow-tooltip='true' label='总间数'>
+            <template slot-scope='{row}'>{{row.afterkf||'--'}}</template>
         </el-table-column>
         <el-table-column prop='area' :show-overflow-tooltip='true' label='面积(㎡)'>
             <template slot-scope='{row}'>{{row.area||'--'}}</template>
         </el-table-column>
         <el-table-column prop label='记录日期' width='100'>
-            <template slot-scope='{row}'>{{row.changedate?formatter(row.changedate):'--'}}</template>
+            <template slot-scope='{row}'>{{row.recordtime?formatter(row.recordtime):'--'}}</template>
         </el-table-column>
     </el-table>
 </template>

+ 2 - 0
src/views/other/gcfz2.vue

@@ -15,6 +15,7 @@
             <el-input
                 @keyup.enter.native='changelc'
                 @blur='changelc'
+                clearable
                 placeholder='搜索区域'
                 size='small'
                 style='width:200px;margin-right:12px;'
@@ -24,6 +25,7 @@
             <div class='picker-box'>
                 <span class='picker-span'>记录日期:</span>
                 <el-date-picker
+                    clearable
                     v-model='cg.dateVal'
                     value-format='yyyyMMdd'
                     type='daterange'

+ 6 - 4
src/views/other/gcfzDialog.vue

@@ -66,7 +66,7 @@ export default {
             })
         },
         changeEmit(val) {
-            //console.log(val)
+            console.log(val)
             if (val.floors && val.floors != '全部') {
                 this.floors = val.floors
             }
@@ -75,6 +75,8 @@ export default {
             }
             if (val.dateVal) {
                 this.dateVal = val.dateVal
+            } else {
+                this.dateVal = []
             }
             this.queryChange()
         },
@@ -91,9 +93,9 @@ export default {
             if (this.searVal) {
                 getParams.keyword = `${this.searVal}:region`
             }
-            if (this.dateVal) {
-                getParams.changedateStartDate = this.dateVal[0] + '000000'
-                getParams.changedateEndDate = this.dateVal[1] + '000000'
+            if (this.dateVal.length > 0) {
+                getParams.recordtimeStartDate = this.dateVal[0] + '000000'
+                getParams.recordtimeEndDate = this.dateVal[1] + '000000'
             }
             queryfzyfchange({ getParams }).then(res => {
                 if (res.result == 'success') {

+ 15 - 9
src/views/room/index.vue

@@ -493,10 +493,11 @@ export default {
             yssjDate: '',
             // 是否更换配件
             isReplaceData: [
+                { id: '全部', name: '全部' },
                 { id: '1', name: '是' },
                 { id: '0', name: '否' }
             ],
-            sfghSelect: '',
+            sfghSelect: '全部',
             sbmcInput4: '',
             sbbhInput4: '',
             zysxInput4: '',
@@ -510,6 +511,7 @@ export default {
             size4: 11,
             searVal: '',
             status: [],
+            allArr: [{ id: '全部', name: '全部' }],
             zt: [],
             sbmcInput5: '',
             sbbhInput5: '',
@@ -517,8 +519,8 @@ export default {
             rwbhInput5: '',
             ycgdbhInput5: '',
             ssmsInput5: '',
-            iszcSelect5: '',
-            statuSelect5: '',
+            iszcSelect5: '全部',
+            statuSelect5: '全部',
             rwksrq: '',
             rwwcrq: '',
             ycgdtbsj: '',
@@ -702,7 +704,7 @@ export default {
                 size: this.size3,
                 orderBy: 'sjjssj,0;location,1'
             }
-            if (this.sfghSelect) {
+            if (this.sfghSelect && this.sfghSelect != '全部') {
                 getParams.ismodel = this.sfghSelect
             }
             // 设备名称、编号
@@ -781,11 +783,11 @@ export default {
             }
             //
             // 是否正常
-            if (this.iszcSelect5) {
+            if (this.iszcSelect5 && this.iszcSelect5 != '正常') {
                 data.zt = this.iszcSelect5
             }
             // 任务状态
-            if (this.statuSelect5) {
+            if (this.statuSelect5 && this.statuSelect5 != '全部') {
                 data.status = this.statuSelect5
             }
             if (this.sbmcInput5) {
@@ -844,7 +846,9 @@ export default {
             querySelect({ data, postParams }).then(res => {
                 //console.log('下拉框', res)
                 let status = [],
-                    zt = []
+                    zt = [],
+                    arr = [],
+                    arr1 = []
 
                 status = res.data.data.sms_wbzy.status ? res.data.data.sms_wbzy.status : []
                 zt = res.data.data.sms_wbzy.zt ? res.data.data.sms_wbzy.zt : []
@@ -854,8 +858,9 @@ export default {
                             id: el.key,
                             name: el.value
                         }
-                        this.status.push(obj)
+                        arr.push(obj)
                     })
+                    this.status = this.allArr.concat(arr)
                 }
                 if (zt.length > 0) {
                     zt.forEach(el => {
@@ -863,8 +868,9 @@ export default {
                             id: el.key,
                             name: el.value == '正常' ? '是' : '否'
                         }
-                        this.zt.push(obj)
+                        arr1.push(obj)
                     })
+                    this.zt = this.allArr.concat(arr1)
                 }
             })
         },