zc

src/api/safetyCheck/index.js

@@ -0,0 +1,50 @@
+import request from '@/utils/request'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+// 查询安全准入资格列表
+export function listGroup(query) {
+  return request({
+    url: '/laboratory/group/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增安全准入资格
+export function addGroup(data) {
+  return request({
+    url: '/laboratory/group',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改安全准入资格
+export function updateGroup(data) {
+  return request({
+    url: '/laboratory/group',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除安全准入资格
+export function delGroup(id) {
+  return request({
+    url: '/laboratory/group/' + id,
+    method: 'delete'
+  })
+}

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

@@ -43,22 +43,22 @@
                 </template>
               </el-table-column>
               <el-table-column label="实验室名称" align="left" prop="name"  show-overflow-tooltip/>
-              <el-table-column label="房间号" align="left" prop="room" width="120" show-overflow-tooltip/>
-              <el-table-column label="学院" align="left" prop="deptName" width="200" show-overflow-tooltip v-if="versionField() == 'xiBeiNongLinDaXue'"/>
-              <el-table-column label="分类/分级" align="left" prop="levelName" width="150" show-overflow-tooltip>
+              <el-table-column label="房间号" align="left" prop="room" :width="versionField() == 'xiBeiNongLinDaXue'?250:150" show-overflow-tooltip/>
+              <el-table-column label="学院" align="left" prop="deptName" :width="versionField() == 'xiBeiNongLinDaXue'?200:130"  show-overflow-tooltip/>
+              <el-table-column label="分类/分级" align="left" prop="levelName" :width="versionField() == 'xiBeiNongLinDaXue'?200:150"  show-overflow-tooltip>
                 <template slot-scope="scope">
                   <span >{{scope.row.typeName}}/</span>
                   <span :style="'color:'+scope.row.fiedColor+';'">{{scope.row.levelName}}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="实验室责任人" align="left" prop="adminName" width="130" show-overflow-tooltip/>
-              <el-table-column label="安全责任人" align="left" prop="safeUserName" width="200" show-overflow-tooltip/>
-              <el-table-column label="操作" align="left" width="160">
+              <el-table-column label="实验室责任人" align="left" prop="adminName" :width="versionField() == 'xiBeiNongLinDaXue'?180:130"  show-overflow-tooltip/>
+              <el-table-column label="安全责任人" align="left" prop="safeUserName" :width="versionField() == 'xiBeiNongLinDaXue'?180:130"  show-overflow-tooltip/>
+              <el-table-column label="操作" align="left" :width="versionField() == 'xiBeiNongLinDaXue'?180:140" >
                 <template slot-scope="scope">
-                  <div style="display: flex;height:30px;">
-                    <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)">
-                      <p class="table-min-button">更多<i class="el-icon-d-arrow-right"></i></p>
+                  <div style="display: flex;height:30px;padding-top: 4px;">
+                    <p class="table-min-button" style="flex:1;margin:0!important;" v-hasPermi="['laboratory:subject:query']" @click="clickPage(7,scope.row)">详情</p>
+                    <el-dropdown style="flex:1;" trigger="click" size="mini" @command="(command) => handleCommand(command, scope.row)">
+                      <p class="table-min-button" style="margin:0!important;">更多<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>
                         <el-dropdown-item v-if="versionField() != 'xiBeiNongLinDaXue'" style="height:36px;line-height:36px;width:90px;text-align: center" command="2">物联配置</el-dropdown-item>