yunxing 4 tahun lalu
induk
melakukan
dfbf97d05d

+ 2 - 0
src/App.vue

@@ -86,6 +86,7 @@ export default {
     },
     beforeMount() {},
     created() {
+        // window.vm = this
         this.handleUrl()
         // store.commit('SETSSOTOKEN', 'admin:liujiandong')
         // console.log(window.location.href)
@@ -99,6 +100,7 @@ export default {
         }
         // 获取楼层列表
         this.getFloorList()
+        console.log('over')
     },
     mounted() {
         // console.log('环境变量', process.env.VUE_APP_RealEnv)

+ 10 - 0
src/router/index.ts

@@ -11,6 +11,7 @@ VueRouter.prototype.push = function push(location, onResolve, onReject) {
 }
 // @ts-ignore
 import { getPvUv } from '@/api/public.js'
+import { nextTick } from 'vue/types/umd'
 Vue.use(VueRouter)
 
 const routes: Array<RouteConfig> = [
@@ -24,6 +25,15 @@ const routes: Array<RouteConfig> = [
             keepAlive: true,
             showTabbar: true,
         },
+        // 进入H5页面时,如果有assetid,跳转到设备详情页面
+        beforeEnter(to, from, next) {
+            if (to.query.assetid) {
+                let assetid = to.query.assetid
+                next({ name: 'AssetDetail', query: { assetid } })
+            } else {
+                next()
+            }
+        },
     },
     // 项目概况
     {

+ 1 - 0
src/store/index.ts

@@ -13,6 +13,7 @@ export default new Vuex.Store({
         appTitle: '管理说明书', //顶部标题
         // ssoToken: null,
         plazaId: '1000772', //项目Id 北京通州
+        // plazaId: '1001146', //项目Id 北京通州
         // plazaId: '1000423', //项目Id 大连高新
         fmapID: '',
         haveFengMap: -1, //是否有蜂鸟地图的数据 -1为等待 0 为失败 1 为成功

+ 2 - 2
src/views/equipmentFacilities/LowVoltageCabinet.vue

@@ -245,7 +245,7 @@ export default {
                 },
             }
             if (this.keyword) {
-                queryData.data.keyword = `${this.keyword}:drawernum,outspec;`
+                queryData.data.keyword = `${this.keyword}:drawernum,outspec,control;`
             }
             // 筛选 配电室之后, location字段上送
             if (this.modalData.location && this.modalData.location !== '全部') {
@@ -360,7 +360,7 @@ export default {
                 },
             }
             if (this.keyword) {
-                queryData.data.keyword = `${this.keyword}:drawernum,outspec;`
+                queryData.data.keyword = `${this.keyword}:drawernum,outspec,control;`
             }
             // 筛选 配电室之后, location字段上送
             console.log(queryData)

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

@@ -278,7 +278,7 @@ export default {
                 ProjectID: this.plazaId,
                 Floors: this.floorsArr.map((item) => {
                     return {
-                        FloorId: item.gcname,
+                        FloorId: item.gname,
                         FloorName: item.code,
                     }
                 }),
@@ -297,7 +297,7 @@ export default {
             Data.map((item) => {
                 fbtArr.push({
                     code: item.FloorName,
-                    gcname: item.FloorId,
+                    gname: item.FloorId,
                 })
             })
             this.fbtArr = fbtArr
@@ -508,7 +508,7 @@ export default {
             // this.fbtArr = [
             //     {
             //         code: 'RF',
-            //         gcname: 'g80',
+            //         gname: 'g80',
             //     },
             // ]
             if (this.fbtArr.length) {

+ 1 - 1
src/views/overview/UpdateRecord.vue

@@ -127,7 +127,7 @@ export default {
                 page: this.page,
                 size: this.size,
                 // TODO: 一年 改一个月
-                changeDateStartDate: moment().subtract(1, 'years').format('YYYYMMDD000000'), //变更记录开始时间 格式yyyyMMddHHmiss 必填
+                changeDateStartDate: moment().subtract(1, 'months').format('YYYYMMDD000000'), //变更记录开始时间 格式yyyyMMddHHmiss 必填
                 changeDateEndDate: moment().format('YYYYMMDD000000'), //变更记录结束时间 格式yyyyMMddHHmiss 必填
             }
             // 全部时,添加排序字段