guoxiaohuan %!s(int64=4) %!d(string=hai) anos
pai
achega
d3c6393eb9

+ 29 - 12
src/components/Legend/src/legend.vue

@@ -6,10 +6,10 @@
 <template>
     <div>
         <div class='legend-container'>
-            <div v-show='!show' class='legend' @click='showTl' v-if='(type==1 || floors.length>0)&& isMessage'>图例</div>
-            <div v-show='show' class='legend2' @click='showTl' v-if='(type==1 || floors.length>0)&& isMessage'>图例</div>
+            <div :class='showView===1?"legend2":"legend"' @click='showTl' v-if='(type==1 || floors.length>0)&& isMessage'>图例</div>
+            <!-- 图里展示状态组件 -->
             <el-collapse-transition v-if='(type==1 || floors.length>0)&& isMessage'>
-                <div class='legend-tab' v-if='show'>
+                <div class='legend-tab' v-if='showView===1'>
                     <div class='legend-table2' v-if='systemName=="土建系统"'>
                         <lengend-view @changeSwitch='handleSwich' :remarksText='remarksText' ref='viewLengend' :systemName='systemName'></lengend-view>
                     </div>
@@ -18,8 +18,9 @@
                     </div>
                 </div>
             </el-collapse-transition>
+            <!-- 图例编辑状态组件 -->
             <el-collapse-transition @isShow2='isShow2'>
-                <div v-if='show2'>
+                <div v-if='showView===2'>
                     <lengend-edit
                         @handleSwich2='handleSwich2'
                         v-if='editTable.length>=0'
