Prechádzať zdrojové kódy

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

shaun-sheep 4 rokov pred
rodič
commit
b708986963

+ 1 - 0
public/index.html

@@ -6,6 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <script src="<%= BASE_URL %>systemConf.js"></script>
     <title>万达广场管理说明书</title>
 </head>
 

+ 31 - 0
public/systemConf.js

@@ -0,0 +1,31 @@
+/**
+ * @author yunxing
+ * @description 项目配置文件
+ *  //editerUrl 万达编辑器地址
+ * example:
+ * 跳转示例
+/* 
+    let { conf } = window.__systemConf,
+    { editerUrl } = conf
+    editerUrl += 'editer?' //编辑器
+    // editerUrl += 'drafts?'   //草稿箱
+
+    let categoryId = 'NTXT' //
+    let ProjectID = '5' // 项目ID
+    let BuildingID = '' // 建筑ID
+    let FloorID = '' // 楼层id
+
+    let params = `categoryId=${categoryId}&ProjectID=${ProjectID}&BuildingID=${BuildingID}&FloorID=${FloorID}`
+    let url = editerUrl + encodeURIComponent(params)
+    window.open(url)
+ */
+var __systemConf = {
+    // 系统编码
+    systemCode: 'wandaBmGuide',
+    conf: {
+        // 编辑器地址
+        // TODO: 修改为对应的地址
+        editerUrl: 'http://192.168.200.1:9910/wandaEditer/',
+    },
+}
+window.__systemConf = __systemConf

+ 2 - 2
src/api/equipmentList.js

@@ -45,6 +45,6 @@ export function queryxxx({ getParams }) {
 }
 
 // 设备设施-楼层电井口(间)控制商铺范围清单
-export function queryx({ getParams }) {
-    return httputils.getJson(`/data/X`, getParams)
+export function queryShops({ getParams }) {
+    return httputils.getJson(`/data/v_glsms_shops/query`, getParams)
 }

+ 14 - 3
src/components/Legend/src/legend.vue

@@ -36,7 +36,7 @@
                 </div>
             </el-collapse-transition>
         </div>
-        <div class='edit_map'>
+        <div class='edit_map' v-if='systemName != "土建系统"'>
             <div class='hover-div'>
                 <!-- 备注编辑器 -->
                 <span @click='legendClik'>
@@ -50,12 +50,12 @@
                 </el-tooltip>
             </div>
             <!-- 编辑平面图 -->
-            <el-tooltip v-if='editPmt' class='item' effect='dark' content='编辑平面图' placement='left'>
+            <el-tooltip @click='goToEditer' v-if='editPmt' class='item' effect='dark' content='编辑平面图' placement='left'>
                 <span class='edit-icon'>
                     <a-icon type='edit' style='color:#fff' />
                 </span>
             </el-tooltip>
-            <span v-else class='edit-icon2'>
+            <span v-else @click='goToEditer' class='edit-icon2'>
                 <a-icon type='edit' style='color:#fff' />
             </span>
             <legend-remarks @queryMarks='queryMarks' ref='EditdMarks'></legend-remarks>
@@ -91,6 +91,7 @@ export default {
             editPmt: false
         }
     },
