Merge remote-tracking branch 'remotes/origin/web-v2' into web-v2-pro

README.md

@@ -47,11 +47,14 @@
     │  ├─suzhouDX-web (化工学院-当前线上版本)
     │  └─suzhouDX-web (安全学院-当前线上版本)
     ├─3.3.4-kdyh (矿大优化版本)
-    │  └─nhkd-web (环测学院-当前线上版本)
+    │  └─nhkd-web (矿大环测学院-当前线上版本)
+    │    └─changAnDaXue-web (长安大学-当前线上版本/去除了AppMain.vue下每次加载预警数据接口)
+    │    └─nhkd-tenantry-web (矿大能动学院-当前线上版本/增加了租户功能,特定租户屏蔽首页)
     ├─3.3.3-AnQuanJianCha (新安全检查版本)
     │  ├─3.3.5-BaoJingZhuaPai&DianHuaBaoJing (报警抓拍&电话报警版本)
     │  └─3.3.6-zzjg&jzbj (组织架构&建筑布局版本)
-    ├─3.3.3-temp (包含 3.3.3 & 3.3.5 & 3.3.6 版本所有内容)
+    │    └─jiaoTongDaXue-Demo(交通大学演示版本)
+    ├─web-v2-temp (包含 3.3.3 & 3.3.5 & 3.3.6 版本所有内容)
     ├─3.3.7-scxjy (手持巡检仪版本)
     │
     │

src/api/laboratory/subject.js

@@ -59,6 +59,15 @@ export function updateSubject(data) {
     data: data
   })
 }
