Browse Source

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

haojianlong 4 years ago
parent
commit
e097b5ee4f

+ 6 - 6
src/api/public.js

@@ -1,4 +1,4 @@
-import httputils from '@/api/httputils'
+import httputils from "@/api/httputils"
 // 查询图片
 export function queryPic({ getParams }) {
     return httputils.getJson(`/data/sms_proimgup/query`, getParams)
@@ -50,10 +50,10 @@ export function queryBrand({ data, postParams }) {
     return httputils.fetchJson(`/data/tb_brand_intentiondetail/query`, data, postParams)
 }
 //记录PV/UV
-export function getPvUv(data){
-    return httputils.postJson(`/data/pvuv/save`, data)
+export function getPvUv(data, postParams) {
+    return httputils.fetchJson(`/data/pvuv/save`, data, postParams)
 }
 // 保存楼层缓存
-export function setFloor( data, postParams ){
-    return httputils.fetchJson(`/data/plaza/floor/set`, data,postParams)
-}
+export function setFloor(data, postParams) {
+    return httputils.fetchJson(`/data/plaza/floor/set`, data, postParams)
+}

+ 2 - 2
src/components/404.vue

@@ -29,7 +29,7 @@ export default {
     methods: {
         goLogin() {
             this.$store.commit('SETSSOTOKEN', null)
-            localStorage.removeItem('beforeunload')
+            sessionStorage.setItem('SSOTOKEN', '')
             let ssoServer = ''
             if (window.location.host == 'http://glsms.wanda-dev.cn') {
                 ssoServer = 'http://oauth.wanda-dev.cn'
@@ -40,7 +40,7 @@ export default {
                 signal = new Date().getTime(),
                 version = '1.0.0'
             window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
-            window.open(`${window.location.href}`, true)
+            // window.open(`${window.location.href}`, true)
         }
     }
 }

+ 7 - 2
src/components/Legend/src/legend.vue

@@ -316,8 +316,10 @@ export default {
         // 点击展示图例框
         showTl() {
             if (this.showView != 1) {
-                this.setLengedHeight()
                 this.$store.commit('SETSHOWVIEW', 1)
+                setTimeout(() => {
+                    this.setLengedHeight()
+                })
             } else {
                 this.$store.commit('SETSHOWVIEW', 0)
             }
@@ -435,6 +437,9 @@ export default {
                         }
                         this.$store.commit('SETREMARKSTEXT', marks)
                     }
+                    setTimeout(() => {
+                      this.setLengedHeight()  
+                    },);
                 }
                 // let remarksText = ''
                 // this.remarksText = ''
@@ -610,7 +615,7 @@ export default {
             }
             if (window.screen.height > 1000) {
                 dom.style.maxHeight = '768px'
-                this.tableHeigth = '668px'
+                this.tableHeigth = '500px'
             } else {
                 dom.style.maxHeight = '434px'
                 this.tableHeigth = '334px'

+ 2 - 1
src/components/editLengend.vue

@@ -272,7 +272,8 @@ export default {
                     dom2.style.height = tabHeight + 100 + 'px'
                 })
             },
-            deep: true
+            deep: true,
+            immediate:true
         }
     }
 }

+ 4 - 0
src/components/menuList.vue

@@ -252,7 +252,11 @@ export default {
             margin: 0 8px;
             cursor: pointer;
             transition: all 0.2s;
+            &:first-child {
+                display: none;
+            }
         }
