瀏覽代碼

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

shaun-sheep 4 年之前
父節點
當前提交
7420cccfd2

+ 4 - 4
package.json

@@ -12,10 +12,10 @@
     "dependencies": {
         "@mapbox/geojson-merge": "^1.1.1",
         "@saga-web/base": "2.1.24",
-        "@saga-web/big": "1.0.91",
-        "@saga-web/draw": "2.1.104",
-        "@saga-web/feng-map": "1.0.26",
-        "@saga-web/graph": "2.1.116",
+        "@saga-web/big": "1.0.93",
+        "@saga-web/draw": "2.1.105",
+        "@saga-web/feng-map": "1.0.28",
+        "@saga-web/graph": "2.1.117",
         "ant-design-vue": "^1.4.10",
         "axios": "^0.19.2",
         "core-js": "^3.4.4",

+ 9 - 10
public/index.html

@@ -106,14 +106,6 @@
         window.onresize = function () {
             remHandle();
         }
-        window.load = function () {
-            // 指定条问题
-            var wd_fm_info = {
-                profile: {
-                    username: encodeURIComponent('张三')
-                }
-            }
-        }
     </script>
 </head>
 
@@ -124,9 +116,16 @@
             it to continue.</strong>
     </noscript>
     <!-- 置顶条问题 -->
-    <!-- <div style="height:26px;background-color:#efefef;padding:0 10px" id="wd"></div> -->
+    <div style="height:26px;background-color:#efefef;padding:0 10px" id="wd-fm"></div>
     <div id="app"></div>
-
+    <script>
+        // 指定条问题
+        var wd_fm_info = {
+            profile: {
+                username: encodeURIComponent('张三')
+            }
+        }
+    </script>
 </body>
 
 </html>

+ 39 - 17
src/api/httputils.js

@@ -1,6 +1,9 @@
 import axios from 'axios'
 import store from '@/store'
-import { MessageBox } from 'element-ui'
+import router from '@/router'
+import {
+    MessageBox
+} from 'element-ui'
 
 var CancelToken = axios.CancelToken
 var cancel
@@ -20,9 +23,14 @@ const axiosservice = axios.create({
 axiosservice.interceptors.request.use(
     (config) => {
         config.withCredentials = true // 允许携带token ,这个是解决跨域产生的相关问题
+        let isPreview = null
         let token = store.getters['ssoToken']
-        console.log()
-        let isPreview = store.getters['isPreview']
+        if(store.getters['isPreview'] == "null" || store.getters['isPreview'] == "" ){
+           isPreview = 'false'
+        }else{
+           isPreview = store.getters['isPreview']
+        }
+
         // if (config.url.indexOf('mapapp') < 0) {
         //     config.headers = {
         //         'sso-token': token,
@@ -44,26 +52,36 @@ axiosservice.interceptors.request.use(
 )
 
 axiosservice.interceptors.response.use(
-    function(res) {
+    function (res) {
         //在这里对返回的数据进行处理
-        let resp = res.data
+        let resp = res.data;
         if (resp.result === 'unauthc') {
             store.commit('logined', false)
             MessageBox.confirm('未登陆或登陆信息已失效, 是否重新登陆?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'error',
-            })
+                    confirmButtonText: '确定',
+                    cancelButtonText: '取消',
+                    type: 'error',
+                })
                 .then((resp) => {
                     window.location.reload()
                 })
-                .catch((error) => {})
-        } else if (resp.result == 'unauthorization') {
-            MessageBox.alert('无权操作', { title: '警告', type: 'error' })
+                .catch((error) => {
+                    console.log('asdfasdfsad')
+                })
+        } else if (resp.error == 'Unauthorized') {
+            MessageBox.alert('无权操作', {
+                title: '警告',
+                type: 'error'
+            })
         }
         return res
     },
-    function(err) {
+    function (err) {
+        if(err.response.status == 401){
+            router.push({
+                path: '/404',
+            })
+        }
         return Promise.reject(err)
     }
 )
@@ -154,7 +172,9 @@ export default {
     download(url, requestData) {
         // 响应类型:arraybuffer, blob
         axiosservice
-            .post(url, requestData, { responseType: 'blob' })
+            .post(url, requestData, {
+                responseType: 'blob'
+            })
             .then((resp) => {
                 let headers = resp.headers
                 let contentType = headers['content-type']
@@ -163,7 +183,9 @@ export default {
                     return false
                 } else {
                     //console.log("下载文件:", resp)
-                    const blob = new Blob([resp.data], { type: contentType })
+                    const blob = new Blob([resp.data], {
+                        type: contentType
+                    })
                     const contentDisposition = resp.headers['content-disposition']
                     let fileName = 'unknown'
                     if (contentDisposition) {
@@ -172,7 +194,7 @@ export default {
                     downFile(blob, fileName)
                 }
             })
-            .catch(function(error) {})
+            .catch(function (error) {})
     },
     axios: axiosservice,
-}
+}

+ 56 - 13
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>
@@ -173,6 +173,13 @@ export default {
         innerLeng: {
             type: Number,
             default: 0
+        },
+        // 弹窗组件内部传入的楼层信息
+        floorInfo: {
+            type: Object,
+            default() {
+                return {}
+            }
         }
     },
     components: { lengendView, legendRemarks, lengendEdit },
@@ -201,6 +208,19 @@ export default {
                 }
             },
             deep: true
+        },
+        // 弹窗组件内传入floorInfo,查询 getDraftNum
+        floorInfo: {
+            handler(newV, oldV) {
+                if (newV !== oldV) {
+                    clearInterval(this.timer)
+                    this.getDraftNum()
+                    this.timer = setInterval(() => {
+                        this.getDraftNum()
+                    }, this.interval)
+                }
+            },
+            deep: true
         }
     },
     '$refs.viewLengend': {
@@ -217,6 +237,8 @@ export default {
             let res = null,
                 floorId = this.$store.state.currentFloor.gname || this.$cookie.get('floorMapId'),
                 categoryId = this.categoryId || this.$cookie.get('categoryId')
+            // 弹窗组件内传入floorInfo,使用其楼层id
+            this.floorInfo.gname && (floorId = this.floorInfo.gname)
             // 增加校验 floorId,防止上传 undefined
             if (!floorId) {
                 return true
@@ -308,26 +330,41 @@ export default {
         },
         /**
          * @name goToEditer
-         * @description t跳转editer编辑器
+         * @description 跳转editer编辑器
          */
         goToEditer() {
+            // 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')
+
+            //主页面(楼层功能,设备设置中的)legend, 楼层参数参数处理
+            let FloorID = this.$cookie.get('floorMapId')
+            let floorName = this.$cookie.get('floorNow')
+            let seq = this.$cookie.get('currentFloorId')
+            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) {
-                this.floorSelect.forEach(el => {
-                    if (el.id == this.floor) {
-                        this.floorName = el.name
-                    }
-                })
+                // 从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
             }
-
-            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')
-            let seq = this.$cookie.get('currentFloorId')
             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, true)
+            window.open(url)
         },
         handleSwich(val) {
             this.queryView(!val)
@@ -350,7 +387,11 @@ export default {
                 buildingId: '1',
                 floorId: this.$store.state.currentFloor.gname
             }
+            // 弹窗组件内传入floorInfo,使用其楼层id
+            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 : []
@@ -402,6 +443,8 @@ export default {
                 buildingId: '1',
                 floorId: this.$store.state.currentFloor.gname
             }
+            // 弹窗组件内传入floorInfo,使用其楼层id
+            this.floorInfo.gname && (data.floorId = this.floorInfo.gname)
             queryStatis({ data, postParams }).then(res => {
                 this.loading1 = false
                 this.editTable = res.data.Data ? res.data.Data : []

+ 9 - 1
src/components/Rotation/src/rotation.vue

@@ -16,11 +16,13 @@
                 <img :src='item.url' alt />
             </el-carousel-item>
         </el-carousel>-->
+        <!-- 不显示指示器 -->
+        <!-- :indicator-position='rotationImg.length == 1 ? "none":""' -->
         <el-carousel
             v-else
             style='height:100%;width:100%'
             :interval='5000'
-            :indicator-position='rotationImg.length == 1 ? "none":""'
+            indicator-position='none'
             :arrow='rotationImg.length == 1 ? "never":"always"'
             @change='changePic'
         >
@@ -64,6 +66,12 @@ export default {
             }
         }
     },
+    // 解决两张图片时,轮播顺序反向
+    created() {
+        if (this.rotationImg && this.rotationImg.length === 2) {
+            this.rotationImg = [...this.rotationImg, ...this.rotationImg]
+        }
+    },
     mounted() {
         if (this.type == 2) {
             this.changePic(1)

+ 3 - 3
src/components/floorList.vue

@@ -6,12 +6,12 @@
 <template>
     <div class='floor-box'>
         <div class='floor-list'>
-            <div class='icon-top' v-if='floorsArr.length>showNumber'>
+            <div class='icon-top' v-if='floorsArr.length>8'>
                 <!-- @click='changeFloor(1,currIndex)' -->
                 <img v-show='parseInt(marginTop) !== 0' v-repeat-click='increase' src='@/assets/imgs/iconBlackTop.png' alt />
                 <img class='disabled' v-show='parseInt(marginTop) === 0' src='@/assets/imgs/iconLightTop.png' alt />
             </div>
-            <div class='floor-out' :style='{ maxHeight:conHeight + "px;" }'>
+            <div class='floor-out' :style='{ height:conHeight + "px" }'>
                 <!--  放开marginTop样式  -->
                 <div class='floor-center' :style='{ marginTop : marginTop }'>
                     <div
@@ -23,7 +23,7 @@
                     >{{item.code}}</div>
                 </div>
             </div>
-            <div class='icon-bottom' v-if='floorsArr.length>showNumber'>
+            <div class='icon-bottom' v-if='floorsArr.length>8'>
                 <!-- v-repeat-click='decrease' -->
                 <img v-show='parseInt(marginTop) !== marginTopMax' v-repeat-click='decrease' src='@/assets/imgs/iconBlackBottom.png' alt />
                 <img class='disabled' v-show='parseInt(marginTop) === marginTopMax' src='@/assets/imgs/iconLightBottom.png' alt />

+ 1 - 0
src/components/floorMap/canvasFun.vue

@@ -143,6 +143,7 @@ export default {
         margin-top: 10px;
         border-left: 1px solid #e4e5e7;
         border-right: 1px solid #e4e5e7;
+        z-index: 1;
     }
 }
 </style>

+ 2 - 2
src/components/menuList.vue

@@ -128,7 +128,7 @@ export default {
             const editerUrl = conf[process.env.NODE_ENV + '_editerUrl']
             let data = `projectId=${this.plazaId}&fmapID=${this.fmapID}&token=${this.$store.state.ssoToken}`
             let url = editerUrl + 'drafts?' + encodeURIComponent(data)
-            window.open(url, true)
+            window.open(url)
         },
         currentTime() {
             this.times = moment().format('YYYY.MM.DD HH:mm')
@@ -179,7 +179,7 @@ export default {
         dumpLegend() {
             const { conf } = window.__systemConf
             const wandaBmGuideUrl = conf[process.env.NODE_ENV + '_wandaBmGuideUrl']
-            window.open(`${wandaBmGuideUrl}home/legendLibrary?token=${this.$store.state.ssoToken}`, true)
+            window.open(`${wandaBmGuideUrl}home/legendLibrary?token=${this.$store.state.ssoToken}`)
         }
     }
 }

+ 95 - 46
src/router/index.js

@@ -1,8 +1,12 @@
 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 {
+    query
+} from "@/utils/query"
+import {
+    getPvUv
+} from "@/api/public.js"
 Vue.use(VueRouter)
 const routes = [
     // {
@@ -25,8 +29,7 @@ const routes = [
         name: "home",
         component: () => import("../views/index"),
         redirect: "/home/homepage",
-        children: [
-            {
+        children: [{
                 path: "homepage",
                 name: "项目首页",
                 component: () => import("../views/homepage"),
@@ -85,6 +88,12 @@ const router = new VueRouter({
 const ignore = ["/404"]
 
 router.beforeEach(async (to, from, next) => {
+    // 如果路径上有plazaId就保存
+    let plazaId = to.query.plazaId ?to.query.plazaId:''
+    if (plazaId) {
+        localStorage.setItem('PLAZAID', plazaId)
+        store.commit('STOREPLAZAID', plazaId)
+    }
     // 取出刷新时的 ssoToken, 路由拦截时app.vue 生命周期还没有执行,store中还没有数据,
     let beforeunload = localStorage.getItem("beforeunload"),
         __token = null
@@ -97,60 +106,61 @@ router.beforeEach(async (to, from, next) => {
             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
             } 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"
-                }
-                let systemcode = "CAD156",
-                    signal = new Date().getTime(),
-                    version = "1.0.0"
-                window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
+                redirectGetToken(to,from)
             }
         }
+        // 如果有token
         if (token) {
-            if (to.path == "/") {
-                next("/group")
-            }
-            if (to.path == "/group" || to.path == "/home/homepage") {
-                if (store.state.accessLevel == -1) {
-                    await store.dispatch("getUserInfo", router)
+            // 有token 将数据 isPreview赋给 vuex方便取值
+            store.commit('SETISPREVIEW', sessionStorage.getItem("SETISPREVIEW"))
+            // 如果在跳转获取token之前保存了指定的路径,则后去token后需要跳转到相关页面
+            if (sessionStorage.getItem("TOURL")) {
+                // 如果去的地址等于缓存的地址
+                if (sessionStorage.getItem("TOURL") == to.path) {
+                    sessionStorage.setItem("TOURL", '')
+                    if (to.path == "/") {
+                        next("/group")
+                    }
+                    if (to.path == "/group" || to.path == "/home/homepage") {
+                        if (store.state.accessLevel == -1) {
+                            await store.dispatch("getUserInfo", router)
+                            console.log('getUserInfo', 4)
+                            await store.dispatch("getBrand")
+                            // await store.dispatch('getFact')
+                        }
+                    }
+                    await store.dispatch("getFloors")
                     await store.dispatch("getBrand")
-                    // await store.dispatch('getFact')
+                    next()
+                } else {
+                    next(sessionStorage.getItem("TOURL"))
                 }
+            } else {
+                if (to.path == "/") {
+                    next("/group")
+                }
+                if (to.path == "/group" || to.path == "/home/homepage") {
+                    if (store.state.accessLevel == -1) {
+                        await store.dispatch("getUserInfo", router)
+                        console.log('getUserInfo', 4)
+                        await store.dispatch("getBrand")
+                        // await store.dispatch('getFact')
+                    }
+                }
+                await store.dispatch("getFloors")
+                await store.dispatch("getBrand")
+                next()
             }
-            console.log("token", token)
-            await store.dispatch("getFloors")
-            await store.dispatch("getBrand")
-            // await store.dispatch('getFact')
-            next()
+
+
         } 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"
-            }
-            let systemcode = "CAD156",
-                signal = new Date().getTime(),
-                version = "1.0.0"
-            window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
+            redirectGetToken(to,from)
         }
     } else {
         next()
@@ -175,4 +185,43 @@ router.afterEach((to) => {
             console.log("error", res)
         })
 })
-export default router
+// 重定向获取token
+function redirectGetToken (to) {
+    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"
+    }
+    let systemcode = "CAD156",
+        signal = new Date().getTime(),
+        version = "1.0.0";
+    // 获取token前需要保存跳转前路径
+    if (!ignore.includes(to.path)) {
+        console.log('to.query.isPreview',to.query.isPreview);
+        console.log('to.query.isPreview',to.query.plazaId)
+    let previewUrl = to.query.isPreview ? to.query.isPreview : '';
+    let plazaId = to.query.plazaId ?to.query.plazaId:''
+    if (previewUrl) {
+        sessionStorage.setItem("SETISPREVIEW", previewUrl)
+        store.commit('SETISPREVIEW', previewUrl)
+    }else{
+        sessionStorage.setItem("SETISPREVIEW", 'false')
+        store.commit('SETISPREVIEW', 'false')
+    }
+    if (plazaId) {
+        localStorage.setItem('PLAZAID', plazaId)
+        store.commit('STOREPLAZAID', plazaId)
+    }
+        sessionStorage.setItem("TOURL", to.path)
+    } else {
+        // 如果重定向前为404则跳入/
+        sessionStorage.setItem("TOURL", '/')
+    }
+    window.location.href = `${ssoServer}/login?systemcode=${systemcode}&signal=${signal}&version=${version}`
+}
+export default router

+ 10 - 10
src/store/index.js

@@ -63,6 +63,7 @@ export default new Vuex.Store({
         isGetmap: (state) => state.isGetmap,
         planNum: (state) => state.planNum,
         typeNum: (state) => state.typeNum,
+        isrequestAuth: (state) => state.isrequestAuth,
     },
     mutations: {
         SETPLAZENAME(state, data) {
@@ -160,6 +161,7 @@ export default new Vuex.Store({
     actions: {
         // 获取项目列表、userId
         async getUserInfo({ commit }, palyload) {
+            console.log('getUserInfo', 1)
             await login({
                 returnTree: true,
             })
@@ -167,6 +169,7 @@ export default new Vuex.Store({
                     // 获取用户当前权限
                     console.log(res.result)
                     if (res.result === 'success') {
+                        console.log('getUserInfo', 2)
                         commit('STOREACCESSLEVEL', res.level)
                         let level = res.level
                         if (window.opener) {
@@ -196,22 +199,19 @@ export default new Vuex.Store({
                         }
                         // commit('SETISREQUESTtAUTH', false)
                         // commit('SETISREQUESTtAUTH', false)
-                    } else {
-                        router.push({
-                            path: '/404',
-                        })
-                        commit('SETISREQUESTtAUTH', res)
                     }
                 })
                 .catch((err) => {
-                    router.push({
-                        path: '/404',
-                    })
+                    console.log('getuserfo catch', err)
+                    // router.push({
+                    //     path: '/404',
+                    // })
                     commit('SETISREQUESTtAUTH', err)
                 })
+            console.log('getUserInfo', 3)
         },
-        getFloors(context) {
-            queryFloor({
+        async getFloors(context) {
+            await queryFloor({
                 plazaId: localStorage.getItem('PLAZAID') || context.state.plazaId,
             }).then((res) => {
                 if (res.result == 'success') {

文件差異過大導致無法顯示
+ 366 - 366
src/utils/plugins/components.js


文件差異過大導致無法顯示
+ 697 - 725
src/views/analysis/CoreDeviceReport.vue


+ 1 - 1
src/views/equipment/fenbuPic.vue

@@ -2,7 +2,7 @@
     <div class='fenbu-box'>
         <!-- 图例 -->
         <div class='legend-boxs'>
-            <Legend :innerLeng='1' :floors='floors' type='0' :categoryId='`${typecode=="FBT1"?"FZQZL":"XFBFYCFL"}`'></Legend>
+            <Legend :innerLeng='1' :floorInfo="floorInfo"  :floors='floors' type='0' :categoryId='`${typecode=="FBT1"?"FZQZL":"XFBFYCFL"}`'></Legend>
             <floor-list v-if='floors.length>0' :changeDataFlag='false' :floorsArr='floors' @emitFloor='emitFloor' :id='"floor"'></floor-list>
         </div>
         <div v-show='floors.length>0' class='canvas-box'>

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

@@ -236,7 +236,7 @@ export default {
             }
             queryPic({ getParams }).then(res => {
                 // console.log('附加数据', res)
-                this.fqPic = res.data
+                this.fqPic = res.data ? res.data : []
             })
         },
         init() {
@@ -467,7 +467,7 @@ export default {
                             box-shadow: 0px 2px 15px 0px rgba(31, 36, 41, 0.08);
                         }
                         .add-img-container {
-                            width: 898px;
+                            width: 450px;
                             max-height: 674px;
                             overflow-y: auto;
                             background: #ffffff;
@@ -505,7 +505,7 @@ export default {
         margin-left: 0 !important;
     }
     #equipment .eq-bottom .eq-right .eq-right-bottom .eq-content .additional-box .add-img-container {
-        width: 640px;
+        width: 360px;
         max-height: 480px;
     }
 }

+ 15 - 4
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: {
@@ -151,10 +162,10 @@ export default {
         }
     },
     mounted() {
-        console.log('商铺电表数 mounted')
-        this.floor = this.$cookie.get('floorMapId')
+        // this.floor = this.$cookie.get('floorMapId')
         console.log(this.floor)
         this.getList()
+        this.getFloorAllSelect()
     }
 }
 </script>

+ 25 - 3
src/views/equipment/table/eqDetaileDialog.vue

@@ -42,7 +42,7 @@
                 tipPlace='top'
                 caption='楼层:'
                 size='small'
-                :selectdata='floorSelect'
+                :selectdata='floorAllSelect'
                 @change='queryTableList'
             ></Select>
             <el-input
@@ -63,7 +63,7 @@
             <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable width='230'>
                 <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='assetnum' label='设备编号' show-overflow-tooltip resizable width='80'>
+            <el-table-column prop='assetnum' label='设备内码' show-overflow-tooltip resizable width='80'>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
             <el-table-column prop='sl' label='数量' width='80'>
@@ -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

+ 25 - 5
src/views/equipment/table/eqListTable.vue

@@ -30,7 +30,7 @@
                 width='160'
                 tipPlace='top'
                 caption='楼层 :'
-                :selectdata='floorSelect'
+                :selectdata='floorAllSelect'
             ></Select>
             <el-input
                 placeholder='搜索生产厂商'
@@ -61,9 +61,9 @@
                 <el-table-column prop='floorcode' label='楼层' width='240' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.floorcode || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable>
+                <!-- <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.wzjc || '--'}}</template>
-                </el-table-column>
+                </el-table-column>-->
                 <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='300'>
                     <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
                 </el-table-column>
@@ -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) {
@@ -196,12 +208,13 @@ export default {
         }
     },
     mounted() {
-        this.floor = this.$cookie.get('floorMapId')
+        // this.floor = this.$cookie.get('floorMapId')
         this.getList()
         this.$nextTick(() => {
             // 页面渲染完成后的回调
             this.tableMaxHeight = this.$refs.tableBox.offsetHeight
         })
+        this.getFloorAllSelect()
     }
 }
 </script>
@@ -234,4 +247,11 @@ export default {
         margin-top: 5vh !important;
     }
 }
+</style>
+<style lang="less">
+.eq-list {
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
+}
 </style>

+ 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,

+ 24 - 3
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) {
@@ -199,12 +212,13 @@ export default {
         }
     },
     mounted() {
-        this.floor = this.$cookie.get('floorMapId')
+        // this.floor = this.$cookie.get('floorMapId')
         this.getList()
         this.$nextTick(() => {
             // 页面渲染完成后的回调
             this.tableMaxHeight = this.$refs.tableBox.offsetHeight
         })
+        this.getFloorAllSelect()
     }
 }
 </script>
@@ -238,4 +252,11 @@ export default {
         margin-top: 5vh !important;
     }
 }
+</style>
+<style lang="less">
+.stand-list {
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
+}
 </style>

+ 15 - 8
src/views/equipment/table/wbTable.vue

@@ -13,7 +13,7 @@
                 style='width:192px;margin-right:12px'
             ></el-input>
             <el-input
-                placeholder='搜索重要事项记录描述'
+                placeholder='搜索事项类型事项描述'
                 size='small'
                 @keyup.enter.native='getList'
                 @blur='getList'
@@ -70,13 +70,13 @@
                 <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable width='460'>
                     <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='assetnum' label='设备码' show-overflow-tooltip resizable width='80'>
+                <el-table-column prop='assetnum' label='设备码' show-overflow-tooltip resizable width='80'>
                     <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='matters' label='重要事项记录' width='180' show-overflow-tooltip resizable>
+                <el-table-column prop='matters' label='事项类型' width='180' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.matters || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='description' label='描述' show-overflow-tooltip resizable min-width='340'>
+                <el-table-column prop='description' label='事项描述' show-overflow-tooltip resizable min-width='340'>
                     <template slot-scope='{row}'>{{row.description || '--'}}</template>
                 </el-table-column>
                 <el-table-column label='更换配件信息' align='center'>
@@ -156,6 +156,10 @@ export default {
             number_format,
             changeOption: [
                 {
+                    id:'',
+                    name:"全部"
+                },
+                {
                     id: '1',
                     name: '是'
                 },
@@ -185,20 +189,20 @@ export default {
             console.log(row)
             if (row.apptype == '外委' || row.apptype == '自维') {
                 if (row.wb_gzglid) {
-                    window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                    window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`)
                 }
             } else if (row.apptype == '安全维保') {
-                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=AQ_WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=AQ_WB_GZGL&uniqueid=${row.wb_gzglid}`)
             }
         },
         // 工单
         ycgd(row) {
             if (row.apptype == '外委' || row.apptype == '自维') {
                 if (row.wb_gzglid) {
-                    window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                    window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`)
                 }
             } else if (row.apptype == '安全维保') {
-                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`)
             }
         },
         //多余输入框监听
@@ -352,5 +356,8 @@ export default {
             color: rgb(31, 36, 41);
         }
     }
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
 }
 </style>

+ 17 - 6
src/views/equipment/table/wxTable.vue

@@ -13,7 +13,7 @@
                 style='width:192px;margin-right:12px'
             ></el-input>
             <el-input
-                placeholder='搜索重要事项记录描述'
+                placeholder='搜索事项类型事项描述'
                 size='small'
                 clearable
                 @keyup.enter.native='getList'
@@ -70,13 +70,13 @@
                 <el-table-column prop='sbmc' label='设备名称' show-overflow-tooltip resizable min-width='460'>
                     <template slot-scope='{row}'>{{row.sbmc || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='assetnum' label='设备码' show-overflow-tooltip resizable width='80'>
+                <el-table-column prop='assetnum' label='设备码' show-overflow-tooltip resizable width='80'>
                     <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='matters' label='重要事项记录' width='180' show-overflow-tooltip resizable>
+                <el-table-column prop='matters' label='事项类型' width='180' show-overflow-tooltip resizable>
                     <template slot-scope='{row}'>{{row.matters || '--'}}</template>
                 </el-table-column>
-                <el-table-column prop='description' label='描述' show-overflow-tooltip resizable min-width='340'>
+                <el-table-column prop='description' label='事项描述' show-overflow-tooltip resizable min-width='340'>
                     <template slot-scope='{row}'>{{row.description || '--'}}</template>
                 </el-table-column>
                 <el-table-column label='更换配件信息' align='center'>
@@ -159,6 +159,10 @@ export default {
             imgUrl: [],
             changeOption: [
                 {
+                    id:'',
+                    name:"全部"
+                },
+                {
                     id: '1',
                     name: '是'
                 },
@@ -182,12 +186,12 @@ export default {
         },
         innerTable(row) {
             if (row.workorderid) {
-                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=${row.workorderid}`, true)
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=${row.workorderid}`)
             }
         },
         //跳转工单编号
         staff(row) {
-            window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=${row.wonum}`, true)
+            window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=${row.wonum}`)
         },
         //多余输入框监听
         confirm(wonum) {
@@ -268,6 +272,10 @@ export default {
             if (newV !== oldV) {
                 // this.tabFind()
                 this.getList()
+                this.$nextTick(() => {
+                    // 页面渲染完成后的回调
+                    this.tableMaxHeight = this.$refs.tableBox.offsetHeight
+                })
             }
         },
         ischange() {
@@ -339,5 +347,8 @@ export default {
             color: rgb(31, 36, 41);
         }
     }
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
 }
 </style>

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

@@ -177,7 +177,7 @@ export default {
         },
         innerTable(row) {
             if (row.gczxwx_lineid) {
-                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=GCZXWXLINE&uniqueid=${row.gczxwx_lineid}`, true)
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=GCZXWXLINE&uniqueid=${row.gczxwx_lineid}`)
             }
         },
         //下拉框查询
@@ -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,
@@ -399,5 +415,8 @@ export default {
             color: rgb(31, 36, 41);
         }
     }
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
 }
 </style>

+ 15 - 3
src/views/other/gcfz2.vue

@@ -9,7 +9,7 @@
                 v-model='cg.floors'
                 size='small'
                 style='margin-right:12px'
-                :selectdata='floorSelect'
+                :selectdata='floorSelect2'
                 :placeholder='"选择楼层"'
             ></Select>
             <el-input
@@ -97,9 +97,16 @@ export default {
             searVal: '',
             cg: {
                 dateVal: '',
-                floors: '',
+                floors: '全部',
                 searVal: ''
-            }
+            },
+            allArr: [
+                {
+                    id: '全部',
+                    name: '全部'
+                }
+            ],
+            floorSelect2: []
         }
     },
     computed: {
@@ -121,6 +128,11 @@ export default {
         indexMethod(index) {
             return (this.page - 1) * this.size + index + 1
         }
+    },
+    mounted() {
+        if (this.floorSelect.length > 0) {
+            this.floorSelect2 = this.allArr.concat(this.floorSelect)
+        }
     }
 }
 </script>

+ 1 - 1
src/views/other/gcfzDialog.vue

@@ -67,7 +67,7 @@ export default {
         },
         changeEmit(val) {
             //console.log(val)
-            if (val.floors) {
+            if (val.floors && val.floors != '全部') {
                 this.floors = val.floors
             }
             if (val.searVal) {

+ 54 - 38
src/views/other/index.vue

@@ -29,9 +29,10 @@
                 <img src='@/assets/imgs/wtp.png' alt />
                 <p class='fjt'>暂无附加数据图片</p>
             </div>
-            <div class='fzyfImg' v-else>
-                <img :src='picFloorImg' alt />
+            <div class='fzyfImg' v-else-if='picFloorImg.length==1'>
+                <img :src='picFloorImg[0].url' alt />
             </div>
+            <rotation v-else :key='2' type='2' :rotationImg='picFloorImg'></rotation>
         </div>
         <gcfz-dialog ref='gcfzDialog' :systemName='systemName'></gcfz-dialog>
     </div>
@@ -58,6 +59,7 @@ export default {
             },
             picFloor: '',
             picFloorImg: [],
+            picFloorArr: [],
             dialogInfo: {},
             floorData: [],
             module: ''
@@ -86,47 +88,60 @@ export default {
                 plazaId: this.plazaId
             }
             queryPic({ getParams }).then(res => {
-                //console.log('库房管理图', res)
-                this.picFloorImg = res.data[0].url ? res.data[0].url : ''
+                // console.log('库房管理图', res)
+                this.picFloorImg = res.data || []
             })
         },
         // 查询哪几个楼层有库房图
         tabSize() {
             let data = { plazaId: this.plazaId }
-            let postParams = [
-                {
-                    tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'f6' }
-                },
-                {
-                    tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'f5' }
-                },
-                {
-                    tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'f4' }
-                },
-                {
-                    tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'f3' }
-                },
-                {
-                    tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'f2' }
-                },
-                {
-                    tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'f1' }
-                },
-                {
-                    tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'b1' }
-                },
-                {
-                    tableName: 'glsms_proimgup',
-                    params: { module: '1004', floor: 'b2' }
-                }
-            ]
+            let postParams = []
+            if (this.floorsArr.length > 0) {
+                this.floorsArr.forEach(e => {
+                    let obj = {
+                        tableName: 'glsms_proimgup',
+                        params: {
+                            module: '1004',
+                            floor: e.gname
+                        }
+                    }
+                    postParams.push(obj)
+                })
+            }
+            // [
+            //     {
+            //         tableName: 'glsms_proimgup',
+            //         params: { module: '1004', floor: 'f6' }
+            //     },
+            //     {
+            //         tableName: 'glsms_proimgup',
+            //         params: { module: '1004', floor: 'f5' }
+            //     },
+            //     {
+            //         tableName: 'glsms_proimgup',
+            //         params: { module: '1004', floor: 'f4' }
+            //     },
+            //     {
+            //         tableName: 'glsms_proimgup',
+            //         params: { module: '1004', floor: 'f3' }
+            //     },
+            //     {
+            //         tableName: 'glsms_proimgup',
+            //         params: { module: '1004', floor: 'f2' }
+            //     },
+            //     {
+            //         tableName: 'glsms_proimgup',
+            //         params: { module: '1004', floor: 'f1' }
+            //     },
+            //     {
+            //         tableName: 'glsms_proimgup',
+            //         params: { module: '1004', floor: 'b1' }
+            //     },
+            //     {
+            //         tableName: 'glsms_proimgup',
+            //         params: { module: '1004', floor: 'b2' }
+            //     }
+            // ]
             queryTab({ data, postParams }).then(res => {
                 //console.log('查询哪几层楼有图', res)
                 this.floorData = []
@@ -148,6 +163,7 @@ export default {
                         }
                         this.floorData.push(obj)
                     }
+                    console.log(this.floorData)
                 })
             })
         }

+ 5 - 0
src/views/other/zhsxOther.vue

@@ -179,5 +179,10 @@ export default {
     .el-input--suffix .el-input__inner {
         padding-right: 20px;
     }
+    @media screen and (max-width: 1366px) {
+        /deep/ .el-table td {
+            padding: 3px 0;
+        }
+    }
 }
 </style>

+ 28 - 8
src/views/other/zhsxOtherTable1.vue

@@ -64,7 +64,11 @@
             </el-table-column>
             <el-table-column prop label='附件' width='80'>
                 <template slot-scope='{row}'>
-                    <div v-if='row.glsmsImage' style='cursor:pointer;color: #0091ff;' @click='clickPic(row.glsmsImage)'>{{row.glsmsImage.length+'张'}}</div>
+                    <div
+                        v-if='row.glsmsZhsxfj'
+                        style='cursor:pointer;color: #0091ff;'
+                        @click='clickPic(row.glsmsZhsxfj)'
+                    >{{row.glsmsZhsxfj.length+'张'}}</div>
                     <!-- <div style='cursor:pointer;color: #0091ff;' @click='clickPic'>{{5+'张'}}</div> -->
                     <div v-else>{{'--'}}</div>
                 </template>
@@ -98,7 +102,7 @@ export default {
             dateVal: '',
             loading: false,
             zhjlTable: [],
-            searVal: '',
+            searVal: '全部',
             total: 0,
             page: 1,
             size: 10,
@@ -131,15 +135,29 @@ export default {
                     name: '供电系统原理图.png',
                     url: 'http://gcgl.wanda.cn/%E7%BB%B4%E4%BF%AE%E5%B7%A5%E5%8D%95%E4%B8%80/WORKORDER_846049_2019-11-19T15-37-42-716.jpg'
                 }
+            ],
+            allArr: [
+                {
+                    id: '全部',
+                    name: '全部'
+                }
             ]
         }
     },
     components: { Select },
     methods: {
-        clickPic() {
-            if (this.imgUrls.length > 0) {
-                this.$refs.picLargeOpen.open(this.imgUrls)
+        clickPic(row) {
+            this.imgUrl = []
+            if (row) {
+                row.forEach(el => {
+                    let obj = {
+                        name: el.description,
+                        url: el.urlname
+                    }
+                    this.imgUrl.push(obj)
+                })
             }
+            this.$refs.picLargeOpen.open(this.imgUrl)
             /* this.imgUrl = []
             this.imgUrl2 = []
             var patternFileExtension = /\.([0-9a-z]+)(?:[\?#]|$)/i
@@ -179,7 +197,7 @@ export default {
                 size: this.size,
                 orderBy: 'createdate,0'
             }
-            if (this.searVal) {
+            if (this.searVal && this.searVal != '全部') {
                 getParams.department = this.searVal
             }
             if (this.ssjlsx) {
@@ -215,7 +233,8 @@ export default {
             }
             querySelect({ data, postParams }).then(res => {
                 //console.log('政府部门', res)
-                let department = []
+                let department = [],
+                    newArr = []
                 department = res.data.data.sms_zhsxjl.department ? res.data.data.sms_zhsxjl.department : []
                 if (department.length > 0) {
                     department.forEach(el => {
@@ -223,9 +242,10 @@ export default {
                             id: el.key,
                             name: el.value
                         }
-                        this.department.push(obj)
+                        newArr.push(obj)
                     })
                     //console.log(this.department)
+                    this.department = this.allArr.concat(newArr)
                 }
             })
         },

+ 15 - 5
src/views/other/zhsxOtherTable2.vue

@@ -121,9 +121,15 @@ export default {
             status2: [],
             zgbm: [],
             conclusion: [],
-            ztdsf: '',
+            ztdsf: '全部',
             bmdsf: '',
-            jcjldsf: ''
+            jcjldsf: '',
+            allArr: [
+                {
+                    id: '全部',
+                    name: '全部'
+                }
+            ]
         }
     },
     components: { Select },
@@ -141,7 +147,7 @@ export default {
             if (this.searVal) {
                 getParams.keyword = `${this.searVal}:description`
             }
-            if (this.ztdsf) {
+            if (this.ztdsf && this.ztdsf != '全部') {
                 getParams.status = this.ztdsf
             }
             if (this.bmdsf) {
@@ -166,7 +172,7 @@ export default {
         //第三方任务
         innerTable(row) {
             if (row.id) {
-                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=DSF_GZGL&uniqueid=${row.id}`, true)
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=DSF_GZGL&uniqueid=${row.id}`)
             }
         },
         changeSelect() {
@@ -194,8 +200,9 @@ export default {
                             id: el.key,
                             name: el.value
                         }
-                        this.status2.push(obj)
+                        status2.push(obj)
                     })
+                    this.status2 = this.allArr.concat(status2)
                 }
                 if (zgbm.length > 0) {
                     zgbm.forEach(el => {
@@ -231,5 +238,8 @@ export default {
         justify-content: flex-end;
         margin-top: 28px;
     }
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
 }
 </style>

+ 0 - 10
src/views/overview/index.vue

@@ -401,16 +401,6 @@ export default {
             //     previewUrl = Boolean(previewUrl.split('=')[1])
             //     this.$store.commit('SETISPREVIEW', previewUrl)
             // }
-            let previewUrl = this.$route.query.isPreview,
-                plazaId = this.$route.query.plazaId
-            if (previewUrl != '') {
-                console.log(previewUrl)
-                this.$store.commit('SETISPREVIEW', previewUrl)
-            }
-            if (plazaId) {
-                localStorage.setItem('PLAZAID', plazaId)
-                this.$store.commit('STOREPLAZAID', plazaId)
-            }
             // let previewUrl = location.href.split('=')[1] ? location.href.split('=')[1].split('&')[0] : false,
             // plazaId = location.href.split('=')[2] ? location.href.split('=')[2] : '1000423'
         }

+ 14 - 5
src/views/room/detail.vue

@@ -44,8 +44,7 @@
                 prefix-icon='el-icon-search'
                 v-model='ssppbh'
             ></el-input>
-
-            <Select
+            <!-- <Select
                 width='146'
                 style='margin-right:12px'
                 tipPlace='top'
@@ -54,7 +53,7 @@
                 @change='changeFloorStr'
                 v-model='floorStr'
                 :selectdata='floorSelect'
-            ></Select>
+            ></Select>-->
         </div>
         <div class='dialog-none'>
             <div class='input-dialog'>
@@ -116,7 +115,7 @@
             <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>
-            <el-table-column prop='assetnum' label='设备编号' :show-overflow-tooltip='true'>
+            <el-table-column prop='assetnum' label='设备内码' :show-overflow-tooltip='true'>
                 <template slot-scope='{row}'>{{row.assetnum||'--'}}</template>
             </el-table-column>
             <el-table-column prop='sl' label='数量' width='70' :show-overflow-tooltip='true'>
@@ -329,7 +328,7 @@ export default {
                 {
                     columnName: { sbglgs: 'sbglgs', sb_status: 'sb_status' },
                     params: {
-                        type_code: this.type_code
+                        type_code: this.row.type_code
                     },
                     tableName: 'sms_asset'
                 }
@@ -342,6 +341,11 @@ export default {
                 if (res.data.data) {
                     let sb_status = [],
                         sbglgs = []
+                    this.sb_status = []
+                    this.sb_status.push({
+                        id: '',
+                        name: '全部'
+                    })
                     sb_status = res.data.data.sms_asset ? res.data.data.sms_asset.sb_status : []
                     sbglgs = res.data.data.sms_asset ? res.data.data.sms_asset.sbglgs : []
                     if (sb_status.length > 0) {
@@ -353,6 +357,11 @@ export default {
                             this.sb_status.push(obj)
                         })
                     }
+                    this.sbglgs = []
+                    this.sbglgs.push({
+                        name: '全部',
+                        id: ''
+                    })
                     if (sbglgs.length > 0) {
                         sbglgs.forEach(el => {
                             let obj = {

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

@@ -21,7 +21,7 @@
                     <el-tab-pane label='机房布置图' name='1' v-if='tableImg.length>0'>
                         <room-table1 v-if='tableImg.length>=0' :tableImg='tableImg'></room-table1>
                     </el-tab-pane>
-                    <el-tab-pane label='配电室低压柜及出线明细表' name='2' v-if='systemName=="配电室机房"'>
+                    <el-tab-pane label='配电室低压柜及出线明细表' name='2' v-if='showLocationflid'>
                         <div class='compute-center'>
                             <Select
                                 width='200'
@@ -29,7 +29,7 @@
                                 v-model='floor2'
                                 tipPlace='top'
                                 caption='楼层:'
-                                :selectdata='floorSelect'
+                                :selectdata='floorSelect2'
                                 :placeholder='"请选择"'
                                 style='margin-right:12px'
                             ></Select>
@@ -157,7 +157,7 @@
                                 clearable
                                 @keyup.enter.native='Index3'
                                 @blur='Index3'
-                                placeholder='搜索重要事项记录、描述'
+                                placeholder='搜索事项类型、事项描述'
                                 size='small'
                                 prefix-icon='el-icon-search'
                                 v-model='zysxInput4'
@@ -455,6 +455,7 @@ export default {
             table3: [],
             table4: [],
             table5: [],
+            showLocationflid: false,
             //
             total: 0,
             page: 1,
@@ -465,11 +466,17 @@ export default {
             total1: 0,
             page1: 1,
             size1: 10,
-            floor2: '',
+            floor2: '全部',
             ctbhInput: '',
             cxggInput: '',
             djbhInput: '',
             kzhlInput: '',
+            allArr: [
+                {
+                    id: '全部',
+                    name: '全部'
+                }
+            ],
             //
             total2: 0,
             page2: 1,
@@ -571,7 +578,7 @@ export default {
                 //判断有没有图片,有图片默认显示按钮是第一个tab,没有图片显示的是第二个tab
                 if (this.tableImg.length > 0) {
                     this.activeName = '1'
-                } else if (this.systemName == '配电室机房') {
+                } else if (this.showLocationflid) {
                     this.activeName = '2'
                     this.Index1()
                 } else {
@@ -588,7 +595,7 @@ export default {
                 page: this.page1,
                 size: this.size1
             }
-            if (this.floor2) {
+            if (this.floor2 && this.floor2 != '全部') {
                 getParams.floor = this.floor2
             }
             if (this.ctbhInput) {
@@ -872,8 +879,14 @@ export default {
             }
             querySystem(params).then(res => {
                 this.smsxtArr = res.data ? res.data[0] : {}
-                console.log(this.smsxtArr)
-
+                // 5201 设备间   5204设备间  5209设备间
+                this.showLocationflid = false
+                if (Object.keys(this.smsxtArr).length > 0) {
+                    let locationflid = this.smsxtArr.locationflid
+                    if (locationflid == '5201' || locationflid == '5204' || locationflid == '5209') {
+                        this.showLocationflid = true
+                    }
+                }
                 this.Index(this.smsxtArr.smsxt)
                 this.content = `查看${this.$cookie.get('floorNow')}层${this.smsxtArr.smsxtname}分布图`
             })
@@ -903,7 +916,11 @@ export default {
             // }
         }
     },
-    mounted() {}
+    mounted() {
+        if (this.floorSelect.length > 0) {
+            this.floorSelect2 = this.allArr.concat(this.floorSelect)
+        }
+    }
 }
 </script>
 <style lang="less" scoped>

+ 3 - 1
src/views/room/room3.vue

@@ -75,7 +75,6 @@ export default {
             this.$emit('Index2Emit', page)
         },
         innerTable(row) {
-            console.log(row)
             this.row = row
             this.innerVisible = true
         },
@@ -108,5 +107,8 @@ export default {
         height: 95% !important;
         margin-top: 50px;
     }
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
 }
 </style>

+ 25 - 6
src/views/room/room4.vue

@@ -14,13 +14,13 @@
                 <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'>
+                <el-table-column prop label='事项类型' show-overflow-tooltip resizable min-width='120'>
                     <template slot-scope='{row}'>{{row.matters||'--'}}</template>
                 </el-table-column>
-                <el-table-column prop label='描述' show-overflow-tooltip resizable min-width='310'>
+                <el-table-column prop label='事项描述' show-overflow-tooltip resizable min-width='310'>
                     <template slot-scope='{row}'>{{row.description||'--'}}</template>
                 </el-table-column>
                 <el-table-column prop label='更换配件信息' align='center' show-overflow-tooltip resizable>
@@ -49,7 +49,7 @@
                         <div
                             v-if='row.glsmsImage'
                             style='cursor:pointer;color: #0091ff;'
-                            @click='clickPic(row.glsmsImage)'
+                            @click.stop='clickPic(row.glsmsImage)'
                         >{{row.glsmsImage.length+'张'}}</div>
                         <div v-else>{{'--'}}</div>
                     </template>
@@ -65,6 +65,8 @@
                 </el-table-column>
             </el-table>
         </div>
+        <pic-large ref='picLargeOpen'></pic-large>
+
         <div class='foot'>
             <el-pagination
                 background
@@ -92,7 +94,8 @@ export default {
             value1: '',
             searVal: '',
             number_format,
-            tableMaxHeight: 0
+            tableMaxHeight: 0,
+            imgUrl: []
         }
     },
     components: { Select },
@@ -110,8 +113,21 @@ export default {
         //工单详情
         innerTable(row) {
             if (row.workorderid) {
-                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=JXWO&uniqueid=WB_GZGL&uniqueid=${row.wb_gzglid}`)
+            }
+        },
+        clickPic(row) {
+            this.imgUrl = []
+            if (row) {
+                row.forEach(el => {
+                    let obj = {
+                        name: el.description,
+                        url: el.url
+                    }
+                    this.imgUrl.push(obj)
+                })
             }
+            this.$refs.picLargeOpen.open(this.imgUrl)
         },
         computedHeight() {
             this.$nextTick(() => {
@@ -143,5 +159,8 @@ export default {
         justify-content: flex-end;
         margin-top: 28px;
     }
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
 }
 </style>

+ 10 - 7
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'>
@@ -25,7 +25,7 @@
                         <div
                             v-if='row.glsmsImage'
                             style='cursor:pointer;color: #0091ff;'
-                            @click='clickPic(row.glsmsImage)'
+                            @click.stop='clickPic(row.glsmsImage)'
                         >{{row.glsmsImage.length+'张'}}</div>
                         <div v-else>{{'--'}}</div>
                     </template>
@@ -115,20 +115,20 @@ export default {
         innerTable(row) {
             if (row.apptype == '外委' || row.apptype == '自维') {
                 if (row.wb_gzglid) {
-                    window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                    window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`)
                 }
             } else if (row.apptype == '安全维保') {
-                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=AQ_WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=AQ_WB_GZGL&uniqueid=${row.wb_gzglid}`)
             }
         },
         // 工单
         ycgd(row) {
             if (row.apptype == '外委' || row.apptype == '自维') {
                 if (row.wb_gzglid) {
-                    window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                    window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`)
                 }
             } else if (row.apptype == '安全维保') {
-                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`, true)
+                window.open(`http://gcgl.wanda.cn/maximo/ui/?event=loadapp&value=WB_GZGL&uniqueid=${row.wb_gzglid}`)
             }
         },
         indexMethod(index) {
@@ -136,7 +136,7 @@ export default {
         },
         pageChanged(page) {
             this.page = page
-            this.$emit('Index4Emit', page)
+            this.$emit('Index4Emit', this.page)
         },
         formatter(date) {
             return moment.unix(date / 1000).format('YYYY.MM.DD HH:mm')
@@ -178,5 +178,8 @@ export default {
         justify-content: flex-end;
         margin-top: 28px;
     }
+    /deep/.el-table tr {
+        cursor: pointer;
+    }
 }
 </style>

+ 1 - 1
src/views/statistics/index.vue

@@ -374,7 +374,7 @@ export default {
                 let routeData = this.$router.resolve({  
                     name:'/home/homePage',
                 })
-                window.open(routeData.href, '_blank');
+                window.open(routeData.href, true);
                 window.__fromGroupPage = {
                     level: 0,
                     plazaName: data.cname,

+ 1 - 0
vue.config.js

@@ -4,6 +4,7 @@ module.exports = {
         proxy: {
             '/data': {
                 target: 'http://60.205.177.43',
+                // target: 'http://10.199.143.126',
                 // target: 'http://192.168.200.11:9003', //yll
                 // target: 'http://localhost:6040/data/',
                 changeOrigin: true,