+// 实验室-修改排序
+export function laboratorySubjectEditSort(data) {
+  return request({
+    url: '/laboratory/subject/editSort',
+    method: 'post',
+    data: data
+  })
+}
+
 // 查询实验室-安全信息牌
 export function getClassifyBySubId(data) {
   return request({
@@ -67,7 +76,6 @@ export function getClassifyBySubId(data) {
     data: data
   })
 }
-
 // 修改实验室(包含新危险源)
 export function updateSubjectEditJoinHazard(data) {
   return request({

src/api/medicUniversity-3_1/index.js

@@ -141,11 +141,11 @@ export function hxpCabinetList(query) {
 }
 
 //获取机柜列表(无权限)
-export function getNoauthList(query) {
+export function getNoauthList(data) {
   return request({
-    url: '/chemical/hxpCabinet/getNoauthList',
-    method: 'get',
-    params: query
+    url: '/chemical/hxpCabinet/getCabinetList',
+    method: 'post',
+    data: data
   })
 }
 

src/api/safetyCheck/index.js

@@ -153,7 +153,7 @@ export function checkDeviceDelete(id) {
 //随手拍-上报记录-列表
 export function securityCheckClapList(query) {
   return request({
-    url: '/zd-security/checkClap/list',
+    url: '/security/checkClap/list',
     method: 'get',
     params: query
   })
@@ -162,7 +162,7 @@ export function securityCheckClapList(query) {
 //随手拍-上报记录-提交
 export function checkClapAdd(data) {
   return request({
-    url: '/zd-security/checkClap/add',
+    url: '/security/checkClap/add',
     method: 'post',
     data: data
   })
@@ -171,7 +171,7 @@ export function checkClapAdd(data) {
 //随手拍-上报记录-详情
 export function findById(query) {
   return request({
-    url: '/zd-security/checkClap/findById',
+    url: '/security/checkClap/findById',
     method: 'get',
     params: query
   })
@@ -180,7 +180,7 @@ export function findById(query) {
 //随手拍-上报记录-整改
 export function clapApprove(data) {
   return request({
-    url: '/zd-security/checkClap/clapApprove',
+    url: '/security/checkClap/clapApprove',
     method: 'post',
     data: data
   })
@@ -189,7 +189,7 @@ export function clapApprove(data) {
 //随手拍-上报记录-上报记录
 export function checkClapMylist(query) {
   return request({
-    url: '/zd-security/checkClap/mylist',
+    url: '/security/checkClap/mylist',
     method: 'get',
     params: query
   })
@@ -200,20 +200,20 @@ export function checkClapMylist(query) {
 //整改报告-列表
 export function checkRectifyList(query) {
   return request({
-    url: '/zd-security/checkRectify/list',
+    url: '/security/checkRectify/list',
     method: 'get',
     params: query
   })
 }
-//整改报告-下载  '/zd-security/checkRectify/genReport/'+row.id
-//整改报告-批量下载  '/zd-security/checkRectify/genReport/zip/'+text
+//整改报告-下载  '/security/checkRectify/genReport/'+row.id
+//整改报告-批量下载  '/security/checkRectify/genReport/zip/'+text
 
 /***************************项目检查库***************************/
 
 //项目检查库-树状列表
 export function checkOptionList(query) {
   return request({
-    url: '/zd-security/checkOption/list',
+    url: '/security/checkOption/list',
     method: 'get',
     params: query
   })
@@ -222,7 +222,7 @@ export function checkOptionList(query) {
 //项目检查库-添加
 export function checkOptionAdd(data) {
   return request({
-    url: '/zd-security/checkOption/add',
+    url: '/security/checkOption/add',
     method: 'post',
     data: data
   })
@@ -231,7 +231,7 @@ export function checkOptionAdd(data) {
 //项目检查库-编辑
 export function checkOptionUpdate(data) {
   return request({
-    url: '/zd-security/checkOption/update',
+    url: '/security/checkOption/update',
     method: 'post',
     data: data
   })
@@ -240,7 +240,7 @@ export function checkOptionUpdate(data) {
 //项目检查库-删除
 export function checkOptionDelete(id) {
   return request({
-    url: '/zd-security/checkOption/delete/'+id,
+    url: '/security/checkOption/delete/'+id,
     method: 'delete'
   })
 }
@@ -248,7 +248,7 @@ export function checkOptionDelete(id) {
 //项目检查库-批量删除
 export function checkOptionBatchDelete(ids) {
   return request({
-    url: '/zd-security/checkOption/batchDelete/'+ids,
+    url: '/security/checkOption/batchDelete/'+ids,
     method: 'delete'
   })
 }
@@ -258,7 +258,7 @@ export function checkOptionBatchDelete(ids) {
 //检查配置 检查人员/整改人员-列表
 export function checkStaffList(query) {
   return request({
-    url: '/zd-security/checkStaff/list',
+    url: '/security/checkStaff/list',
     method: 'get',
     params: query
   })
@@ -267,7 +267,7 @@ export function checkStaffList(query) {
 //检查配置 检查人员/整改人员-查询当前配置
 export function checkSet(query) {
   return request({
-    url: '/zd-security/checkSet/list',
+    url: '/security/checkSet/list',
     method: 'get',
     params: query
   })
@@ -276,7 +276,7 @@ export function checkSet(query) {
 //检查配置 检查人员/整改人员-保存当前配置
 export function checkSetAdd(data) {
   return request({
-    url: '/zd-security/checkSet/add',
+    url: '/security/checkSet/add',
     method: 'post',
     data: data
   })
@@ -285,7 +285,7 @@ export function checkSetAdd(data) {
 //检查配置 人员列表查询
 export function checkStaffUserList(data) {
   return request({
-    url: '/zd-security/checkStaffUser/list',
+    url: '/security/checkStaffUser/list',
     method: 'post',
     data: data
   })
@@ -297,7 +297,7 @@ export function checkStaffUserList(data) {
 //自查任务-列表
 export function checkPlanList(data) {
   return request({
-    url: '/zd-security/checkPlan/list',
+    url: '/security/checkPlan/list',
     method: 'post',
     data: data
   })
@@ -307,7 +307,7 @@ export function checkPlanList(data) {
 //自查任务-根据计划ID查询管理列表
 export function findByCheckPlanId(data) {
   return request({
-    url: '/zd-security/checkManage/findByCheckPlanId',
+    url: '/security/checkManage/findByCheckPlanId',
     method: 'post',
     data: data
   })
@@ -317,7 +317,7 @@ export function findByCheckPlanId(data) {
 //自查任务-查询管理列表
 export function checkManageList(data) {
   return request({
-    url: '/zd-security/checkManage/list',
+    url: '/security/checkManage/list',
     method: 'post',
     data: data
   })
@@ -329,7 +329,7 @@ export function checkManageList(data) {
 //自查任务-查询管理任务详情接口
 export function findCheckManage(query) {
   return request({
-    url: '/zd-security/checkManage/findCheckManage',
+    url: '/security/checkManage/findCheckManage',
     method: 'get',
     params: query
   })
@@ -339,7 +339,7 @@ export function findCheckManage(query) {
 //自查任务-查询管理保存/提交
 export function checkManageUpdate(data) {
   return request({
-    url: '/zd-security/checkManage/update',
+    url: '/security/checkManage/update',
     method: 'put',
     data: data
   })
@@ -349,7 +349,7 @@ export function checkManageUpdate(data) {
 //自查任务-根据计划ID删除
 export function checkPlanDelete(query) {
   return request({
-    url: '/zd-security/checkPlan/delete',
+    url: '/security/checkPlan/delete',
     method: 'delete',
     params: query
   })
@@ -359,7 +359,7 @@ export function checkPlanDelete(query) {
 //自查任务-查询历史计划标题列表
 export function getHistoryPlanTitles(query) {
   return request({
-    url: '/zd-security/checkPlan/getHistoryPlanTitles',
+    url: '/security/checkPlan/getHistoryPlanTitles',
     method: 'get',
     params: query
   })
@@ -368,7 +368,7 @@ export function getHistoryPlanTitles(query) {
 //检查计划-根据ID隐藏历史标题
 export function hideHistoryPlanTitle(query) {
   return request({
-    url: '/zd-security/checkPlan/hideHistoryPlanTitle',
+    url: '/security/checkPlan/hideHistoryPlanTitle',
     method: 'get',
     params: query
   })
@@ -414,7 +414,7 @@ export function conditionSubjectInfo(data) {
 //自查任务-新增计划
 export function checkPlanAdd(data) {
   return request({
-    url: '/zd-security/checkPlan/add',
+    url: '/security/checkPlan/add',
     method: 'post',
     data: data
   })
@@ -424,7 +424,7 @@ export function checkPlanAdd(data) {
 //自查任务-计划详情
 export function findCheckPlan(query) {
   return request({
-    url: '/zd-security/checkPlan/findCheckPlan',
+    url: '/security/checkPlan/findCheckPlan',
     method: 'get',
     params: query
   })
@@ -434,7 +434,7 @@ export function findCheckPlan(query) {
 //自查任务-修改计划
 export function checkPlanUpdate(data) {
   return request({
-    url: '/zd-security/checkPlan/update',
+    url: '/security/checkPlan/update',
     method: 'put',
     data: data
   })
@@ -447,7 +447,7 @@ export function checkPlanUpdate(data) {
 //校院巡察组-分页获取校院巡查组列表
 export function checkGroupList(data) {
   return request({
-    url: '/zd-security/checkGroup/list',
+    url: '/security/checkGroup/list',
     method: 'post',
     data: data
   })
@@ -456,7 +456,7 @@ export function checkGroupList(data) {
 //校院巡察组-通过id查询巡查组详情
 export function checkGroupFind(query) {
   return request({
-    url: '/zd-security/checkGroup/find',
+    url: '/security/checkGroup/find',
     method: 'get',
     params: query
   })
@@ -465,7 +465,7 @@ export function checkGroupFind(query) {
 //校院巡察组-启用-停用巡查组
 export function checkGroupEnable(query) {
   return request({
-    url: '/zd-security/checkGroup/enable',
+    url: '/security/checkGroup/enable',
     method: 'put',
     params: query
   })
@@ -474,7 +474,7 @@ export function checkGroupEnable(query) {
 //校院巡察组-通过id删除巡查组
 export function checkGroupDelete(query) {
   return request({
-    url: '/zd-security/checkGroup/delete',
+    url: '/security/checkGroup/delete',
     method: 'delete',
     params: query
   })
@@ -482,7 +482,7 @@ export function checkGroupDelete(query) {
 //校院巡察组-新增
 export function checkGroupAdd(data) {
   return request({
-    url: '/zd-security/checkGroup/add',
+    url: '/security/checkGroup/add',
     method: 'post',
     data: data
   })
@@ -491,7 +491,7 @@ export function checkGroupAdd(data) {
 //校院巡察组-编辑
 export function checkGroupUpdate(data) {
   return request({
-    url: '/zd-security/checkGroup/update',
+    url: '/security/checkGroup/update',
     method: 'put',
     data: data
   })
@@ -500,7 +500,7 @@ export function checkGroupUpdate(data) {
 //校院巡察组-获取巡察组下拉列表
 export function findGroupList(data) {
   return request({
-    url: '/zd-security/checkGroup/findGroupList',
+    url: '/security/checkGroup/findGroupList',
     method: 'post',
     data: data
   })
@@ -513,7 +513,7 @@ export function findGroupList(data) {
 //整改报告-报告隐患列表
 export function checkHazardList(query) {
   return request({
-    url: '/zd-security/checkHazard/list',
+    url: '/security/checkHazard/list',
     method: 'get',
     params: query
   })
@@ -521,7 +521,7 @@ export function checkHazardList(query) {
 //待整改
 export function rectifyList(query) {
   return request({
-    url: '/zd-security/checkHazard/rectifyList',
+    url: '/security/checkHazard/rectifyList',
     method: 'get',
     params: query
   })
@@ -529,7 +529,7 @@ export function rectifyList(query) {
 //待复核
 export function recheckList(query) {
   return request({
-    url: '/zd-security/checkHazard/recheckList',
+    url: '/security/checkHazard/recheckList',
     method: 'get',
     params: query
   })
@@ -537,7 +537,7 @@ export function recheckList(query) {
 //已完成
 export function overList(query) {
   return request({
-    url: '/zd-security/checkHazard/overList',
+    url: '/security/checkHazard/overList',
     method: 'get',
     params: query
   })
@@ -546,7 +546,7 @@ export function overList(query) {
 //安全隐患-校院巡察/批量审核列表
 export function batchApprovalList(query) {
   return request({
-    url: '/zd-security/checkHazard/batchApprovalList',
+    url: '/security/checkHazard/batchApprovalList',
     method: 'get',
     params: query
   })
@@ -555,7 +555,7 @@ export function batchApprovalList(query) {
 //安全隐患-暂无法整改列表数据
 export function unableRectifyList(query) {
   return request({
-    url: '/zd-security/checkHazard/unableRectifyList',
+    url: '/security/checkHazard/unableRectifyList',
     method: 'get',
     params: query
   })
@@ -564,7 +564,7 @@ export function unableRectifyList(query) {
 //安全隐患-批量审核
 export function batchApprove(data) {
   return request({
-    url: '/zd-security/checkRectify/batchApprove',
+    url: '/security/checkRectify/batchApprove',
     method: 'post',
     data: data
   })
@@ -573,7 +573,7 @@ export function batchApprove(data) {
 //安全隐患-隐患详情
 export function getHazardById(query) {
   return request({
-    url: '/zd-security/checkHazard/getHazardById',
+    url: '/security/checkHazard/getHazardById',
     method: 'get',
     params: query
   })
@@ -582,7 +582,7 @@ export function getHazardById(query) {
 //安全隐患-隐患整改-隐患审核
 export function addOrApprove(data) {
   return request({
-    url: '/zd-security/checkRectify/addOrApprove',
+    url: '/security/checkRectify/addOrApprove',
     method: 'post',
     data: data
   })
@@ -594,7 +594,7 @@ export function addOrApprove(data) {
 //数据统计-实验室列表头部数据汇总
 export function dataStatisticsSubListTop(query) {
   return request({
-    url: '/zd-security/DataStatistics/subListTop',
+    url: '/security/DataStatistics/subListTop',
     method: 'get',
     params: query
   })
@@ -603,7 +603,7 @@ export function dataStatisticsSubListTop(query) {
 //数据统计-按实验室查询列表
 export function dataStatisticsSubList(query) {
   return request({
-    url: '/zd-security/DataStatistics/subList',
+    url: '/security/DataStatistics/subList',
     method: 'get',
     params: query
   })
@@ -612,7 +612,7 @@ export function dataStatisticsSubList(query) {
 //数据统计-安全隐患列表头部数据汇总
 export function dataStatisticsHazardListTop(query) {
   return request({
-    url: '/zd-security/DataStatistics/hazardListTop',
+    url: '/security/DataStatistics/hazardListTop',
     method: 'get',
     params: query
   })
@@ -621,7 +621,7 @@ export function dataStatisticsHazardListTop(query) {
 //数据统计-按安全隐患查询列表
 export function dataStatisticsHazardList(query) {
   return request({
-    url: '/zd-security/DataStatistics/hazardList',
+    url: '/security/DataStatistics/hazardList',
     method: 'get',
     params: query
   })
@@ -630,7 +630,7 @@ export function dataStatisticsHazardList(query) {
 //数据统计-指标列表头部数据汇总
 export function dataStatisticsItemsListTop(query) {
   return request({
-    url: '/zd-security/DataStatistics/itemsListTop',
+    url: '/security/DataStatistics/itemsListTop',
     method: 'get',
     params: query
   })
@@ -639,7 +639,7 @@ export function dataStatisticsItemsListTop(query) {
 //数据统计-按指标查询列表
 export function dataStatisticsItemsList(query) {
   return request({
-    url: '/zd-security/DataStatistics/itemsList',
+    url: '/security/DataStatistics/itemsList',
     method: 'get',
     params: query
   })
@@ -648,7 +648,7 @@ export function dataStatisticsItemsList(query) {
 //数据统计-按检查内容查询列表
 export function dataStatisticsContentList(query) {
   return request({
-    url: '/zd-security/DataStatistics/contentList',
+    url: '/security/DataStatistics/contentList',
     method: 'get',
     params: query
   })
@@ -656,7 +656,7 @@ export function dataStatisticsContentList(query) {
 //数据统计-按检查内容头部数据汇总
 export function dataStatisticsContentListTop(query) {
   return request({
-    url: '/zd-security/DataStatistics/hazardContentTop',
+    url: '/security/DataStatistics/hazardContentTop',
     method: 'get',
     params: query
   })
@@ -681,7 +681,7 @@ export function dataStatisticsContentListTop(query) {
 //通用接口-人员查询(过滤已选/未选)
 export function findUserList(data) {
   return request({
-    url: '/zd-system/user/findUserList',
+    url: '/system/user/findUserList',
     method: 'post',
     data: data
   })
@@ -706,7 +706,7 @@ export function haveHazardInSub(data) {
 //通用接口-查询检查项再特定实验室发生历史次数
 export function countHazardNum(query) {
   return request({
-    url: '/zd-security/checkHazard/countHazardNum',
+    url: '/security/checkHazard/countHazardNum',
     method: 'get',
     params: query
   })
@@ -715,7 +715,7 @@ export function countHazardNum(query) {
 //通用接口-根据实验室id查询该实验室有关计划
 export function getCheckPlanBySubId(query) {
   return request({
-    url: '/zd-security/checkManage/getCheckPlanBySubId',
+    url: '/security/checkManage/getCheckPlanBySubId',
     method: 'get',
     params: query
   })
@@ -750,7 +750,7 @@ export function getHazardInfoBySubId(query) {
 //通用接口-根据选择的设备id生成检查项
 export function getHazardInfo(query) {
   return request({
-    url: '/zd-security/checkManage/getHazardInfo',
+    url: '/security/checkManage/getHazardInfo',
     method: 'get',
     params: query
   })
@@ -758,7 +758,7 @@ export function getHazardInfo(query) {
 //通用接口-根据选择的设备id生成检查项
 export function getHazardInfoByJoinIds(query) {
   return request({
-    url: '/zd-security/checkManage/getHazardInfoByJoinIds',
+    url: '/security/checkManage/getHazardInfoByJoinIds',
     method: 'get',
     params: query
   })
@@ -767,7 +767,7 @@ export function getHazardInfoByJoinIds(query) {
 //开展检查-提交
 export function checkManageAdd(data) {
   return request({
-    url: '/zd-security/checkManage/add',
+    url: '/security/checkManage/add',
     method: 'post',
     data: data
   })
@@ -775,7 +775,7 @@ export function checkManageAdd(data) {
 //通知配置-获取通知配置
 export function noticeConfigList(query) {
   return request({
-    url: '/zd-security/noticeConfig/list',
+    url: '/security/noticeConfig/list',
     method: 'get',
     params: query
   })
@@ -783,7 +783,7 @@ export function noticeConfigList(query) {
 //通知配置-提交通知配置
 export function noticeConfigAdd(data) {
   return request({
-    url: '/zd-security/noticeConfig/add',
+    url: '/security/noticeConfig/add',
     method: 'post',
     data: data
   })
@@ -792,7 +792,7 @@ export function noticeConfigAdd(data) {
 //附件列表查询-通过计划ID查询附件列表
 export function getFindByCheckPlanId(query) {
   return request({
-    url: '/zd-security/upload/findByCheckPlanId',
+    url: '/security/upload/findByCheckPlanId',
     method: 'get',
     params: query
   })
@@ -801,7 +801,7 @@ export function getFindByCheckPlanId(query) {
 //工作台跳转后-按指标统计列表
 export function hiddenDataItemsSubList(query) {
   return request({
-    url: '/zd-security/collegCheck/hiddenDataItemsSubList',
+    url: '/security/collegCheck/hiddenDataItemsSubList',
     method: 'get',
     params: query
   })
@@ -810,7 +810,7 @@ export function hiddenDataItemsSubList(query) {
 //工作台跳转后-按指标统计顶部数据
 export function hiddenDataItemsSubListTop(query) {
   return request({
-    url: '/zd-security/collegCheck/hiddenDataItemsSubListTop',
+    url: '/security/collegCheck/hiddenDataItemsSubListTop',
     method: 'get',
     params: query
   })
@@ -828,7 +828,7 @@ export function listSubAdmin(query){
 //工作台跳转后-获取当前角色所属院系ID
 export function getloginUser(query){
   return request({
-    url: '/zd-security/collegCheck/getloginUser',
+    url: '/security/collegCheck/getloginUser',
     method: 'get',
     params: query
   })
@@ -837,7 +837,7 @@ export function getloginUser(query){
 //整改报告-查看文档模式数据
 export function viewReport(id){
   return request({
-    url: '/zd-security/checkRectify/viewReport/'+id,
+    url: '/security/checkRectify/viewReport/'+id,
     method: 'get',
   })
 }
@@ -845,7 +845,7 @@ export function viewReport(id){
 //整改通知书-查看文档模式数据
 export function getRectifyAdviceNoteView(id){
   return request({
-    url: '/zd-security/checkManage/getRectifyAdviceNoteView/'+id,
+    url: '/security/checkManage/getRectifyAdviceNoteView/'+id,
     method: 'get',
   })
 }
@@ -853,7 +853,7 @@ export function getRectifyAdviceNoteView(id){
 //整改告知书-查看文档模式数据
 export function getRectifyNotificationView(id){
   return request({
-    url: '/zd-security/checkManage/getRectifyNotificationView/'+id,
+    url: '/security/checkManage/getRectifyNotificationView/'+id,
     method: 'get',
   })
 }
@@ -867,7 +867,7 @@ export function getRectifyNotificationView(id){
 //获取权限范围(巡查/自查)
 export function getGentle(query){
   return request({
-    url: '/zd-security/checkSet/getGentle',
+    url: '/security/checkSet/getGentle',
     method: 'get',
     params: query
   })

src/main.js

@@ -20,7 +20,7 @@ import './assets/icons' // icon
 import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
-import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree, spaceJudgment, spaceJudgmentHTML, isNum, urlJudge } from "@/utils/ruoyi";
+import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree, spaceJudgment, spaceJudgmentHTML, isNum, urlJudge, clickCopy } from "@/utils/ruoyi";
 import Pagination from "@/components/Pagination";
 // 自定义表格工具组件
 import RightToolbar from "@/components/RightToolbar"
@@ -67,6 +67,7 @@ Vue.prototype.spaceJudgment = spaceJudgment
 Vue.prototype.spaceJudgmentHTML = spaceJudgmentHTML
 Vue.prototype.isNum = isNum
 Vue.prototype.urlJudge = urlJudge
+Vue.prototype.clickCopy = clickCopy
 Vue.prototype.judgmentNetworkReturnAddress = judgmentNetworkReturnAddress
 
 Vue.prototype.msgSuccess = function (msg) {

src/utils/ruoyi.js

@@ -317,3 +317,23 @@ export function urlJudge(url) {
 export function versionField() {
   return process.env.VUE_APP_VERSION_DIFFERENCE_FIELD
 }
+
+/**
+ * 点击复制文本
+ */
+export function clickCopy(context,name) {
+  // 创建输入框元素
+  let oInput = document.createElement('input');
+  // 将想要复制的值
+  oInput.value = context;
+  // 页面底部追加输入框
+  document.body.appendChild(oInput);
+  // 选中输入框
+  oInput.select();
+  // 执行浏览器复制命令
+  document.execCommand('Copy');
+  // 弹出复制成功信息
+  this.msgSuccess(name?name+'复制成功':'复制成功');
+  // 复制后移除输入框
+  oInput.remove();
+}

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

@@ -193,19 +193,19 @@
           <el-input v-model="dialogForm.nameThree" maxlength="10" placeholder="请输入楼层名称" />
         </el-form-item>
         <el-form-item label="房间类型：" prop="key">
-          <el-input v-model="dialogForm.key" maxlength="10" placeholder="请输入排序序号" />
+          <el-input v-model="dialogForm.key" maxlength="10" placeholder="请输入房间类型" />
         </el-form-item>
         <el-form-item label="房间号：" prop="key">
-          <el-input v-model="dialogForm.key" maxlength="10" placeholder="请输入排序序号" />
+          <el-input v-model="dialogForm.key" maxlength="10" placeholder="请输入房间号" />
         </el-form-item>
         <el-form-item label="房间名称：" prop="key">
-          <el-input v-model="dialogForm.key" maxlength="10" placeholder="请输入排序序号" />
+          <el-input v-model="dialogForm.key" maxlength="10" placeholder="请输入房间名称" />
         </el-form-item>
         <el-form-item label="房间选择：" prop="key">
-          <el-input v-model="dialogForm.key" maxlength="10" placeholder="请输入排序序号" />
+          <el-input v-model="dialogForm.key" maxlength="10" placeholder="请输入房间选择" />
         </el-form-item>
         <el-form-item label="房间位置：" prop="key">
-          <el-input v-model="dialogForm.key" maxlength="10" placeholder="请输入排序序号" />
+          <el-input v-model="dialogForm.key" maxlength="10" placeholder="请输入房间位置" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

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

@@ -102,10 +102,109 @@
           <!--&gt;</el-option>-->
         <!--</el-select>-->
       <!--</el-form-item>-->
-      <div class="title-box">
-        <p class="left-title">安全信息牌</p>
+      <div class="title-button-box">
+        <div class="title-min-button-box" :class="checkButtonType == 1?'checkButtonBox':''">
+          <p @click="clickButtonType(1)">管控一体机</p>
+          <p></p>
+        </div>
+        <div class="title-min-button-box" :class="checkButtonType == 2?'checkButtonBox':''">
+          <p @click="clickButtonType(2)">安全信息牌</p>
+          <p></p>
+        </div>
+        <div class="title-null-div">
+          <p></p>
+          <p></p>
+        </div>
+      </div>
+      <!--管控一体机-->
+      <div class="bottom-form-box-one" v-if="checkButtonType == 1">
+        <div class="left-form-box">
+          <el-form-item label="实验室负责人" prop="adminId" class="form-item">
+            <el-select
+              style="width:500px;"
+              v-model="form.adminId"
+              filterable
+              remote
+              clearable
+              reserve-keyword
+              placeholder="请输入至少2个字符搜索相关人员"
+              :remote-method="userSelectList"
+              :loading="loading">
+              <el-option
+                v-for="item in optionsUser"
+                :key="item.userId"
+                :label="item.nickName"
+                :value="item.userId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="安全警示标识" prop="safeSigns" class="form-item">
+            <el-select v-model="form.safeSigns" multiple  placeholder="请选择安全警示标识" style="width:500px;">
+              <el-option
+                v-for="dict in safetyWarning"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="风控防控措施" prop="riskMeasure" class="form-item">
+            <el-select v-model="form.riskMeasure" multiple  placeholder="请选择风险防控措施" style="width:500px;">
+              <el-option
+                v-for="dict in riskMeasure"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+        <div class="right-form-box">
+          <el-form-item label="安全责任人" prop="safeUserId" class="form-item">
+            <el-select
+              style="width:500px;"
+              v-model="form.safeUserId"
+              :multiple-limit="2"
+              multiple
+              filterable
+              remote
+              clearable
+              reserve-keyword
+              placeholder="请输入至少2个字符搜索相关人员"
+              :remote-method="userSelectListOne"
+              :loading="loading">
+              <el-option
+                v-for="item in optionsUserOne"
+                :key="item.userId"
+                :label="item.nickName"
+                :value="item.userId">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="主要危险类别" prop="hazardCategory" class="form-item">
+            <el-select v-model="form.hazardCategory" multiple  placeholder="请选择主要危险类别" style="width:500px;">
+              <el-option
+                v-for="dict in hazardCategory"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="灭火要点" prop="outfire" class="form-item">
+            <el-select v-model="form.outfire" multiple  placeholder="请选择灭火要点" style="width:500px;">
+              <el-option
+                v-for="dict in extinguishingKeyPoints"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </div>
       </div>
-      <div class="bottom-form-box">
+      <!--安全信息牌-->
+      <div class="bottom-form-box" v-if="checkButtonType == 2">
         <div class="top-form-box">
           <el-form-item label="实验室负责人" prop="adminId" class="form-item" label-width="180px">
             <el-select
@@ -249,6 +348,8 @@
 
           },
           labMoldList:[],
+          //一体机/电子信息牌状态切换
+          checkButtonType:1,
         }
       },
       created() {
@@ -258,10 +359,10 @@
         this.getListClassifiedAll();
         this.getListClasstypeAll();
         this.labMoldQueryOption();
-
-        if(!this.subjectData.id){
-          this.getClassifyBySubId();
-        }
+        //获取楼栋
+        buildFloorGetlist({type:2}).then(response => {
+          this.buildings = response.rows;
+        });
         //安全标识字典
         this.getDicts("sys_safety_warning").then(response => {
           this.safetyWarning = response.data;
@@ -293,6 +394,9 @@
           this.$set(this.form,'details',this.subjectData.details)
           this.$refs.UEditor.text=unescape(this.subjectData.details)
           this.$set(this.form,'moldId',this.subjectData.moldId)
+          this.$set(this.form,'room',this.subjectData.room)
+          this.$set(this.form,'details',this.subjectData.details)
+          this.$refs.UEditor.text=unescape(this.subjectData.details)
           if(this.subjectData.adminId){
             this.$set(this.form,'adminId',this.subjectData.adminId)
             this.userSelectList(this.subjectData.adminName);
@@ -333,7 +437,7 @@
             this.$set(this.form, 'safeUserId', safeUserIdList);
           }
           //安全信息牌
-          if(this.subjectData.classifyList){
+          if(this.subjectData.classifyList[0]){
             //循环取安全信息牌信息
             let list=this.subjectData.classifyList
             for(let i=0;i<list.length;i++){
@@ -346,6 +450,8 @@
               }
             }
             this.safetyInfoList=list
+          }else{
+            this.getClassifyBySubId();
           }
           //根据学院获取楼栋
           buildFloorGetlist({type:2}).then(response => {
@@ -356,13 +462,16 @@
             });
           });
         }else{
-          //根据学院获取楼栋
-          buildFloorGetlist({type:2}).then(response => {
-            this.buildings = response.rows;
-          });
+          this.getClassifyBySubId();
         }
       },
       methods:{
+        //一体机/电子信息牌切换
+        clickButtonType(type){
+          if(type != this.checkButtonType){
+            this.$set(this,'checkButtonType',type);
+          }
+        },
         hardwareTypeFun(){
           if(this.hardwareTypeTow==1 && this.subjectData.hKCount>0){
             this.msgError("删除现有准入设备后，才能更改准入设备类型!");
@@ -548,6 +657,43 @@
     *{
       margin:0;
     }
+    .title-button-box{
+      display: flex;
+      padding:0 20px 30px 20px;
+      .title-min-button-box{
+        p:nth-child(1){
+          cursor: pointer;
+          text-align: center;
+          font-size:18px;
+          color:#999;
+          line-height:80px;
+          height:80px;
+          padding-right:40px;
+        }
+        p:nth-child(2){
+          height:1px;
+          background-color: #dedede;
+        }
+        .checkButtonBox{
+          color:#0045AF;
+        }
+      }
+      .checkButtonBox{
+        p:nth-child(1){
+          color:#0045AF!important;
+        }
+      }
+      .title-null-div{
+        flex:1;
+        p:nth-child(1){
+          height:80px;
+        }
+        p:nth-child(2){
+          height:1px;
+          background-color: #dedede;
+        }
+      }
+    }
     .title-box{
       display: flex;
       margin:0 20px 30px;
@@ -583,6 +729,22 @@
         margin-bottom:30px;
       }
     }
+    .bottom-form-box-one{
+      display: flex;
+      padding-left:20px;
+      .left-form-box{
+        width:650px;
+      }
+      .right-form-box{
+        width:650px;
+      }
+      .form-item{
+        display: inline-block;
+        overflow: hidden;
+        min-height:40px;
+        margin-bottom:30px;
+      }
+    }
     .rich-text{
       margin: 20px;
     }

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

@@ -404,7 +404,7 @@ import {
   updateSubject,
   mangerVoice,
   startUrl,
-  queryHardByTypeList, subjectTriggerModes,
+  queryHardByTypeList, getHaikangUserList, subjectTriggerModes, subjectEditSort, laboratorySubjectEditSort
 } from '@/api/laboratory/subject'
 import { listData} from "@/api/system/dict/data";
 import { listDepartments } from "@/api/system/dept";
@@ -733,6 +733,13 @@ export default {
       let self = this;
       let type = 0; //硬件 //0全部
       subjectInfo(row.id,type).then(response => {
+        let classifyList = [];
+        for(let i=0;i<response.data.classifyList.length;i++){
+          if(response.data.classifyList[i].privateList.length>0 && (response.data.classifyList[i].classifyType==1||response.data.classifyList[i].classifyType==2)){
+            classifyList.push(response.data.classifyList[i]);
+          }
+        }
+        response.data.classifyList = classifyList;
         // console.log("获取实验室详情",response.data)
         this.$set(this,'newData',response.data);
         if(response.data.safeUserName){
@@ -1084,7 +1091,7 @@ export default {
             id:row.id,
             diyOrder:row.diyOrder,
           };
-          updateSubject(obj).then(response => {
+          laboratorySubjectEditSort(obj).then(response => {
             self.msgSuccess("修改成功");
             self.getList();
           });

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

@@ -4,7 +4,7 @@
         <div :class="versionField() == 'xiBeiNongLinDaXue'?'top-max-box-flex':''" class="top-max-box" style="position: relative">
           <div class="all-title-box">
             <p></p>
-            <p style="flex:1;">实验室安全信息牌</p>
+            <p style="flex:1;">实验室信息</p>
             <div v-if="versionField() == 'xiBeiNongLinDaXue'" class="reset-button-one" style="margin-top:-5px;width:80px!important;height:30px!important;line-height:30px!important;" @click="backPage">返回</div>
           </div>
           <div class="left-top-title-box">
@@ -34,6 +34,41 @@
               </div>
             </div>
           </div>
+          <p class="info-max-title-p">管控一体机信息</p>
+          <div class="info-max-box">
+            <div class="left-box">
+              <div class="for-text-box">
+                <p class="info-title">主要危险类别：{{!newData.hazardCategory?'未配置':''}}</p>
+                <div class="for-box" v-for="(item,index1) in newData.hazardCategory" :key="index1">
+                  <p class="for-info-p" v-for="(minItem,index2) in hazardCategory" :key="index2" v-if="minItem.dictValue == item">● {{minItem.dictLabel}}</p>
+                </div>
+              </div>
+              <div class="for-text-box">
+                <p class="info-title">灭火要点：{{!newData.outfire?'未配置':''}}</p>
+                <div class="for-box" v-for="(item,index1) in newData.outfire" :key="index1">
+                  <p class="for-info-p" v-for="(minItem,index2) in extinguishingKeyPoints" :key="index2" v-if="minItem.dictValue == item">● {{minItem.dictLabel}}</p>
+                </div>
+              </div>
+            </div>
+            <div class="right-box">
+              <div class="for-text-box">
+                <p class="info-title">风险防控措施：{{!newData.riskMeasure?'未配置':''}}</p>
+                <div class="for-box" v-for="(item,index1) in newData.riskMeasure" :key="index1">
+                  <p class="for-info-p" v-for="(minItem,index2) in riskMeasure" :key="index2" v-if="minItem.dictValue == item">● {{minItem.dictLabel}}</p>
+                </div>
+              </div>
+              <div class="for-img-box">
+                <p class="info-title" style="margin-bottom:7px;">安全警示标识：{{!newData.safeSigns?'未配置':''}}</p>
+                <img src="@/assets/newImages/icon_aqxxp_jzxy.png" v-if="item == 'xiyan'" v-for="(item,index) in newData.safeSigns" :key="index">
+                <img src="@/assets/newImages/icon_aqxxp_jzys.png" v-if="item == 'yinshi'" v-for="(item,index) in newData.safeSigns" :key="index">
+                <img src="@/assets/newImages/icon_aqxxp_dxaq.png" v-if="item == 'anquan'" v-for="(item,index) in newData.safeSigns" :key="index">
+                <img src="@/assets/newImages/icon_aqxxp_gzf.png" v-if="item == 'gongzuofu'" v-for="(item,index) in newData.safeSigns" :key="index">
+                <img src="@/assets/newImages/icon_aqxxp_gbmc.png" v-if="item == 'menchuang'" v-for="(item,index) in newData.safeSigns" :key="index">
+                <img src="@/assets/newImages/icon_aqxxp_gbsd.png" v-if="item == 'shuidian'" v-for="(item,index) in newData.safeSigns" :key="index">
+              </div>
+            </div>
+          </div>
+          <p class="info-max-title-p">电子信息牌信息</p>
           <div class="info-max-box">
             <div class="for-text-box" v-if="item.privateList.length>0 && item.classifyType==1" v-for="(item,index) in  newData.classifyList">
               <p class="info-title">{{item.classifyName}}:</p>
@@ -45,6 +80,9 @@
               <p class="info-title" style="margin-bottom:7px;">{{item.classifyName}}:</p>
               <img :src="item2.infoContent" v-for="(item2,index2) in item.privateList" :key="index2">
             </div>
+            <div class="for-img-box" v-if="!newData.classifyList[0]">
+              <p class="info-title">未配置</p>
+            </div>
           </div>
         </div>
       </div>
@@ -510,6 +548,15 @@
             }
           }
         }
+        .info-max-title-p{
+          line-height:20px;
+          font-size:16px;
+          color:#333;
+          font-weight:700;
+          border-top:1px dashed #999999;
+          padding-top:20px;
+          margin-top:10px;
+        }
         .info-max-box{
           margin-top:7px;
           display: flex;

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

@@ -66,7 +66,7 @@
 
     <el-table v-loading="loading" border :data="noticeList" @selection-change="handleSelectionChange">
       <!--<el-table-column type="selection" width="55" align="center" />-->
-      <el-table-column label="序号" align="left" prop="noticeId" width="100" />
+      <el-table-column label="序号"  width="50" align="center"  type="index"/>
       <el-table-column
         label="公告标题"
         align="left"

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

@@ -11,6 +11,18 @@
           size="small"
         />
       </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select
+          v-model="queryParams.status"
+          placeholder="请选择"
+          clearable
+          size="small"
+          style="width: 240px"
+        >
+          <el-option :key="0" label="正常" :value="0"/>
+          <el-option :key="1" label="异常" :value="1"/>
+        </el-select>
+      </el-form-item>
       <el-form-item label="操作" prop="businessType">
         <el-select
           v-model="queryParams.businessType"
@@ -47,12 +59,26 @@
     </el-form>
 
     <el-table ref="tables" border v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-      <el-table-column label="操作人员" align="left" prop="operName"/>
-      <el-table-column label="操作内容" align="left" prop="businessType" :formatter="typeFormat"/>
-      <el-table-column label="操作模块" align="left" prop="title" />
-      <el-table-column label="操作页面" align="left" prop="title" />
-      <el-table-column label="登录IP" align="left" prop="operIp"/>
-      <el-table-column label="操作日期" align="left" prop="operTime">
+      <el-table-column label="主题" align="left" prop="title" width="200"  show-overflow-tooltip/>
+      <el-table-column label="类型" align="left" prop="businessType" width="80" :formatter="typeFormat"  show-overflow-tooltip/>
+      <el-table-column label="接口地址" align="left" prop="operUrl" width="200" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <p @click="clickCopy(scope.row.operUrl,'接口地址')" style="cursor:pointer;">{{scope.row.operUrl}}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="ip" align="left" prop="operIp" width="120" show-overflow-tooltip/>
+      <el-table-column label="参数" align="left" prop="operParam" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <p @click="clickCopy(scope.row.operParam,'参数')" style="cursor:pointer;">{{scope.row.operParam}}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="left" prop="status" width="80" show-overflow-tooltip>
+        <template slot-scope="scope">
+          {{scope.row.status==0?'正常':'异常'}}
+        </template>
+      </el-table-column>
+      <el-table-column label="操作人" align="left" prop="operName" width="140" show-overflow-tooltip/>
+      <el-table-column label="操作日期" align="left" prop="operTime" width="180" show-overflow-tooltip>
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.operTime) }}</span>
         </template>

src/views/comprehensive/system/publicConfig/integrationConfig.vue

@@ -29,24 +29,24 @@
           <span>秒</span>
         </el-form-item>
       </div>
-      <!--<div class="form-max-box">-->
-        <!--<el-form-item label="签到/离开示意图：" prop="signMap">-->
-          <!--<el-upload-->
-            <!--class="certificate-avatar-uploader"-->
-            <!--:action="uploadImgUrl"-->
-            <!--:show-file-list="false"-->
-            <!--accept="image/jpeg,image/gif,image/png"-->
-            <!--:on-success="(res)=>handleAvatarSuccess(res,'signMap')"-->
-            <!--:headers="headers"-->
-            <!--:before-upload="beforeAvatarUpload">-->
-            <!--<img v-if="form.signMap" :src="form.signMap" class="avatar">-->
-            <!--<i v-if="!form.signMap" class="el-icon-plus avatar-uploader-icon" >上传</i>-->
-          <!--</el-upload>-->
-          <!--<i v-if="form.signMap" class="el-icon-view" @click="lookImg(form.signMap)"-->
-             <!--style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;-->
-            <!--height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>-->
-        <!--</el-form-item>-->
-      <!--</div>-->
+      <div class="form-max-box">
+        <el-form-item label="签到/离开示意图：" prop="signMap">
+          <el-upload
+            class="certificate-avatar-uploader"
+            :action="uploadImgUrl"
+            :show-file-list="false"
+            accept="image/jpeg,image/gif,image/png"
+            :on-success="(res)=>handleAvatarSuccess(res,'signMap')"
+            :headers="headers"
+            :before-upload="beforeAvatarUpload">
+            <img v-if="form.signMap" :src="form.signMap" class="avatar">
+            <i v-if="!form.signMap" class="el-icon-plus avatar-uploader-icon" >上传</i>
+          </el-upload>
+          <i v-if="form.signMap" class="el-icon-view" @click="lookImg(form.signMap)"
+             style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;
+            height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
+        </el-form-item>
+      </div>
       <div class="form-max-box">
         <el-form-item label="视频封面：" prop="videoCover">
           <el-upload
@@ -65,24 +65,24 @@
             height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
         </el-form-item>
       </div>
-      <!--<div class="form-max-box">-->
-        <!--<el-form-item label="操作指南：" prop="operationGuide">-->
-          <!--<el-upload-->
-            <!--class="certificate-avatar-uploader"-->
-            <!--:action="uploadImgUrl"-->
-            <!--:show-file-list="false"-->
-            <!--accept="image/jpeg,image/gif,image/png"-->
-            <!--:on-success="(res)=>handleAvatarSuccess(res,'operationGuide')"-->
-            <!--:headers="headers"-->
-            <!--:before-upload="beforeAvatarUpload">-->
-            <!--<img v-if="form.operationGuide" :src="form.operationGuide" class="avatar">-->
-            <!--<i v-if="!form.operationGuide" class="el-icon-plus avatar-uploader-icon">上传</i>-->
-          <!--</el-upload>-->
-          <!--<i v-if="form.operationGuide" class="el-icon-view" @click="lookImg(form.operationGuide)"-->
-             <!--style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;-->
-            <!--height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>-->
-        <!--</el-form-item>-->
-      <!--</div>-->
+      <div class="form-max-box">
+        <el-form-item label="操作指南：" prop="operationGuide">
+          <el-upload
+            class="certificate-avatar-uploader"
+            :action="uploadImgUrl"
+            :show-file-list="false"
+            accept="image/jpeg,image/gif,image/png"
+            :on-success="(res)=>handleAvatarSuccess(res,'operationGuide')"
+            :headers="headers"
+            :before-upload="beforeAvatarUpload">
+            <img v-if="form.operationGuide" :src="form.operationGuide" class="avatar">
+            <i v-if="!form.operationGuide" class="el-icon-plus avatar-uploader-icon">上传</i>
+          </el-upload>
+          <i v-if="form.operationGuide" class="el-icon-view" @click="lookImg(form.operationGuide)"
+             style="position: absolute;top:0;right:0;z-index:999;border-radius:3px;cursor:pointer;width:20px;
+            height:20px;line-height:20px;text-align: center;background: rgba(0,0,0,0.2);color:#fff;"></i>
+        </el-form-item>
+      </div>
     </el-form>
     <div class="sub_btn">
       <p class="null-p"></p>

src/views/emergencyManagement/electronicInformationBoard/index.vue

@@ -73,7 +73,7 @@
                width="520px" append-to-body id="onDutyConfiguration-dialog-box">
       <el-form ref="form" :model="addForm" :rules="rules" label-width="100px">
         <el-form-item label="设备编号：" prop="cardNum">
-          <el-input v-model="addForm.cardNum" placeholder="请输入设备编号" maxlength="30" style="width:360px;"/>
+          <el-input v-model="addForm.cardNum" placeholder="请输入设备编号" maxlength="50" style="width:360px;"/>
         </el-form-item>
         <el-form-item label="实验室：" prop="subjectId">
           <el-select

src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/InventoryDetails/index.vue

@@ -201,12 +201,12 @@
     methods: {
       //获取化学品柜列表
       getNoauthList(){
-        getNoauthList().then(response => {
+        getNoauthList({}).then(response => {
           let list = [];
-          for(let i=0;i<response.rows.length;i++){
+          for(let i=0;i<response.data.length;i++){
             let obj ={
-              value:response.rows[i].id,
-              label:response.rows[i].cabinetName,
+              value:response.data[i].id,
+              label:response.data[i].cabinetName,
             }
             list.push(obj);
           }

src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/OutboundRecord/index.vue

@@ -237,12 +237,12 @@
       },
       //获取化学品柜列表
       getNoauthList(){
-        getNoauthList().then(response => {
+        getNoauthList({}).then(response => {
           let list = [];
-          for(let i=0;i<response.rows.length;i++){
+          for(let i=0;i<response.data.length;i++){
             let obj ={
-              value:response.rows[i].id,
-              label:response.rows[i].cabinetName,
+              value:response.data[i].id,
+              label:response.data[i].cabinetName,
             }
             list.push(obj);
           }

src/views/medicUniversity-3_1/chemicalManagement/InventoryManagement/warehousingRecord/index.vue

@@ -244,12 +244,12 @@
       },
       //获取化学品柜列表
       getNoauthList(){
-        getNoauthList().then(response => {
+        getNoauthList({}).then(response => {
           let list = [];
-          for(let i=0;i<response.rows.length;i++){
+          for(let i=0;i<response.data.length;i++){
             let obj ={
-              value:response.rows[i].id,
-              label:response.rows[i].cabinetName,
+              value:response.data[i].id,
+              label:response.data[i].cabinetName,
             }
             list.push(obj);
           }

src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/CabinetManagement/smartLock.vue

@@ -87,7 +87,7 @@
       </div>
     </div>
     <!--新增/编辑-->
-    <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="520px" append-to-body class="add-dialog-box" :close-on-click-modal="false">
+    <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="620px" append-to-body class="add-dialog-box">
       <el-form ref="form" :model="form" :rules="rules" label-width="140px">
         <el-form-item label="智能终端编号：" prop="hardwareNum">
           <el-input v-model="form.hardwareNum" placeholder="最大20个字符，包含大小写字母、数字" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" maxlength="30" style="width:320px;"/>

src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/ChemicalInfo/addPage.vue

@@ -249,7 +249,11 @@
         this.formData = JSON.parse(JSON.stringify(this.addPropsData));
         this.formData.chemicalShape = this.addPropsData.chemicalShape+''
         if(this.formData.classifyAttribute){
-          this.formData.classifyAttribute = this.formData.classifyAttribute.split(",");
+          if(this.formData.classifyAttribute[0]){
+            this.formData.classifyAttribute = this.formData.classifyAttribute.split(",");
+          }else{
+            this.formData.classifyAttribute = [];
+          }
         }else{
           this.formData.classifyAttribute = [];
         }

src/views/medicUniversity-3_1/chemicalManagement/chemicalLibrary/ChemicalInfo/listPage.vue

@@ -114,7 +114,7 @@
                   <p @click="addList(index,bigIndex)">+添加</p>
                 </div>
                 <div class="for-min-box" v-for="(minItem,minIndex) in bigItem.list">
-                  <el-form-item class="num-input-item" label="容器容量规格" label-width="120px" :prop="'maxList.'+ index +'.chemicalJoinCabinetSonList.'+bigIndex+'.list.'+minIndex+'.chemicalAmount'" :rules="rules.chemicalAmount">
+                  <el-form-item class="num-input-item" label="容器容量规格" label-width="120px" :prop="'maxList.'+ index +'.chemicalJoinCabinetSonList.'+bigIndex+'.list.'+minIndex+'.chemicalAmount'" :rules="rules.chemicalAmountLock">
                     <div class="num-input-min-box">
                       <el-input-number
                         style="width:110px;"
@@ -128,7 +128,7 @@
                       <p class="num-title-span">{{listPropsData.chemicalUnit}}</p>
                     </div>
                   </el-form-item>
-                  <el-form-item class="num-input-item" label="容器重量规格" label-width="120px" :prop="'maxList.'+ index +'.chemicalJoinCabinetSonList.'+bigIndex+'.list.'+minIndex+'.tare'" :rules="rules.tare">
+                  <el-form-item class="num-input-item" label="容器重量规格" label-width="120px" :prop="'maxList.'+ index +'.chemicalJoinCabinetSonList.'+bigIndex+'.list.'+minIndex+'.tare'" :rules="rules.tareLock">
                     <div class="num-input-min-box">
                       <el-input-number
                         style="width:110px;"
@@ -241,9 +241,54 @@
         console.log('rule',rule)
         const list = rule.field.split('.');
         let index = parseFloat(list[1]);
+        let index2 = parseFloat(list[3]);
         let max = parseFloat(this.dialogData.maxList[index].maxNum);
+        let tare = parseFloat(this.dialogData.maxList[index].list[index2].tare);
         if(value>max){
-            callback(new Error("超出该机柜可存放量"));
+          callback(new Error("超出该机柜可存放量"));
+        }else if(value<tare){
+          callback(new Error("容器容量规格不能小于容器重量规格"));
+        }else{
+          callback();
+        }
+      };
+      const computingCapacityLock = (rule, value, callback) => {
+        console.log('rule',rule)
+        const list = rule.field.split('.');
+        let index = parseFloat(list[1]);
+        let index1 = parseFloat(list[3]);
+        let index2 = parseFloat(list[5]);
+        let max = parseFloat(this.dialogData.maxList[index].maxNum);
+        let tare = parseFloat(this.dialogData.maxList[index].chemicalJoinCabinetSonList[index1].list[index2].tare);
+        if(value>max){
+          callback(new Error("超出该机柜可存放量"));
+        }else if(value<tare){
+          callback(new Error("容器容量规格不能小于容器重量规格"));
+        }else{
+          callback();
+        }
+      };
+      const computingTare = (rule, value, callback) => {
+        console.log('rule',rule)
+        const list = rule.field.split('.');
+        let index = parseFloat(list[1]);
+        let index2 = parseFloat(list[3]);
+        let chemicalAmount = parseFloat(this.dialogData.maxList[index].list[index2].chemicalAmount);
+        if(value>chemicalAmount){
+          callback(new Error("容器重量规格不能大于容器容量规格"));
+        }else{
+          callback();
+        }
+      };
+      const computingTareLock = (rule, value, callback) => {
+        console.log('rule',rule)
+        const list = rule.field.split('.');
+        let index = parseFloat(list[1]);
+        let index1 = parseFloat(list[3]);
+        let index2 = parseFloat(list[5]);
+        let chemicalAmount = parseFloat(this.dialogData.maxList[index].chemicalJoinCabinetSonList[index1].list[index2].chemicalAmount);
+        if(value>chemicalAmount){
+          callback(new Error("容器重量规格不能大于容器容量规格"));
         }else{
           callback();
         }
@@ -291,11 +336,22 @@
           chemicalAmount:[
             { required: true, message: '请输入容器容量', trigger: 'blur' },
             { required: true, message: "请输入容器容量", validator: this.spaceJudgment, trigger: "blur" },
-            { required: true, message: "超出该机柜可存放量", validator: computingCapacity, trigger: "blur" },
+            { required: true, validator: computingCapacity, trigger: "blur" },
+          ],
+          chemicalAmountLock:[
+            { required: true, message: '请输入容器容量', trigger: 'blur' },
+            { required: true, message: "请输入容器容量", validator: this.spaceJudgment, trigger: "blur" },
+            { required: true, validator: computingCapacityLock, trigger: "blur" },
           ],
           tare:[
             { required: true, message: '请输入容器自重', trigger: 'blur' },
-            { required: true, message: "请输入容器自重", validator: this.spaceJudgment, trigger: "blur" }
+            { required: true, message: "请输入容器自重", validator: this.spaceJudgment, trigger: "blur" },
+            { required: true, validator: computingTare, trigger: "blur" },
+          ],
+          tareLock:[
+            { required: true, message: '请输入容器自重', trigger: 'blur' },
+            { required: true, message: "请输入容器自重", validator: this.spaceJudgment, trigger: "blur" },
+            { required: true, validator: computingTareLock, trigger: "blur" },
           ],
           storageNum:[
             { required: true, message: '请输入存放数量', trigger: 'blur' },

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

@@ -125,7 +125,7 @@
                :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="设备编号：" prop="hardwareNum">
-          <el-input v-model="form.hardwareNum" placeholder="最大30个字符，包含大小写字母、数字" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" maxlength="30" style="width:360px;"/>
+          <el-input v-model="form.hardwareNum" placeholder="最大50个字符，包含大小写字母、数字" onkeyup="value=value.replace(/[^\w\.\/]/ig,'')" maxlength="50" style="width:360px;"/>
         </el-form-item>
         <el-form-item label="实验室：" prop="subjectId">
           <el-select

src/views/medicUniversity-3_1/chemicalManagement/usageRecord/index.vue

@@ -257,12 +257,12 @@
       },
       //获取化学品柜列表
       getNoauthList(){
-        getNoauthList().then(response => {
+        getNoauthList({}).then(response => {
           let list = [];
-          for(let i=0;i<response.rows.length;i++){
+          for(let i=0;i<response.data.length;i++){
             let obj ={
-              value:response.rows[i].id,
-              label:response.rows[i].cabinetName,
+              value:response.data[i].id,
+              label:response.data[i].cabinetName,
             }
             list.push(obj);
           }

src/views/safetyCheck/laboratorySelfTest/selfInspectionTask/addDialog.vue

@@ -438,7 +438,7 @@
               <p class="reset-button-one" @click="deviceResetQueryLeft" style="width:60px;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table ref="leftDeviceTable" border :data="deviceTableListLeft" @selection-change="deviceChangeLeft" :row-key="getRowKeys">
+          <el-table ref="leftDeviceTable" border :data="deviceTableListLeft" @selection-change="deviceChangeLeft" :row-key="getDeviceRowKeys">
             <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
             <el-table-column label="名称" align="center" prop="chName" show-overflow-tooltip/>
             <el-table-column label="型号" align="center" prop="code" show-overflow-tooltip width="150"/>
@@ -488,7 +488,7 @@
               <p class="reset-button-one" @click="deviceResetQueryRight" style="width:60px;">重置</p>
             </el-form-item>
           </el-form>
-          <el-table ref="rightDeviceTable" border :data="deviceTableListRight" @selection-change="deviceChangeRight" :row-key="getRowKeys">
+          <el-table ref="rightDeviceTable" border :data="deviceTableListRight" @selection-change="deviceChangeRight" :row-key="getDeviceRowKeys">
             <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
             <el-table-column label="名称" align="center" prop="chName" show-overflow-tooltip/>
             <el-table-column label="型号" align="center" prop="code" show-overflow-tooltip width="150"/>
@@ -1398,6 +1398,9 @@
       getSubRowKeys(row) {
         return row.subId
       },
+      getDeviceRowKeys(row) {
+        return row.id
+      },
       deptChange(selection){
         let self = this;
         this.deptNumLeft = selection.length;

src/views/safetyCheck/startInspection/index.vue

@@ -156,7 +156,7 @@
                 </el-form-item>
                 <el-form-item label="检查项目" :prop="'checkHazardDtoList.'+index+'.hazardCheckPro'" :rules="rules.hazardCheckPro" label-width="123px">
                   <el-cascader
-                    @change="(val)=>cascaderChange(val,'',index)"
+                    @change="(val)=>cascaderChange(val,'',index,'')"
                     v-model="item.hazardCheckPro"
                     style="width: 898px"
                     placeholder="请选择检查项"
@@ -170,7 +170,7 @@
                       <p v-else style="max-width:300px;overflow: hidden;text-overflow:ellipsis;white-space:nowrap;">{{data.labelName}}</p>
                     </template>
                   </el-cascader>
-                  <p class="hazard-check-count-p" v-if="hazardCheckCount>0">此检查项在当前实验室累计出现 <span>{{hazardCheckCount}}</span> 次隐患</p>
+                  <p class="hazard-check-count-p" v-if="item.hazardCheckCount>0">此检查项在当前实验室累计出现 <span>{{item.hazardCheckCount}}</span> 次隐患</p>
                 </el-form-item>
                 <el-form-item label="检查要点" label-width="123px">
                   <el-input
@@ -264,7 +264,7 @@
                       <el-radio :label="0">不符合</el-radio>
                     </el-radio-group>
                     <el-cascader
-                      @change="(val)=>cascaderChange(val,item2,index2)"
+                      @change="(val)=>cascaderChange(val,item2,index,index2)"
                       v-model="item2.hazardCheckPro"
                       style="width: 730px"
                       placeholder="请选择检查项"
@@ -279,7 +279,7 @@
                       </template>
                     </el-cascader>
                     <i class="el-icon-delete" v-if="planType==1"  @click="delCheckHazardDtoList(index,index2,3)" style="color: #0183FA;margin-left: 20px;cursor: pointer;"></i>
-                    <p class="hazard-check-count-p" v-if="hazardCheckCount>0">此检查项在当前实验室累计出现 <span>{{hazardCheckCount}}</span> 次隐患</p>
+                    <p class="hazard-check-count-p" v-if="item2.hazardCheckCount>0">此检查项在当前实验室累计出现 <span>{{item2.hazardCheckCount}}</span> 次隐患</p>
                   </el-form-item>
                   <el-form-item v-if="item2.checkFlag==0" label="隐患等级" :prop="'checkHazardInfoVoList.'+index+'.checkHazardDtoList.'+index2+'.hazardLevel'" :rules="rules.hazardLevel" label-width="123px">
                     <el-select v-model="item2.hazardLevel" clearable placeholder="请选择隐患等级" style="width: 408px">
@@ -1146,7 +1146,7 @@
         }).catch(() => {});
       },
       //检查项选中
-      cascaderChange(val,item,index){
+      cascaderChange(val,item,index,index2){
         let obj = this.getCascaderDataQuery(val,this.options);
 
         if(this.addForm.checkCategory==1){//综合检查
@@ -1155,12 +1155,11 @@
             this.msgError('未找到相关项目')
             return
           }
-          console.log(obj)
           this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckCode',obj.code);
           this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckName',obj.name);
           this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckPoint',obj.mainPoint);
           countHazardNum({subId:this.addForm.subId, hazardCheckPro:val}).then( response => {
-            this.$set(this,'hazardCheckCount',response.data);
+            this.$set(this.addForm.checkHazardDtoList[index],'hazardCheckCount',response.data);
           })
         }else if(this.addForm.checkCategory==2){//专项检查
           if(!obj){
@@ -1168,11 +1167,10 @@
             this.msgError('未找到相关项目')
             return
           }
-          console.log(obj)
           item.hazardCheckCode=obj.code;
           item.hazardCheckName=obj.name;
           countHazardNum({subId:this.addForm.subId, hazardCheckPro:val}).then( response => {
-            this.$set(this,'hazardCheckCount',response.data);
+            this.$set(this.addForm.checkHazardInfoVoList[index].checkHazardDtoList[index2],'hazardCheckCount',response.data);
           })
         }
       },

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

@@ -85,6 +85,7 @@ export default {
   name: "Exam",
   data() {
     return {
+      loading:false,
       examList:[],
       myListExam: [],
       levels: [

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

@@ -126,6 +126,7 @@
       flex-direction: column;
       .button-max-box{
         display: flex;
+        padding:20px 0;
         .button-p{
           line-height:35px;
           margin-right:10px;

src/views/securityCheck/checkRecord/reformCheck.vue

@@ -58,7 +58,8 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="loading" border :data="checkRecordList" border>
-        <el-table-column label="项目序号" align="left" prop="jcxSstkNum" width="100" show-overflow-tooltip/>
+        <el-table-column label="序号" type="index" align="center" width="50"/>
+        <!--<el-table-column label="项目序号" align="left" prop="jcxSstkNum" width="100" show-overflow-tooltip/>-->
         <el-table-column label="隐患描述" align="left" prop="yhMs" show-overflow-tooltip/>
         <el-table-column label="整改类型" align="left" prop="zgType" width="110" show-overflow-tooltip>
           <template slot-scope="scope">{{scope.row.zgType==0?'一般整改':(scope.row.zgType==1?'重大整改':'')}}</template>

src/views/securityCheck/checkRecord/verifyCheck.vue

@@ -56,7 +56,8 @@
         </el-form-item>
       </el-form>
       <el-table v-loading="loading" border :data="checkRecordList" border>
-        <el-table-column label="项目序号" align="left" prop="jcxNum" width="180"/>
+        <el-table-column label="序号" type="index" align="center" width="50"/>
+        <!--<el-table-column label="项目序号" align="left" prop="jcxNum" width="180"/>-->
         <el-table-column label="隐患描述" align="left" prop="yhMs" width="290" :show-overflow-tooltip="true"/>
         <el-table-column label="整改类型" align="left" prop="zgType" width="150">
           <template slot-scope="scope">{{scope.row.zgType==0?'一般整改':(scope.row.zgType==1?'重大整改':'')}}</template>

src/views/studentViews/chemicalManagement/studentChemicalInfo/addPage.vue

@@ -109,7 +109,7 @@
                   <p @click="addList(index,bigIndex)">+添加</p>
                 </div>
                 <div class="for-min-box" v-for="(minItem,minIndex) in bigItem.list">
-                  <el-form-item class="num-input-item" label="容器容量规格" label-width="120px" :prop="'maxList.'+ index +'.chemicalJoinCabinetSonList.'+bigIndex+'.list.'+minIndex+'.chemicalAmount'" :rules="rules.chemicalAmount">
+                  <el-form-item class="num-input-item" label="容器容量规格" label-width="120px" :prop="'maxList.'+ index +'.chemicalJoinCabinetSonList.'+bigIndex+'.list.'+minIndex+'.chemicalAmount'" :rules="rules.chemicalAmountLock">
                     <div class="num-input-min-box">
                       <el-input-number
                         style="width:110px;"
@@ -123,7 +123,7 @@
                       <p class="num-title-span">{{selectioned.chemicalUnit}}</p>
                     </div>
                   </el-form-item>
-                  <el-form-item class="num-input-item" label="容器重量规格" label-width="120px" :prop="'maxList.'+ index +'.chemicalJoinCabinetSonList.'+bigIndex+'.list.'+minIndex+'.tare'" :rules="rules.tare">
+                  <el-form-item class="num-input-item" label="容器重量规格" label-width="120px" :prop="'maxList.'+ index +'.chemicalJoinCabinetSonList.'+bigIndex+'.list.'+minIndex+'.tare'" :rules="rules.tareLock">
                     <div class="num-input-min-box">
                       <el-input-number
                         style="width:110px;"
@@ -223,7 +223,7 @@
 </template>
 
 <script>
-  import { getNoAdminSubjectListNopage,getCabinetBySubId,hxpChemicalJoinCabinet,getRestStockByManyCabinet,classifyList } from "@/api/medicUniversity-3_1/index";
+  import { filterDept,getSubList,getCabinetBySubId,hxpChemicalJoinCabinet,getRestStockByManyCabinet,classifyList } from "@/api/medicUniversity-3_1/index";
   import { getHxpQueryByUser } from "@/api/studentApi/chemicalManagement/index";
   import { getLogoInfo } from "@/api/system/publicConfig";
   export default {
@@ -247,6 +247,22 @@
           callback();
         }
       };
+      const computingCapacityLock = (rule, value, callback) => {
+        console.log('rule',rule)
+        const list = rule.field.split('.');
+        let index = parseFloat(list[1]);
+        let index1 = parseFloat(list[3]);
+        let index2 = parseFloat(list[5]);
+        let max = parseFloat(this.dialogData.maxList[index].maxNum);
+        let tare = parseFloat(this.dialogData.maxList[index].chemicalJoinCabinetSonList[index1].list[index2].tare);
+        if(value>max){
+          callback(new Error("超出该机柜可存放量"));
+        }else if(value<tare){
+          callback(new Error("容器容量规格不能小于容器重量规格"));
+        }else{
+          callback();
+        }
+      };
       const computingTare = (rule, value, callback) => {
         console.log('rule',rule)
         const list = rule.field.split('.');
@@ -259,6 +275,19 @@
           callback();
         }
       };
+      const computingTareLock = (rule, value, callback) => {
+        console.log('rule',rule)
+        const list = rule.field.split('.');
+        let index = parseFloat(list[1]);
+        let index1 = parseFloat(list[3]);
+        let index2 = parseFloat(list[5]);
+        let chemicalAmount = parseFloat(this.dialogData.maxList[index].chemicalJoinCabinetSonList[index1].list[index2].chemicalAmount);
+        if(value>chemicalAmount){
+          callback(new Error("容器重量规格不能大于容器容量规格"));
+        }else{
+          callback();
+        }
+      };
 
       return {
         //限制时间范围
@@ -303,11 +332,21 @@
             { required: true, message: "请输入容器容量", validator: this.spaceJudgment, trigger: "blur" },
             { required: true, validator: computingCapacity, trigger: "blur" },
           ],
+          chemicalAmountLock:[
+            { required: true, message: '请输入容器容量', trigger: 'blur' },
+            { required: true, message: "请输入容器容量", validator: this.spaceJudgment, trigger: "blur" },
+            { required: true, validator: computingCapacityLock, trigger: "blur" },
+          ],
           tare:[
             { required: true, message: '请输入容器自重', trigger: 'blur' },
             { required: true, message: "请输入容器自重", validator: this.spaceJudgment, trigger: "blur" },
             { required: true, validator: computingTare, trigger: "blur" },
           ],
+          tareLock:[
+            { required: true, message: '请输入容器自重', trigger: 'blur' },
+            { required: true, message: "请输入容器自重", validator: this.spaceJudgment, trigger: "blur" },
+            { required: true, validator: computingTareLock, trigger: "blur" },
+          ],
           storageNum:[
             { required: true, message: '请输入存放数量', trigger: 'blur' },
             { required: true, message: "请输入存放数量", validator: this.spaceJudgment, trigger: "blur" }
@@ -547,27 +586,26 @@
       //化学品存放
       handleAdd(){
         //查询当前院系
-        // filterDept().then(response => {
-        //   if(!this.selectioned.id){
-        //     this.msgError('请勾选化学品')
-        //     return
-        //   }
-        //   let text = "";
-        //   let idText = "";
-        //   for(let i=0;i<response.data.length;i++){
-        //     if(i==0){
-        //       text = text + response.data[i].deptName;
-        //       idText = idText + response.data[i].deptId;
-        //     }else{
-        //       text = text +'-'+ response.data[i].deptName;
-        //       idText = idText +','+ response.data[i].deptId;
-        //     }
-        //   }
-        //   this.$set(this,'dialogDeptName',text);
-        //   this.$set(this,'dialogDeptId',idText);
-        //   this.getSubList();
-        // });
+        filterDept().then(response => {
+          if(!this.selectioned.id){
+            this.msgError('请勾选化学品')
+            return
+          }
+          let text = "";
+          let idText = "";
+          for(let i=0;i<response.data.length;i++){
+            if(i==0){
+              text = text + response.data[i].deptName;
+              idText = idText + response.data[i].deptId;
+            }else{
+              text = text +'-'+ response.data[i].deptName;
+              idText = idText +','+ response.data[i].deptId;
+            }
+          }
+          this.$set(this,'dialogDeptName',text);
+          this.$set(this,'dialogDeptId',idText);
           this.getSubList();
+        });
       },
       backPage(){
         this.$parent.pageToggle(0);
@@ -608,7 +646,8 @@
       },
       //根据所属院系或多个院系获取实验室列表
       getSubList(){
-        getNoAdminSubjectListNopage().then(response => {
+        let ids = this.dialogDeptId+'';
+        getSubList(ids).then(response => {
           this.$set(this,'dialogData',{
             subId:"",
             chemicalId:"",

src/views/studentViews/chemicalManagement/studentOutboundRecord/index.vue

@@ -231,12 +231,12 @@
       },
       //获取化学品柜列表
       getNoauthList(){
-        getNoauthList().then(response => {
+        getNoauthList({}).then(response => {
           let list = [];
-          for(let i=0;i<response.rows.length;i++){
+          for(let i=0;i<response.data.length;i++){
             let obj ={
-              value:response.rows[i].id,
-              label:response.rows[i].cabinetName,
+              value:response.data[i].id,
+              label:response.data[i].cabinetName,
             }
             list.push(obj);
           }

src/views/studentViews/chemicalManagement/studentUsageRecord/index.vue

@@ -235,12 +235,12 @@
       },
       //获取化学品柜列表
       getNoauthList(){
-        getNoauthList().then(response => {
+        getNoauthList({}).then(response => {
           let list = [];
-          for(let i=0;i<response.rows.length;i++){
+          for(let i=0;i<response.data.length;i++){
             let obj ={
-              value:response.rows[i].id,
-              label:response.rows[i].cabinetName,
+              value:response.data[i].id,
+              label:response.data[i].cabinetName,
             }
             list.push(obj);
           }

src/views/studentViews/chemicalManagement/studentWarehousingRecord/index.vue

@@ -238,12 +238,12 @@
       },
       //获取化学品柜列表
       getNoauthList(){
-        getNoauthList().then(response => {
+        getNoauthList({}).then(response => {
           let list = [];
-          for(let i=0;i<response.rows.length;i++){
+          for(let i=0;i<response.data.length;i++){
             let obj ={
-              value:response.rows[i].id,
-              label:response.rows[i].cabinetName,
+              value:response.data[i].id,
+              label:response.data[i].cabinetName,
             }
             list.push(obj);
           }

src/views/system/alarm/index.vue

@@ -37,7 +37,7 @@
 
       </el-form>
 
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
+    <el-table border  :data="dataList" @selection-change="handleSelectionChange">
       <el-table-column label="报警方式" align="center" prop="method" />
       <el-table-column label="报警状态" align="center" prop="status">
         <template slot-scope="scope">

src/views/system/ceditScoreSite/index.vue

@@ -71,7 +71,7 @@
 
     <el-table v-loading="loading" border :data="ceditScoreSiteList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="序号"  width="50" align="center"  type="index"/>
       <el-table-column label="合格分" align="center" prop="passScore" />
       <el-table-column label="是否需要获得安全准入证书,0:是,1:否" align="center" prop="getCondition" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">

src/views/system/violationScoreSite/index.vue

@@ -95,7 +95,7 @@
 
     <el-table v-loading="loading" border :data="violationScoreSiteList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="序号" align="center" prop="id" />
+      <el-table-column label="序号"  width="50" align="center"  type="index"/>
       <el-table-column label="穿戴未通过扣分" align="center" prop="wear" />
       <el-table-column label="未做离开考勤" align="center" prop="leave" />
       <el-table-column label="未考勤签到进入实验室" align="center" prop="laboratory" />