@@ -136,7 +137,7 @@ export default {
         }
     },
     computed: {
-        ...mapGetters(['plazaId', 'fmapID', 'floorSelect', 'isMessage', 'ssoToken'])
+        ...mapGetters(['plazaId', 'fmapID', 'floorSelect', 'isMessage', 'ssoToken', 'showView'])
     },
     props: {
         floors: {
@@ -253,19 +254,29 @@ export default {
         },
         // 点击展示图例框
         showTl() {
-            this.show = !this.show
-            this.queryView(false)
-            if (this.show) {
-                this.show2 = false
+            if (this.showView != 1) {
+                this.$store.commit('SETSHOWVIEW', 1)
+            } else {
+                this.$store.commit('SETSHOWVIEW', 0)
             }
+            // this.showView = !this.showView
+            this.queryView(false)
+            // if (this.showView) {
+            //     this.show2 = false
+            // }
         },
         cance() {
             this.show2 = false
         },
         // 编辑图例
         editTl() {
-            this.show = false
-            this.show2 = true
+            if (this.showView != 2) {
+                this.$store.commit('SETSHOWVIEW', 2)
+            } else {
+                this.$store.commit('SETSHOWVIEW', 0)
+            }
+            // this.show = false
+            // this.show2 = true
             this.queryEditNum(true)
         },
         /**
@@ -291,8 +302,14 @@ export default {
             let url = editerUrl + 'editer?' + encodeURIComponent(data)
             window.open(url, true)
         },
+        // 编辑状态取消
         isShow2() {
-            this.show2 = !this.show2
+            // if (this.showView != 2) {
+            //     this.$store.commit('SETSHOWVIEW', 1)
+            // } else {
+            //     this.$store.commit('SETSHOWVIEW', 0)
+            // }
+            // this.show2 = !this.show2
         },
         handleSwich(val) {
             this.queryView(!val)

+ 5 - 0
src/store/index.js

@@ -32,6 +32,7 @@ export default new Vuex.Store({
         remarksText: '', //备注
         bunkObj: {}, // 铺位名称
         currentFloor: {}, //当前选中的楼层信息
+        showView: 1, //展示图例1、编辑图例2、附加图片3
     },
     getters: {
         isPreview: (state) => state.isPreview,
@@ -48,6 +49,7 @@ export default new Vuex.Store({
         legendTable: (state) => state.legendTable,
         remarksText: (state) => state.remarksText,
         bunkObj: (state) => state.bunkObj,
+        showView: (state) => state.showView,
     },
     mutations: {
         SETISPREVIEW(state, data) {
@@ -109,6 +111,9 @@ export default new Vuex.Store({
         SETCURRENTFLOOR(state, data) {
             state.currentFloor = data
         },
+        SETSHOWVIEW(state, data) {
+            state.showView = data
+        },
     },
     actions: {
         // 获取项目列表、userId

+ 19 - 11
src/views/equipment/index.vue

@@ -30,14 +30,14 @@
                         <floorMap ref='floorMap' :id='"equip"' :loadName='loadName' :type='"system"'></floorMap>
                         <!--  -->
                         <div class='additional-box' v-if='fqPic.length>0'>
-                            <div class='additional' @click='additionalColl' v-if='!show'>
-                                <img src='../../assets/imgs/bg.png' alt />
-                            </div>
-                            <div class='additional2' @click='additionalColl' v-else>
+                            <div class='additional2' @click='additionalColl' v-if='showView===3'>
                                 <img src='../../assets/imgs/bg2.png' alt />
                             </div>
+                            <div class='additional' @click='additionalColl' v-else>
+                                <img src='../../assets/imgs/bg.png' alt />
+                            </div>
                             <el-collapse-transition>
-                                <div v-if='show' class='add-img'>
+                                <div v-if='showView===3' class='add-img'>
                                     <img :src='fqPic[0].url' alt />
                                 </div>
                             </el-collapse-transition>
@@ -114,8 +114,13 @@ export default {
         dialogVisible(eve) {
             this.$refs.dialog.showModal(eve)
         },
+        //附加数据图片查看 showView为3展示状态
         additionalColl() {
-            this.show = !this.show
+            if (this.showView != 3) {
+                this.$store.commit('SETSHOWVIEW', 3)
+            } else {
+                this.$store.commit('SETSHOWVIEW', 0)
+            }
         },
         // 查询附加数据图片
         queryTable(system) {
@@ -156,7 +161,7 @@ export default {
         this.$refs.floorMap.init(this.floorInfo.gname)
     },
     computed: {
-        ...mapGetters(['floorsArr', 'plazaId'])
+        ...mapGetters(['floorsArr', 'plazaId', 'showView'])
     }
 }
 </script>
@@ -305,6 +310,7 @@ export default {
                         .add-img {
                             width: 560px;
                             height: 360px;
+                            overflow: auto;
                             background: #ffffff;
                             -webkit-box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.06);
                             box-shadow: 0px 2px 8px 0px rgba(31, 36, 41, 0.06);
@@ -314,11 +320,13 @@ export default {
                             right: 77px;
                             bottom: 381px;
                             z-index: 2;
+                            padding: 24px;
                             img {
-                                max-width: 100%;
-                                max-height: 100%;
-                                display: block;
-                                margin: 0 auto;
+                                width: 100%;
+                                // max-height: 100%;
+                                // display: block;
+                                // margin: 0 auto;
+                                object-fit: cover;
                             }
                         }
                     }

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

@@ -49,11 +49,11 @@
         </div>
         <el-table :data='tableData' :border='true' style='width: 100%;amrgin-bottom:30px'>
             <el-table-column type='index' label='序号' width='60' :index='indexMethod'></el-table-column>
-            <el-table-column prop='sbjc' label='设备名称' show-overflow-tooltip resizable min-width='150'>
+            <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'>
-                <template slot-scope='{row}'>{{row.assetnum || '--'}}</template>
+            <el-table-column prop='sbjbm' label='设备编号' show-overflow-tooltip resizable width='80'>
+                <template slot-scope='{row}'>{{row.sbjbm || '--'}}</template>
             </el-table-column>
             <el-table-column prop='sl' label='数量' width='80'>
                 <template slot-scope='{row}'>{{row.sl>=0?row.sl:'--'}}</template>
@@ -79,7 +79,7 @@
             <el-table-column prop='manufacturer' label='生产厂商' show-overflow-tooltip resizable min-width='150'>
                 <template slot-scope='{row}'>{{row.manufacturer || '--'}}</template>
             </el-table-column>
-            <el-table-column prop='fws' label='服务商' show-overflow-tooltip resizable>
+            <el-table-column prop='fws' label='服务商' show-overflow-tooltip resizable width='200'>
                 <template slot-scope='{row}'>{{row.fws || '--'}}</template>
             </el-table-column>
         </el-table>

+ 18 - 6
src/views/other/zhsxOtherTable2.vue

@@ -20,19 +20,31 @@
                 :selectdata='status2'
                 :placeholder='"请选择"'
                 @change='dsfjc'
+                style='margin-right:12px'
             ></Select>
-            <Select
+            <!-- <Select
                 @change='dsfjc'
                 width='200'
                 tipPlace='top'
                 caption='部门:'
                 v-if='zgbm.length>0'
                 size='small'
+                style='margin-right:12px'
                 v-model='bmdsf'
                 :selectdata='zgbm'
                 :placeholder='"请选择"'
-            ></Select>
-            <Select
+            ></Select>-->
+            <el-input
+                clearable
+                @change='dsfjc'
+                placeholder='搜索部门'
+                size='small'
+                prefix-icon='el-icon-search'
+                v-model='bmdsf'
+                style='width:200px;margin-right:12px'
+            ></el-input>
+            <el-input clearable @change='dsfjc' placeholder='搜索检测结论' size='small' prefix-icon='el-icon-search' v-model='jcjldsf' style='width:200px'></el-input>
+            <!-- <Select
                 @change='dsfjc'
                 width='200'
                 tipPlace='top'
@@ -42,7 +54,7 @@
                 :selectdata='conclusion'
                 :placeholder='"请选择"'
                 v-model='jcjldsf'
-            ></Select>
+            ></Select>-->
         </div>
         <el-table
             row-key='id'
@@ -122,10 +134,10 @@ export default {
                 getParams.status2 = this.ztdsf
             }
             if (this.bmdsf) {
-                getParams.status2 = this.bmdsf
+                getParams.keyword = `${this.bmdsf}:zgbm`
             }
             if (this.jcjldsf) {
-                getParams.conclusion = this.jcjldsf
+                getParams.keyword = `${this.jcjldsf}:conclusion`
             }
             queryDsfrw({ getParams }).then(res => {
                 if (res.result == 'success') {

+ 4 - 2
src/views/room/index.vue

@@ -7,7 +7,7 @@
     <div class='compute-box'>
         <el-dialog :title='`${systemName}`||"机房"' :visible.sync='visible' :fullscreen='true'>
             <div class='compute-span'></div>
-            <el-tooltip class='item' effect='dark' :content='content' placement='top' v-if='smsxtArr.length>0'>
+            <el-tooltip class='item' effect='dark' :content='content' placement='top' v-if='(type=="floor" && smsxtArr.length>0)||type=="system"'>
                 <div class='compute-zf' @click='jumpFloor'></div>
             </el-tooltip>
 
@@ -493,7 +493,8 @@ export default {
             rwwcrq: '',
             ycgdtbsj: '',
             ycgdyssj: '',
-            smsxtArr: { smsx: '1001', smsxtname: '供电系统' }
+            smsxtArr: { smsx: '1001', smsxtname: '供电系统' },
+            type: ''
         }
     },
     components: {
@@ -844,6 +845,7 @@ export default {
             this.visible = true
             this.systemName = name.name
             this.location = name.location
+            this.type = name.type
             if (name.type == 'floor') {
                 this.init()
             } else if (name.type == 'system') {