+
         .is-active {
             color: #025baa;
             font-weight: bolder;

+ 78 - 75
src/router/index.js

@@ -1,8 +1,8 @@
-import Vue from 'vue'
-import store from '@/store'
-import VueRouter from 'vue-router'
-import { query } from '@/utils/query'
-import { getPvUv } from '@/api/public.js'
+import Vue from "vue"
+import store from "@/store"
+import VueRouter from "vue-router"
+import { query } from "@/utils/query"
+import { getPvUv } from "@/api/public.js"
 Vue.use(VueRouter)
 const routes = [
     // {
@@ -10,130 +10,130 @@ const routes = [
     //     redirect: '/home/overview', // 只有区域,及区域以上用户才能进入总部首页这一套
     // },
     {
-        path: '/404',
-        name: '404页面',
-        component: () => import('../components/404'),
+        path: "/404",
+        name: "404页面",
+        component: () => import("../components/404"),
     },
     {
-        path: '/group',
-        name: '集团首页',
-        component: () => import('../views/statistics/index'),
+        path: "/group",
+        name: "集团首页",
+        component: () => import("../views/statistics/index"),
     },
     // home
     {
-        path: '/home',
-        name: 'home',
-        component: () => import('../views/index'),
-        redirect: '/home/homepage',
+        path: "/home",
+        name: "home",
+        component: () => import("../views/index"),
+        redirect: "/home/homepage",
         children: [
             {
-                path: 'homepage',
-                name: '项目首页',
-                component: () => import('../views/homepage'),
-                redirect: '/home/overview',
+                path: "homepage",
+                name: "项目首页",
+                component: () => import("../views/homepage"),
+                redirect: "/home/overview",
             },
             //概览
             {
-                path: 'overview',
-                name: '项目概览',
-                component: () => import('../views/overview'),
+                path: "overview",
+                name: "项目概览",
+                component: () => import("../views/overview"),
             },
             // 楼层功能
             {
-                path: 'floorFunc',
-                name: '楼层功能',
-                component: () => import('../views/floorFunc'),
+                path: "floorFunc",
+                name: "楼层功能",
+                component: () => import("../views/floorFunc"),
             },
             // 设备设施
             {
-                path: 'equipment',
-                name: '设备设施',
-                component: () => import('../views/equipment'),
+                path: "equipment",
+                name: "设备设施",
+                component: () => import("../views/equipment"),
             },
             // 其他功能
             {
-                path: 'other',
-                name: '其他事项',
-                component: () => import('../views/other'),
+                path: "other",
+                name: "其他事项",
+                component: () => import("../views/other"),
             },
             // 分析
             {
-                path: 'analysis',
-                name: '分享报表',
-                component: () => import('../views/analysis'),
+                path: "analysis",
+                name: "分享报表",
+                component: () => import("../views/analysis"),
             },
             //图例库管理
             {
-                path: 'legendLibrary',
-                name: '图例管理',
-                component: () => import('../views/legendLibrary'),
+                path: "legendLibrary",
+                name: "图例管理",
+                component: () => import("../views/legendLibrary"),
             },
             //图例绘制规则
             {
-                path: 'legendRules',
-                name: '绘制规则',
-                component: () => import('../views/legendRules'),
+                path: "legendRules",
+                name: "绘制规则",
+                component: () => import("../views/legendRules"),
             },
         ],
     },
 ]
 const router = new VueRouter({
-    mode: 'history',
+    mode: "history",
     base: process.env.BASE_URL,
     routes,
 })
-const ignore = ['/404']
+const ignore = ["/404"]
 
 router.beforeEach(async (to, from, next) => {
     // 取出刷新时的 ssoToken, 路由拦截时app.vue 生命周期还没有执行,store中还没有数据,
-    let beforeunload = localStorage.getItem('beforeunload'),
+    let beforeunload = localStorage.getItem("beforeunload"),
         __token = null
     beforeunload && (__token = JSON.parse(beforeunload).ssoToken)
     if (!ignore.includes(to.path)) {
         //都是需要token检验的页面 首先优先获取路由上带的token
         let token = null
         if (to.query.token) {
-            store.commit('SETSSOTOKEN', to.query.token) //存vuex
-            sessionStorage.setItem('SSOTOKEN', to.query.token)
+            store.commit("SETSSOTOKEN", to.query.token) //存vuex
+            sessionStorage.setItem("SSOTOKEN", to.query.token)
             token = to.query.token
         } else {
             // to.query.token ? to.query.token : store.getters['ssoToken'] ? store.getters['ssoToken'] : __token
-            if (store.getters['ssoToken']) {
-                token = store.getters['ssoToken']
-            } else if (sessionStorage.getItem('SSOTOKEN')) {
-                token = sessionStorage.getItem('SSOTOKEN')
-                store.commit('SETSSOTOKEN', sessionStorage.getItem('SSOTOKEN')) //存vuex
+            if (store.getters["ssoToken"]) {
+                token = store.getters["ssoToken"]
+            } else if (sessionStorage.getItem("SSOTOKEN")) {
+                token = sessionStorage.getItem("SSOTOKEN")
+                store.commit("SETSSOTOKEN", sessionStorage.getItem("SSOTOKEN")) //存vuex
             } else {
                 let lastRoute = {
                     path: to.path,
                     params: to.params,
                     query: to.query,
                 }
-                store.commit('SETLASTROUTER', lastRoute)
-                let ssoServer = 'http://oauth.wanda-dev.cn'
-                if (process.env.NODE_ENV == 'wanda_build') {
-                    ssoServer = 'http://oauth.wanda.cn'
+                store.commit("SETLASTROUTER", lastRoute)
+                let ssoServer = "http://oauth.wanda-dev.cn"
+                if (process.env.NODE_ENV == "wanda_build") {
+                    ssoServer = "http://oauth.wanda.cn"
                 }
-                let systemcode = 'CAD156',
+                let systemcode = "CAD156",
                     signal = new Date().getTime(),
-                    version = '1.0.0'
+                    version = "1.0.0"
                 window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
             }
         }
         if (token) {
-            if (to.path == '/') {
-                next('/group')
+            if (to.path == "/") {
+                next("/group")
             }
-            if (to.path == '/group' || to.path == '/home/homepage') {
+            if (to.path == "/group" || to.path == "/home/homepage") {
                 if (store.state.accessLevel == -1) {
-                    await store.dispatch('getUserInfo', router)
-                    await store.dispatch('getBrand')
+                    await store.dispatch("getUserInfo", router)
+                    await store.dispatch("getBrand")
                     // await store.dispatch('getFact')
                 }
             }
-            console.log('token', token)
-            await store.dispatch('getFloors')
-            await store.dispatch('getBrand')
+            console.log("token", token)
+            await store.dispatch("getFloors")
+            await store.dispatch("getBrand")
             // await store.dispatch('getFact')
             next()
         } else {
@@ -142,14 +142,14 @@ router.beforeEach(async (to, from, next) => {
                 params: to.params,
                 query: to.query,
             }
-            store.commit('SETLASTROUTER', lastRoute)
-            let ssoServer = 'http://oauth.wanda-dev.cn'
-            if (process.env.NODE_ENV == 'wanda_build') {
-                ssoServer = 'http://oauth.wanda.cn'
+            store.commit("SETLASTROUTER", lastRoute)
+            let ssoServer = "http://oauth.wanda-dev.cn"
+            if (process.env.NODE_ENV == "wanda_build") {
+                ssoServer = "http://oauth.wanda.cn"
             }
-            let systemcode = 'CAD156',
+            let systemcode = "CAD156",
                 signal = new Date().getTime(),
-                version = '1.0.0'
+                version = "1.0.0"
             window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
         }
     } else {
@@ -159,17 +159,20 @@ router.beforeEach(async (to, from, next) => {
 })
 // 跳入路由后要对发送pvuv
 router.afterEach((to) => {
-    let data = {
-        type: 'router',
+    let postParams = {
+        type: "router",
         target: to.name,
         parameter: to.path,
     }
-    getPvUv(data)
+    const data = {
+        plazaId: store.getters["plazaId"],
+    }
+    getPvUv(data, postParams)
         .then((res) => {
-            console.log('pvuv', res)
+            console.log("pvuv", res)
         })
         .catch((res) => {
-            console.log('error', res)
+            console.log("error", res)
         })
 })
 export default router

+ 2 - 2
src/store/index.js

@@ -8,9 +8,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: '',

+ 15 - 7
src/views/equipment/index.vue

@@ -83,9 +83,9 @@ export default {
             categoryId: 'GDXT',
             systemName: '供电系统',
             floorInfo: {
-                code: "F1",
-                gcode: "1F",
-                gname: "f1",
+                code: 'F1',
+                gcode: '1F',
+                gname: 'f1',
                 seq: 100
             },
             smsxt: '1001',
@@ -127,12 +127,15 @@ export default {
             this.querySmsxt()
             this.viewLengend()
             // 发送pvUv
-            let data = {
+            const data = {
+                plazaId: this.plazaId
+            }
+            let postParams = {
                 type: 'equipmentRouter',
                 target: item.name,
                 parameter: item.categoryId
             }
-            getPvUv(data)
+            getPvUv(data, postParams )
                 .then(res => {
                     console.log('pvuv', res)
                 })
@@ -167,12 +170,17 @@ export default {
                     this.$refs.dialog.showModal(eve)
                 })
                 // pvuv接口记录
-                let data = {
+                // 发送pvUv
+                const data = {
+                    plazaId: this.plazaId
+                }
+
+                let postParams = {
                     type: 'modal',
                     target: eve.id,
                     parameter: eve.label
                 }
-                getPvUv(data)
+                getPvUv( data, postParams )
                     .then(res => {
                         console.log('pvuv', res)
                     })

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

@@ -6,7 +6,7 @@
                 placeholder='搜索电井间'
                 size='small'
                 @keyup.enter.native='getList'
-                @blur="getList"
+                @blur='getList'
                 prefix-icon='el-icon-search'
                 v-model='welldes'
                 clearable
@@ -16,7 +16,7 @@
                 placeholder='搜索商铺编号'
                 size='small'
                 @keyup.enter.native='getList'
-                @blur="getList"
+                @blur='getList'
                 prefix-icon='el-icon-search'
                 v-model='shopsnum'
                 clearable
@@ -95,7 +95,7 @@ export default {
                 getParams.keyword += `${this.welldes}:welldes;`
             }
             if (this.shopsnum) {
-                getParams.keyword += `${this.shopsnum}:shopsnum;`
+                getParams.keyword += `${this.shopsnum}:shopsnumList;`
             }
             if (getParams.keyword == '') {
                 delete getParams.keyword

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

@@ -13,10 +13,10 @@
         <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' label='总间数'>
+        <el-table-column prop='beforekf' :show-overflow-tooltip='true' label='总间数'>
             <template slot-scope='{row}'>{{row.beforekf||'--'}}</template>
         </el-table-column>
-        <el-table-column prop='area' label='面积(㎡)'>
+        <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'>

+ 4 - 4
src/views/other/zhsxOtherTable1.vue

@@ -31,7 +31,7 @@
                 clearable
                 placeholder='搜索记录事项'
                 @keyup.enter.native='getZhjl'
-                @blur="getZhjl"
+                @blur='getZhjl'
                 size='small'
                 prefix-icon='el-icon-search'
                 v-model='ssjlsx'
@@ -50,16 +50,16 @@
             <el-table-column prop sortable label='日期' width='100' resizable>
                 <template slot-scope='{row}'>{{formatter(row.createdate)||'--'}}</template>
             </el-table-column>
-            <el-table-column prop label='政府部门' width='160'>
+            <el-table-column prop label='政府部门' :show-overflow-tooltip='true' width='160'>
                 <template slot-scope='{row}'>{{row.department||'--'}}</template>
             </el-table-column>
             <el-table-column prop label='记录事项' :show-overflow-tooltip='true' min-width='700'>
                 <template slot-scope='{row}'>{{row.recordsx||'--'}}</template>
             </el-table-column>
-            <el-table-column prop label='工作要求' width='160'>
+            <el-table-column prop label='工作要求' :show-overflow-tooltip='true' width='160'>
                 <template slot-scope='{row}'>{{row.workyq||'--'}}</template>
             </el-table-column>
-            <el-table-column prop label='整改要求' width='160'>
+            <el-table-column prop label='整改要求' :show-overflow-tooltip='true' width='160'>
                 <template slot-scope='{row}'>{{row.zgyq||'--'}}</template>
             </el-table-column>
             <el-table-column prop label='附件' width='80'>

+ 4 - 4
src/views/other/zhsxOtherTable2.vue

@@ -4,7 +4,7 @@
             <el-input
                 clearable
                 @keyup.enter.native='dsfjc'
-                @blur="dsfjc"
+                @blur='dsfjc'
                 placeholder='搜索任务名称'
                 size='small'
                 prefix-icon='el-icon-search'
@@ -38,7 +38,7 @@
             <el-input
                 clearable
                 @keyup.enter.native='dsfjc'
-                 @blur="dsfjc"
+                @blur='dsfjc'
                 placeholder='搜索部门'
                 size='small'
                 prefix-icon='el-icon-search'
@@ -48,7 +48,7 @@
             <el-input
                 clearable
                 @keyup.enter.native='dsfjc'
-                 @blur="dsfjc"
+                @blur='dsfjc'
                 placeholder='搜索检测结论'
                 size='small'
                 prefix-icon='el-icon-search'
@@ -80,7 +80,7 @@
             <el-table-column prop :show-overflow-tooltip='true' sortable label='任务名称' width='540'>
                 <template slot-scope='{row}'>{{row.description||'--'}}</template>
             </el-table-column>
-            <el-table-column prop label='状态' width='90'>
+            <el-table-column prop label='状态' :show-overflow-tooltip='true' width='90'>
                 <template slot-scope='{row}'>{{row.status||'--'}}</template>
             </el-table-column>
             <el-table-column prop label='部门' width='260' :show-overflow-tooltip='true'>

+ 5 - 3
src/views/overview/index.vue

@@ -11,9 +11,11 @@
                 <span>项目基本信息</span>
             </nav>
             <!-- <el-button type='info' plain disabled> -->
-            <div class='view-button' :disabled='true' @click='findxmzl' title='数字化移交系统上线后可用'>
-                <img src='../../assets/imgs/wd.png' alt />
-                项目资料
+            <div title='数字化移交系统上线后可用'>
+                <div class='view-button' :disabled='true' @click='findxmzl'>
+                    <img src='../../assets/imgs/wd.png' alt />
+                    项目资料
+                </div>
             </div>
             <!-- </el-button> -->
         </div>

+ 3 - 3
src/views/room/detail.vue

@@ -112,7 +112,7 @@
             style='width:100%;margin-top:12px'
             :header-cell-style='{background:"rgba(245,246,247,1)",fontFamily:"MicrosoftYaHei",color:"rgba(100,108,115,1)",lineHeight:"16px",fontSize:"12px"}'
         >
-            <el-table-column type='index' label='序号' width='50' :index='indexMethod'></el-table-column>
+            <el-table-column type='index' label='序号' width='50'></el-table-column>
             <el-table-column prop='sbjc' label='设备名称' min-width='150' :show-overflow-tooltip='true' resizable>
                 <template slot-scope='{row}'>{{row.type_name||'--'}}</template>
             </el-table-column>
@@ -168,7 +168,7 @@ import { mapGetters } from 'vuex'
 import { queryHxsbDetail } from '@/api/room.js'
 
 export default {
-    props: ['row'],
+    props: ['row', 'location'],
     data() {
         return {
             dialogFormVisible: false,
@@ -248,7 +248,7 @@ export default {
                 manufacturer: this.row.manufacturer || '--',
                 sbxh: this.row.sbxh || '--',
                 brand: this.row.brand || '--',
-                location: this.row.classstructureid,
+                location: this.location,
                 classstructureid: this.row.classstructureid
                 // type_code: this.row.type_code
             }

+ 1 - 0
src/views/room/index.vue

@@ -135,6 +135,7 @@
                             :page='page2'
                             :total='total2'
                             :size='size2'
+                            :location='location'
                             @Index2Emit='Index2Emit'
                         ></room-table3>
                     </el-tab-pane>

+ 2 - 2
src/views/room/room3.vue

@@ -42,7 +42,7 @@
             ></el-pagination>
         </div>
         <el-dialog width='90%' :title='`${systemName}-${row.type_name}`' :visible.sync='innerVisible' append-to-body>
-            <detail v-if='row' :row='row' :floorChange='floorChange'></detail>
+            <detail v-if='row' :row='row' :location='location' :floorChange='floorChange'></detail>
         </el-dialog>
     </div>
 </template>
@@ -53,7 +53,7 @@ import { Select } from 'meri-design'
 import Detail from './detail'
 
 export default {
-    props: ['table3', 'total', 'page', 'size', 'loading', 'floorChange', 'systemName'],
+    props: ['table3', 'total', 'page', 'size', 'loading', 'floorChange', 'systemName', 'location'],
     data() {
         return {
             innerVisible: false,