zc

src/views/comprehensive/laboratoryManagement/building/buildingDetails.vue

@@ -104,7 +104,9 @@
       </div>
       <div class="max-right-box">
         <div class="right-title-box">
-          <p class="right-title-p">{{buildName}}楼{{floorName}}层</p>
+          <el-tooltip class="item" effect="dark" :content="buildName+'楼'+floorName+'层'" placement="top-start">
+            <p class="right-title-p">{{buildName}}楼{{floorName}}层</p>
+          </el-tooltip>
           <div @click="buttonShadeClick">
             <p class="el-icon-question"></p>
             <p>使用帮助</p>

src/views/comprehensive/laboratoryManagement/building/newIndex.vue

@@ -128,7 +128,9 @@
                           <div class="map-max-for-center-min-left"></div>
                           <div class="map-max-for-center-min-center"
                                :class="bigItem.type == 2?'for-map-box-one':(bigItem.type == 1?'for-map-box':(bigItem.type == 3?'for-map-box-two':''))">
-                            <div class="min-text-box" v-if="bigItem.type==1">{{bigItem.roomNum}}</div>
+                            <div class="min-text-box"
+                                 :style="'line-height:'+(bigItem.h-4)+'px;height:'+(bigItem.h-4)+'px;'"
+                                 v-if="bigItem.type==1">{{bigItem.roomNum}}</div>
                             <div v-if="bigItem.type == 1"
                                  :class="minItem.toward=='top'?'center-move-door-p-t':(minItem.toward=='bottom'?'center-move-door-p-b':(minItem.toward=='left'?'center-move-door-p-l':(minItem.toward=='right'?'center-move-door-p-r':'')))"
                                  v-for="(minItem,minIndex) in bigItem.doorList" :key="minIndex"
@@ -179,7 +181,9 @@
                       <div class="map-max-for-center-min-left"></div>
                       <div class="map-max-for-center-min-center"
                            :class="item.type == 2?'for-map-box-one':(item.type == 1?'for-map-box':(item.type == 3?'for-map-box-two':''))">
-                        <div class="min-text-box" v-if="item.type==1">{{item.roomNum}}</div>
+                        <div class="min-text-box"
+                             :style="'line-height:'+(item.h-4)+'px;height:'+(item.h-4)+'px;'"
+                             v-if="item.type==1">{{item.roomNum}}</div>
                         <div v-if="item.type == 1"
                             :class="minItem.toward=='top'?'center-move-door-p-t':(minItem.toward=='bottom'?'center-move-door-p-b':(minItem.toward=='left'?'center-move-door-p-l':(minItem.toward=='right'?'center-move-door-p-r':'')))"
                              v-for="(minItem,minIndex) in item.doorList" :key="minIndex"
@@ -363,7 +367,9 @@
                         <div class="map-max-for-center-min-left"></div>
                         <div class="map-max-for-center-min-center"
                              :class="item.type == 2?'for-map-box-one':(item.type == 1 &&item.checkType?'for-map-box-three':(item.type == 3?'for-map-box-two':(item.type == 1?'for-map-box':'')))">
-                          <div class="min-text-box" v-if="item.type==1">{{item.roomNum}}</div>
+                          <div class="min-text-box"
+                               :style="'line-height:'+(item.h-4)+'px;height:'+(item.h-4)+'px;'"
+                               v-if="item.type==1">{{item.roomNum}}</div>
                           <div v-if="item.type == 1"
                                :class="minItem.toward=='top'?'center-move-door-p-t':(minItem.toward=='bottom'?'center-move-door-p-b':(minItem.toward=='left'?'center-move-door-p-l':(minItem.toward=='right'?'center-move-door-p-r':'')))"
                                v-for="(minItem,minIndex) in item.doorList" :key="minIndex"
@@ -1438,7 +1444,6 @@
                             word-break:break-all;
                             overflow: hidden;
                             z-index:999;
-                            margin:30% 0 0 0;
                             font-size:14px;
                             line-height:20px;
                           }
@@ -1624,7 +1629,6 @@
                           word-break:break-all;
                           overflow: hidden;
                           z-index:999;
-                          margin:30% 0 0 0;
                           font-size:14px;
                           line-height:20px;
                         }
@@ -1819,7 +1823,6 @@
                     word-break:break-all;
                     overflow: hidden;
                     z-index:999;
-                    margin:30% 0 0 0;
                     font-size:14px;
                     line-height:20px;
                   }

src/views/emergencyManagement/plan/index.vue

@@ -16,9 +16,9 @@
           <el-select v-model="param.startCondition" placeholder="请选择启动条件" clearable size="small">
             <el-option
               v-for="dict in deptOptions"
-              :key="dict.funNum"
+              :key="dict.describe"
               :label="dict.describe"
-              :value="dict.funNum"
+              :value="dict.describe"
             ></el-option>
           </el-select>
         </el-form-item>

src/views/emergencyManagement/plan/newAddPlan.vue

@@ -469,6 +469,15 @@
                       age++
                       console.log('age++');
                     }
+                    if(self.form.labRiskPlanLevels[i].riskPlanSensorList[o].minMonitor>=self.dialogForm.riskPlanSensorList[x].minMonitor&&
+                      self.form.labRiskPlanLevels[i].riskPlanSensorList[o].minMonitor<=self.dialogForm.riskPlanSensorList[x].maxMonitor){
+                      age++
+                      console.log('age++');
+                    }else if(self.form.labRiskPlanLevels[i].riskPlanSensorList[o].maxMonitor>=self.dialogForm.riskPlanSensorList[x].minMonitor&&
+                      self.form.labRiskPlanLevels[i].riskPlanSensorList[o].maxMonitor<=self.dialogForm.riskPlanSensorList[x].maxMonitor){
+                      age++
+                      console.log('age++');
+                    }
                   }
                 }
                 if(self.dialogForm.riskPlanSensorList.length == num && self.dialogForm.riskPlanSensorList.length == age){

src/views/emergencyManagement/plan/newAssociatedPage.vue

@@ -144,9 +144,17 @@
           <!--</div>-->
           <el-table ref="table" v-loading="loading" border :data="dialogTableData" @selection-change="handleSelectionChange" :row-key="getRowKeys">
             <el-table-column type="selection" width="55" :reserve-selection="true" align="center" />
-            <el-table-column label="实验室" width="220" align="center" prop="id" />
-            <el-table-column label="安全分类" width="100" align="center" prop="name" />
-            <el-table-column label="安全分级" width="100" align="center" prop="key" />
+            <el-table-column label="实验室" width="220" align="center" prop="name" show-overflow-tooltip/>
+            <el-table-column label="安全分类" width="100" align="center" prop="typeId" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span v-for="(item,index) in typeList" :key="index" v-if="item.id == scope.row.typeId">{{item.typeName}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="安全分级" width="100" align="center" prop="level" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <span v-for="(item,index) in levelList" :key="index" v-if="item.id == scope.row.level">{{item.classifiedName}}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="危险源" align="left">
               <template slot-scope="scope">
                 <div style="margin-bottom:10px;">