zc

src/assets/styles/ZDelement.scss

@@ -131,20 +131,21 @@ background: rgba(255,255,255,0);
   top:1px;
   left:1px;
 }
+.el-table--medium th, .el-table--medium td {
+  padding: 8px 0;
+}
 .el-table__header-wrapper{
+  height:39px;
   th, td{
-    padding:19px 0;
+    padding:8px 0;
   }
 }
 //表格
 .el-table__body-wrapper{
   th, td{
-    padding:10px 0;
+    padding:8px 0;
   }
 }
-//.el-table--medium th, .el-table--medium td{
-//  padding:18px 0;
-//}
 .el-table{
   font-size:14px;
 }

src/assets/styles/ZDpageCss.scss

@@ -5,6 +5,9 @@
   scrollbar-width: thin; /* 滚动条宽度有三种：thin、auto、none */
 }
 /*===================================各个页面独立样式===================================*/
+p{
+  margin:0;
+}
 //风险预案
 .plan .el-button--text{
   width:120px!important;
@@ -1577,10 +1580,10 @@
 //风险统计
 .plan_log{
   .el-table__header-wrapper{
-    height:50px;
+    height:39px;
   }
   .el-table--medium th, .el-table--medium td{
-    padding:13px 0;
+    padding:8px 0;
   }
   .el-table .cell{
     font-size:14px;

src/views/comprehensive/laboratoryManagement/exhaustAirRecord/index.vue

@@ -0,0 +1,17 @@
+<template>
+    <div class="exhaustAirRecord">
+
+    </div>
+</template>
+
+<script>
+  export default {
+    name: 'index'
+  }
+</script>
+
+<style scoped>
+  .exhaustAirRecord{
+
+  }
+</style>

src/views/comprehensive/laboratoryManagement/subject/index.vue

@@ -53,9 +53,9 @@
             <el-table-column label="安全责任人" align="left" prop="safeUserName" width="200" show-overflow-tooltip/>
             <el-table-column label="操作" align="left" width="160">
               <template slot-scope="scope">
-                <div style="display: flex;height:30px;">
+                <div style="display: flex;">
                   <p class="table-min-button" style="margin-right:10px;" v-hasPermi="['laboratory:subject:query']" @click="clickPage(7,scope.row)">详情</p>
-                  <el-dropdown trigger="click" size="mini" @command="(command) => handleCommand(command, scope.row)">
+                  <el-dropdown style="height:23px;" trigger="click" size="mini" @command="(command) => handleCommand(command, scope.row)">
                     <p class="table-min-button">更多<i class="el-icon-d-arrow-right"></i></p>
                     <el-dropdown-menu slot="dropdown" style="margin:0!important;">
                       <el-dropdown-item style="height:36px;line-height:36px;width:90px;text-align: center" command="1" v-hasPermiAnd="['laboratory:subject:query','laboratory:subject:edit']">关联配置</el-dropdown-item>

src/views/comprehensive/message/labNotify/index.vue

@@ -47,7 +47,7 @@
       <el-table v-loading="loading" border :data="notifyplanList" @selection-change="handleSelectionChange">
         <!--<el-table-column type="selection" width="55" align="center" />-->
         <!--<el-table-column label="主键" align="left" prop="id" />-->
-        <el-table-column label="标题" align="left" prop="title" />
+        <el-table-column label="标题" align="left" prop="title" show-overflow-tooltip/>
         <el-table-column label="发布单位" align="left" prop="company" />
         <el-table-column label="类型" align="left" prop="notifyType">
           <template slot-scope="scope">{{scope.row.notifyType == 1?'工作通知':(scope.row.notifyType == 2?'校院通知':'')}}</template>

src/views/comprehensive/message/labNotifyplan/index.vue

@@ -41,7 +41,7 @@
       <el-table v-loading="loading" border :data="notifyplanList" @selection-change="handleSelectionChange">
         <!--<el-table-column type="selection" width="55" align="center" />-->
         <!--<el-table-column label="主键" align="center" prop="id" />-->
-        <el-table-column label="标题" align="left" prop="title" />
+        <el-table-column label="标题" align="left" prop="title" show-overflow-tooltip/>
         <el-table-column label="发布单位" align="left" prop="company" />
         <el-table-column label="发布人" align="left" prop="createBy" />
         <el-table-column label="发布时间" align="left" prop="createTime" />

src/views/comprehensive/system/syntheticMusic/index.vue

@@ -12,11 +12,11 @@
     <el-table v-loading="loading" :data="synthesisList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="主键id" align="center" prop="id" />
-      <el-table-column label="音乐地址" align="center" prop="musicUrl" />
+      <el-table-column label="音乐地址" align="center" prop="musicUrl" show-overflow-tooltip/>
       <el-table-column label="音量大小" align="center" prop="musicVolume" />
-      <el-table-column label="背景音乐地址" align="center" prop="bgmusicUrl" />
+      <el-table-column label="背景音乐地址" align="center" prop="bgmusicUrl" show-overflow-tooltip/>
       <el-table-column label="背景音乐大小" align="center" prop="bgmusicVolume" />
-      <el-table-column label="合成音乐新地址" align="center" prop="newMusicUrl" />
+      <el-table-column label="合成音乐新地址" align="center" prop="newMusicUrl" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="160" v-if="tableButtonType">
         <template slot-scope="scope">
           <div class="button-box">

src/views/emergencyManagement/smartLoT/abnormal/index.vue

@@ -82,8 +82,8 @@
       </el-table-column>
       <!--<el-table-column label="类型" align="left" prop="type" />-->
       <el-table-column label="学院" align="left" prop="deptName" />
-      <el-table-column label="实验室" align="left" prop="subjectName" />
-      <el-table-column label="异常原因" align="left" prop="abnormalReason" />
+      <el-table-column label="实验室" align="left" prop="subjectName" show-overflow-tooltip/>
+      <el-table-column label="异常原因" align="left" prop="abnormalReason" show-overflow-tooltip/>
       <el-table-column label="最近异常时间" align="left" prop="lastAbnormalTime" />
       <el-table-column label="状态" align="left" prop="hardwareOperateName" width="100">
         <template slot-scope="scope"><span>{{scope.row.hardwareOperateName}}</span></template>

src/views/emergencyManagement/smartLoT/sensor/index.vue

@@ -44,8 +44,8 @@
     </el-form>
 
     <el-table v-loading="loading" border :data="sensorList" @selection-change="handleSelectionChange">
-      <el-table-column label="名称" align="left" prop="name" />
-      <el-table-column label="网关编号" align="left" prop="gatewayId" />
+      <el-table-column label="名称" align="left" prop="name" show-overflow-tooltip/>
+      <el-table-column label="网关编号" align="left" prop="gatewayId" show-overflow-tooltip/>
       <el-table-column label="学院" align="left" prop="deptName" />
       <el-table-column label="实验室" align="left" prop="subjectName" />
       <el-table-column label="路由" align="left" prop="routeNum" />

src/views/gasManage3_0/manage/infoStatistics/infoStatistics.vue

@@ -90,15 +90,15 @@
                 <el-table-column label="气瓶编号" align="left" prop="airNumber"/>
                 <el-table-column label="气体名称" align="left" prop="airName"></el-table-column>
                 <el-table-column label="气体级别/规格" align="left" prop="configName"></el-table-column>
-                <el-table-column label="气瓶厂家" align="left" prop="companyName"></el-table-column>
-                <el-table-column label="实验地点" align="left" prop="location"></el-table-column>
+                <el-table-column label="气瓶厂家" align="left" prop="companyName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="实验地点" align="left" prop="location" show-overflow-tooltip></el-table-column>
                 <el-table-column label="使用人数" align="left" prop="numberPersons"></el-table-column>
                 <el-table-column label="当前气压" align="left" prop="currentPressure">
                   <template slot-scope="scope">
                     <span>{{scope.row.currentPressure}}Mpa</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="最后使用时间" align="left" prop="lastTime"></el-table-column>
+                <el-table-column label="最后使用时间" align="left" prop="lastTime" width="200"></el-table-column>
                 <el-table-column label="状态" align="left" prop="storageStatus">
                   <template slot-scope="scope">
                     <p :class="scope.row.storageStatus == 1?'color_warn':(scope.row.storageStatus == 2?'color_FF4E00':(scope.row.storageStatus == 3?'color_14AE10':''))">{{scope.row.storageStatus == 1?'空闲':(scope.row.storageStatus == 2?'使用中':(scope.row.storageStatus == 3?'已出库':''))}}</p>

src/views/gasManage3_0/manage/supplierManage/supplierManage.vue

@@ -68,7 +68,7 @@
         </el-table-column>
         <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="180">
           <template slot-scope="scope">
-            <div style="display: flex;height:30px;">
+            <div style="display: flex;">
               <p v-hasPermi="['airbottle:supplier:query']" class="table-min-button" @click="handleClick('',scope.row,'detail')">查看</p>
               <el-dropdown size="mini" @command="(command) => handleCommand(command, scope.row)">
                     <span class="table-min-button">

src/views/hazardManagement/hazard/index.vue

@@ -61,11 +61,11 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="查看次数" align="left" prop="scanCount" width="140" />
-        <el-table-column label="二维码" align="left" width="140">
+        <el-table-column label="查看次数" align="left" prop="scanCount" width="100" />
+        <el-table-column label="二维码" align="left" width="100">
           <template slot-scope="scope">
             <div @click="dialogQrCodeOn(scope.row.qrCodeUrl)">
-              <vue-qr style="height:50px;width:50px;cursor:pointer;" :text="scope.row.qrCodeUrl" :size="200"></vue-qr>
+              <vue-qr style="height:23px;width:23px;cursor:pointer;" :text="scope.row.qrCodeUrl" :size="200"></vue-qr>
             </div>
           </template>
         </el-table-column>

src/views/hierarchicalControl/hierarchicalControl/gradeManageRecord/index.vue

@@ -81,7 +81,7 @@
         <el-table-column label="类型" align="center" prop="moldName" width="149"/>
         <el-table-column label="安全分类" align="center" prop="typeName" width="130"/>
         <el-table-column label="安全分级" align="center" prop="levelName" width="130"/>
-        <el-table-column label="学院" align="center" prop="deptName" width="130"/>
+        <el-table-column label="学院" align="center" prop="deptName" width="130" show-overflow-tooltip/>
         <el-table-column label="执行周期" align="center" prop="cycle" width="149"/>
         <!--<el-table-column label="执行人身份" align="center" prop="userPosition" />-->
         <el-table-column label="状态" align="center" prop="status"width="149">

src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/msds/index.vue

@@ -36,8 +36,8 @@
         <el-table-column label="查看次数" align="center" prop="scanCount" width="100"/>
         <el-table-column label="二维码" align="center" width="100">
         <template slot-scope="scope">
-        <div style="height:50px;" @click="dialogQrCodeOn(scope.row.qrCodeUrl)">
-          <vue-qr style="height:50px;width:50px;cursor:pointer;" :text="scope.row.qrCodeUrl" :size="200"></vue-qr>
+        <div style="height:23px;" @click="dialogQrCodeOn(scope.row.qrCodeUrl)">
+          <vue-qr style="height:23px;width:23px;cursor:pointer;" :text="scope.row.qrCodeUrl" :size="200"></vue-qr>
         </div>
         </template>
         </el-table-column>

src/views/medicUniversity-3_1/chemicalManagement/deviceManagement/smartLocker/index.vue

@@ -81,8 +81,8 @@
       <el-table  border :data="tableList" @selection-change="handleSelectionChange" ref="multipleTable" :row-key="getRowKeys">
         <el-table-column type="selection" width="50" align="center" :reserve-selection="true"/>
         <el-table-column label="智能柜锁编号" align="center" prop="hardwareNum" width="280"/>
-        <el-table-column label="柜锁名称" align="center" prop="name" width="180"/>
-        <el-table-column label="学院" align="center" prop="deptName" width="160"/>
+        <el-table-column label="柜锁名称" align="center" prop="name" width="180" show-overflow-tooltip/>
+        <el-table-column label="学院" align="center" prop="deptName" width="160" show-overflow-tooltip/>
         <el-table-column label="位置" align="center" prop="posi" width="250" show-overflow-tooltip/>
         <!--sass后放开-->
         <!--<el-table-column label="设备状态" align="center" prop="status" width="100">-->

src/views/safetyEducationExam/safeLearning/safe_book/index.vue

@@ -61,11 +61,11 @@
         </template>
       </el-table-column>
       <el-table-column label="创建时间" align="left" prop="createTime"  width="280"/>
-      <el-table-column label="查看次数" align="left" prop="scanCount" width="190"/>
-      <el-table-column label="二维码" align="left" width="140">
+      <el-table-column label="查看次数" align="left" prop="scanCount" width="100"/>
+      <el-table-column label="二维码" align="left" width="100">
         <template slot-scope="scope">
           <div @click="dialogQrCodeOn(scope.row.qrCodeUrl)">
-            <vue-qr style="height:50px;width:50px;cursor:pointer;" :text="scope.row.qrCodeUrl" :size="200"></vue-qr>
+            <vue-qr style="height:23px;width:23px;cursor:pointer;" :text="scope.row.qrCodeUrl" :size="200"></vue-qr>
           </div>
         </template>
       </el-table-column>

src/views/safetyEducationExam/securityExam/exam/index.vue

@@ -49,7 +49,7 @@
       </el-form-item>
     </el-form>
     <el-table v-loading="loading" border :data="examList" @selection-change="handleSelectionChange" v-show="pageType==0">
-      <el-table-column label="考试名称" align="left" prop="title" />
+      <el-table-column label="考试名称" align="left" prop="title" show-overflow-tooltip/>
       <el-table-column label="适用范围" align="left" prop="scopeType">
         <template slot-scope="scope">
           <span v-for="(item,index) in scopeTypes" :key="index" v-if="scope.row.scopeType==item.type">{{item.value}}</span>

src/views/safetyEducationExam/securityExam/exam_my/index.vue

@@ -12,8 +12,8 @@
       ><i class="el-icon-arrow-left"></i>返回</p>
       <div class="el-table-box" v-if="tableType==1">
         <el-table v-loading="loading" border :data="examList">
-          <el-table-column label="考试名称" align="left" prop="title"/>
-          <el-table-column label="描述" align="left" prop="content"/>
+          <el-table-column label="考试名称" align="left" prop="title" show-overflow-tooltip/>
+          <el-table-column label="描述" align="left" prop="content" show-overflow-tooltip/>
           <el-table-column label="考试类型" align="left" prop="content">
             <template slot-scope="scope">
               <p :class="scope.row.scopeType==1?'border-colorA':(scope.row.scopeType==2?'border-colorB':(scope.row.scopeType==3?'border-colorC':(scope.row.scopeType==4?'border-colorD':'')))">{{scope.row.scopeType==1?'安全准入考试':scope.row.scopeType==2?'负面清单考试':(scope.row.scopeType==3?'黑名单考试':scope.row.scopeType==4?'模拟考试':'')}}</p>

src/views/safetyEducationExam/securityExam/qu/index.vue

@@ -93,7 +93,7 @@
       @selection-change="handleSelectionChange"
       v-show="pageType == 0"
     >
-      <el-table-column label="题目名称" align="left" prop="content"/>
+      <el-table-column label="题目名称" align="left" prop="content" show-overflow-tooltip/>
       <el-table-column label="题目类型"  align="left" prop="quType" width="120">
         <template slot-scope="scope">
           <span

src/views/system/alarm/index.vue

@@ -47,7 +47,7 @@
         </template>
       </el-table-column>
       <el-table-column label="联系方式" align="center" prop="phone" />
-      <el-table-column label="报警内容" align="center" prop="notice" width="500"/>
+      <el-table-column label="报警内容" align="center" prop="notice" width="500" show-overflow-tooltip/>
       <el-table-column label="拨打次数" align="center" prop="isBack" />
       <el-table-column label="回调时间" align="center" prop="updateTime" width="200"/>
       <el-table-column label="首次报警时间" align="center" prop="createTime" width="200"/>