zc

src/api/secureAccess/index.js

@@ -1,416 +1 @@
 import request from '@/utils/request'
-
-//编辑条件
-export function materialdataPut(data) {
-  return request({
-    url: '/laboratory/materialdata',
-    method: 'put',
-    data:data
-  })
-}
-
-//添加条件
-export function materialdata(data) {
-  return request({
-    url: '/laboratory/materialdata/add',
-    method: 'post',
-    data: data
-  })
-}
-
-//获取条件列表
-export function materialdataList(query) {
-  return request({
-    url: '/laboratory/materialdata/list',
-    method: 'get',
-    params: query
-  })
-}
-
-//删除条件
-export function materialdataDel(id) {
-  return request({
-    url: '/laboratory/materialdata/'+id,
-    method: 'delete',
-  })
-}
-
-//安全准入审批接口
-export function laboratoryApply(data) {
-  return request({
-    url: '/laboratory/apply',
-    method: 'put',
-    data: data
-  })
-}
-
-// 查询安全准入资格列表
-export function listGroup(query) {
-  return request({
-    url: '/laboratory/group/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询安全准入资格详细
-export function getGroup(id) {
-  return request({
-    url: '/laboratory/group/' + id,
-    method: 'get'
-  })
-}
-
-// 新增安全准入资格
-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 filterSubjectDictList(data) {
-  return request({
-    url: '/laboratory/subject/getFilterSubjectDict',
-    method: 'get',
-    params: data
-  })
-}
-
-// 查询审批记录列表
-export function listApproval(query) {
-  return request({
-    url: '/laboratory/approval/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询审批记录详细
-export function getApproval(id) {
-  return request({
-    url: '/laboratory/approval/' + id,
-    method: 'get'
-  })
-}
-
-// 删除审批记录
-export function delApproval(id) {
-  return request({
-    url: '/laboratory/approval/' + id,
-    method: 'delete'
-  })
-}
-
-// 新增审批记录
-export function addApproval(data) {
-  return request({
-    url: '/laboratory/approval',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改审批记录
-export function updateApproval(data) {
-  return request({
-    url: '/laboratory/approval',
-    method: 'put',
-    data: data
-  })
-}
-
-//查询审批列表
-export function applyApproval(query) {
-  return request({
-    url: '/laboratory/apply/approval',
-    method: 'get',
-    params: query
-  })
-}
-
-//安全准入审核列表接口
-export function applyList(query) {
-  return request({
-    url: '/laboratory/apply/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询危险源下拉列表
-export function optionHazard(data) {
-  return request({
-    url: '/laboratory/hazard/queryOption',
-    method: 'post',
-    data: data
-  })
-}
-
-//打包下载
-export function downloadwBatch(data) {
-  return request({
-    url: '/laboratory/apply/downloadwBatch',
-    method: 'post',
-    data: data
-  })
-}
-
-//安全准入详情接口
-export function getDetails(query) {
-  return request({
-    url: '/laboratory/apply/getDetails',
-    method: 'get',
-    params: query
-  })
-}
-
-//查询专业
-export function majorListPower(query) {
-  return request({
-    url: '/system/major/listPower',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询major列表
-export function listMajorAll(query) {
-  return request({
-    url: '/system/major/listAll',
-    method: 'get',
-    params: query
-  })
-}
-
-// 审批通过操作
-export function submitApproval(data) {
-  return request({
-    url: '/laboratory/approval/appOperation',
-    method: 'put',
-    data: data
-  })
-}
-
-// 审批不通过操作
-export function failedApproval(data) {
-  return request({
-    url: '/laboratory/approval/failedOperation',
-    method: 'put',
-    data: data
-  })
-}
-
-//获取实验室当前准入配置
-export function materialApply(query) {
-  return request({
-    url: '/laboratory/apply/materialApply',
-    method: 'get',
-    params: query
-  })
-}
-
-//安全准入提交接口
-export function materialAdd(data) {
-  return request({
-    url: '/laboratory/apply/materialAdd',
-    method: 'post',
-    data: data
-  })
-}
-//安全准入修改接口
-export function materialUpdate(data) {
-  return request({
-    url: '/laboratory/apply/materialUpdate',
-    method: 'post',
-    data: data
-  })
-}
-
-//根据名称查询导师
-export function selectUserListByName(query) {
-  return request({
-    url: '/system/user/selectUserListByName',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询实验室字典列表
-export function subjectDictList(data) {
-  return request({
-    url: '/laboratory/subject/getSubjectDict',
-    method: 'get',
-    params: data
-  })
-}
-
-// 查询个人安全准入办理列表
-export function userAppRovallist(query) {
-  return request({
-    url: '/laboratory/approval/userAppRovallist',
-    method: 'get',
-    params: query
-  })
-}
-
-// 通过实验室 查询对应的安全准入规则
-export function securityBySubjectId(subjectId) {
-  return request({
-    url: '/laboratory/approval/querySecurityBySubjectId',
-    method: 'post',
-    data: {subjectId: subjectId}
-  })
-}
-
-//查询申请记录列表
-export function listapply(query) {
-  return request({
-    url: '/laboratory/apply/listapply',
-    method: 'get',
-    params: query
-  })
-}
-
-// 删除审批记录
-export function applyDelete(id) {
-  return request({
-    url: '/laboratory/apply/'+id,
-    method: 'delete'
-  })
-}
-
-// 查询学生信息列表
-export function listStudentinfo(query) {
-  return request({
-    url: '/laboratory/studentinfo/list',
-    method: 'get',
-    params: query
-  })
-}
-// 查询学生信息列表 -按审核类型
-export function listStudentinfoByAudit(type) {
-  return request({
-    url: `/laboratory/studentinfo/list/${type}`,
-    method: 'get'
-  })
-}
-// 查询学生信息详细
-export function getStudentinfo(joinStudentsId) {
-  return request({
-    url: '/laboratory/studentinfo/' + joinStudentsId,
-    method: 'get'
-  })
-}
-// 删除学生信息
-export function delStudentinfo(joinStudentsId) {
-  return request({
-    url: '/laboratory/studentinfo/' + joinStudentsId,
-    method: 'delete'
-  })
-}
-// 新增学生信息
-export function addStudentinfo(data) {
-  return request({
-    url: '/laboratory/studentinfo',
-    method: 'post',
-    data: data
-  })
-}
-// 修改学生信息
-export function updateStudentinfo(data) {
-  return request({
-    url: '/laboratory/studentinfo',
-    method: 'put',
-    data: data
-  })
-}
-
-// 审核
-export function auditStudentinfo(data,f) {
-  let v = f==1?'success':'fail'
-  return request({
-    url: `/laboratory/studentinfo/audit/${v}`,
-    method: 'put',
-    data: data
-  })
-}
-
-//新增白名单
-export function whitelistAddList(data) {
-  return request({
-    url: '/laboratory/whitelist/addList',
-    method: 'post',
-    data:data
-  })
-}
-
-//编辑白名单
-export function whitelistEditList(data) {
-  return request({
-    url: '/laboratory/whitelist/editWhiteBySubJoin',
-    method: 'put',
-    data:data
-  })
-}
-
-//新增准入实验室获取实验室列表
-export function getAllSubjectByParame(query) {
-  return request({
-    url: '/laboratory/subject/getAllSubjectByParame',
-    method: 'get',
-    params: query
-  })
-}
-
-// 新增白名单人员查询接口
-export function whitelistSelectUserListByName(name) {
-  return request({
-    url: '/system/user/selectUserListByNotWhite?nickName='+name,
-    method: 'get'
-  })
-}
-
-//编辑 获取白名单用户的信息
-export function whitelistEdit(name) {
-  return request({
-    url: '/laboratory/whitelist/'+name,
-    method: 'get'
-  })
-}
-
-//获取白名单列表
-export function whitelistList(query) {
-  return request({
-    url: '/laboratory/whitelist/list',
-    method: 'get',
-    params: query
-  })
-}
-
-//编辑 获取白名单实验室信息
-export function whitelistSubListEdit(name) {
-  return request({
-    url: '/laboratory/whitelist/subList/'+name,
-    method: 'get'
-  })
-}
-
-//删除白名单
-export function whitelistDel(id) {
-  return request({
-    url: '/laboratory/whitelist/'+id,
-    method: 'post'
-  })
-}

src/apiDemo/secureAccess/index.js

@@ -0,0 +1,416 @@
+import request from '@/utils/request'
+
+//编辑条件
+export function materialdataPut(data) {
+  return request({
+    url: '/laboratory/materialdata',
+    method: 'put',
+    data:data
+  })
+}
+
+//添加条件
+export function materialdata(data) {
+  return request({
+    url: '/laboratory/materialdata/add',
+    method: 'post',
+    data: data
+  })
+}
+
+//获取条件列表
+export function materialdataList(query) {
+  return request({
+    url: '/laboratory/materialdata/list',
+    method: 'get',
+    params: query
+  })
+}
+
+//删除条件
+export function materialdataDel(id) {
+  return request({
+    url: '/laboratory/materialdata/'+id,
+    method: 'delete',
+  })
+}
+
+//安全准入审批接口
+export function laboratoryApply(data) {
+  return request({
+    url: '/laboratory/apply',
+    method: 'put',
+    data: data
+  })
+}
+
+// 查询安全准入资格列表
+export function listGroup(query) {
+  return request({
+    url: '/laboratory/group/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询安全准入资格详细
+export function getGroup(id) {
+  return request({
+    url: '/laboratory/group/' + id,
+    method: 'get'
+  })
+}
+
+// 新增安全准入资格
+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 filterSubjectDictList(data) {
+  return request({
+    url: '/laboratory/subject/getFilterSubjectDict',
+    method: 'get',
+    params: data
+  })
+}
+
+// 查询审批记录列表
+export function listApproval(query) {
+  return request({
+    url: '/laboratory/approval/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询审批记录详细
+export function getApproval(id) {
+  return request({
+    url: '/laboratory/approval/' + id,
+    method: 'get'
+  })
+}
+
+// 删除审批记录
+export function delApproval(id) {
+  return request({
+    url: '/laboratory/approval/' + id,
+    method: 'delete'
+  })
+}
+
+// 新增审批记录
+export function addApproval(data) {
+  return request({
+    url: '/laboratory/approval',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改审批记录
+export function updateApproval(data) {
+  return request({
+    url: '/laboratory/approval',
+    method: 'put',
+    data: data
+  })
+}
+
+//查询审批列表
+export function applyApproval(query) {
+  return request({
+    url: '/laboratory/apply/approval',
+    method: 'get',
+    params: query
+  })
+}
+
+//安全准入审核列表接口
+export function applyList(query) {
+  return request({
+    url: '/laboratory/apply/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询危险源下拉列表
+export function optionHazard(data) {
+  return request({
+    url: '/laboratory/hazard/queryOption',
+    method: 'post',
+    data: data
+  })
+}
+
+//打包下载
+export function downloadwBatch(data) {
+  return request({
+    url: '/laboratory/apply/downloadwBatch',
+    method: 'post',
+    data: data
+  })
+}
+
+//安全准入详情接口
+export function getDetails(query) {
+  return request({
+    url: '/laboratory/apply/getDetails',
+    method: 'get',
+    params: query
+  })
+}
+
+//查询专业
+export function majorListPower(query) {
+  return request({
+    url: '/system/major/listPower',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询major列表
+export function listMajorAll(query) {
+  return request({
+    url: '/system/major/listAll',
+    method: 'get',
+    params: query
+  })
+}
+
+// 审批通过操作
+export function submitApproval(data) {
+  return request({
+    url: '/laboratory/approval/appOperation',
+    method: 'put',
+    data: data
+  })
+}
+
+// 审批不通过操作
+export function failedApproval(data) {
+  return request({
+    url: '/laboratory/approval/failedOperation',
+    method: 'put',
+    data: data
+  })
+}
+
+//获取实验室当前准入配置
+export function materialApply(query) {
+  return request({
+    url: '/laboratory/apply/materialApply',
+    method: 'get',
+    params: query
+  })
+}
+
+//安全准入提交接口
+export function materialAdd(data) {
+  return request({
+    url: '/laboratory/apply/materialAdd',
+    method: 'post',
+    data: data
+  })
+}
+//安全准入修改接口
+export function materialUpdate(data) {
+  return request({
+    url: '/laboratory/apply/materialUpdate',
+    method: 'post',
+    data: data
+  })
+}
+
+//根据名称查询导师
+export function selectUserListByName(query) {
+  return request({
+    url: '/system/user/selectUserListByName',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询实验室字典列表
+export function subjectDictList(data) {
+  return request({
+    url: '/laboratory/subject/getSubjectDict',
+    method: 'get',
+    params: data
+  })
+}
+
+// 查询个人安全准入办理列表
+export function userAppRovallist(query) {
+  return request({
+    url: '/laboratory/approval/userAppRovallist',
+    method: 'get',
+    params: query
+  })
+}
+
+// 通过实验室 查询对应的安全准入规则
+export function securityBySubjectId(subjectId) {
+  return request({
+    url: '/laboratory/approval/querySecurityBySubjectId',
+    method: 'post',
+    data: {subjectId: subjectId}
+  })
+}
+
+//查询申请记录列表
+export function listapply(query) {
+  return request({
+    url: '/laboratory/apply/listapply',
+    method: 'get',
+    params: query
+  })
+}
+
+// 删除审批记录
+export function applyDelete(id) {
+  return request({
+    url: '/laboratory/apply/'+id,
+    method: 'delete'
+  })
+}
+
+// 查询学生信息列表
+export function listStudentinfo(query) {
+  return request({
+    url: '/laboratory/studentinfo/list',
+    method: 'get',
+    params: query
+  })
+}
+// 查询学生信息列表 -按审核类型
+export function listStudentinfoByAudit(type) {
+  return request({
+    url: `/laboratory/studentinfo/list/${type}`,
+    method: 'get'
+  })
+}
+// 查询学生信息详细
+export function getStudentinfo(joinStudentsId) {
+  return request({
+    url: '/laboratory/studentinfo/' + joinStudentsId,
+    method: 'get'
+  })
+}
+// 删除学生信息
+export function delStudentinfo(joinStudentsId) {
+  return request({
+    url: '/laboratory/studentinfo/' + joinStudentsId,
+    method: 'delete'
+  })
+}
+// 新增学生信息
+export function addStudentinfo(data) {
+  return request({
+    url: '/laboratory/studentinfo',
+    method: 'post',
+    data: data
+  })
+}
+// 修改学生信息
+export function updateStudentinfo(data) {
+  return request({
+    url: '/laboratory/studentinfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 审核
+export function auditStudentinfo(data,f) {
+  let v = f==1?'success':'fail'
+  return request({
+    url: `/laboratory/studentinfo/audit/${v}`,
+    method: 'put',
+    data: data
+  })
+}
+
+//新增白名单
+export function whitelistAddList(data) {
+  return request({
+    url: '/laboratory/whitelist/addList',
+    method: 'post',
+    data:data
+  })
+}
+
+//编辑白名单
+export function whitelistEditList(data) {
+  return request({
+    url: '/laboratory/whitelist/editWhiteBySubJoin',
+    method: 'put',
+    data:data
+  })
+}
+
+//新增准入实验室获取实验室列表
+export function getAllSubjectByParame(query) {
+  return request({
+    url: '/laboratory/subject/getAllSubjectByParame',
+    method: 'get',
+    params: query
+  })
+}
+
+// 新增白名单人员查询接口
+export function whitelistSelectUserListByName(name) {
+  return request({
+    url: '/system/user/selectUserListByNotWhite?nickName='+name,
+    method: 'get'
+  })
+}
+
+//编辑 获取白名单用户的信息
+export function whitelistEdit(name) {
+  return request({
+    url: '/laboratory/whitelist/'+name,
+    method: 'get'
+  })
+}
+
+//获取白名单列表
+export function whitelistList(query) {
+  return request({
+    url: '/laboratory/whitelist/list',
+    method: 'get',
+    params: query
+  })
+}
+
+//编辑 获取白名单实验室信息
+export function whitelistSubListEdit(name) {
+  return request({
+    url: '/laboratory/whitelist/subList/'+name,
+    method: 'get'
+  })
+}
+
+//删除白名单
+export function whitelistDel(id) {
+  return request({
+    url: '/laboratory/whitelist/'+id,
+    method: 'post'
+  })
+}

src/views/iotDevice/intelligenceIot/iotHardware/addPage.vue

@@ -45,12 +45,15 @@
                 style="width:500px;"
                 v-model="newData.address"
                 @change="cascaderChange"
+                clearable
+                @clear="cascaderClear"
                 placeholder="请选择楼栋楼层"
                 :props="{value: 'id', label: 'name',children:'buildFloorVoList'}"
                 :options="treeOptions" :show-all-levels="false"></el-cascader>
             </el-form-item>
             <el-form-item label="实验室：" prop="subId">
-              <el-select v-model="newData.subId" placeholder="请选择实验室" style="width: 500px">
+              <el-select v-model="newData.subId" placeholder="请选择实验室"
+                         clearable style="width: 500px">
                 <el-option v-for="item in subOptions" :key="item.subId" :label="item.subName" :value="item.subId"/>
               </el-select>
             </el-form-item>
@@ -136,6 +139,12 @@
           this.$set(this,'subOptions',response.data);
         })
       },
+      //清除楼层选中
+      cascaderClear(){
+        // this.$set(this.newData,'address',[]);
+        this.$set(this.newData,'subId','');
+        this.$set(this,'subOptions',[]);
+      },
       //设备属性选中
       selectChangeStats(val){
         let self = this;

src/views/iotDevice/monitoringWarning/messageTemplate/addPage.vue

@@ -112,7 +112,6 @@
               style="width:500px;"
               :disabled="showType"
               v-model="newData.receiver"
-              collapse-tags
               multiple
               filterable
               remote
@@ -432,7 +431,6 @@
               remark:obj.remark,
               agentId:obj.agentId?obj.agentId:null,
               receiveDept:obj.receiveDept?obj.receiveDept.split('|'):[],
-              receiver:obj.receiver?obj.receiver.split('|'):[],
               receiveTag:obj.receiveTag?obj.receiveTag.split('|'):[],
               bodyType:obj.bodyType?obj.bodyType:null,
               title:obj.title?obj.title:null,
@@ -440,10 +438,12 @@
               signature:obj.signature?obj.signature:null,
               content:obj.content?obj.content:null,
             };
-            if(newObj.alarmType == 3 || newObj.alarmType == 5){
-              systemUserSelect({userType:1,userName:'',userIds:newObj.receiver}).then(response => {
-                this.userOptions = response.data;
-              });
+            if(newObj.alarmType == 2){
+              newObj.receiver = obj.receiver?obj.receiver.split('|'):[];
+            }else if(newObj.alarmType == 3){
+              newObj.receiver = obj.receiver?obj.receiver.split(','):[];
+            }else{
+              newObj.receiver = obj.receiver?obj.receiver:'';
             }
             this.$set(this,'newData',newObj);
           }else{

src/views/iotDevice/operationManagement/monitorLog/index.vue

@@ -33,7 +33,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="时间" prop="state">
+          <el-form-item label="" prop="state">
             <el-date-picker
               :clearable="false"
               v-model="dateRange"

src/views/secureAccess/accessRequirement/addPage.vue

@@ -1,36 +1,40 @@
 <!--新增/编辑准入条件-->
 <template>
-  <div class="accessRequirementAddPage">
-    <el-form :model="form" ref="form" label-width="100px" :rules="rules">
-      <el-form-item label="材料名称" prop="materialName">
-        <el-input v-model="form.materialName" placeholder="请输入材料名称" style="width:320px;" maxlength="15" ></el-input>
-      </el-form-item>
-      <el-form-item label="材料描述" prop="materialDescribe">
-        <el-input v-model="form.materialDescribe" type="textarea" placeholder="请输入材料描述" style="width:320px;" maxlength="50" ></el-input>
-      </el-form-item>
-      <el-form-item label="材料类型" prop="materialType">
-        <el-radio-group v-model="form.materialType" @change="radioChange">
-          <el-radio :label="1">上传材料</el-radio>
-          <el-radio :label="2">关联材料</el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="文件格式" prop="fileType" v-if="form.materialType==1">
-        <el-checkbox-group v-model="form.fileType">
-          <el-checkbox :label="1">PDF</el-checkbox>
-          <el-checkbox :label="2">WORD</el-checkbox>
-          <el-checkbox :label="3">图片</el-checkbox>
-        </el-checkbox-group>
-      </el-form-item>
-      <el-form-item label="关联材料" prop="relationType" v-if="form.materialType == 2">
-        <el-select v-model="form.relationType" placeholder="请选择关联材料">
-          <el-option :label="item.name" :value="item.id" v-for="(item,index) in materialTypeList" :key="index"></el-option>
-        </el-select>
-      </el-form-item>
-      <div class="bottom-button-box">
-        <p class="reset-button-one" @click="backPage">取消</p>
-        <p class="inquire-button-one" @click="upData">提交</p>
-      </div>
-    </el-form>
+  <div class="page-container accessRequirementAddPage">
+    <div class="page-top-title-box">
+      <p class="page-top-title-name-p">添加</p>
+      <p class="page-top-title-out-p" @click="backPage">返回</p>
+      <p class="page-top-title-submit-p" @click="upData">提交</p>
+    </div>
+    <div class="content-box">
+      <el-form :model="form" ref="form" label-width="100px" :rules="rules">
+        <el-form-item label="材料名称" prop="materialName">
+          <el-input v-model="form.materialName" placeholder="请输入材料名称" style="width:320px;" maxlength="15" ></el-input>
+        </el-form-item>
+        <el-form-item label="材料描述" prop="materialDescribe">
+          <el-input v-model="form.materialDescribe" type="textarea" resize="none"
+                    placeholder="请输入材料描述" style="width:320px;" maxlength="50" ></el-input>
+        </el-form-item>
+        <el-form-item label="材料类型" prop="materialType">
+          <el-radio-group v-model="form.materialType" @change="radioChange">
+            <el-radio :label="1">上传材料</el-radio>
+            <el-radio :label="2">关联材料</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="文件格式" prop="fileType" v-if="form.materialType==1">
+          <el-checkbox-group v-model="form.fileType">
+            <el-checkbox :label="1">PDF</el-checkbox>
+            <el-checkbox :label="2">WORD</el-checkbox>
+            <el-checkbox :label="3">图片</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+        <el-form-item label="关联材料" prop="relationType" v-if="form.materialType == 2">
+          <el-select v-model="form.relationType" placeholder="请选择关联材料">
+            <el-option :label="item.name" :value="item.id" v-for="(item,index) in materialTypeList" :key="index"></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+    </div>
   </div>
 </template>
 
@@ -175,20 +179,8 @@
 
 <style scoped lang="scss">
   .accessRequirementAddPage{
-    flex:1;
-    overflow-y: scroll;
-    box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
-    padding:50px 0 50px 60px!important;
-    border-radius: 10px;
-    .bottom-button-box{
-      margin-top:50px;
-      display: flex;
-      p:nth-child(1){
-        margin:0 20px 0 100px;
-      }
-      .inquire-button-one{
-        width: 140px;
-      }
+    .content-box{
+      margin-top:20px;
     }
   }
 </style>

src/views/secureAccess/accessRequirement/index.vue

@@ -43,11 +43,11 @@
       return {
         pageType:1,
         propsData:{},
-        newList:[],
+        newList:[{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},{},],
       };
     },
     created() {
-      this.getList();
+      // this.getList();
     },
     methods: {
       getList(){
@@ -114,27 +114,15 @@
 
 <style scoped lang="scss">
   .accessRequirement{
-    flex:1;
-    display: flex;
-    flex-direction: column;
-    overflow: hidden!important;
-    p{
-      margin:0;
-      padding:0;
-    }
     .accessRequirementPage{
-      flex:1;
-      overflow-y: scroll;
-      box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
-      padding:50px 0 50px 60px!important;
-      border-radius: 10px;
+      margin:40px;
       .add-button-box{
         display: inline-block;
         height:188px;
         width:332px;
         border:2px dashed #e0e0e0;
         border-radius:10px;
-        margin:0 44px 50px 0;
+        margin:0 40px 50px 0;
         overflow: hidden;
         cursor: pointer;
         div{
@@ -160,7 +148,7 @@
         width:332px;
         border:2px solid #e0e0e0;
         border-radius:10px;
-        margin:0 46px 50px 0;
+        margin:0 40px 50px 0;
         overflow: hidden;
         .for-text-box{
           .for-name{

src/views/secureAccess/approval/failed.vue

@@ -1,40 +1,41 @@
 <!--准入凭证审核/未通过-->
 <template>
   <div class="failed">
-    <el-table class="table-box" v-loading="loading" border :data="approvalList" @selection-change="handleSelectionChange">
+    <div class="page-content-box">
+      <el-table class="table-box" v-loading="loading" border :data="approvalList" @selection-change="handleSelectionChange">
 
-      <el-table-column label="申请人" align="left" prop="userName" />
-      <el-table-column label="申请人身份" align="left" prop="userType">
-        <template slot-scope="scope">
-          {{scope.row.userType == '11' ? '教职工':(scope.row.userType == '22' ? '学生':'')}}
-        </template>
-      </el-table-column>
-      <el-table-column label="申请实验室" align="left" prop="subjectName" />
-      <el-table-column label="申请时间" align="left" prop="creatTime" >
-        <template slot-scope="scope">
-          {{scope.row.creatTime}} {{scope.row.hi}}
-        </template>
-      </el-table-column>
-      <el-table-column label="有效期" align="left" prop="validBeginTime">
-        <template slot-scope="scope">
-          {{scope.row.validBeginTime}}至{{scope.row.validEndTime}}
-        </template>
-      </el-table-column>
-      <el-table-column label="驳回原因" align="left" prop="rejectCause" show-overflow-tooltip></el-table-column>
-      <!--<el-table-column label="准入凭证名称" align="left" prop="configureName" />-->
-      <!--<el-table-column label="凭证申请时间" align="left" prop="createTime" />-->
-      <!--<el-table-column label="凭证未通过时间" align="left" prop="failedDate" />-->
-      <!--<el-table-column label="凭证未通过原因" align="left" prop="failedReason" />-->
-    </el-table>
-
-    <pagination :page-sizes="[20, 30, 40, 50]"
-      v-show="total>0"
-      :total="total"
-      layout="total, prev, pager, next, sizes, jumper"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+        <el-table-column label="申请人" align="left" prop="userName" />
+        <el-table-column label="申请人身份" align="left" prop="userType">
+          <template slot-scope="scope">
+            {{scope.row.userType == '11' ? '教职工':(scope.row.userType == '22' ? '学生':'')}}
+          </template>
+        </el-table-column>
+        <el-table-column label="申请实验室" align="left" prop="subjectName" />
+        <el-table-column label="申请时间" align="left" prop="creatTime" >
+          <template slot-scope="scope">
+            {{scope.row.creatTime}} {{scope.row.hi}}
+          </template>
+        </el-table-column>
+        <el-table-column label="有效期" align="left" prop="validBeginTime">
+          <template slot-scope="scope">
+            {{scope.row.validBeginTime}}至{{scope.row.validEndTime}}
+          </template>
+        </el-table-column>
+        <el-table-column label="驳回原因" align="left" prop="rejectCause" show-overflow-tooltip></el-table-column>
+        <!--<el-table-column label="准入凭证名称" align="left" prop="configureName" />-->
+        <!--<el-table-column label="凭证申请时间" align="left" prop="createTime" />-->
+        <!--<el-table-column label="凭证未通过时间" align="left" prop="failedDate" />-->
+        <!--<el-table-column label="凭证未通过原因" align="left" prop="failedReason" />-->
+      </el-table>
+      <pagination :page-sizes="[20, 30, 40, 50]"
+                  v-show="total>0"
+                  :total="total"
+                  layout="total, prev, pager, next, sizes, jumper"
+                  :page.sync="queryParams.pageNum"
+                  :limit.sync="queryParams.pageSize"
+                  @pagination="getList"
+      />
+    </div>
 
     <!-- 添加或修改审批记录对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">

src/views/secureAccess/approval/index.vue

@@ -1,22 +1,19 @@
 <!--准入资格审核-->
 <template>
   <div class="app-container approval">
-    <div class="top-big-box" v-if="pageType==1||pageType==2||pageType==3">
-      <div>
-        <p :class="pageType==1?'color_one':'color_99'" @click="tableClick(1)">待审核</p>
-        <p :class="{'back_one':pageType==1}"></p>
+    <div class="top-button-max-box">
+      <div class="top-button-box" @click="tableClick(1)">
+        <p :class="pageType == 1 ? 'p-color':''">待审核</p>
+        <p :class="pageType == 1 ? 'p-back':''"></p>
       </div>
-      <div>
-        <p :class="pageType==2?'color_one':'color_99'" @click="tableClick(2)">已通过</p>
-        <p :class="{'back_one':pageType==2}"></p>
+      <div class="top-button-box" @click="tableClick(2)" >
+        <p :class="pageType == 2 ? 'p-color':''">已通过</p>
+        <p :class="pageType == 2 ? 'p-back':''"></p>
       </div>
-      <div>
-        <p :class="pageType==3?'color_one':'color_99'" @click="tableClick(3)">未通过</p>
-        <p :class="{'back_one':pageType==3}"></p>
+      <div class="top-button-box" @click="tableClick(3)">
+        <p :class="pageType == 3 ? 'p-color':''">未通过</p>
+        <p :class="pageType == 3 ? 'p-back':''"></p>
       </div>
-      <p class="null-p"></p>
-      <!--<p class="add-button-one-120" @click="tableClick(4)"-->
-      <!--&gt;<i class="el-icon-plus"></i>准入资格配置</p>-->
     </div>
     <pending v-if="pageType==1"></pending>
     <passed v-if="pageType==2"></passed>
@@ -77,43 +74,33 @@ export default {
 </script>
 <style scoped lang="scss">
   .approval {
-    display: flex!important;
+    flex:1;
+    display: flex;
     flex-direction: column;
-    box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
-    padding:20px!important;
-    .top-big-box{
+    overflow: hidden;
+    .top-button-max-box{
       display: flex;
-      border-bottom:2px solid #E0E0E0;
-      margin-top:-9px;
-      margin-bottom:32px;
-      div{
-        cursor:pointer;
-        width:128px;
+      padding-top:4px;
+      border-bottom:1px solid #D8D8D8;
+      .top-button-box{
+        height:73px;
+        padding:0 25px;
         p:nth-child(1){
-          line-height:58px;
-          font-size:18px;
+          line-height:68px;
           text-align: center;
-          margin:0;
+          font-weight:500;
+          cursor: pointer;
         }
         p:nth-child(2){
-          width:80px;
-          height:4px;
-          margin:0 auto;
-          border-radius:1px;
+          height:5px;
+          border-radius:2px;
+        }
+        .p-color{
+          color:#0045AF;
+        }
+        .p-back{
+          background: #0045AF;
         }
-      }
-      .null-p{
-        flex:1;
-      }
-      .add-button-one-120{
-        margin-top:9px;
-        margin-right:20px;
-      }
-      .color_one{
-        color:#0045AF;
-      }
-      .color_99{
-        color:#999;
       }
     }
   }

src/views/secureAccess/approval/passed.vue

@@ -1,98 +1,98 @@
 <!--准入凭证审核/已通过-->
 <template>
   <div class="passed">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="关键字" prop="releaseDescribe">
-        <el-input
-          v-model="queryParams.searchValue"
-          placeholder="申请人/实验室名称"
-          clearable
-          size="small"
-        />
-      </el-form-item>
-      <el-form-item label="时间段" label-width="70px">
-        <el-date-picker
-          :clearable="false"
-          v-model="dateRange"
-          size="small"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
-      <el-form-item label="专业" prop="major" label-width="90px">
-        <el-select v-model="queryParams.userMajorId" filterable  placeholder="请选择">
-          <el-option
-            v-for="item in majorList"
-            :key="item.id"
-            :label="item.majorName"
-            :value="item.id">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <p class="inquire-button-one" @click="handleQuery">查询</p>
-        <p class="reset-button-one" @click="resetQuery">重置</p>
-        <p style="margin-left: 10px" class="inquire-button-one" @click="handleExport"
-           v-hasPermi="['laboratory:apply:export']">导出</p>
-      </el-form-item>
-    </el-form>
-    <el-table class="table-box" v-loading="loading" border :data="approvalList" @selection-change="handleSelectionChange">
+    <div class="page-form-title-box">
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="" prop="releaseDescribe">
+          <el-input
+            v-model="queryParams.searchValue"
+            placeholder="申请人/实验室名称"
+            clearable
+            size="small"
+          />
+        </el-form-item>
+        <el-form-item label="" label-width="70px">
+          <el-date-picker
+            :clearable="false"
+            v-model="dateRange"
+            size="small"
+            style="width: 240px"
+            value-format="yyyy-MM-dd"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+          ></el-date-picker>
+        </el-form-item>
+        <el-form-item label="" prop="major" label-width="90px">
+          <el-select v-model="queryParams.userMajorId" filterable  placeholder="请选择专业">
+            <el-option
+              v-for="item in majorList"
+              :key="item.id"
+              :label="item.majorName"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <p class="page-inquire-common-style-button" @click="handleQuery">查询</p>
+        <p class="page-reset-common-style-button" @click="resetQuery">重置</p>
+        <p class="page-inquire-common-style-button" style="margin-left: 10px"
+           @click="handleExport" v-hasPermi="['laboratory:apply:export']">导出</p>
+      </el-form>
+    </div>
+    <div class="page-content-box">
+      <el-table class="table-box" v-loading="loading" border :data="approvalList" @selection-change="handleSelectionChange">
 
-      <el-table-column label="申请人" align="left" prop="userName" />
-      <el-table-column label="申请人身份" align="left" prop="userType">
-        <template slot-scope="scope">
-          {{scope.row.userType == '11' ? '教职工':(scope.row.userType == '22' ? '学生':'')}}
-        </template>
-      </el-table-column>
-      <el-table-column label="申请实验室" align="left" prop="subjectName" />
-      <el-table-column label="申请时间" align="left" prop="creatTime" >
-        <template slot-scope="scope">
-          {{scope.row.creatTime}} {{scope.row.hi}}
-        </template>
-      </el-table-column>
-      <el-table-column label="有效期" align="left" prop="validBeginTime">
-        <template slot-scope="scope">
-          {{scope.row.validBeginTime}}至{{scope.row.validEndTime}}
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
-        <template slot-scope="scope">
-          <div class="table-button-box">
-            <p class="table-button-null"></p>
-            <p class="table-button-p"
-               v-hasPermi="['laboratory:apply:query']"
-               @click="goInfoPage(scope.row)">查看</p>
-            <p class="table-button-null"></p>
-          </div>
-        </template>
-      </el-table-column>
-      <!--<el-table-column label="准入凭证名称" align="left" prop="configureName" />-->
-      <!--<el-table-column label="凭证通过时间" align="left" prop="passedDate" />-->
-      <!--<el-table-column label="凭证到期时间" align="left" prop="expirationDate" >-->
+        <el-table-column label="申请人" align="left" prop="userName" />
+        <el-table-column label="申请人身份" align="left" prop="userType">
+          <template slot-scope="scope">
+            {{scope.row.userType == '11' ? '教职工':(scope.row.userType == '22' ? '学生':'')}}
+          </template>
+        </el-table-column>
+        <el-table-column label="申请实验室" align="left" prop="subjectName" />
+        <el-table-column label="申请时间" align="left" prop="creatTime" >
+          <template slot-scope="scope">
+            {{scope.row.creatTime}} {{scope.row.hi}}
+          </template>
+        </el-table-column>
+        <el-table-column label="有效期" align="left" prop="validBeginTime">
+          <template slot-scope="scope">
+            {{scope.row.validBeginTime}}至{{scope.row.validEndTime}}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
+          <template slot-scope="scope">
+            <div class="table-button-box">
+              <p class="table-button-null"></p>
+              <p class="table-button-p"
+                 v-hasPermi="['laboratory:apply:query']"
+                 @click="goInfoPage(scope.row)">查看</p>
+              <p class="table-button-null"></p>
+            </div>
+          </template>
+        </el-table-column>
+        <!--<el-table-column label="准入凭证名称" align="left" prop="configureName" />-->
+        <!--<el-table-column label="凭证通过时间" align="left" prop="passedDate" />-->
+        <!--<el-table-column label="凭证到期时间" align="left" prop="expirationDate" >-->
         <!--<template slot-scope="scope">-->
-  <!--          <p v-for="(item,index) in recordContents" :key="index" v-if="scope.row.recordOther ==item.type">-->
-              <!--{{scope.row.expirationDate}}-->
-              <!--<el-tag :type="scope.row.recordOther==4?'danger':scope.row.recordOther==3?'warning':'green'">-->
-                <!--{{item.value}}-->
-              <!--</el-tag>-->
-            <!--</p >-->
-<!--        </template>-->
-      <!--</el-table-column>-->
-    </el-table>
-
-    <pagination :page-sizes="[20, 30, 40, 50]"
-      v-show="total>0"
-      :total="total"
-      layout="total, prev, pager, next, sizes, jumper"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
+        <!--          <p v-for="(item,index) in recordContents" :key="index" v-if="scope.row.recordOther ==item.type">-->
+        <!--{{scope.row.expirationDate}}-->
+        <!--<el-tag :type="scope.row.recordOther==4?'danger':scope.row.recordOther==3?'warning':'green'">-->
+        <!--{{item.value}}-->
+        <!--</el-tag>-->
+        <!--</p >-->
+        <!--        </template>-->
+        <!--</el-table-column>-->
+      </el-table>
+      <pagination :page-sizes="[20, 30, 40, 50]"
+                  v-show="total>0"
+                  :total="total"
+                  layout="total, prev, pager, next, sizes, jumper"
+                  :page.sync="queryParams.pageNum"
+                  :limit.sync="queryParams.pageSize"
+                  @pagination="getList"
+      />
+    </div>
     <!-- 添加或修改审批记录对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
@@ -370,5 +370,11 @@ import {
     flex:1;
     display: flex!important;
     flex-direction: column;
+    .page-form-title-box{
+      border:none;
+    }
+    .page-content-box{
+      padding-top:0;
+    }
   }
 </style>

src/views/secureAccess/approval/pending.vue

@@ -1,48 +1,48 @@
 <!--准入凭证审核/待审核-->
 <template>
   <div class="pending">
-    <el-table class="table-box" v-loading="loading" border :data="approvalList" @selection-change="handleSelectionChange">
-
-      <el-table-column label="申请人" align="left" prop="userName" />
-      <el-table-column label="申请人身份" align="left" prop="userType">
-        <template slot-scope="scope">
-          {{scope.row.userType == '11' ? '教职工':(scope.row.userType == '22' ? '学生':'')}}
-        </template>
-      </el-table-column>
-      <el-table-column label="申请实验室" align="left" prop="subjectName" />
-      <!--<el-table-column label="准入凭证名称" align="left" prop="configureName" />-->
-      <el-table-column label="申请时间" align="left" prop="creatTime" >
-        <template slot-scope="scope">
-          {{scope.row.creatTime}} {{scope.row.hi}}
-        </template>
-      </el-table-column>
-      <el-table-column label="有效期" align="left" prop="validBeginTime">
-        <template slot-scope="scope">
-          {{scope.row.validBeginTime}}至{{scope.row.validEndTime}}
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="120">
-        <template slot-scope="scope">
-          <div class="table-button-box">
-            <p class="table-button-null"></p>
-            <p class="table-button-p"
-               @click="goInfoPage(scope.row)"
-               v-hasPermi="['laboratory:apply:edit']"
-            >审核</p>
-            <p class="table-button-null"></p>
-          </div>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination :page-sizes="[20, 30, 40, 50]"
-      v-show="total>0"
-      :total="total"
-      layout="total, prev, pager, next, sizes, jumper"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <div class="page-content-box">
+      <el-table class="table-box" v-loading="loading" border :data="approvalList" @selection-change="handleSelectionChange">
+        <el-table-column label="申请人" align="left" prop="userName" />
+        <el-table-column label="申请人身份" align="left" prop="userType">
+          <template slot-scope="scope">
+            {{scope.row.userType == '11' ? '教职工':(scope.row.userType == '22' ? '学生':'')}}
+          </template>
+        </el-table-column>
+        <el-table-column label="申请实验室" align="left" prop="subjectName" />
+        <!--<el-table-column label="准入凭证名称" align="left" prop="configureName" />-->
+        <el-table-column label="申请时间" align="left" prop="creatTime" >
+          <template slot-scope="scope">
+            {{scope.row.creatTime}} {{scope.row.hi}}
+          </template>
+        </el-table-column>
+        <el-table-column label="有效期" align="left" prop="validBeginTime">
+          <template slot-scope="scope">
+            {{scope.row.validBeginTime}}至{{scope.row.validEndTime}}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="120">
+          <template slot-scope="scope">
+            <div class="table-button-box">
+              <p class="table-button-null"></p>
+              <p class="table-button-p"
+                 @click="goInfoPage(scope.row)"
+                 v-hasPermi="['laboratory:apply:edit']"
+              >审核</p>
+              <p class="table-button-null"></p>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination :page-sizes="[20, 30, 40, 50]"
+                  v-show="total>0"
+                  :total="total"
+                  layout="total, prev, pager, next, sizes, jumper"
+                  :page.sync="queryParams.pageNum"
+                  :limit.sync="queryParams.pageSize"
+                  @pagination="getList"
+      />
+    </div>
 
     <!-- 添加或修改审批记录对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">

src/views/secureAccess/approval_handle/addPage.vue

@@ -1,9 +1,10 @@
 <!--安全准入办理-->
 <template>
   <div class="addPage approval_handle_addPage">
-    <div class="top-title-box">
-      <p>准入申请</p>
-      <p class="button-p reset-button-one" @click="backPage">返回</p>
+    <div class="page-top-title-box">
+      <p class="page-top-title-name-p">准入申请</p>
+      <p class="page-top-title-out-p" @click="backPage">返回</p>
+      <p class="page-top-title-submit-p" style="width:230px;" @click="typeClick">我已选择实验室，上传准入材料</p>
     </div>
     <div class="addPage-max-box">
       <el-form :model="form" ref="form" :rules="rules" label-position="left" label-width="100px">
@@ -47,10 +48,9 @@
               ></el-date-picker>
             </el-form-item>
             <el-form-item label="申请备注" prop="applyCause" >
-              <el-input type="textarea" style="width: 300px" v-model="form.applyCause" placeholder="请输入申请备注" maxlength="50" />
+              <el-input type="textarea" style="width: 300px" v-model="form.applyCause" resize="none" placeholder="请输入申请备注" maxlength="50" />
             </el-form-item>
           </div>
-          <p class="inquire-button-one" style="width:750px;margin:200px 0 0 85px;" @click="typeClick">我已选择实验室，上传准入材料</p>
         </div>
         <!--学生-->
         <div class="addPage-type-two"  v-if="minType == 2&&subjectData.sysUser.userType == '22'">

src/views/secureAccess/approval_handle/index.vue

@@ -167,10 +167,6 @@ export default {
   },
   created() {
     this.newGetList();
-    // this.getDicts("subject_class").then(response => {
-    //   this.subClassOptions = response.data;
-    // })
-    // this.getDeptList();
   },
   methods: {
     //页面切换

src/views/secureAccess/whitelist/addPage.vue

@@ -1,14 +1,15 @@
 <!--白名单新增-->
 <template>
-  <div class="add-whitelist">
-    <div class="top-max-button-title-box">
-      <p>新增准入白名单</p>
-      <p class="button-p reset-button-one" @click="backPage">返回</p>
+  <div class="page-container add-whitelist">
+    <div class="page-top-title-box">
+      <p class="page-top-title-name-p">新增准入白名单</p>
+      <p class="page-top-title-out-p" @click="backPage">返回</p>
+      <p class="page-top-title-submit-p" @click="upButton">提交</p>
     </div>
     <div class="form-max-box">
-      <div class="left">
+      <div class="left-max-box">
         <el-form :model="form" ref="drawerForm" :rules="rules" >
-          <el-form-item label="姓名" prop="userIds" style="margin-top:40px;">
+          <el-form-item label="姓名" prop="userIds">
             <el-select
               :disabled="isEdit"
               v-model="form.userIds"
@@ -35,13 +36,12 @@
               </div>
             </div>
           </div>
-          <addPageSubPageSZDX v-if="versionField() === 'suZhouDaXue'"></addPageSubPageSZDX>
-          <addPageSubPagePublic v-else></addPageSubPagePublic>
-          <!--<p class="inquire-button-one" style="margin:100px 50px;" @click="upButton">提交</p>-->
         </el-form>
       </div>
-      <div class="right">
-        <div style="text-align: right;margin: 20px;" class="right_t"> <p class="inquire-button-one"  style="width: 150px" @click="newAdmittance">新增准入实验室</p></div>
+      <div class="right-max-box">
+        <div style="text-align: right;margin: 20px;" class="right_t">
+          <p class="inquire-button-one"  style="width: 150px" @click="newAdmittance">新增准入实验室</p>
+        </div>
         <el-table class="table-box" border v-loading="loading" :data="subjectList">
           <el-table-column label="申请实验室" align="left" prop="name" />
           <el-table-column label="楼栋" align="left" prop="building" />
@@ -143,17 +143,13 @@ import {
   whitelistEdit, whitelistEditList,
   whitelistList,
   whitelistSubListEdit
-} from "@/api/secureAccess/index";
+} from "@/apiDemo/secureAccess/index";
 import { listInfo } from "@/api/commonality/permission";
 import { buildFloorGetlist } from "@/api/commonality/noPermission";
-import addPageSubPagePublic from './differenceComponent/addPageSubPagePublic.vue'
-import addPageSubPageSZDX from './differenceComponent/addPageSubPageSZDX.vue'
+//                    V3
+
 export default {
   name: "add-whitelist",
-  components: {
-    addPageSubPagePublic,
-    addPageSubPageSZDX
-  },
   props:{
     pageData:{},
   },
@@ -178,7 +174,7 @@ export default {
         pageSize:20,
       },
       total:0,
-      subjectList:[],
+      subjectList:[{}],
       dialogVisible:false,
       dialogForm:{
         pageNum: 1,
@@ -198,17 +194,17 @@ export default {
     };
   },
   created() {
-    if(this.pageData.id){
-      this.isEdit=true;
-      this.whitelistEdit();
-      this.whitelistSubListEdit();
-      this.dialogForm.whiteUserId=this.pageData.userId;
-      this.getUserRoleBySub();
-    }else{
-      this.isEdit=false;
-      this.getUserRoleBySub();
-    }
-    this.buildsList();
+    // if(this.pageData.id){
+    //   this.isEdit=true;
+    //   this.whitelistEdit();
+    //   this.whitelistSubListEdit();
+    //   this.dialogForm.whiteUserId=this.pageData.userId;
+    //   this.getUserRoleBySub();
+    // }else{
+    //   this.isEdit=false;
+    //   this.getUserRoleBySub();
+    // }
+    // this.buildsList();
   },
   methods: {
 
@@ -424,30 +420,30 @@ export default {
     },
     //新增提交
     whitelistAddList(){
-
+      let self = this;
       let labWhiteJoinSubList=[];
-      this.subjectList.forEach(function (item,index){
+      self.subjectList.forEach(function (item,index){
         labWhiteJoinSubList.push({'subjectId':item.subjectId})
       })
       let obj = {
-        labWhitelist:this.userList,
+        labWhitelist:self.userList,
         labWhiteJoinSubList:labWhiteJoinSubList
       }
       whitelistAddList(obj).then(response => {
         if(response.code==200){
-          this.msgSuccess("操作成功")
-          this.backPage();
+          self.msgSuccess("操作成功")
+          self.backPage();
         }else if(response.code==205){
-          this.$confirm(response.message, "警告", {
+          self.$confirm(response.message, "警告", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning"
           }).then(() => {
             //  确定
-            this.$router.push({ path: '/comprehensive/laboratoryManagement/accessAuthorization' });
+            self.$router.push({ path: '/comprehensive/laboratoryManagement/accessAuthorization' });
           }).catch(function() {
             //  取消
-            this.backPage();
+            self.backPage();
           });
         }
       });
@@ -559,44 +555,28 @@ export default {
 
 <style scoped lang="scss">
 .add-whitelist {
-  display: flex !important;
-  flex-direction: column;
-  height: 100%;
-  /*box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);*/
-  padding:20px 20px 20px!important;
-  .top-max-button-title-box{
-    display: flex;
-    border-bottom:1px solid #E0E0E0;
-    p:nth-child(1){
-      flex:1;
-      font-size:16px;
-      line-height:40px;
-      padding-bottom:20px;
-      color:#0045AF;
-    }
-    p:nth-child(2){
-      margin-right:20px;
-    }
-  }
   .form-max-box{
-    height: 100%;
+    padding:20px;
+    flex:1;
     display: flex;
-    .left{
-      width: 24%;
+    overflow: hidden;
+    .left-max-box{
+      width:370px;
+      margin-right:20px;
       .for-max-box{
         margin-left:40px;
         .for-box{
-          display: inline-block;
           border-radius:6px;
           background: rgba(1,131,250,0.2);
-          margin:0 10px 10px;
+          margin:0 0 10px 10px;
           .for-min-box{
             display: flex;
+            overflow: hidden;
             p{
               flex:1;
-              padding:0 20px;
+              padding:10px 0 10px 20px;
               margin:0;
-              line-height:40px;
+              line-height:20px;
               color:#0183FA;
             }
             img{
@@ -609,9 +589,10 @@ export default {
         }
       }
     }
-    .right{
+    .right-max-box{
+      flex:1;
       display: flex;
-      width: 76%;
+      overflow: hidden;
       position: relative;
       .right_t{
         position: absolute;

src/views/secureAccess/whitelist/differenceComponent/addPageSubPagePublic.vue

@@ -1,82 +0,0 @@
-<template>
-  <p class="inquire-button-one" style="margin:100px 50px;" @click="upButton">提交</p>
-</template>
-
-<script>
-  import { whitelistAddList,whitelistEditList } from "@/api/secureAccess/index";
-  export default {
-    name: 'addPageSubPagePublic',
-    methods:{
-      // 上传按钮
-      upButton(){
-        let self = this;
-        if(!self.$parent.$parent.userList[0]){
-          self.msgError("请先添加人员")
-          return
-        }
-        self.$confirm('是否确认提交?', "", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          if(self.$parent.$parent.pageData.id){
-            self.whitelistEditList();
-          }else{
-            self.whitelistAddList();
-          }
-        }).then(() => {}).catch(() => {});
-      },
-      //新增提交
-      whitelistAddList(){
-        let self = this;
-        let labWhiteJoinSubList=[];
-        self.$parent.$parent.subjectList.forEach(function (item,index){
-          labWhiteJoinSubList.push({'subjectId':item.subjectId})
-        })
-        let obj = {
-          labWhitelist:self.$parent.$parent.userList,
-          labWhiteJoinSubList:labWhiteJoinSubList
-        }
-        whitelistAddList(obj).then(response => {
-          if(response.code==200){
-            self.msgSuccess("操作成功")
-            self.$parent.$parent.backPage();
-          }else if(response.code==205){
-            self.$confirm(response.message, "警告", {
-              confirmButtonText: "确定",
-              cancelButtonText: "取消",
-              type: "warning"
-            }).then(() => {
-              //  确定
-              self.$router.push({ path: '/comprehensive/laboratoryManagement/accessAuthorization' });
-            }).catch(function() {
-              //  取消
-              self.$parent.$parent.backPage();
-            });
-          }
-        });
-      },
-      //编辑提交
-      whitelistEditList(){
-        let self = this;
-        let labWhiteJoinSubList=[];
-        //循环取出实验室id
-        self.$parent.$parent.subjectList.forEach(function (item,index){
-          labWhiteJoinSubList.push({'subjectId':item.subjectId})
-        })
-        let obj = {
-          userId:self.$parent.$parent.userList[0].userId,
-          labWhiteJoinSubList:labWhiteJoinSubList
-        }
-        whitelistEditList(obj).then(response => {
-          self.msgSuccess("操作成功")
-          self.$parent.$parent.backPage();
-        });
-      },
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>

src/views/secureAccess/whitelist/differenceComponent/addPageSubPageSZDX.vue

@@ -1,68 +0,0 @@
-<template>
-  <p class="inquire-button-one" style="margin:100px 50px;" @click="upButton">提交</p>
-</template>
-
-<script>
-  import { whitelistAddList,whitelistEditList } from "@/api/secureAccess/index";
-  export default {
-    name: 'addPageSubPageSZDX',
-    methods:{
-      // 上传按钮
-      upButton(){
-        let self = this;
-        if(!self.$parent.$parent.userList[0]){
-          self.msgError("请先添加人员")
-          return
-        }
-        self.$confirm('是否确认提交?', "", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning"
-        }).then(function() {
-          if(self.$parent.$parent.pageData.id){
-            self.whitelistEditList();
-          }else{
-            self.whitelistAddList();
-          }
-        }).then(() => {}).catch(() => {});
-      },
-      //新增提交
-      whitelistAddList(){
-        let self = this;
-        let labWhiteJoinSubList=[];
-        self.$parent.$parent.subjectList.forEach(function (item,index){
-          labWhiteJoinSubList.push({'subjectId':item.subjectId})
-        })
-        let obj = {
-          labWhitelist:self.$parent.$parent.userList,
-          labWhiteJoinSubList:labWhiteJoinSubList
-        }
-        whitelistAddList(obj).then(response => {
-          self.msgSuccess("操作成功")
-          self.$parent.$parent.backPage();
-        });
-      },
-      //编辑提交
-      whitelistEditList(){
-        let self = this;
-        let labWhiteJoinSubList=[];
-        //循环取出实验室id
-        self.$parent.$parent.subjectList.forEach(function (item,index){
-          labWhiteJoinSubList.push({'subjectId':item.subjectId})
-        })
-        let obj = {
-          userId:self.$parent.$parent.userList[0].userId,
-          labWhiteJoinSubList:labWhiteJoinSubList
-        }
-        whitelistEditList(obj).then(response => {
-          self.msgSuccess("操作成功")
-          self.$parent.$parent.backPage();
-        });
-      },
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>

src/views/secureAccess/whitelist/index.vue

@@ -1,7 +1,7 @@
 <!--白名单列表-->
 <template>
   <div class="app-container whitelist">
-    <div class="whitelist-page" v-if="pageType == 1">
+    <div class="page-container whitelist-page" v-if="pageType == 1">
       <div class="page-form-title-box">
         <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="90px">
           <el-form-item label="" prop="userName">
@@ -64,7 +64,8 @@
 </template>
 
 <script>
-  import { whitelistList,whitelistDel } from "@/api/secureAccess/index";
+  import { whitelistList,whitelistDel } from "@/apiDemo/secureAccess/index";
+  //                    V3
   import addPage from './addPage.vue'
   export default {
     components:{
@@ -159,21 +160,7 @@
 
 <style scoped lang="scss">
   .whitelist {
-    flex:1;
-    display: flex !important;
-    flex-direction: column;
-    overflow: hidden;
-    box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
     .whitelist-page{
-      flex:1;
-      display: flex;
-      flex-direction: column;
-      overflow: hidden;
-      .button-box{
-        margin:0 auto;
-        width:190px;
-        display: flex;
-      }
     }
   }
 </style>