heyang

src/api/laboratory/subject.js

@@ -384,6 +384,14 @@ export function AddImpowerHaikang(data) {
     data: data
   })
 }
+//编辑用户授权
+export function editImpowerHaikang(data) {
+  return request({
+    url: '/laboratory/haikang/user/update',
+    method: 'post',
+    data: data
+  })
+}
 // 删除用户授权
 export function delUserHaikang(id) {
   return request({

src/views/comprehensive/laboratoryManagement/accessAuthorization/authorizejinan.vue

@@ -53,7 +53,7 @@
             <template slot-scope="scope">
               <div class="button-box">
                 <p class="table-min-button"
-                   v-hasPermi="['bottle:usegasAuditRecord:list']"
+                   v-hasPermi="['haikang:user:list']"
                    @click="handleClick('',scope.row,'detail')"
                 >查看授权</p>
               </div>

src/views/comprehensive/laboratoryManagement/accessAuthorization/lookImpower.vue

@@ -43,13 +43,13 @@
         <el-form-item label="" prop="title" style="float: right">
           <p class="inquire-button-one"
              style="width: 120px;margin-left: 10px;"
+             v-if="!admittance"
              @click="handleClick('','','addStudent')"
-             v-hasPermi="['airbottle:supplier:add']"
           ><i class="el-icon-plus"></i>新增学生授权</p>
           <p class="inquire-button-one"
              style="width: 120px;margin-left: 10px;"
+             v-if="!whiteList"
              @click="handleClick('','','addTeacher')"
-             v-hasPermi="['airbottle:supplier:add']"
           ><i class="el-icon-plus"></i>新增教职工授权</p>
 
         </el-form-item>
@@ -64,6 +64,7 @@
         <el-table-column label="失效时间" align="left" prop="invalidTime">
           <template slot-scope="scope">
             <el-date-picker
+              :disabled="admittance || whiteList"
               :picker-options="pickerOptions0"
               v-model="scope.row.invalidTime"
               value-format="yyyy-MM-dd"
@@ -76,9 +77,11 @@
           <template slot-scope="scope">
             <div class="button-box">
               <p class="table-min-button"
-                 v-hasPermi="['bottle:usegasAuditRecord:list']"
+                 v-if="!admittance && !whiteList"
                  @click="handleClick('',scope.row,'delete')"
               >删除</p>
+              <p class="table-min-button" v-if="scope.row.userType=='学生' && admittance">安全准入</p>
+              <p class="table-min-button" v-if="scope.row.userType=='教师' && whiteList">白名单</p>
             </div>
 
           </template>
@@ -206,7 +209,13 @@
 <script>
 import { listStudentUser, listTeacherUser } from '@/api/system/user_student'
 import { listDepartments } from '@/api/system/dept'
-import { AddImpowerHaikang, delUserHaikang, getHaikangQueryTypes, getHaikangUserList } from '@/api/laboratory/subject'
+import {
+  AddImpowerHaikang,
+  delUserHaikang,
+  editImpowerHaikang,
+  getHaikangQueryTypes,
+  getHaikangUserList
+} from '@/api/laboratory/subject'
 
 export default {
   name: "Approval",
@@ -260,6 +269,8 @@ export default {
           return time.getTime() < Date.now() - 8.64e7;//如果没有后面的-8.64e7就是不可以选择今天的
         }
       },
+      admittance:false,//智能门禁有没有勾选安全准入
+      whiteList:false,//智能门禁有没有勾选白名单
     };
 
 
@@ -466,12 +477,12 @@ export default {
         //
         // })
         _this.tableData.forEach(function(item2) {
-          arr.push({'invalidTime':item2.invalidTime,'userId':item2.userId,'verifyMode':item2.verifyMode})
+          arr.push({'invalidTime':item2.invalidTime,'userId':item2.userId,'verifyMode':item2.verifyMode,id:item2.id})
         })
         console.log(arr)
         _this.form.detailList=arr;
         setTimeout(function () {
-          AddImpowerHaikang(_this.form).then(response => {
+          editImpowerHaikang(_this.form).then(response => {
             if(response.code==200){
               _this.msgSuccess("修改成功");
               _this.getList();
@@ -517,6 +528,10 @@ export default {
   mounted() {
     this.queryParams.hardId=this.pageData.hardId;
     this.form.hardId=this.pageData.hardId;
+    this.admittance=this.pageData.controlScope.search("1") != -1
+    this.whiteList=this.pageData.controlScope.search("2") != -1
+    console.log('安全准入'+this.admittance)
+    console.log('白名单'+this.whiteList)
     this.listDepartments();
     this.getHaikangQueryTypes()
     this.getList()

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

@@ -1384,17 +1384,17 @@ export default {
               text-align: center;
             }
             .entrance_c{
-              width: 80px;
-              height: 80px;
-              margin: 8px 0 8px 64px;
+              width: 50px;
+              height: 50px;
+              margin: 20px 0 8px 44px;
             }
             .entrance_r{
               margin-left: 30px;
               >p{
-                font-size: 16px;
+                font-size: 12px;
                 font-weight: 400;
                 color: #333333;
-                line-height: 24px;
+                line-height: 20px;
               }
               >p:nth-of-type(1){
                 margin: 20px 0 10px 0;