dedsudiyu 2 роки тому
батько
коміт
33a9c68f12

+ 1 - 1
src/views/comprehensive/laboratoryManagement/building/buildingDetails.vue

@@ -153,7 +153,7 @@
       </div>
     </div>
     <!--房间/灯设置-->
-    <el-dialog :title="dialogOpenType==1?'新增房间':(dialogOpenType==6?'新增指示灯':'')" :visible.sync="dialogOpen" v-if="dialogOpen" width="600px" append-to-body>
+    <el-dialog :title="dialogOpenType==1?'编辑房间':(dialogOpenType==6?'编辑指示灯':'')" :visible.sync="dialogOpen" v-if="dialogOpen" width="600px" append-to-body>
       <el-form ref="dialogForm" :model="dialogForm" :rules="rules" label-width="120px">
         <div v-if="dialogOpenType == 1">
           <el-form-item label="房间类型:" prop="roomType">

+ 7 - 8
src/views/comprehensive/laboratoryManagement/building/newIndex.vue

@@ -256,13 +256,13 @@
               </el-table-column>
               <el-table-column label="创建人" align="left" prop="createBy" width="200"/>
               <el-table-column label="创建时间" align="left" prop="createTime" width="200"/>
-              <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="100">
-                <template slot-scope="scope">
-                  <div class="button-box" style="display: flex">
-                    <p class="table-min-button" @click="roomClick(1,scope.row)">编辑</p>
-                  </div>
-                </template>
-              </el-table-column>
+              <!--<el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="100">-->
+                <!--<template slot-scope="scope">-->
+                  <!--<div class="button-box" style="display: flex">-->
+                    <!--<p class="table-min-button" @click="roomClick(1,scope.row)">编辑</p>-->
+                  <!--</div>-->
+                <!--</template>-->
+              <!--</el-table-column>-->
             </el-table>
             <pagination
               style="margin-top:20px;"
@@ -580,7 +580,6 @@
                 parentId: this.parentId
               }
               this.getTreeSonList(obj)
-              this.getList()
             })
           }
         })

+ 3 - 1
src/views/newEvacuationBigData.vue

@@ -103,7 +103,9 @@
               </el-option>
             </el-select>
           </div>
-          <p class="text-p">{{subText}}  {{floorText}}</p>
+          <el-tooltip class="item" effect="dark" :content="subText+floorText" placement="top">
+            <p class="text-p">{{subText}}  {{floorText}}</p>
+          </el-tooltip>
           <p class="button-p-one" @click="evacuationButton">{{evacuationType?'结束疏散':'立即疏散'}}</p>
           <p class="button-p-two" @click="goRoute">{{routeType?'返回':'全屏'}}</p>
         </div>