guoxiaohuan 4 anni fa
parent
commit
b4ea6ff0cd

+ 10 - 4
src/components/Legend/src/legend.vue

@@ -22,7 +22,7 @@
             <el-collapse-transition>
                 <div v-if='showView===2'>
                     <lengend-edit
-                        @handleSwich2='handleSwich2'
+                        @changeSwitch='handleSwich'
                         v-if='editTable.length>0'
                         :loading='loading1'
                         ref='editLen'
@@ -51,9 +51,10 @@
             </el-tooltip>
             <!-- 编辑图例 -->
             <el-tooltip effect='dark' content='编辑图例' placement='left'>
-                <p v-if='systemName != "土建系统" && isMessage' @click='editTl' class='tltk-1'>
-                    <img src='@/assets/imgs/bjtl.png' alt />
-                </p>
+                <span class='bjtk' v-if='systemName != "土建系统" && isMessage' @click='editTl'>图例</span>
+                <!-- <p v-if='systemName != "土建系统" && isMessage' @click='editTl' class='tltk-1'> -->
+                <!-- <img src='@/assets/imgs/bjtl.png' alt /> -->
+                <!-- </p> -->
             </el-tooltip>
             <!-- 新增分布图 -->
             <el-tooltip effect='dark' content='新增分布图' placement='left' v-if='floorSelect.length!=floors.length && type==0'>
@@ -337,6 +338,7 @@ export default {
             // this.show2 = !this.show2
         },
         handleSwich(val) {
+            console.log(val)
             this.queryView(!val)
         },
         // 默认隐藏为0的项目
@@ -448,11 +450,15 @@ export default {
                     element.Modify = element.IsModify
                 })
                 this.queryEdit(val)
+                this.$store.commit('SETSHOWVIEW', 1)
+                this.handleSwich(true)
                 // this.isShow2()
             } else {
                 // this.show2 = false
                 // this.isShow2()
                 // this.queryEditNum(true)
+                this.$store.commit('SETSHOWVIEW', 1)
+                this.handleSwich(true)
             }
         },
         addFloor() {

+ 8 - 3
src/components/Rotation/src/rotation.vue

@@ -54,6 +54,7 @@ export default {
     .rotationCon {
         height: 100%;
         width: 100%;
+        text-align: center;
         // display: flex;
     }
     img {
@@ -102,13 +103,17 @@ export default {
         width: 100%;
         overflow: auto;
     }
+    /deep/ .el-carousel__item {
+        text-align: center;
+        background: #fff;
+    }
     img {
         // width: 100%;
-        // height: 100%;
+        height: 100%;
         // object-fit: fill;
         // min-width: 100%;
-        width: 100%;
-        min-height: 100%;
+        // width: 100%;
+        // min-height: 100%;
     }
 }
 </style>

+ 4 - 1
src/components/editLengend.vue

@@ -141,6 +141,8 @@ export default {
         },
         // 编辑图例取消
         cancel() {
+            console.log(this.editNum)
+
             if (this.editNum.length > 0) {
                 this.$confirm('图例中的数据发生变化, 是否需要保存?', {
                     confirmButtonText: '保存',
@@ -157,10 +159,10 @@ export default {
                         })
                         this.editNum = []
                         this.$emit('saveNum', this.editNum)
-                        this.$store.commit('SETSHOWVIEW', 1)
                     })
             } else {
                 this.$store.commit('SETSHOWVIEW', 1)
+                this.$emit('saveNum', this.editNum)
             }
         },
         // 编辑图里保存
@@ -195,6 +197,7 @@ export default {
                             message: '操作成功',
                             type: 'success'
                         })
+                        this.$emit('changeSwitch', true)
                         this.$store.commit('SETSHOWVIEW', 1)
                     } else {
                         this.$message({

+ 1 - 1
src/components/viewLengend.vue

@@ -102,7 +102,7 @@ export default {
         },
         setSelected() {
             this.legendTable.forEach(t => {
-                this.$refs.dataTable.toggleRowSelection(t, t.Type != 'None')
+                this.$refs.dataTable.toggleRowSelection(t, true)
             })
         }
     },

+ 3 - 0
src/views/equipment/eqDialog.vue

@@ -308,6 +308,9 @@ export default {
     .el-tabs,
     .el-tabs__content {
         height: calc(100% - 45px);
+        /deep/ .el-tab-pane > div {
+            height: 100% !important;
+        }
     }
     .el-tabs__item {
         padding: 5px 16px;