+    props: ['systemName'],
     components: { lengendView, legendRemarks, lengendEdit },
     methods: {
         testClick(data) {},
@@ -150,6 +151,16 @@ export default {
             this.show2 = true
             this.queryEditNum(true)
         },
+        /**
+         * @name goToEditer
+         * @description t跳转editer编辑器
+         */
+        goToEditer() {
+            const { conf } = window.__systemConf,
+                { editerUrl } = conf
+
+            window.open(editerUrl + 'editer?projectId=1111&projectName=万达广场', true)
+        },
         isShow2() {
             console.log(this.isShow2)
             this.show2 = !this.show2

+ 3 - 2
src/store/index.js

@@ -11,9 +11,10 @@ export default new Vuex.Store({
             employeename: '', //用户名称:艾宇;
             orgCode: '',
             username: 'yangxiaoyong3', //账户名称
-            projectName: '',
+            projects: [],
         },
         plazaId: '1000423',
+        projectName: '', //全局项目名称
         floorsArr: [], //楼层数组
         floorSelect: [], //楼层下拉框
     },
@@ -33,7 +34,7 @@ export default new Vuex.Store({
             state.userInfo.employeename = palyload.employeename
             state.userInfo.orgCode = palyload.orgCode
             state.userInfo.username = palyload.username
-            // state.userInfo.projectName = palyload.plazas
+            state.userInfo.projects = palyload.plazas
         },
         SETFLOORS(state, data) {
             state.floorsArr = data

+ 2 - 2
src/utils/format.js

@@ -3,7 +3,7 @@ const formatTime = (time) => {
     return time > 10 ? time : "0" + time
 }
 const formatter = (date) => {
-    return moment.unix(date / 1000).format("YYYY.MM.DD")
+    return moment.unix(date / 1000).format("YYYY.MM.DD hh:mm")
 }
 const number_format = (number, decimals, dec_point, thousands_sep) => {
     /*
@@ -19,7 +19,7 @@ const number_format = (number, decimals, dec_point, thousands_sep) => {
         sep = typeof thousands_sep === "undefined" ? "," : thousands_sep,
         dec = typeof dec_point === "undefined" ? "." : dec_point,
         s = "",
-        toFixedFix = function (n, prec) {
+        toFixedFix = function(n, prec) {
             var k = Math.pow(10, prec)
             return "" + Math.ceil(n * k) / k
         }

+ 9 - 9
src/utils/plugins/components.js

@@ -403,12 +403,12 @@ var system = [
                         {
                             label: "给水系统原理示意图",
                             id: "GSYL1",
-                            param: { tab_code: "1572", type_code: "2021" },
+                            param: { tab_code: "1572", type_code: "2021", difference: "给水" },
                         },
                         {
                             label: "排水系统原理示意图",
                             id: "GSYL2",
-                            param: { tab_code: "1542", type_code: "2022" },
+                            param: { tab_code: "1542", type_code: "2022", difference: "排水" },
                         },
                     ],
                 },
@@ -425,12 +425,12 @@ var system = [
                         {
                             label: "给水系统",
                             id: "GSWB1",
-                            param: { tab_code: "gps01" },
+                            param: { tab_code: "gps01", difference: "给水" },
                         },
                         {
                             label: "排水系统",
                             id: "GSWB2",
-                            param: { tab_code: "gps02" },
+                            param: { tab_code: "gps02", difference: "排水" },
                         },
                     ],
                 },
@@ -441,12 +441,12 @@ var system = [
                         {
                             label: "给水系统",
                             id: "GSWX1",
-                            param: { tab_code: "1592" },
+                            param: { tab_code: "1592", difference: "给水" },
                         },
                         {
                             label: "排水系统",
                             id: "GSWX2",
-                            param: { tab_code: "1593" },
+                            param: { tab_code: "1593", difference: "排水" },
                         },
                     ],
                 },
@@ -457,17 +457,17 @@ var system = [
                         {
                             label: "给水系统专项维修",
                             id: "GSZW1",
-                            param: { tab_code: "1592" },
+                            param: { tab_code: "1592", difference: "给水" },
                         },
                         {
                             label: "排水系统专项维修",
                             id: "GSZW2",
-                            param: { tab_code: "1593" },
+                            param: { tab_code: "1593", difference: "排水" },
                         },
                         {
                             label: "其他事项",
                             id: "GSQT",
-                            param: { tab_code: "1594" },
+                            param: { tab_code: "1594", difference: "" },
                         },
                     ],
                 },

+ 32 - 15
src/views/equipment/eqDialog.vue

@@ -45,13 +45,31 @@
                         <tableList v-else-if='value.id.slice(0,4)=="RDQD"' :param='param' ref='list1' major='弱电'></tableList>
                         <tableList v-else-if='value.id.slice(0,4)=="NTQD"' :param='param' ref='list2' major='暖通'></tableList>
                         <!-- 维保表格 -->
-                        <wb-table v-else-if='value.id.slice(2,4)=="WB"' :smsxt='smsxt' :major='dialogInfo.id'></wb-table>
+                        <wb-table
+                            v-else-if='value.id.slice(2,4)=="WB"'
+                            :smsxt='smsxt'
+                            :tabLabel='tabLabel'
+                            :difference='difference'
+                            :major='dialogInfo.id'
+                        ></wb-table>
                         <!-- 维修的表格 -->
-                        <wx-table v-else-if='value.id.slice(2,4)=="WX"' :smsxt='smsxt' :major='dialogInfo.id'></wx-table>
+                        <wx-table
+                            v-else-if='value.id.slice(2,4)=="WX"'
+                            :smsxt='smsxt'
+                            :tabLabel='tabLabel'
+                            :difference='difference'
+                            :major='dialogInfo.id'
+                        ></wx-table>
                         <!-- 专维 -->
-                        <zw-table v-else-if='value.id.slice(2,4)=="ZW"' :smsxt='smsxt' :major='dialogInfo.id'></zw-table>
+                        <zw-table
+                            v-else-if='value.id.slice(2,4)=="ZW"'
+                            :smsxt='smsxt'
+                            :tabLabel='tabLabel'
+                            :difference='difference'
+                            :major='dialogInfo.id'
+                        ></zw-table>
                         <!-- 其他 -->
-                        <other-table v-else-if='value.id.slice(2,4)=="QT"' ref='qtList' :smsxt='smsxt' :major='dialogInfo.id'></other-table>
+                        <other-table v-else-if='value.id.slice(2,4)=="QT"' ref='qtList' :tabLabel='tabLabel' :smsxt='smsxt' :major='dialogInfo.id'></other-table>
                     </el-tab-pane>
                 </el-tabs>
             </div>
@@ -81,7 +99,9 @@ export default {
             dialogInfo: {},
             param: '', //区分清单tab
             typecode: '', //区分原理图的tab
-            rotationImg: []
+            difference: '', //区分给水排水
+            rotationImg: [],
+            tabLabel: ''
         }
     },
     mounted() {},
@@ -100,6 +120,7 @@ export default {
             if (Object.keys(this.dialogInfo).length > 0 && this.dialogInfo.children.length > 0) {
                 this.activeName = this.dialogInfo.children[0].param.tab_code
                 this.typecode = this.dialogInfo.children[0].param.type_code
+                this.difference = this.dialogInfo.children[0].param.difference
                 if (this.dialogInfo.children[0].id.slice(2, 4) == 'YL') {
                     this.isShowTab()
                     this.initImage(this.typecode)
@@ -127,13 +148,12 @@ export default {
             //原理图的tab怎么传typecode
             if (this.dialogInfo.children.length > 0) {
                 this.typecode = this.dialogInfo.children[`${tab.index}`].param.type_code
+                this.difference = this.dialogInfo.children[`${tab.index}`].param.difference
             }
             if (this.dialogInfo.children[0].id.slice(2, 4) == 'YL') {
                 this.initImage(this.typecode)
             }
-            if (tab.label == '其他事项') {
-                this.$refs.qtList.getList()
-            }
+            this.tabLabel = tab.label
         },
         tabClick(value) {
             console.log(value, '-----.')
@@ -144,14 +164,11 @@ export default {
         //系统原理图接口
         initImage(typecode) {
             let getParams = {
-                data: {
-                    plazaId: this.$store.state.plazaId,
-                    system: this.systemName.slice(0, 2),
-                    tyepcode: typecode
-                }
+                plazaId: this.$store.state.plazaId,
+                system: this.systemName.slice(0, 2)
             }
-            queryPic(getParams).then(res => {
-                this.rotationImg = res.data
+            queryPic({ getParams }).then(res => {
+                this.rotationImg = res.data || []
             })
         },
         //原理图没图片不显示tab

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

@@ -32,7 +32,7 @@
                     </div>
                     <div class='eq-content'>
                         <div class='legend-boxs'>
-                            <Legend></Legend>
+                            <Legend :systemName='systemName'></Legend>
                         </div>
                         <floorMap ref='floorMap'></floorMap>
                         <div class='additional-box'>

+ 21 - 35
src/views/equipment/table/djspTable.vue

@@ -7,7 +7,7 @@
                 size='small'
                 @change='getList'
                 prefix-icon='el-icon-search'
-                v-model='keyword'
+                v-model='welldes'
                 clearable
                 style='width:192px;margin-right:12px'
             ></el-input>
@@ -16,7 +16,7 @@
                 size='small'
                 @change='getList'
                 prefix-icon='el-icon-search'
-                v-model='keyword'
+                v-model='shopsnum'
                 clearable
                 style='width:192px;margin-right:12px'
             ></el-input>
@@ -36,65 +36,51 @@
                 <template slot-scope='{row}'>{{row.shopsnum || '--'}}</template>
             </el-table-column>
         </el-table>
-        <div class='foot'>
-            <el-pagination
-                background
-                layout='prev, pager, next'
-                :total='total'
-                :page-size='size'
-                @prev-click='pageChanged'
-                @next-click='pageChanged'
-                @current-change='pageChanged'
-            ></el-pagination>
-        </div>
+        <div class='foot'></div>
     </div>
 </template>
 <script>
 import Select from '@/components/Select/Select.vue'
 import EqDetail from './eqDetaileDialog'
-import { queryEquipmentList } from '@/api/equipmentList.js'
+import { queryShops } from '@/api/equipmentList.js'
 import { mapGetters } from 'vuex'
 
 export default {
     components: { Select, EqDetail },
     data() {
         return {
-            dataSelect2: [
-                { id: 'test1', name: '选择项' },
-                { id: 'test2', name: '单平米' },
-                { id: 'test3', name: '下级分项' },
-                { id: 'test4', name: '滑动平均滑动平均' }
-            ],
             tableData: [],
-            total: 0,
-            currentPage: 1,
-            size: 10,
             floor: '',
             innerVisible: false, //详情弹框
-            keyword: ''
+            shopsnum: '',
+            welldes: ''
         }
     },
     computed: {
         ...mapGetters(['floorSelect'])
     },
-    props: ['major'],
+
     methods: {
         pageChanged(page) {
             this.currentPage = page
             this.getList()
         },
         getList() {
-            let postParams = {
-                // tab_code: this.param
+            let getParams = {}
+            if (this.floor) {
+                getParams.floor = this.floorSelect
+            }
+            getParams.keyword = ''
+            if (this.welldes) {
+                getParams.keyword += `${this.welldes}:welldes;`
+            }
+            if (this.shopsnum) {
+                getParams.keyword += `${this.shopsnum}:shopsnum;`
             }
-            let data = {
-                page: this.currentPage,
-                size: this.size,
-                plazaId: this.$store.state.plazaId,
-                major: this.major,
-                keyword: this.keyword
+            if (getParams.keyword == '') {
+                delete getParams.keyword
             }
-            queryEquipmentList({ data, postParams }).then(res => {
+            queryShops({ getParams }).then(res => {
                 console.log(res)
                 this.tableData = res.data.data
                 this.total = res.data.count
@@ -103,7 +89,7 @@ export default {
     },
 
     mounted() {
-        // this.getList()
+        this.getList()
     }
 }
 </script>

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

@@ -55,7 +55,7 @@
             <el-table-column prop='assetnum' label='设备编号' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sl' label='数量'>
+            <el-table-column prop='sl' label='数量' width='100'>
                 <template slot-scope='{row}'>{{row.sl || '--'}}</template>
             </el-table-column>
             <el-table-column prop='sbglgs' label='管理归属' show-overflow-tooltip resizable>
@@ -70,7 +70,7 @@
             <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='floor' sortable label='楼层'>
+            <el-table-column prop='floor' sortable label='楼层' width='100'>
                 <template slot-scope='{row}'>{{row.floor || '--'}}</template>
             </el-table-column>
             <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable>

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

@@ -36,7 +36,7 @@
             <el-table-column prop='sbjc' label='设备名称' width='160'>
                 <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sl' label='数量'>
+            <el-table-column prop='sl' label='数量' width='100'>
                 <template slot-scope='{row}'>{{row.sl || '--'}}</template>
             </el-table-column>
             <el-table-column prop='brand' label='品牌'>
@@ -45,7 +45,7 @@
             <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='floor' label='楼层'>
+            <el-table-column prop='floor' label='楼层' width='100'>
                 <template slot-scope='{row}'>{{row.floor || '--'}}</template>
             </el-table-column>
             <el-table-column prop='wzjc' label='安装位置' show-overflow-tooltip resizable>

+ 7 - 1
src/views/equipment/table/otherTable.vue

@@ -102,7 +102,7 @@ export default {
             handleOption: []
         }
     },
-    props: ['major', 'smsxt'],
+    props: ['major', 'smsxt', 'tabLabel'],
     computed: {
         ...mapGetters(['floorSelect'])
     },
@@ -195,6 +195,12 @@ export default {
                 this.tabFind()
                 this.getList()
             }
+        },
+        tabLabel(newV, oldV) {
+            if (newV !== oldV) {
+                this.tabFind()
+                this.getList()
+            }
         }
     },
     mounted() {

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

@@ -37,7 +37,7 @@
                 <template slot-scope='{row}'>{{row.sbjc || '--'}}</template>
             </el-table-column>
             <!-- sbjc -->
-            <el-table-column prop='sl' label='数量'>
+            <el-table-column prop='sl' label='数量' width='100'>
                 <template slot-scope='{row}'>{{row.sl || '--'}}</template>
             </el-table-column>
             <el-table-column prop='brand' label='品牌'>
@@ -46,7 +46,7 @@
             <el-table-column prop='sbxh' label='型号' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.sbxh || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='floor' label='楼层'>
+            <el-table-column prop='floor' label='楼层' width='100'>
                 <template slot-scope='{row}'>{{row.floor || '--'}}</template>
             </el-table-column>
             <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable>

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

@@ -18,7 +18,7 @@
             <el-table-column prop='lb' label='类别' width='160'>
                 <template slot-scope='{row}'>{{row.lb || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sl' label='数量'>
+            <el-table-column prop='sl' label='数量' width='100'>
                 <template slot-scope='{row}'>{{row.sl || '--'}}</template>
             </el-table-column>
             <el-table-column prop='brand' label='品牌'>

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

@@ -98,10 +98,10 @@
                     <div style='cursor:pointer;color: #0091ff;' @click='clickPic(row.glsmsImage)'>{{row.glsmsImage?row.glsmsImage.length+'张':'--'}}</div>
                 </template>
             </el-table-column>
-            <el-table-column prop='reportdate' label='填报时间' width='120'>
+            <el-table-column prop='reportdate' label='填报时间' width='140'>
                 <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate):'--'}}</template>
             </el-table-column>
-            <el-table-column prop='sjjssj' label='验收时间' width='120'>
+            <el-table-column prop='sjjssj' label='验收时间' width='140'>
                 <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj): '--'}}</template>
             </el-table-column>
             <el-table-column prop='wonum' label='任务编号' show-overflow-tooltip resizable>
@@ -158,7 +158,7 @@ export default {
             matters: ''
         }
     },
-    props: ['smsxt', 'major'],
+    props: ['smsxt', 'major', 'difference', 'tabLabel'],
     computed: {
         ...mapGetters(['floorSelect'])
     },
@@ -176,6 +176,7 @@ export default {
             let getParams = {
                 data: {
                     smsxt: this.smsxt,
+                    difference: this.difference,
                     plazaId: this.$store.state.plazaId,
                     page: this.currentPage,
                     size: this.size,
@@ -229,10 +230,16 @@ export default {
         }
     },
     watch: {
-        smsxt(newV, oldV) {
+        difference(newV, oldV) {
             if (newV !== oldV) {
                 this.getList()
             }
+        },
+        tabLabel(newV, oldV) {
+            if (newV !== oldV) {
+                this.tabFind()
+                this.getList()
+            }
         }
     },
     mounted() {

+ 11 - 5
src/views/equipment/table/wxTable.vue

@@ -106,10 +106,10 @@
                     <div style='cursor:pointer;color: #0091ff;' @click='clickPic(row.glsmsImage)'>{{row.glsmsImage?row.glsmsImage.length+'张':'--'}}</div>
                 </template>
             </el-table-column>
-            <el-table-column prop='reportdate' label='填报时间' width='120'>
+            <el-table-column prop='reportdate' label='填报时间' width='140'>
                 <template slot-scope='{row}'>{{row.reportdate?formatter(row.reportdate): '--'}}</template>
             </el-table-column>
-            <el-table-column prop='sjjssj' label='验收时间' width='120'>
+            <el-table-column prop='sjjssj' label='验收时间' width='140'>
                 <template slot-scope='{row}'>{{row.sjjssj?formatter(row.sjjssj): '--'}}</template>
             </el-table-column>
             <el-table-column prop='wonum' label='工单编号' show-overflow-tooltip resizable>
@@ -169,7 +169,7 @@ export default {
     computed: {
         ...mapGetters(['floorSelect'])
     },
-    props: ['smsxt', 'major'],
+    props: ['smsxt', 'major', 'difference', 'tabLabel'],
     methods: {
         //多余输入框监听
         confirm(wonum) {
@@ -184,7 +184,7 @@ export default {
             let getParams = {
                 data: {
                     smsxt: this.smsxt,
-                    // tab: this.major,
+                    difference: this.difference,
                     plazaId: this.$store.state.plazaId,
                     page: this.currentPage,
                     size: this.size,
@@ -237,10 +237,16 @@ export default {
         }
     },
     watch: {
-        smsxt(newV, oldV) {
+        difference(newV, oldV) {
             if (newV !== oldV) {
                 this.getList()
             }
+        },
+        tabLabel(newV, oldV) {
+            if (newV !== oldV) {
+                this.tabFind()
+                this.getList()
+            }
         }
     },
     mounted() {

+ 11 - 4
src/views/equipment/table/zwTable.vue

@@ -83,10 +83,10 @@
             <el-table-column prop='sxjd' label='当前阶段' show-overflow-tooltip resizable>
                 <template slot-scope='{row}'>{{row.sxjd || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='lxsjwcsj' label='立项日期' show-overflow-tooltip resizable>
+            <el-table-column prop='lxsjwcsj' label='立项日期' show-overflow-tooltip resizable width='140'>
                 <template slot-scope='{row}'>{{row.lxsjwcsj?formatter(row.lxsjwcsj):'--'}}</template>
             </el-table-column>
-            <el-table-column prop='yssjwcsj' label='验收日期' show-overflow-tooltip resizable>
+            <el-table-column prop='yssjwcsj' label='验收日期' show-overflow-tooltip resizable width='140'>
                 <template slot-scope='{row}'>{{row.yssjwcsj?formatter(row.yssjwcsj):'--'}}</template>
             </el-table-column>
             <el-table-column prop='status' label='验收结果' show-overflow-tooltip resizable>
@@ -146,7 +146,7 @@ export default {
     computed: {
         ...mapGetters(['floorSelect'])
     },
-    props: ['smsxt', 'major'],
+    props: ['smsxt', 'major', 'difference', 'tabLabel'],
     methods: {
         //多余输入框监听
         confirm(status, yssjwcsj) {
@@ -232,6 +232,7 @@ export default {
                     smsxt: this.smsxt,
                     plazaId: this.$store.state.plazaId,
                     page: this.currentPage,
+                    difference: this.difference,
                     size: this.size
                 }
             }
@@ -273,7 +274,13 @@ export default {
         }
     },
     watch: {
-        smsxt(newV, oldV) {
+        difference(newV, oldV) {
+            if (newV !== oldV) {
+                this.tabFind()
+                this.getList()
+            }
+        },
+        tabLabel(newV, oldV) {
             if (newV !== oldV) {
                 this.tabFind()
                 this.getList()

+ 50 - 27
src/views/index.vue

@@ -9,35 +9,58 @@
 import menuList from '@/components/menuList.vue'
 
 export default {
-    props: [],
-    data() {
-        return {
-            modelNum: 0,
-            // shebeisheshiShow: false,
-            routerName: 'aa',
-            imgSrcNum: 1,
-            tanchuanShow: false
-        }
+  props: [],
+  data() {
+    return {
+      modelNum: 0,
+      // shebeisheshiShow: false,
+      routerName: "aa",
+      imgSrcNum: 1,
+      tanchuanShow: false,
+      showMenu: true, //是否显隐menuList
+    };
+  },
+  computed: {},
+  created() { },
+  mounted() {
+    //   路由为home下的legendLibrary(图例)时,刷新时执行 handleRoute 路由处理函数
+    this.handleRoute(this.$route);
+  },
+  watch: {
+    // tanchuanShow(newVal) {
+    //   console.log(newVal)
+    // }
+    $route: "handleRoute",
+  },
+  methods: {
+    handlerouterName(val) {
+      console.log(val);
+      this.routerName = val;
+      if (val == "de") {
+        this.modelNum = 3;
+      } else if (val == "floorFunc") {
+        this.modelNum = 2;
+      }
     },
-    computed: {},
-    created() {},
-    mounted() {},
-    watch: {
-        // tanchuanShow(newVal) {
-        //   console.log(newVal)
-        // }
-    },
-    methods: {
-        handlerouterName(val) {
-            console.log(val)
-            this.routerName = val
-            if (val == 'de') {
-                this.modelNum = 3
-            } else if (val == 'floorFunc') {
-                this.modelNum = 2
-            }
-        }
+    /**
+     * @name handleRoute
+     * @param newRoute 当前路由
+     * @description 路由处理函数, 当前路由为home下的legendLibrary(图例)时,隐藏 menuList组件
+     */
+    handleRoute(newRoute) {
+      let path = "";
+      newRoute.path && (path = newRoute.path);
+      if (!path) {
+        return true;
+      }
+      let lastPath = path.split("home/")[1];
+      if (lastPath === "legendLibrary") {
+        this.showMenu = false;
+      } else {
+        this.showMenu = true;
+      }
     },
+  },
     components: {
         menuList
     }

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

@@ -80,7 +80,7 @@ export default {
         queryPicter() {
             this.picFloor = this.$cookie.get('floorNow')
             let getParams = {
-                module: '1002',
+                module: '1004',
                 floor: this.picFloor,
                 plazaId: this.$store.state.plazaId
             }