zc

src/api/system/user_student.js

@@ -193,4 +193,21 @@ export function getStudentInfo(userId) {
   })
 }
 
+//批量获取学生数据
+export function studentBatchSelect(data) {
+  return request({
+    url: 'system/user/student/batchSelect/'+data,
+    method: 'post',
+  })
+}
+
+//批量修改学生卡号
+export function studentUpdateCardNum(data) {
+  return request({
+    url: '/system/user/student/updateCardNum',
+    method: 'put',
+    data: data
+  })
+}
+
 

src/api/system/user_teacher.js

@@ -284,3 +284,20 @@ export function treeselect(query) {
     params: query
   })
 }
+
+//批量获取老师数据
+export function teacherBatchSelect(data) {
+  return request({
+    url: 'system/user/teacher/batchSelect/'+data,
+    method: 'post',
+  })
+}
+
+//批量修改老师卡号
+export function teacherUpdateCardNum(data) {
+  return request({
+    url: '/system/user/teacher/updateCardNum',
+    method: 'put',
+    data: data
+  })
+}

src/assets/styles/ZDpageCss.scss

@@ -158,20 +158,6 @@
 
   width:340px!important;
 }
-//识别器管理
-.recognizer .el-form-item__label{
-  width:90px!important;
-}
-.recognizer-dialog-box .el-form-item__label{
-  width:130px!important;
-}
-.recognizer-dialog-box .el-input--medium{
-  width:340px!important;
-}
-.recognizer-dialog-box .el-input-number--medium{
-
-  width:340px!important;
-}
 //硬件管理
 .hardware-dialog{
   .el-form-item__label{

src/utils/request.js

@@ -127,8 +127,8 @@ service.interceptors.response.use(res => {
         },1000);
       }
       return Promise.reject(new Error(msg))
-    } else if (code == 303 || code == 530 || code == 503 || code == 504) {
-      // 303-考试从定向   530-账号不存在   503-验证码错误  504特殊报错code 用于报错后需要返回code进行后续操作
+    } else if (code == 303 || code == 530 || code == 503 || code == 504|| code == 205) {
+      // 303-考试从定向   530-账号不存在   503-验证码错误  504特殊报错code 205智能门禁状态 用于报错后需要返回code进行后续操作
       return res.data
     } else if (code != 200) {
       Notification.error({

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

@@ -0,0 +1,896 @@
+<!--供应商管理-->
+<template>
+  <div class="supplier">
+    <div class="supplier-title">
+      <P>实验室名称-已授权列表 </P>
+      <p class="button-p reset-button-one" @click="backPage">返回</p>
+    </div>
+    <div class="supplier-page">
+      <advanced-search :searchData="searchData"></advanced-search>
+        <el-table  v-loading="loading"  ref="multipleTable2"  border tooltip-effect="dark" :row-key="getRowKeys2" :data="tableData"
+                  highlight-current-row @selection-change="handleSelectionChange2">
+          <el-table-column type="selection"  width="55" :reserve-selection="true" align="center"></el-table-column>
+        <el-table-column label="所属单位" align="left" prop="deptName"/>
+        <el-table-column label="姓名" align="left" prop="nickName"></el-table-column>
+        <el-table-column  align="left" prop="verifyMode">
+          <template slot-scope="scope" slot="header">
+            <span>验证方式
+              <el-tooltip class="item" effect="dark" placement="top-start">
+                <i class= 'el-icon-question' style="color:#E6A23C; margin-left:5px;font-size: 16px;'"></i>
+                <div style="width: 200px;" slot="content">红色:表示此验证方式失败<br/>绿色表示此验证方式成功</div>
+              </el-tooltip>
+            </span>
+          </template>
+          <template slot-scope="scope">
+              <span  v-for="item in scope.row.verifyList" :class="item.verifyStatus?'verify-green':'verify-red'">{{item.name}}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="授权状态" align="left" prop="isretry">
+          <template slot-scope="scope">
+            <span v-if="scope.row.impowerStatus">成功</span>
+            <span v-if="!scope.row.impowerStatus">失败</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="类别" align="left" prop="userType"></el-table-column>
+        <el-table-column label="授权时间" align="left" prop="verifyTime"></el-table-column>
+        <el-table-column label="授权人" align="left" prop="verifyUser"></el-table-column>
+        <el-table-column label="失效时间" align="left" prop="invalidTime" width="250">
+          <template slot-scope="scope">
+            <el-date-picker
+              :disabled="(scope.row.userType=='学生' && admittance) || (scope.row.userType=='教师' && whiteList)"
+              :picker-options="pickerOptions0"
+              v-model="scope.row.invalidTime"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="请选择失效时间">
+            </el-date-picker>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="220">
+          <template slot-scope="scope">
+            <div class="button-box" style="display: flex;justify-content: flex-start;">
+              <p class="table-min-button" v-if="(scope.row.userType=='学生' && !admittance && !scope.row.isretry) || (scope.row.userType=='教师' && !whiteList) && !scope.row.isretry" style="color: #333;cursor: text" @click="handleClick('',scope.row,'again')">手动<i style="color: #0183FA;cursor: pointer;font-style: normal;text-decoration:underline" @click="handleClick('',scope.row,'retry')">重试</i></p>
+              <p class="table-min-button" v-if="scope.row.userType=='学生' && admittance"  style="color: #333;cursor: text" @click="handleClick('',scope.row,'again')"  >安全准入<i style="color: #0183FA;cursor: pointer;font-style: normal;text-decoration:underline" @click="handleClick('',scope.row,'retry')" v-if="!scope.row.isretry">重试</i></p>
+              <p class="table-min-button" v-if="scope.row.userType=='教师' && whiteList" style="color: #333;cursor: text" @click="handleClick('',scope.row,'again')" >白名单<i style="color: #0183FA;cursor: pointer;font-style: normal;text-decoration:underline" @click="handleClick('',scope.row,'retry')" v-if="!scope.row.isretry">重试</i></p>
+              <p class="table-min-button" v-if="(scope.row.userType=='学生' && !admittance) || (scope.row.userType=='教师' && !whiteList)"@click="handleClick('',scope.row,'delete')">删除</p>
+            </div>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div style="display: flex;height:32px;margin-top:15px;">
+        <div style="flex:5;">
+          <pagination :page-sizes="[20, 30, 40, 50]"
+                      v-show="total>0"
+                      :total="total"
+                      style="margin:0;"
+                      :page.sync="queryParams.pageNum"
+                      :limit.sync="queryParams.pageSize"
+                      @pagination="getList"
+          />
+        </div>
+      </div>
+      <div style="text-align: center;">
+        <el-button class="color_ff back_one" style="width: 300px;" @click="loseTimeSubmitForm()">确定</el-button>
+      </div>
+
+    </div>
+    <!--关联实验室弹框-->
+    <el-dialog :title=dialogTitle @close="handleClose" :visible.sync="dialogVisible" width="80%">
+      <el-form :model="dialogForm" ref="dialogForm" :inline="true" label-width="140px">
+        <el-form-item label="关键字" prop="name" >
+          <el-input
+            v-model="dialogForm.searchValue"
+            placeholder="请输入名称/联系方式"
+            clearable
+            size="small"
+          />
+        </el-form-item>
+        <el-form-item label="所属单位" prop="deptId" label-width="80px">
+          <el-select v-model="dialogForm.deptId" clearable placeholder="请选择学院">
+            <el-option
+              v-for="item in collegeOptions"
+              :key="item.deptId"
+              :label="item.deptName"
+              :value="item.deptId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <p class="inquire-button-one" style="margin-left:20px;" @click="onSearch">查询</p>
+          <p class="reset-button-one" style="margin-left:20px;" @click="resetForm">重置</p>
+        </el-form-item>
+      </el-form>
+      <div class="btn_list">
+        <i class="el-icon-warning"></i>
+        <i>已选择 {{labWhiteJoinSubList.length}} 项目</i>
+        <i @click="toggleSelection(dialogTable)">全选本页</i>
+        <i></i>
+        <i @click="toggleSelection()">清除选项</i>
+      </div>
+      <el-table ref="multipleTable"  border tooltip-effect="dark" :row-key="getRowKeys" :data="dialogTable"
+                highlight-current-row @selection-change="handleSelectionChange" style="cursor: pointer;height:500px;">
+        <el-table-column type="selection"  width="55" :reserve-selection="true" align="center"></el-table-column>
+        <el-table-column label="所属单位" align="left" prop="deptName"/>
+        <el-table-column label="姓名" align="left" prop="nickName" />
+        <el-table-column label="导师" align="left" prop="tutorUserName" v-if="userType==1"/>
+        <el-table-column label="专业" align="left" prop="major" v-if="userType==1"/>
+        <el-table-column label="身份" align="left" prop="positionName" v-if="userType==2"/>
+        <el-table-column label="验证方式" align="left" prop="verifyMode">
+          <template slot-scope="scope">
+            <el-select v-model="scope.row.verifyMode" @change="verifyModeFun(scope.row)" clearable >
+              <el-option
+                v-for="item in verifyWayList"
+                :key="item.key"
+                :label="item.value"
+                :value="item.key">
+              </el-option>
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column label="失效时间" align="left" prop="invalidTime">
+          <template slot-scope="scope">
+            <el-date-picker
+              @blur="invalidTimeFun(scope.row,$event)"
+              :picker-options="pickerOptions0"
+              v-model="scope.row.invalidTime"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="请选择失效时间">
+            </el-date-picker>
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination :page-sizes="[20, 30, 40, 50]"
+                  v-show="total>0"
+                  :total="total"
+                  :page.sync="dialogForm.pageNum"
+                  :limit.sync="dialogForm.pageSize"
+                  @pagination="getUserList"
+      />
+      <div class="configuration">
+        <el-form  :model="configuration" ref="queryForm" :inline="true" v-if="unifyDeploy">
+          <el-form-item label="验证方式:" prop="name">
+            <el-select v-model="configuration.verifyMode" clearable >
+              <el-option
+                v-for="item in verifyWayList"
+                :key="item.key"
+                :label="item.value"
+                :value="item.key">
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="失效时间:" prop="name">
+            <el-date-picker
+              :picker-options="pickerOptions0"
+              v-model="configuration.invalidTime"
+              value-format="yyyy-MM-dd"
+              type="date"
+              placeholder="请选择失效时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-form>
+        <p :class="unifyDeploy?'add-button-one-120':'inquire-button-one'"  @click="unifyDeployFun()">{{unifyDeploy?'取消统一配置':'统一配置'}}</p>
+        <el-button class="color_ff back_one" @click="submitForm()">确定</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listUser} from '@/api/permissionRequired'
+import { listDepartments } from '@/api/system/dept'
+import advancedSearch from "@/components/ZDcomponents/advancedSearch.vue"
+import {
+  AddImpowerHaikang,
+  delUserHaikang,
+  editImpowerHaikang,
+  getHaikangQueryTypes,
+  getHaikangUserList, retryImpowerHaikang
+} from '@/api/laboratory/subject'
+
+export default {
+  name: "Approval",
+
+  components: {
+    advancedSearch
+  },
+  props:{
+    pageData:{},
+  },
+  data() {
+    return {
+      loading:false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize:20,
+        searchValue:'',
+        userType:'',
+        hardId:'',
+        startTime:'',
+        endTime:'',
+      },
+      total:0,
+      tableData:[],
+      dateRange:[],
+      dialogForm:{
+        pageNum: 1,
+        pageSize: 20,
+        userType: '',
+        searchValue:'',
+        deptId:'',
+      },
+      dialogTitle:'选择学生',
+      dialogVisible:false,
+      collegeOptions:[],//学院
+      labWhiteJoinSubList:[],
+      dialogTable:[],
+      radioList:[],
+      userType:1,//判断是学生 1 教职工2
+      verifyWayList:[],
+      configuration:{
+        invalidTime:'',
+        verifyMode:'',
+      },
+      unifyDeploy:false,
+      //提交
+      form:{},
+      // 设置只能选择当前日期及之后的日期
+      pickerOptions0: {
+        disabledDate(time) {
+          return time.getTime() < Date.now();//如果没有后面的-8.64e7就是不可以选择今天的
+        }
+      },
+      impowerList:[],//授权列表选中
+      admittance:false,//智能门禁有没有勾选安全准入
+      whiteList:false,//智能门禁有没有勾选白名单
+      searchData:{
+        buttonList:[//按钮数组没有则为空
+          {
+            name:"批量重试",//按钮名称 只有再状态 1 时需要
+            type:"1", //按钮类型 1.按钮 2.导入 3.导出
+            parameter:"batchAgain",//按钮字符用于返回方法时的判断
+            hasPermi:"", // 权限字段 如果没有则传空字符 hasPermi:"",
+            isHasPermi:false//判断是否需要使用权限字符
+          },
+        ],
+        searchList:[//搜索数组
+          {
+            name:"关键字",//描述名称
+            key:"searchValue",//键名 用于返回数据
+            value:"",//内容 用于组件内绑定数据
+            placeholder:"请输入姓名/工号/学号",//输入提示
+            level:"1",//1.普通搜索 2.高级搜索  普通搜索默认会在高级搜索时显示
+            type:"1",//类型 1.input 2.select 3.TimePicker
+            universal:'20',//通用参数 input时为最大长度 //TimePicker时可不传
+            width:'260',//el-form-item 长度 可传可不传 不传时input/select默认180长度 TimePicker默认240长度
+          },
+          {
+            name:"类别",//描述名称
+            key:"userType",//键名 用于返回数据
+            value:"",//内容 用于组件内绑定数据
+            placeholder:"请选择类别",//输入提示
+            level:"1",//1.普通搜索 2.高级搜索  普通搜索默认会在高级搜索时显示
+            type:"2",//类型 1.input 2.select 3.TimePicker
+            universal:[ //通用参数 select时为列表数据 //TimePicker时可不传
+              {label:"学生",value:"22"},{label:"教师",value:"11"},
+            ],
+            width:'175',//el-form-item 长度 可传可不传 不传时input/select默认180长度 TimePicker默认240长度
+          },
+          {
+            name:"授权时间段",//描述名称
+            key:"dateRange",//键名 用于返回数据
+            value:"",//内容 用于组件内绑定数据
+            placeholder:"请选择",//输入提示
+            level:"2",//1.普通搜索 2.高级搜索  普通搜索默认会在高级搜索时显示
+            type:"3",//类型 1.input 2.select 3.TimePicker
+            width:'260',//el-form-item 长度 可传可不传 不传时input/select默认180长度 TimePicker默认240长度
+          },
+          {
+            name:"分类",//描述名称
+            key:"state",//键名 用于返回数据
+            value:"",//内容 用于组件内绑定数据
+            placeholder:"请选择分类",//输入提示
+            level:"2",//1.普通搜索 2.高级搜索  普通搜索默认会在高级搜索时显示
+            type:"2",//类型 1.input 2.select 3.TimePicker
+            universal:[ //通用参数 select时为列表数据 //TimePicker时可不传
+              {label:"全部",value:""},{label:"授权验证成功",value:true},{label:"授权验证失败",value:false},
+            ],
+            width:'175',//el-form-item 长度 可传可不传 不传时input/select默认180长度 TimePicker默认240长度
+          },
+        ],
+      },
+    };
+
+
+  },
+  methods: {
+
+      //弹出层表格里验证方式改变重新赋值
+      verifyModeFun(d){
+        let _this=this;
+        this.dialogTable.forEach(function(item,index){
+          if(item.userId==d.userId){
+            _this.$set(_this.dialogTable,index,d)
+          }
+        })
+      },
+      //弹出层表格里失效时间改变重新赋值
+        invalidTimeFun(item,e){
+          this.dialogTable.splice(1,0);
+
+      },
+    //获取当前日期
+      getdate() {
+        const dates = new Date()
+        dates.setMonth(dates.getMonth() + 1)
+        var pastMonth = dates.getMonth() + 1
+        var pastDay = dates.getDate()
+        if (pastMonth >= 1 && pastMonth <= 9) {
+          pastMonth = '0' + pastMonth
+        }
+        if (pastDay >= 0 && pastDay <= 9) {
+          pastDay = '0' + pastDay
+        }
+        const endDate = dates.getFullYear() + '-' + pastMonth + '-' + pastDay
+        return endDate
+      },
+      //查询
+      onSearch() {
+        this.dialogForm.pageNo = 1;
+        this.getUserList();
+      },
+      //重置
+      resetForm() {
+        this.dialogForm.searchValue = '';
+        this.dialogForm.deptId = '';
+        this.onSearch();
+      },
+      //统一配置
+      unifyDeployFun(){
+          this.unifyDeploy=!this.unifyDeploy
+          if(this.unifyDeploy==false){
+            this.configuration.invalidTime='';
+            this.configuration.verifyMode='';
+          }
+      },
+      getRowKeys(row) {
+        return row.userId;   //指定row-key的一个标识
+      },
+      getRowKeys2(row) {
+        return row.id;   //指定row-key的一个标识
+      },
+      //监听关联记录弹窗关闭
+      handleClose(){
+        console.log('弹窗关闭');
+        this.$refs.multipleTable.clearSelection();
+        this.dialogForm.searchValue='';
+        this.dialogForm.pageNum=1;
+        this.dialogForm.deptId='';
+        this.configuration.invalidTime='';
+        this.configuration.verifyMode='';
+      },
+      //取消选中
+      toggleSelection(rows) {
+        let _this=this;
+        if (rows) {
+          rows.forEach(row => {
+            this.$refs.multipleTable.toggleRowSelection(row,true);
+          });
+
+        } else {
+          this.$refs.multipleTable.clearSelection();
+        }
+      },
+      //选中实验室
+      handleSelectionChange(val){
+        let _this=this;
+        this.labWhiteJoinSubList=[];
+        this.labWhiteJoinSubList=val;
+
+      },
+     //已授权列表
+      handleSelectionChange2(val){
+        let _this=this;
+        this.impowerList=[];
+        this.impowerList=val;
+
+      },
+
+      handleClick(index,row,doType){
+        let _this=this;
+        if(doType=='delete'){//删除
+          let _this=this
+          console.log(row)
+          this.$confirm('是否确认删除['+row.nickName+']门禁授权?', "警告", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(function() {
+            delUserHaikang(row.id).then( response => {
+              _this.msgSuccess("删除成功");
+              _this.getList();
+            });
+          }).then(() => {
+            _this.getList();
+
+          }).catch(() => {});
+        }else if(doType=='retry'){
+          let arr=[];
+          arr.push({'id':row.id})
+          _this.retryImpowerHaikang(arr)
+        }
+      },
+      //获取学院列表
+      listDepartments(){
+        listDepartments().then(response => {
+          this.collegeOptions = response.data;
+        });
+      },
+      /** 弹框查询列表 */
+      getUserList() {//type 1学生 2教职工
+        let _this=this;
+        this.loading = true;
+        if(_this.userType==1){
+          this.dialogForm.userType=22
+          listUser(this.addDateRange(this.dialogForm, this.dateRange)).then(response => {
+              this.dialogTable = response.rows;
+              this.total = response.total;
+              this.loading = false;
+              this.dialogTable.forEach(function(item) {
+                  item.verifyMode='faceOrFpOrCardOrPw'
+                  item.invalidTime=_this.getdate()
+              })
+            }
+          );
+        }else if(_this.userType==2){
+          this.dialogForm.userType=11
+          listUser(this.addDateRange(this.dialogForm, this.dateRange)).then(response => {
+              this.dialogTable = response.rows;
+              this.total = response.total;
+              this.loading = false;
+              this.dialogTable.forEach(function(item) {
+                item.verifyMode='faceOrFpOrCardOrPw'
+                item.invalidTime=_this.getdate()
+              })
+            }
+          );
+
+        }
+      },
+      /** 查询门禁授权类型 */
+      getHaikangQueryTypes(){
+        getHaikangQueryTypes().then(response => {
+          if(response.code==200){
+            this.verifyWayList=response.data
+          }
+        });
+      },
+
+      //返回
+      backPage(){
+        this.$parent.handleClick('','','back');
+        this.$parent.getList();
+      },
+      //父组件必要此方法用于接收参数
+      searchClick(type,data){
+        let _this = this;
+        if(type == 1){ //type  1.查询
+          console.log(data);
+          this.queryParams = JSON.parse(JSON.stringify(data));
+          if(data.dateRange){
+            this.queryParams.startTime = data.dateRange[0];
+            this.queryParams.endTime = data.dateRange[1];
+            delete this.queryParams.dateRange
+          }else{
+            delete this.queryParams.dateRange
+          }
+          this.queryParams.hardId=this.pageData.hardId;
+          this.queryParams.pageNum = 1;
+          this.queryParams.pageSize = 20;
+          this.getList();
+        }else if(type == 2) { //type  1.重置
+          this.queryParams = {
+            pageNum: 1,
+            pageSize: 20,
+          };
+          this.getList();
+        }else if(type=='addStudent'){
+          _this.unifyDeploy=false;
+          _this.dialogVisible=true;
+          _this.dialogTitle='选择学生';
+          _this.userType=1;
+          this.getUserList();
+        }else if(type=='addTeacher'){
+          _this.unifyDeploy=false;
+          _this.dialogVisible=true;
+          _this.dialogTitle='选择教职工';
+          _this.userType=2;
+          this.getUserList();
+        }else if(type=='batchAgain'){
+          if(_this.impowerList.length<=0){
+            _this.msgError("请选择需要授权的数据!");
+          }else{
+            let arr=[];
+            this.impowerList.forEach(function(item){
+              arr.push({'id':item.id})
+            })
+            _this.retryImpowerHaikang(arr)
+
+          }
+
+        }
+      },
+      getList(){
+        let _this=this;
+        getHaikangUserList(_this.queryParams).then( response => {
+          let res=response.rows;
+          _this.tableData=res;
+          _this.total=response.total;
+          //先判断是或还是+,如果是或,判断有哪几种,并且判断每种显示红色还是绿色,如果是加,判断是否每个都是true,如果有一个不是那就是红色,入股都是那是绿色
+
+          _this.tableData.forEach(function(item) {
+            let verifyList=[];
+            let isVerify=true;//判断验证方式显示颜色
+            let isretry=true;//判断是否需要显示重试按钮
+            let impowerStatus=false;//授权状态
+            if(item.verifyMode.indexOf('或')!=-1){//或
+
+              if(item.verifyMode.search('密码')!=-1){
+                verifyList.push({verifyStatus:item.state,name:'密码'})
+                if(!item.state){
+                  isretry=false
+                }else{
+                  impowerStatus=true;
+                }
+              }
+              if(item.verifyMode.search('人脸')!=-1){
+                verifyList.push({verifyStatus:item.ifFace,name:'人脸'})
+                if(!item.ifFace){
+                  isretry=false
+                }else{
+                  impowerStatus=true;
+                }
+              }
+              if(item.verifyMode.search('刷卡')!=-1){
+                verifyList.push({verifyStatus:item.ifCard,name:'刷卡'})
+                if(!item.ifCard){
+                  isretry=false
+                }else{
+                  impowerStatus=true;
+                }
+              }
+              if(item.verifyMode.search('指纹')!=-1){
+                verifyList.push({verifyStatus:item.ifFinger,name:'指纹'})
+                if(!item.ifFinger){
+                  isretry=false
+                }else{
+                  impowerStatus=true;
+                }
+              }
+              item.verifyList=verifyList;
+              item.isretry=isretry;
+              item.impowerStatus=impowerStatus;
+
+            }else if(item.verifyMode.indexOf('+')!=-1){//+
+
+              if(item.verifyMode.search('密码')!=-1){
+                if(!item.state){
+                  isVerify=false;
+                  isretry=false;
+                  impowerStatus=false;
+                }else{
+                  impowerStatus=true;
+                }
+              }
+              if(item.verifyMode.search('人脸')!=-1){
+                if(!item.ifFace){
+                  isVerify=false;
+                  isretry=false;
+                  impowerStatus=false;
+                }else{
+                  impowerStatus=true;
+                }
+              }
+              if(item.verifyMode.search('刷卡')!=-1){
+                if(!item.ifCard){
+                  isVerify=false;
+                  isretry=false;
+                  impowerStatus=false;
+                }else{
+                  impowerStatus=true;
+                }
+              }
+              if(item.verifyMode.search('指纹')!=-1){
+                if(!item.ifFinger){
+                  isVerify=false;
+                  isretry=false;
+                  impowerStatus=false;
+                }else{
+                  impowerStatus=true;
+                }
+              }
+              verifyList.push({verifyStatus:isVerify,name:item.verifyMode})
+              item.verifyList=verifyList;
+              item.isretry=isretry;
+              item.impowerStatus=impowerStatus;
+            }else{//其他单个
+              if(item.verifyMode.search('密码')!=-1){
+                verifyList.push({verifyStatus:item.state,name:'密码'})
+                if(!item.state){
+                  isretry=false
+                }else{
+                  impowerStatus=true;
+                }
+              }
+              if(item.verifyMode.search('人脸')!=-1){
+                verifyList.push({verifyStatus:item.ifFace,name:'人脸'})
+                if(!item.ifFace){
+                  isretry=false
+                }else{
+                  impowerStatus=true;
+                }
+              }
+              if(item.verifyMode.search('刷卡')!=-1){
+                verifyList.push({verifyStatus:item.ifCard,name:'刷卡'})
+                if(!item.ifCard){
+                  isretry=false
+                }else{
+                  impowerStatus=true;
+                }
+              }
+              if(item.verifyMode.search('指纹')!=-1){
+                verifyList.push({verifyStatus:item.ifFinger,name:'指纹'})
+                if(!item.ifFinger){
+                  isretry=false
+                }else{
+                  impowerStatus=true;
+                }
+              }
+              item.verifyList=verifyList;
+              item.isretry=isretry;
+              item.impowerStatus=impowerStatus;
+            }
+          })
+          console.log(_this.tableData)
+        });
+      },
+      //失效时间修改后提交
+      loseTimeSubmitForm(){
+        let _this=this;
+        let arr=[];
+        _this.tableData.forEach(function(item2) {
+          arr.push({'invalidTime':item2.invalidTime,'userId':item2.userId,'verifyMode':item2.verifyMode,id:item2.id})
+        })
+        _this.form.detailList=arr;
+        setTimeout(function () {
+          editImpowerHaikang(_this.form).then(response => {
+            if(response.code==200){
+              _this.msgSuccess("修改成功");
+              _this.getList();
+            }
+          });
+        },100)
+      },
+      //重试
+      retryImpowerHaikang(arr){
+        let _this=this;
+        _this.form.detailList=arr;
+        retryImpowerHaikang(_this.form).then(response => {
+          if(response.code==200){
+            _this.msgSuccess("重试成功");
+            _this.dialogVisible=false;
+            _this.$refs.multipleTable2.clearSelection();
+            _this.getList();
+          }else if(response.code==205){
+            _this.$confirm(response.msg, "警告", {
+              confirmButtonText: "确定",
+              cancelButtonText: "取消",
+              type: "warning"
+            }).then(function() {
+              _this.dialogVisible=false;
+              _this.getList();
+            }).then(() => {
+              _this.dialogVisible=false;
+              _this.getList();
+            }).catch(() => {});
+          }
+        });
+      },
+      /* 新增授权*/
+      submitForm(){
+        let _this=this;
+        let arr=[];
+        if(this.labWhiteJoinSubList.length>0){
+          if(_this.configuration.invalidTime && _this.configuration.verifyMode){//统一配置
+            this.labWhiteJoinSubList.forEach(function(item){
+              arr.push({'invalidTime':_this.configuration.invalidTime,'userId':item.userId,'verifyMode':_this.configuration.verifyMode})
+            })
+          }else{
+            this.labWhiteJoinSubList.forEach(function(item){
+              arr.push({'invalidTime':item.invalidTime,'userId':item.userId,'verifyMode':item.verifyMode})
+            })
+          }
+          _this.form.detailList=arr;
+          AddImpowerHaikang(_this.form).then(response => {
+            if(response.code==200){
+              _this.msgSuccess("新增成功");
+              _this.dialogVisible=false;
+              _this.getList();
+            }else if(response.code==205){
+              _this.$confirm(response.msg, "警告", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+              }).then(function() {
+                _this.dialogVisible=false;
+                _this.getList();
+              }).then(() => {
+                _this.dialogVisible=false;
+                _this.getList();
+              }).catch(() => {});
+            }
+          });
+        }else{
+          this.msgError("请先选择人员!");
+        }
+
+
+
+      },
+  },
+  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
+
+    if(!this.admittance){//安全准入-学生授权
+      this.searchData.buttonList.unshift( {
+        name:"新增学生授权",//按钮名称 只有再状态 1 时需要
+        type:"1", //按钮类型 1.按钮 2.导入 3.导出
+        parameter:"addStudent",//按钮字符用于返回方法时的判断
+        hasPermi:"", // 权限字段 如果没有则传空字符 hasPermi:"",
+        isHasPermi:false//判断是否需要使用权限字符
+      })
+    }
+    if(!this.whiteList){//白名单-教职工授权
+      this.searchData.buttonList.unshift({
+        name:"新增教职工授权",//按钮名称 只有再状态 1 时需要
+        type:"1", //按钮类型 1.按钮 2.导入 3.导出
+        parameter:"addTeacher",//按钮字符用于返回方法时的判断
+        hasPermi:"", // 权限字段 如果没有则传空字符 hasPermi:"",
+        isHasPermi:false//判断是否需要使用权限字符
+      })
+    }
+    console.log( this.searchData.buttonList)
+    this.listDepartments();
+    this.getHaikangQueryTypes()
+    this.getList()
+  }
+};
+</script>
+
+<style lang="scss">
+.supplier{
+  flex:1;
+  display: flex;
+  flex-direction: column;
+
+  /*顶部*/
+  .supplier-title{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    border-bottom: 1px solid #E0E0E0;
+    height: 90px;
+    p:nth-child(1){
+      line-height:60px;
+      color: #0045AF;
+      font-size:14px;
+      margin:0 12px 0 20px;
+    }
+    p:nth-child(2){
+      margin-right:20px;
+    }
+  }
+  .supplier-page{
+    flex:1;
+    display: flex!important;
+    flex-direction: column;
+   // box-shadow: 0 0 8px 2px rgba(0, 0, 0, 0.1);
+    padding:20px 20px 20px!important;
+    border-radius:10px;
+  }
+  /*弹框*/
+  .btn_list{
+    width: 100%;
+    height: 40px;
+    background: rgba(1,131,250,0.1);
+    border-radius: 6px;
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    margin-bottom: 32px;
+    >i{
+      font-style: normal;
+      display: inline-block;
+      cursor: pointer;
+    }
+    >i:nth-of-type(1){
+      font-size: 20px;
+      color: #0045AF;
+      margin: 0 16px 0 14px;
+    }
+    >i:nth-of-type(2){
+      font-size: 16px;
+      font-family: Source Han Sans CN;
+      font-weight: bold;
+      color: #999999;
+      line-height: 16px;
+    }
+    >i:nth-of-type(3){
+      font-size: 16px;
+      font-family: Source Han Sans CN;
+      font-weight: bold;
+      color: #0045AF;
+      line-height: 16px;
+      margin: 0 28px 0 46px;
+    }
+    >i:nth-of-type(4){
+      font-size: 16px;
+      font-family: Source Han Sans CN;
+      font-weight: bold;
+      color: #0045AF;
+      line-height: 16px;
+    }
+    >i:nth-of-type(5){
+      font-size: 16px;
+      font-family: Source Han Sans CN;
+      font-weight: bold;
+      color: #FFA312;
+      line-height: 16px;
+      margin: 0 40px 0 28px;
+    }
+    .bottom-button-box{
+      display: flex;
+      width:220px;
+      margin: 0;
+      p{
+        font-size:14px;
+        height:30px;
+        width:100px;
+        line-height:30px;
+        text-align: center;
+        border-radius:4px;
+      }
+      p:nth-child(1){
+        border:1px solid #E0E0E0;
+        margin-right:20px;
+      }
+      p:nth-child(2){
+        border:1px solid #0045AF;
+      }
+    }
+  }
+  .configuration{
+    height: 70px;
+    display: flex;
+    justify-content: flex-end;
+    align-items: center;
+    border-top: 1px solid #D8D8D8;
+    .el-form-item{
+      margin-bottom: 0!important;
+    }
+  }
+  /*验证方式*/
+  .verify-green{
+    color: #46D417;
+    margin-right: 10px;
+  }
+  .verify-red{
+    color: #FF0000;
+    margin-right: 10px;
+  }
+}
+</style>

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

@@ -1266,6 +1266,7 @@
                 }
               }
               .center-big-box{
+                overflow: hidden;
                 flex:1;
                 display: flex;
                 .center-left-p{
@@ -1367,6 +1368,7 @@
                 }
               }
               .center-big-box{
+                overflow: hidden;
                 flex:1;
                 display: flex;
                 .center-left-p{
@@ -1471,6 +1473,7 @@
                 }
               }
               .center-big-box{
+                overflow: hidden;
                 flex:1;
                 display: flex;
                 .center-left-p{

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

@@ -104,7 +104,7 @@
         </div>
         <div class="things-box" v-for="(item,index) in newData.labHardwareVOListTwo" :key="item.id" v-if="item.hardwareTypeEnum.enumName == 'SWITCH'">
           <div class="things-for-box">
-            <p class="left-title">电源控制</p>
+            <p class="left-title">{{item.hardwareName}}</p>
             <el-switch
               v-if="item.state.code == 3||item.state.code == 4"
               class="switch"
@@ -121,7 +121,7 @@
         </div>
         <div class="things-box" v-for="(item,index) in newData.labHardwareVOListTwo" :key="item.id" v-if="item.hardwareTypeEnum.enumName == 'AI_VENTILATION'">
           <div class="things-for-box">
-            <p class="left-title">智能通风</p>
+            <p class="left-title">{{item.hardwareName}}</p>
             <el-switch
               v-if="item.state.code == 3||item.state.code == 4"
               class="switch"
@@ -669,10 +669,15 @@
         .things-for-box{
           display: flex;
           .left-title{
+            width: 110px;
             font-size:14px;
             color:#333;
             line-height:30px;
-            margin-right:30px;
+            margin-right:10px;
+            display:block;
+            overflow:hidden;
+            text-overflow:ellipsis;
+            white-space:nowrap;
           }
           .switch{
 

src/views/comprehensive/personnel/student/bindingCardPage.vue

@@ -0,0 +1,244 @@
+<template>
+    <div class="bindingCardPage">
+      <div class="title-box">
+        <p>批量绑定校园卡</p>
+      </div>
+      <div class="watch-head-box">
+        <p>姓名</p>
+        <p>学号</p>
+        <p>学院</p>
+        <p>手机号码</p>
+        <p>校园卡号</p>
+      </div>
+      <div class="center-max-big-box scrollbar-box">
+        <div class="watch-data-list" v-for="(item,index) in watchList" :key="index">
+          <p>{{item.nickName}}</p>
+          <p>{{item.userName}}</p>
+          <p>{{item.deptName}}</p>
+          <p>{{item.phonenumber}}</p>
+          <div class="input-big-box">
+            <el-input class="input-box" type="text"
+                      maxLength="30"
+                      v-model="item.cardNum"
+                      clearable
+                      placeholder="请输入或读取校园卡号"
+            />
+            <p class="input-msg-p">{{item.cardType==1?'卡号已存在':(item.cardType==2?'卡号重复':'')}}</p>
+          </div>
+        </div>
+      </div>
+      <div class="button-box">
+        <p></p>
+        <p class="reset-button-one" @click="outPageButton">返回</p>
+        <p class="add-button-one-90" @click="setButton">保存</p>
+      </div>
+    </div>
+</template>
+
+<script>
+  import { studentBatchSelect, studentUpdateCardNum } from "@/api/system/user_student";
+  export default {
+    name: 'bindingCardPage',
+    props:{
+      ids:{},
+    },
+    data(){
+      return{
+        watchList:[],
+      }
+    },
+    created(){
+
+    },
+    mounted(){
+      this.studentBatchSelect();
+    },
+    methods:{
+      //批量获取老师数据
+      studentBatchSelect(){
+        studentBatchSelect(this.ids).then(response => {
+          this.watchList = response.data;
+          this.getInitialization();
+        })
+      },
+      //返回
+      outPageButton(){
+        this.$parent.outPage(1);
+      },
+      //提交
+      setButton(){
+        let self = this
+        if(this.setVerification()){
+          let list = [];
+          for(let i=0;i<self.watchList.length;i++){
+            if(self.watchList[i].cardNum){
+              let obj = {
+                userId:self.watchList[i].userId,
+                cardNum:self.watchList[i].cardNum,
+              }
+              list.push(obj);
+            }
+          }
+          studentUpdateCardNum(list).then(response => {
+            if(response.data.repeatCard == 0){
+              this.msgSuccess(response.msg);
+              this.$parent.handleQuery();
+            }else{
+              this.repeatMark(response.data.repeatList);
+            }
+          })
+        }
+      },
+      //提交验证
+      setVerification(){
+        let self = this;
+        for(let i=0;i<self.watchList.length;i++){
+          self.watchList[i].cardType = 0;
+          if (self.watchList[i].cardNum){
+            self.watchList[i].cardNum = self.watchList[i].cardNum.replace(/^\s*|\s*$/g,"");
+          }
+        }
+        let num = 0;
+        for(let i=0;i<self.watchList.length;i++){
+          for(let o=0;o<self.watchList.length;o++){
+            if(self.watchList[i].cardNum == self.watchList[o].cardNum &&
+               self.watchList[i].userId != self.watchList[o].userId &&
+              self.watchList[i].cardNum && self.watchList[o].cardNum){
+              self.$set(self.watchList[i],'cardType',2);
+              self.$set(self.watchList[o],'cardType',2);
+              num++
+            }
+          }
+        }
+        this.$forceUpdate();
+        return num == 0;
+      },
+      //数据初始化
+      getInitialization(){
+        let self = this;
+        for(let i=0;i<self.watchList.length;i++){
+          self.watchList[i].cardType = 0;
+        }
+        this.$forceUpdate();
+      },
+      //重复标记
+      repeatMark(list){
+        let self = this;
+        for(let i=0;i<list.length;i++){
+          for(let o=0;o<self.watchList.length;o++){
+            if(list[i] == self.watchList[o].cardNum){
+              self.watchList[o].cardType = 1;
+            }
+          }
+        }
+        this.$forceUpdate();
+      },
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  *{
+    margin:0;
+    padding:0;
+    font-weight:500;
+    color:#333;
+  }
+  .bindingCardPage{
+    display: flex;
+    flex-direction: column;
+    flex:1;
+    overflow: hidden;
+    .title-box{
+      border-bottom:1px solid #E0E0E0;
+      p{
+        color:#0045AF;
+        line-height:60px;
+        margin-left:24px;
+        font-size:18px;
+      }
+    }
+    .watch-head-box{
+      padding:10px 40px 10px;
+      display: flex;
+      p{
+        line-height:40px;
+        font-size:16px;
+        font-weight: 600;
+      }
+      p:nth-child(1){
+        width:200px;
+      }
+      p:nth-child(2){
+        width:200px;
+      }
+      p:nth-child(3){
+        width:200px;
+      }
+      p:nth-child(4){
+        width:300px;
+      }
+      input{
+        width:300px;
+      }
+    }
+    .center-max-big-box{
+      flex:1;
+      padding:0 40px;
+      .watch-data-list{
+        display: flex;
+        margin-bottom:10px;
+        p{
+          line-height:40px;
+          font-size:16px;
+        }
+        p:nth-child(1){
+          width:200px;
+        }
+        p:nth-child(2){
+          width:200px;
+        }
+        p:nth-child(3){
+          width:200px;
+        }
+        p:nth-child(4){
+          width:300px;
+        }
+        .input-big-box{
+          display: flex;
+          flex:1;
+          .input-box{
+            width:300px;
+          }
+          .input-msg-p{
+            margin-left:20px;
+            width:100px;
+            color:#FF6666;
+            font-size:14px;
+          }
+        }
+      }
+    }
+    .button-box{
+      height:80px;
+      display: flex;
+      border-top:1px solid #E0E0E0;
+      p{
+        margin-top:20px;
+      }
+      p:nth-child(1){
+        flex:1;
+      }
+      p:nth-child(2){
+        width:80px;
+        margin-right:20px;
+        font-size:16px;
+      }
+      p:nth-child(3){
+        width:80px;
+        margin-right:20px;
+        font-size:16px;
+      }
+    }
+  }
+</style>

src/views/comprehensive/personnel/student/index_SuZhouDX.vue

@@ -1,10 +1,10 @@
 <!--学生管理-->
 <template>
   <div class="app-container student">
-    <div v-if="pageType == 1" class="student-one-box">
+    <div v-show="pageType == 1" class="student-one-box">
       <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" v-show="showSearch">
         <!--v-hasPermi="['laboratory:plan:add']"-->
-        <el-form-item label="关键字" prop="searchValue" label-width="58px">
+        <el-form-item label="关键字" prop="searchValue" label-width="54px">
           <el-input
             maxLength="20"
             v-model="queryParams.searchValue"
@@ -14,19 +14,10 @@
             style="width: 240px"
           />
         </el-form-item>
-        <el-form-item label="专业" prop="majorId" label-width="60px">
-          <el-select v-model="queryParams.majorId" clearable placeholder="请选择专业">
-            <el-option
-              v-for="item in professionOptions"
-              :key="item.id"
-              :label="item.majorName"
-              :value="item.id">
-            </el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="学院" prop="deptId" label-width="80px">
+        <el-form-item label="学院" prop="deptId" label-width="50px">
           <el-select v-model="queryParams.deptId" clearable placeholder="请选择学院">
             <el-option
+              style="width:80px;"
               v-for="item in collegeOptions"
               :key="item.deptId"
               :label="item.deptName"
@@ -34,12 +25,22 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="状态" prop="status" label-width="60px">
+        <el-form-item label="状态" prop="status" label-width="50px">
           <el-select v-model="queryParams.status" clearable placeholder="请选择状态">
             <el-option :key="0" label="启用" :value="0"></el-option>
             <el-option :key="1" label="停用" :value="1"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="校园卡" prop="cardNumSimple" label-width="54px">
+          <el-select v-model="queryParams.cardNumSimple" clearable placeholder="请选择">
+            <el-option
+              v-for="item in professionOptions"
+              :key="item.postId"
+              :label="item.postName"
+              :value="item.postId">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item>
           <el-dropdown @command="importButton" v-hasPermi="['system:user_student:import']">
             <div class="form-dropdown-box">
@@ -73,13 +74,20 @@
             ><i class="el-icon-plus"></i>新增</p>
           </el-col>
         </el-form-item>
+        <el-form-item style="float: right;">
+          <el-col :span="1.5" v-hasPermi="['system:user_student:check']">
+            <p class="add-button-one-90"
+               @click="bindingCard"
+            >批量绑卡</p>
+          </el-col>
+        </el-form-item>
         <el-form-item>
           <p class="inquire-button-one" @click="handleQuery">查询</p>
           <p class="reset-button-one" @click="resetQuery">重置</p>
         </el-form-item>
       </el-form>
       <el-table  border :data="userList" @selection-change="handleSelectionChange" ref="multipleTable" :row-key="getRowKeys">
-        <el-table-column type="selection" width="50" align="center"/>
+        <el-table-column type="selection" width="50" :reserve-selection="true" align="center"/>
         <el-table-column label="序号"  width="50" align="center"  type="index"/>
         <el-table-column label="姓名" align="left" prop="nickName"/>
         <el-table-column label="学号" align="left" prop="userName" width="180">
@@ -149,6 +157,7 @@
       </div>
     </div>
     <add-page v-if="pageType == 2" :editType="editType" :propsData="propsData" :titleName="titleName"></add-page>
+    <binding-card-page v-if="pageType == 3" :ids="ids"></binding-card-page>
     <!--重置密码-->
     <el-dialog title="重置密码" :visible.sync="reviseOpen" width="600px" append-to-body class="teacher-revise-dialog-box">
       <el-form :model="passwordForm" ref="passwordForm" :inline="true" :rules="rules" class="addCheckPage-min">
@@ -214,11 +223,13 @@ import { treeselect } from "@/api/system/dept";
 import {listMajorAll} from "@/api/system/major";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import addPage from "./addPage_SuZhouDX.vue"
+import bindingCardPage from "./bindingCardPage.vue"
 
 export default {
   name: "User",
   components: {
-    addPage
+    addPage,
+    bindingCardPage
   },
   data() {
     const equalToPassword = (rule, value, callback) => {
@@ -255,7 +266,16 @@ export default {
       // 部门树选项
       deptOptions: undefined,
       //专业列表
-      professionOptions:[],
+      professionOptions:[
+        {
+          postName:"未绑定",
+          postId:"0",
+        },
+        {
+          postName:"已绑定",
+          postId:"1",
+        },
+      ],
       //学院列表
       collegeOptions:[],
       // 是否显示弹出层
@@ -375,16 +395,25 @@ export default {
   },
   created() {
     this.getList();
-    this.getListAll();
+    // this.getListAll();
     this.listDepartments();
-    this.getDicts("sys_user_sex").then(response => {
-
-    });
-    this.getConfigKey("sys.user.initPassword").then(response => {
-
-    });
+    this.getDicts("sys_user_sex").then(response => {});
+    this.getConfigKey("sys.user.initPassword").then(response => {});
   },
   methods: {
+    //批量绑卡页面跳转与数量检测
+    bindingCard(){
+      let self = this;
+      if(self.ids.length<1){
+        self.msgError('请先勾选人员')
+        return
+      }
+      if(self.ids.length>50){
+        self.msgError('批量绑卡最多只可选中50条数据,当前选中了'+self.ids.length+'条.')
+        return
+      }
+      this.pageType = 3;
+    },
     //关闭重置密码页面
     reviseOpenOff(){
       this.reviseOpen = false;
@@ -479,31 +508,21 @@ export default {
       }
     },
     //=========表格扩展选择器方法---开始=========
-    //选择本页
-    selectPage(){
-      console.log(this.$refs.multipleTable)
-      this.$refs.multipleTable.toggleAllSelection()
-      // console.log(this.$refs.multipleTable.selection)
-    },
-    //清除选择
-    clearSelection(){
-      this.$refs.multipleTable.clearSelection()
-    },
     /*===记录勾选数据===
       需要再el-table 添加  :row-key="getRowKeys"
       需要在selection 添加 :reserve-selection="true"
     */
     getRowKeys(row) {
-      return row.id
+      return row.userId
     },
     //=========表格扩展选择器方法---结束=========
     /** 查询用户列表 */
     getList() {
-      // this.loading = true;
+      this.loading = true;
       listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-          this.userList = response.rows;
+          this.$set(this,'userList',response.rows);
           this.total = response.total;
-          // this.loading = false;
+          this.loading = false;
         }
       );
     },
@@ -533,7 +552,10 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      this.pageType = 1;
       this.queryParams.pageNum = 1;
+      this.$set(this,"selectedNum",0);
+      this.$refs.multipleTable.clearSelection()
       this.getList();
     },
     /** 重置按钮操作 */
@@ -544,7 +566,7 @@ export default {
         pageNum: 1,
         pageSize:20,
         searchValue: "",
-        majorId: "",
+        cardNumSimple: "",
         deptId: "",
         status: "",
       });

src/views/comprehensive/personnel/teacher/bindingCardPage.vue

@@ -0,0 +1,244 @@
+<template>
+    <div class="bindingCardPage">
+      <div class="title-box">
+        <p>批量绑定校园卡</p>
+      </div>
+      <div class="watch-head-box">
+        <p>姓名</p>
+        <p>工号</p>
+        <p>部门</p>
+        <p>手机号码</p>
+        <p>校园卡号</p>
+      </div>
+      <div class="center-max-big-box scrollbar-box">
+        <div class="watch-data-list" v-for="(item,index) in watchList" :key="index">
+          <p>{{item.nickName}}</p>
+          <p>{{item.userName}}</p>
+          <p>{{item.deptName}}</p>
+          <p>{{item.phonenumber}}</p>
+          <div class="input-big-box">
+            <el-input class="input-box" type="text"
+                      maxLength="30"
+                      v-model="item.cardNum"
+                      clearable
+                      placeholder="请输入或读取校园卡号"
+            />
+            <p class="input-msg-p">{{item.cardType==1?'卡号已存在':(item.cardType==2?'卡号重复':'')}}</p>
+          </div>
+        </div>
+      </div>
+      <div class="button-box">
+        <p></p>
+        <p class="reset-button-one" @click="outPageButton">返回</p>
+        <p class="add-button-one-90" @click="setButton">保存</p>
+      </div>
+    </div>
+</template>
+
+<script>
+  import { teacherBatchSelect, teacherUpdateCardNum } from "@/api/system/user_teacher";
+  export default {
+    name: 'bindingCardPage',
+    props:{
+      ids:{},
+    },
+    data(){
+      return{
+        watchList:[],
+      }
+    },
+    created(){
+
+    },
+    mounted(){
+      this.teacherBatchSelect();
+    },
+    methods:{
+      //批量获取老师数据
+      teacherBatchSelect(){
+        teacherBatchSelect(this.ids).then(response => {
+          this.watchList = response.data;
+          this.getInitialization();
+        })
+      },
+      //返回
+      outPageButton(){
+        this.$parent.outPage(1);
+      },
+      //提交
+      setButton(){
+        let self = this
+        if(this.setVerification()){
+          let list = [];
+          for(let i=0;i<self.watchList.length;i++){
+            if(self.watchList[i].cardNum){
+              let obj = {
+                userId:self.watchList[i].userId,
+                cardNum:self.watchList[i].cardNum,
+              }
+              list.push(obj);
+            }
+          }
+          teacherUpdateCardNum(list).then(response => {
+            if(response.data.repeatCard == 0){
+              this.msgSuccess(response.msg);
+              this.$parent.handleQuery();
+            }else{
+              this.repeatMark(response.data.repeatList);
+            }
+          })
+        }
+      },
+      //提交验证
+      setVerification(){
+        let self = this;
+        for(let i=0;i<self.watchList.length;i++){
+          self.watchList[i].cardType = 0;
+          if (self.watchList[i].cardNum){
+            self.watchList[i].cardNum = self.watchList[i].cardNum.replace(/^\s*|\s*$/g,"");
+          }
+        }
+        let num = 0;
+        for(let i=0;i<self.watchList.length;i++){
+          for(let o=0;o<self.watchList.length;o++){
+            if(self.watchList[i].cardNum == self.watchList[o].cardNum &&
+               self.watchList[i].userId != self.watchList[o].userId &&
+              self.watchList[i].cardNum && self.watchList[o].cardNum){
+              self.$set(self.watchList[i],'cardType',2);
+              self.$set(self.watchList[o],'cardType',2);
+              num++
+            }
+          }
+        }
+        this.$forceUpdate();
+        return num == 0;
+      },
+      //数据初始化
+      getInitialization(){
+        let self = this;
+        for(let i=0;i<self.watchList.length;i++){
+          self.watchList[i].cardType = 0;
+        }
+        this.$forceUpdate();
+      },
+      //重复标记
+      repeatMark(list){
+        let self = this;
+        for(let i=0;i<list.length;i++){
+          for(let o=0;o<self.watchList.length;o++){
+            if(list[i] == self.watchList[o].cardNum){
+              self.watchList[o].cardType = 1;
+            }
+          }
+        }
+        this.$forceUpdate();
+      },
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  *{
+    margin:0;
+    padding:0;
+    font-weight:500;
+    color:#333;
+  }
+  .bindingCardPage{
+    display: flex;
+    flex-direction: column;
+    flex:1;
+    overflow: hidden;
+    .title-box{
+      border-bottom:1px solid #E0E0E0;
+      p{
+        color:#0045AF;
+        line-height:60px;
+        margin-left:24px;
+        font-size:18px;
+      }
+    }
+    .watch-head-box{
+      padding:10px 40px 10px;
+      display: flex;
+      p{
+        line-height:40px;
+        font-size:16px;
+        font-weight: 600;
+      }
+      p:nth-child(1){
+        width:200px;
+      }
+      p:nth-child(2){
+        width:200px;
+      }
+      p:nth-child(3){
+        width:200px;
+      }
+      p:nth-child(4){
+        width:300px;
+      }
+      input{
+        width:300px;
+      }
+    }
+    .center-max-big-box{
+      flex:1;
+      padding:0 40px;
+      .watch-data-list{
+        display: flex;
+        margin-bottom:10px;
+        p{
+          line-height:40px;
+          font-size:16px;
+        }
+        p:nth-child(1){
+          width:200px;
+        }
+        p:nth-child(2){
+          width:200px;
+        }
+        p:nth-child(3){
+          width:200px;
+        }
+        p:nth-child(4){
+          width:300px;
+        }
+        .input-big-box{
+          display: flex;
+          flex:1;
+          .input-box{
+            width:300px;
+          }
+          .input-msg-p{
+            margin-left:20px;
+            width:100px;
+            color:#FF6666;
+            font-size:14px;
+          }
+        }
+      }
+    }
+    .button-box{
+      height:80px;
+      display: flex;
+      border-top:1px solid #E0E0E0;
+      p{
+        margin-top:20px;
+      }
+      p:nth-child(1){
+        flex:1;
+      }
+      p:nth-child(2){
+        width:80px;
+        margin-right:20px;
+        font-size:16px;
+      }
+      p:nth-child(3){
+        width:80px;
+        margin-right:20px;
+        font-size:16px;
+      }
+    }
+  }
+</style>

src/views/comprehensive/personnel/teacher/index_SuZhouDX.vue

@@ -1,7 +1,7 @@
 <!--教职工管理-->
 <template>
   <div class="app-container teacher">
-    <div v-if="pageType == 1" class="teacher-one-box">
+    <div v-show="pageType == 1" class="teacher-one-box">
       <div class="top-max-box">
         <div class="left-max-box ">
           <div class="top-button-max-box">
@@ -56,39 +56,19 @@
           <el-form :model="queryParams" class="form-box" ref="queryForm" :inline="true" v-show="showSearch">
             <!--v-hasPermi="['laboratory:plan:add']"-->
 
-            <el-form-item label="关键字" prop="searchValue" label-width="60px">
+            <el-form-item label="关键字" prop="searchValue" label-width="54px">
               <el-input
                 maxLength="20"
                 v-model="queryParams.searchValue"
-                placeholder="姓名/工号/联系方式"
-                clearable
-                size="small"
-                style="width: 150px"
+                placeholder="姓名/工号/电话"
+                style="width: 130px"
               />
             </el-form-item>
-            <el-form-item label="身份" prop="position" label-width="50px">
-              <el-select
-                v-model="queryParams.position"
-                placeholder="请选择"
-                clearable
-                size="small"
-                style="width: 100px"
-              >
-                <el-option
-                  v-for="dict in postionList"
-                  :key="dict.postId"
-                  :label="dict.postName"
-                  :value="dict.postId"
-                />
-              </el-select>
-            </el-form-item>
-            <el-form-item label="状态" prop="nature" label-width="50px">
+            <el-form-item label="状态" prop="nature" label-width="40px">
               <el-select
                 v-model="queryParams.nature"
                 placeholder="请选择"
                 clearable
-                size="small"
-                style="width: 100px"
               >
                 <el-option
                   v-for="dict in workClass"
@@ -98,13 +78,11 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="检查者" prop="isCheck" label-width="60px">
+            <el-form-item label="检查者" prop="isCheck" label-width="54px">
               <el-select
                 v-model="queryParams.isCheck"
                 placeholder="请选择"
                 clearable
-                size="small"
-                style="width: 240px"
               >
                 <el-option
                   v-for="dict in userTypeList"
@@ -114,9 +92,23 @@
                 />
               </el-select>
             </el-form-item>
+            <el-form-item label="校园卡" prop="cardNumSimple" label-width="54px">
+              <el-select
+                v-model="queryParams.cardNumSimple"
+                placeholder="请选择"
+                clearable
+              >
+                <el-option
+                  v-for="dict in postionList"
+                  :key="dict.postId"
+                  :label="dict.postName"
+                  :value="dict.postId"
+                />
+              </el-select>
+            </el-form-item>
             <el-form-item>
               <el-dropdown @command="importButton" v-hasPermi="['system:user_teacher:import']">
-                <div class="form-dropdown-box">
+                <div class="form-dropdown-box" style="margin-left:5px;">
                   <img src="@/assets/ZDimages/personnelManagement/icon_jzgxx_dr.png">
                   <p>导入</p>
                   <img src="@/assets/ZDimages/personnelManagement/icon_jzggl_xljt.png">
@@ -147,6 +139,13 @@
                 ><i class="el-icon-plus"></i>新增</p>
               </el-col>
             </el-form-item>
+            <el-form-item style="float: right;">
+              <el-col :span="1.5" v-hasPermi="['system:user_teacher:check']">
+                <p class="add-button-one-90"
+                   @click="bindingCard"
+                >批量绑卡</p>
+              </el-col>
+            </el-form-item>
             <el-form-item>
               <p class="inquire-button-one" @click="handleQuery">查询</p>
               <p class="reset-button-one" @click="resetQuery">重置</p>
@@ -254,6 +253,7 @@
       </div>
     </div>
     <add-page v-if="pageType == 2" :editType="editType" :propsData="propsData" :titleName="titleName"></add-page>
+    <binding-card-page v-if="pageType == 3" :ids="ids"></binding-card-page>
     <!--重置密码-->
     <el-dialog title="重置密码" :visible.sync="reviseOpen" width="600px" append-to-body class="teacher-revise-dialog-box">
       <p class="teacher-text-p">确定要重置该账号的密码吗？</p>
@@ -370,13 +370,15 @@
   import { Message } from 'element-ui'
   import userList from "./userList.vue"
   import addPage from "./addPage_SuZhouDX.vue"
+  import bindingCardPage from "./bindingCardPage.vue"
 
   export default {
     name: "User",
     components: {
       Treeselect,
       userList,
-      addPage
+      addPage,
+      bindingCardPage
     },
     data() {
       return {
@@ -448,7 +450,7 @@
           pageNum: 1,
           pageSize:20,
           searchValue: "",
-          position: "",
+          cardNumSimple: "",
           nature: "",
           isCheck: "",
         },
@@ -504,7 +506,16 @@
         //学院列表
         deptList:[],
         //职位列表
-        postionList: [],
+        postionList: [
+          {
+            postName:"未绑定",
+            postId:"0",
+          },
+          {
+            postName:"已绑定",
+            postId:"1",
+          },
+        ],
         //文化程度
         educationList:[],
         // 新增学生开关
@@ -557,7 +568,7 @@
       this.getList();
       this.getTreeselect();
       this.getDeptList();
-      this.getPostionList();
+      // this.getPostionList();
       // //职称
       // this.getDicts("professional").then(response => {
       //   this.professional = response.data;
@@ -579,6 +590,19 @@
       });
     },
     methods: {
+      //批量绑卡页面跳转与数量检测
+      bindingCard(){
+        let self = this;
+        if(self.ids.length<1){
+          self.msgError('请先勾选人员')
+          return
+        }
+        if(self.ids.length>50){
+          self.msgError('批量绑卡最多只可选中50条数据,当前选中了'+self.ids.length+'条.')
+          return
+        }
+        this.pageType = 3;
+      },
       //人员添加接口
       takeUserData(ids,idsData){
         let list = [];
@@ -925,13 +949,7 @@
       getList() {
         this.loading = true;
         listUser(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-            for(let i=0;i<response.rows.length;i++){
-              if(response.rows[i].position == "未定"){
-                response.rows[i].position = "";
-              }
-            }
             this.$set(this,'userList',response.rows);
-            // this.userList = response.rows;
             this.total = response.total;
             this.loading = false;
           }
@@ -991,7 +1009,10 @@
       },
       /** 搜索按钮操作 */
       handleQuery() {
+        this.pageType = 1;
         this.queryParams.pageNum = 1;
+        this.$set(this,"selectedNum",0);
+        this.$refs.multipleTable.clearSelection()
         this.getList();
       },
       /** 重置按钮操作 */
@@ -1002,7 +1023,7 @@
           pageNum: 1,
           pageSize:20,
           searchValue: "",
-          position: "",
+          cardNumSimple: "",
           nature: "",
           isCheck: "",
         });
@@ -1333,9 +1354,9 @@
   .right-max-box{
     .form-box{
       .el-select{
-        width:100px !important;
+        width:90px !important;
         > .el-input{
-          width:100px !important;
+          width:90px !important;
         }
       }
     }
@@ -1345,7 +1366,7 @@
       .form-dropdown-box{
         display: flex;
         margin:0;
-        padding:0 10px;
+        padding:0 5px 0 0;
         cursor: pointer;
         height:40px;
         img:nth-child(1){

src/views/creditViolation/violation/violation/index.vue

@@ -493,8 +493,8 @@ export default {
       },
       addRules:{
         userId:[
-          {required: true, message: '请输入检索内容选择学生', trigger: 'blur'},
-          { required: true, message: "请输入检索内容选择学生", validator: this.spaceJudgment, trigger: "blur" }
+          {required: true, message: '请输入姓名', trigger: 'blur'},
+          { required: true, message: "请输入姓名", validator: this.spaceJudgment, trigger: "blur" }
         ],
         laboratoryId:[
           {required: true, message: '请选择实验室', trigger: 'blur'}
@@ -965,7 +965,8 @@ export default {
       if (query !== '' && query.length>1) {
         this.loading = true;
         let obj = {
-          nickName : query
+          nickName : query,
+          userType: 22,
         };
         selectListUser(obj).then(response => {
           this.optionsUser = response.data;

src/views/gasManage3_0/manage/recognizerManage/recognizerManage.vue

@@ -26,10 +26,11 @@
     </el-form>
 
     <el-table border v-loading="loading" :data="sensorList">
-      <el-table-column label="设备编号" align="left" prop="hardwareNum" />
-      <el-table-column label="学院" align="center" prop="deptName" width="250"/>
-      <el-table-column label="位置" align="center" prop="posi" width="250" show-overflow-tooltip/>
-      <el-table-column label="设备状态" align="center" prop="status">
+      <el-table-column label="设备名称" align="left" prop="deviceName" show-overflow-tooltip/>
+      <el-table-column label="设备编号" align="left" prop="hardwareNum" show-overflow-tooltip/>
+      <el-table-column label="学院" align="center" prop="deptName" width="200" show-overflow-tooltip/>
+      <el-table-column label="位置" align="center" prop="position" width="250" show-overflow-tooltip/>
+      <el-table-column label="设备状态" align="center" prop="status" width="120">
         <template slot-scope="scope">
           <el-switch
             v-hasPermi="['laboratory:hardware7:changeStatus']"
@@ -44,9 +45,9 @@
           </el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="250"/>
-      <el-table-column label="创建人" align="center" prop="createBy" width="250"/>
-      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="220">
+      <el-table-column label="创建时间" align="center" prop="createTime" width="200" show-overflow-tooltip/>
+      <el-table-column label="创建人" align="center" prop="createBy" width="200" show-overflow-tooltip/>
+      <el-table-column label="操作" align="left" class-name="small-padding fixed-width" width="150">
         <template slot-scope="scope">
           <div class="button-box">
             <p class="table-min-button"
@@ -72,10 +73,13 @@
       @pagination="getList"
     />
     <!-- 添加或修改传感器对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body class="recognizer add-hardware-dialog-box">
-      <el-form ref="form" :model="form" :rules="rules" :inline="true">
+    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body class="recognizer recognizer-manage add-hardware-dialog-box">
+      <el-form ref="form" :model="form" :rules="rules" :inline="true" label-width="130px">
+        <el-form-item label="设备名称" prop="deviceName">
+          <el-input v-model="form.deviceName" maxlength="30" placeholder="请输入识别器编号" style="width: 400px"/>
+        </el-form-item>
         <el-form-item label="识别器编号" prop="hardwareNum">
-          <el-input v-model="form.hardwareNum" placeholder="请输入识别器编号" style="width: 400px"/>
+          <el-input v-model="form.hardwareNum" maxlength="30" placeholder="请输入识别器编号" style="width: 400px"/>
         </el-form-item>
         <el-form-item label="所属实验室" prop="subjectId">
           <el-select v-model="form.subjectId" placeholder="请选择实验室" style="width: 400px">
@@ -87,23 +91,28 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="IP地址" >
-          <el-input v-model="form.ipAddress" placeholder="请输入IP地址" style="width: 400px"/>
-        </el-form-item>
-        <el-form-item label="连接方式">
+        <div class="form-input-ip-box">
+          <el-form-item label="IP地址" label-width="130px" prop="ipAddress" class="form-ip">
+            <el-input v-model="form.ipAddress" maxlength="30" placeholder="请输入IP地址"/>
+          </el-form-item>
+          <el-form-item label="端口" label-width="54px" prop="port" class="form-port">
+            <el-input style="width:120px;" maxlength="5" v-model="form.port" placeholder="请输入端口"/>
+          </el-form-item>
+        </div>
+        <el-form-item label="连接方式" prop="manufacturerType">
           <el-select v-model="form.manufacturerType" placeholder="请选择" style="width:400px;" >
             <el-option :label="item.dictLabel" :value="item.dictValue" v-for="(item,index) in materialTypeList" :key="index"></el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item label="推送频率" >
+        <el-form-item label="推送频率" prop="sessionIndex">
           <el-select v-model="form.sessionIndex" placeholder="请选择设备推送频率"  style="width:400px;">
             <el-option  label="最大" value="0"></el-option>
             <el-option  label="中等" value="1"></el-option>
             <el-option  label="最小" value="2"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="天线数量" >
+        <el-form-item label="天线数量" prop="channels">
           <el-select v-model="form.channels" placeholder="请选择信道数量" @change="antennaNumFun()"  style="width:400px;">
             <el-option  label="1" value="1"></el-option>
             <el-option  label="2" value="2"></el-option>
@@ -115,7 +124,7 @@
         <el-row  v-for="(item,index) in antennaNum" :key="index">
           <el-col :span="12">
             <el-form-item :label="(index+1)+'号天线感应距离'">
-              <el-input-number v-model="uniformPower[index]" placeholder="请输入设备输出频率" style="width:140px;"/>
+              <el-input-number v-model="uniformPower[index]" maxlength="10" placeholder="请输入设备输出频率" style="width:140px;"/>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -162,6 +171,20 @@ export default {
   name: "Sensor",
   components: { Treeselect },
   data() {
+    const ipVerification  = (rule, value, callback) => {
+      if(!/^((2((5[0-5])|([0-4]\d)))|([0-1]?\d{1,2}))(\.((2((5[0-5])|([0-4]\d)))|([0-1]?\d{1,2}))){3}$/.test(value)) {
+        callback(new Error("IP地址错误"));
+      } else {
+        callback()
+      }
+    };
+    const portVerification  = (rule, value, callback) => {
+      if(!/^[0-9]+$/.test(value)) {
+        callback(new Error("端口号错误"));
+      } else {
+        callback()
+      }
+    };
     return {
       // 遮罩层
       loading: true,
@@ -185,14 +208,16 @@ export default {
       // 表单参数
       form: {
         id:'',
+        deviceName:'',
         hardwareNum:'',
         subjectId:'',
         deviceType:'7',
         ipAddress:'',//ip地址
+        port:'',//ip地址
         channels:4,//信道
         sessionIndex:0,//设备推送频率
         uniformPower:'',//设备推送频率
-        manufacturerType:'',//供应商
+        manufacturerType:null,//连接方式
       },
       materialTypeList:[],
       uniformPower:[20,20,20,20],
@@ -201,15 +226,32 @@ export default {
       detectionArr:[],//检测类型数组
       // 表单校验
       rules: {
-        name:[
-          {required: true, message: '识别器名称不能为空', trigger: 'blur'}
+        deviceName:[
+          {required: true, message: '设备名称不能为空', trigger: 'blur'}
         ],
         hardwareNum:[
           {required: true, message: '识别器编号不能为空', trigger: 'blur'}
         ],
         subjectId:[
           {required: true, message: '所属实验室不能为空', trigger: 'blur'}
-        ]
+        ],
+        ipAddress:[
+          {required: true, message: 'IP地址不能为空', trigger: 'blur'},
+          { required: true, validator: ipVerification, trigger: "blur" },
+        ],
+        port:[
+          {required: true, message: '端口不能为空', trigger: 'blur'},
+          { required: true, validator: portVerification, trigger: "blur" },
+        ],
+        manufacturerType:[
+          {required: true, message: '请选择连接方式', trigger: 'blur'},
+        ],
+        sessionIndex:[
+          {required: true, message: '请选择推送频率', trigger: 'blur'},
+        ],
+        channels:[
+          {required: true, message: '请选择天线数量', trigger: 'blur'},
+        ],
       },
     };
   },
@@ -309,9 +351,12 @@ export default {
         id: null,
         name: null,
         deviceType:'7',
+        deviceName:null,
         hardwareNum: null,
         subjectId: null,
         ipAddress: null,
+        port: null,
+        manufacturerType:null,
         channels: '4',
         sessionIndex: '0',
         uniformPower: '',
@@ -351,14 +396,16 @@ export default {
       let _this=this;
       this.open = true;
       this.title = "修改识别器";
-      this.form.id=row.id
-      this.form.deviceType='7'
-      this.form.hardwareNum=row.hardwareNum
-      this.form.subjectId=row.subjectId
-      this.form.ipAddress=row.ipAddress
-      this.form.channels=row.channels+''
-      this.form.sessionIndex=row.sessionIndex+''
-      this.form.manufacturerType=row.manufacturerType+''
+      this.form.id=row.id;
+      this.form.deviceType='7';
+      this.form.deviceName=row.deviceName;
+      this.form.hardwareNum=row.hardwareNum;
+      this.form.subjectId=row.subjectId;
+      this.form.ipAddress=row.ipAddress;
+      this.form.port=row.port;
+      this.form.channels=row.channels+'';
+      this.form.sessionIndex=row.sessionIndex+'';
+      this.form.manufacturerType=row.manufacturerType+'';
       //this.uniformPower=row.uniformPower.split(',')
       this.antennaNum=[];
       this.uniformPower=[];
@@ -373,7 +420,7 @@ export default {
         _this.uniformPower.push(item.split(':')[0])
         _this.detection.push(item.split(':')[1])
       })
-
+      this.$forceUpdate();
     },
     /** 提交按钮 */
     submitForm() {
@@ -481,9 +528,9 @@ export default {
     left: 21%!important;
   }
 }
-.recognizer{
-  .el-form-item__label{
-    width:130px!important;
+.recognizer-manage{
+  .el-form-item__error {
+    left: 0 !important;
   }
   //.el-input--suffix{
   //  width:340px!important;
@@ -497,6 +544,27 @@ export default {
   //.el-input-number--medium{
   //  width:240px!important;
   //}
+  .form-input-ip-box{
+    display: flex;
+    width:550px;
+    .form-ip{
+      margin-right:0;
+      width:340px;
+      input{
+        width:200px;
+      }
+    }
+    .form-port{
+      margin-right:0;
+      flex:1;
+      input{
+        width:136px;
+      }
+      input{
+        /*width:120px;*/
+      }
+    }
+  }
 }
 </style>
 

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

@@ -0,0 +1,540 @@
+<!--智能门禁-->
+<template>
+  <div class="app-container SmartAccessControl">
+    <el-form :model="queryParamsData" class="form-box" ref="queryForm" :inline="true">
+      <el-form-item label="关键字" prop="searchValue">
+        <el-input
+          maxLength="30"
+          v-model="queryParamsData.searchValue"
+          placeholder="门禁锁编号/实验室"
+          clearable
+          size="small"
+          style="width: 240px"
+        />
+      </el-form-item>
+      <el-form-item label="学院" prop="deptId">
+        <el-select v-model="queryParamsData.deptId" clearable placeholder="请选择学院">
+          <el-option
+            v-for="item in optionsListOne"
+            :key="item.deptId"
+            :label="item.deptName"
+            :value="item.deptId">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="状态" prop="useStatus">
+        <el-select v-model="queryParamsData.operate" clearable placeholder="请选择状态">
+          <el-option
+            v-for="item in optionsListTwo"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <p class="inquire-button-one" @click="handleQuery" style="margin-right:10px;">查询</p>
+        <p class="reset-button-one" @click="resetQuery">重置</p>
+      </el-form-item>
+      <el-form-item style="float: right;">
+        <el-col :span="1.5" v-hasPermi="['laboratory:hardware6:add']">
+          <p class="add-button-one-90"
+             @click="pageToggle(1)"
+          ><i class="el-icon-plus"></i>新增</p>
+        </el-col>
+      </el-form-item>
+    </el-form>
+    <el-table  border :data="tableList" ref="multipleTable">
+      <el-table-column label="门禁锁编号" align="center" prop="hardwareNum"/>
+      <el-table-column label="学院" align="center" prop="deptName" width="250"/>
+      <el-table-column label="实验室" align="center" prop="posi" width="250" show-overflow-tooltip/>
+      <el-table-column label="设备状态" align="center" prop="status" width="100">
+        <template slot-scope="scope">{{scope.row.operate.name}}</template>
+      </el-table-column>
+      <el-table-column label="创建人" align="center" prop="createBy" width="150"/>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="250"/>
+      <el-table-column label="操作" align="center" width="140" class-name="small-padding fixed-width" v-if="tableButtonType">
+        <template slot-scope="scope">
+          <div class="button-box">
+            <p class="table-min-button" style="margin-right:10px;" v-hasPermi="['laboratory:hardware6:edit']" @click="pageToggle(2,scope.row)">编辑</p>
+            <p class="table-min-button" v-hasPermi="['laboratory:hardware6:remove']" @click="pageToggle(3,scope.row)">删除</p>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination :page-sizes="[20, 30, 40, 50]"
+                v-show="total>0"
+                :total="total"
+                :page.sync="queryParamsData.pageNum"
+                :limit.sync="queryParamsData.pageSize"
+                @pagination="getList"
+    />
+
+    <!--新增/编辑-->
+    <el-dialog :title="dialogTitle" :visible.sync="addDialogType" v-if="addDialogType" width="520px" append-to-body class="add-dialog-box">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px">
+        <el-form-item label="实验室：" prop="subjectId">
+          <el-select
+            style="width:360px;"
+            v-model="form.subjectId"
+            filterable
+            remote
+            clearable
+            @focus="selectFocus"
+            reserve-keyword
+            @clear="clearClick"
+            placeholder="搜索选择实验室"
+            :remote-method="getSelectList"
+            :loading="loading">
+            <el-option
+              v-for="item in selectList"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="门禁编号" prop="hardwareNum">
+          <el-input
+            style="width:320px;"
+            v-model="form.hardwareNum"
+            placeholder="请输入门禁编号"
+            maxlength="20"
+            size="small"
+          />
+        </el-form-item>
+        <el-form-item label="门禁名称" prop="name" >
+          <el-input
+            style="width:320px;"
+            v-model="form.name"
+            placeholder="请输入门禁名称"
+            maxlength="8"
+            size="small"
+          />
+        </el-form-item>
+        <el-form-item label="IP" prop="ipAddress" >
+          <el-input
+            style="width:320px;"
+            v-model="form.ipAddress"
+            placeholder="请输入IP"
+            maxlength="15"
+            size="small"
+          />
+        </el-form-item>
+        <el-form-item label="端口" prop="port" >
+          <el-input
+            style="width:320px;"
+            v-model="form.port"
+            placeholder="请输入端口"
+            maxlength="6"
+            size="small"
+          />
+        </el-form-item>
+        <el-form-item label="设备管理证号" prop="harUser" >
+          <el-input
+            style="width:320px;"
+            v-model="form.harUser"
+            placeholder="请输入设备管理证号"
+            maxlength="30"
+            size="small"
+          />
+        </el-form-item>
+        <el-form-item label="设备管理密码" prop="harPsw" >
+          <el-input
+            style="width:320px;"
+            v-model="form.harPsw"
+            placeholder="请输入设备管理密码"
+            maxlength="30"
+            size="small"
+          />
+        </el-form-item>
+        <el-form-item label="门禁权限" style="margin-bottom: 0">
+          <el-checkbox-group v-model="form.controlScope">
+            <el-checkbox label="1" >关联安全准入</el-checkbox>
+            <el-checkbox label="2">关联白名单</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { hxpSmartTerminal,filterDept,getSubList,addHxpSmartTerminal,putHxpSmartTerminal,getHxpSmartTerminal,delHxpSmartTerminal } from "@/api/medicUniversity-3_1/index";
+import { listHardware, delHardware, addHardware, updateHardware } from "@/api/medicUniversity-3_1/index";
+import { listDepartments } from "@/api/system/dept";
+import { getToken } from "@/utils/auth";
+export default {
+  name: "SmartAccessControl-jinan",
+  data() {
+    return {
+      // table操作按钮校验
+      tableButtonType:this.hasPermiDom(['laboratory:hardware6:edit','laboratory:hardware6:remove']),
+      //上传相关配置
+      uploadImgUrl: window.location.href.split('://')[0]+'://' + process.env.VUE_APP_BASE_API + "/laboratory/hardware/importData", // 上传地址
+      headers: {
+        Authorization: "Bearer " + getToken(),
+      },
+      // 遮罩层
+      loading:false,
+      //页面状态
+      pageType:1,
+      // 搜索数据
+      queryParamsData:{
+        pageNum:1,
+        pageSize:20,
+      },
+      //数据数量
+      total:0,
+      //数据数组
+      tableList:[],
+      //学院列表
+      optionsListOne:[],
+      //状态列表
+      optionsListTwo:[{id:"ONLINE",name:"在线"},{id:"OFFLINE",name:"离线"}],
+      //编辑新增相关
+      dialogTitle:"",
+      addDialogType:false,
+      form:{},
+      selectList:[],
+      selectListData:[],
+      rules:{
+        name: [
+          { required: true, trigger: "blur", message: "请输入门禁名称" },
+        ],
+        hardwareNum: [
+          { required: true, trigger: "blur", message: "最大20个字符，包含大小写字母、数字" },
+          { required: true, message: "最大20个字符，包含大小写字母、数字", validator: this.spaceJudgment, trigger: "blur" }
+        ],
+        subjectId: [
+          { required: true, trigger: "blur", message: "搜索选择实验室" },
+        ],
+        relayCode: [
+          { required: true, message: "请输入设备编号", trigger: "blur" },
+          { required: true, message: "请输入设备编号", validator: this.spaceJudgment, trigger: "blur" }
+        ],
+        bit: [
+          { required: true, message: "请输入路由", trigger: "blur" },
+          { required: true, message: "请输入路由", validator: this.spaceJudgment, trigger: "blur" }
+        ],
+        ipAddress: [
+          { required: true, message: "请输入IP", trigger: "blur" },
+          { required: true, message: "请输入IP", validator: this.spaceJudgment, trigger: "blur" }
+        ],
+        port: [
+          { required: true, message: "请输入端口", trigger: "blur" },
+          { required: true, message: "请输入端口", validator: this.spaceJudgment, trigger: "blur" }
+        ],
+
+        harUser: [
+          { required: true, message: "请输入设备管理证号", trigger: "blur" },
+          { required: true, message: "请输入设备管理证号", validator: this.spaceJudgment, trigger: "blur" }
+        ],
+        harPsw: [
+          { required: true, message: "请输入设备管理密码", trigger: "blur" },
+          { required: true, message: "请输入设备管理密码", validator: this.spaceJudgment, trigger: "blur" }
+        ],
+
+      },
+    };
+  },
+  created() {
+
+  },
+  mounted(){
+    this.filterDept();
+    this.listDepartments();
+    this.getList();
+  },
+  methods: {
+    selectFocus(){
+      if(!this.selectList[0]){
+        this.filterDept();
+      }
+    },
+    //获取学院列表
+    listDepartments(){
+      listDepartments().then(response => {
+        this.optionsListOne = response.data;
+      });
+    },
+    pageToggle(type,row){
+      let self = this;
+      if(type == 1){
+        //新增
+        this.dialogTitle = '新增';
+        this.$set(this,'form',{
+          subjectId:"",
+          hardwareNum:"",
+          name:"",
+          ipAddress:"",
+          port:"",
+          harUser:"",
+          harPsw:"",
+          controlScope:[],
+        });
+        this.clearClick();
+        this.addDialogType = true;
+      }else if(type == 2){
+        // 编辑
+        this.dialogTitle = '编辑';
+        this.$set(this,'form',JSON.parse(JSON.stringify(row)));
+        if(row.controlScope){
+          this.form.controlScope=row.controlScope.split(',')
+        }else{
+          this.form.controlScope=[]
+        }
+        this.clearClick();
+        this.addDialogType = true;
+      }else if(type == 3){
+        // 删除
+        this.$confirm('确认要删除吗?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          delHardware(row.id).then(response => {
+            if (response.code == 200){
+              self.msgSuccess(response.msg);
+              self.getList();
+            }
+          });
+        }).then(() => {
+        }).catch(() => {});
+      }
+    },
+    //查询当前院系
+    filterDept(){
+      filterDept().then(response => {
+        let idText = "";
+        for(let i=0;i<response.data.length;i++){
+          if(i==0){
+            idText = idText + response.data[i].deptId;
+          }else{
+            idText = idText +','+ response.data[i].deptId;
+          }
+        }
+        //查询院系下实验室
+        getSubList(idText).then(response => {
+          //当前列表
+          this.selectList = JSON.parse(JSON.stringify(response.data));
+          //原始列表数据
+          this.selectListData = JSON.parse(JSON.stringify(response.data));
+        });
+      });
+    },
+    /** 实验室-本地懒加载 */
+    getSelectList(val) {
+      let self = this;
+      let list = [];
+      for(let i=0;i<self.selectListData.length;i++){
+        if(self.selectListData[i].name.indexOf(val) != -1){
+          list.push(self.selectListData[i]);
+        }
+      }
+      this.selectList = JSON.parse(JSON.stringify(list))
+    },
+    //实验室选中清除
+    clearClick(){
+      this.selectList = JSON.parse(JSON.stringify(this.selectListData))
+    },
+    submitForm(){
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if(this.form.id){
+            //编辑
+            this.form.type = 11;
+            this.form.controlScope=this.form.controlScope.join(','),
+              updateHardware(this.form).then(response => {
+                if (response.code == 200){
+                  this.addDialogType = false;
+                  this.msgSuccess(response.msg);
+                  this.getList();
+                }
+              });
+          }else{
+            //新增
+            let obj = {
+              type:11,
+              subjectId:this.form.subjectId,
+              hardwareNum:this.form.hardwareNum,
+              name:this.form.name,
+              ipAddress:this.form.ipAddress,
+              port:this.form.port,
+              harUser:this.form.harUser,
+              harPsw:this.form.harPsw,
+              controlScope:this.form.controlScope.join(','),
+            }
+            addHardware(obj).then(response => {
+              if (response.code == 200){
+                this.addDialogType = false;
+                this.msgSuccess(response.msg);
+                this.resetQuery();
+              }else if(response.code == 205){
+                this.$confirm(response.msg, "警告", {
+                  confirmButtonText: "确定",
+                  cancelButtonText: "取消",
+                  type: "warning"
+                }).then(() => {
+                  //  确定
+                  this.$router.push({ path: '/comprehensive/laboratoryManagement/accessAuthorization' });
+                }).catch(function() {
+                  //  取消
+                });
+              }
+            });
+          }
+        }
+      })
+    },
+    cancel(){
+      this.addDialogType = false;
+    },
+    //获取数据列表
+    getList(){
+      this.queryParamsData.type = 'HK_DOOR';
+      listHardware(this.queryParamsData).then(response => {
+        this.total = response.total;
+        this.tableList = response.rows;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParamsData.pageNum = 1;
+      this.queryParamsData.pageSize = 20;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.$set(this,'queryParamsData',{});
+      this.handleQuery();
+    },
+
+  },
+}
+</script>
+
+<style scoped lang="scss">
+.SmartAccessControl{
+  flex:1;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden!important;
+  padding:20px !important;
+  p{
+    margin:0;
+    padding:0;
+  }
+  .form-box{
+    .form-dropdown-box{
+      display: flex;
+      margin:0;
+      padding:0 10px;
+      cursor: pointer;
+      height:40px;
+      img:nth-child(1){
+        width:16px;
+        height:16px;
+        margin-top:12px;
+      }
+      p{
+        width:47px;
+        text-align: center;
+        font-size:14px;
+        margin:0;
+        line-height:40px;
+      }
+      img:nth-child(3){
+        width:10px;
+        height:6px;
+        margin-top:17px;
+      }
+    }
+  }
+  .button-box{
+    display: flex;
+  }
+}
+</style>
+<style lang="scss">
+.import-dialog-box{
+  .import-dialog-upLoad-box{
+    .el-upload{
+      width:450px;
+      margin:0 55px;
+      .el-upload-dragger{
+        width:450px;
+        .el-icon-upload{
+          font-size:100px;
+          color:#CBE6FE;
+        }
+        .el-upload__text{
+          margin-top:20px;
+        }
+      }
+    }
+    .el-upload__tip{
+      margin-left:60px;
+      font-size:14px;
+      margin-top:10px;
+    }
+    .el-upload-text-box{
+      background: #F5F5F5;
+      border-radius: 10px;
+      margin:15px 30px 0;
+      padding:0 20px 15px;
+      overflow: hidden;
+      *{
+        margin:0;
+      }
+      .img-text-box{
+        display: flex;
+        margin-top:15px;
+        img{
+          width:16px;
+          height:16px;
+          margin-right:13px;
+        }
+        p{
+          height:16px;
+          line-height:16px;
+          font-size:12px;
+        }
+      }
+      .text-p{
+        margin-top:15px;
+        margin-left:29px;
+        height:16px;
+        line-height:16px;
+        font-size:12px;
+      }
+    }
+  }
+  .teacher-import-dialog-button-box{
+    display: flex;
+    width:190px;
+    margin:0 auto;
+    p{
+      width:70px;
+      height:30px;
+      line-height:30px;
+      font-size:14px;
+      margin:0 auto;
+    }
+  }
+  .teacher-import-dialog-position-box{
+    width:100%;
+    height:100%;
+    position: absolute;
+    top:0;
+    left:0;
+    z-index: 999;
+    background: rgba(255,255,255,0.4);
+    border-radius:20px;
+  }
+}
+</style>

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

@@ -55,7 +55,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="分类名称" prop="title">
-          <el-input v-model="form.title" placeholder="请输入分类名称" />
+          <el-input v-model="form.title" placeholder="请输入分类名称" maxLength="50"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">

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

@@ -189,11 +189,12 @@ export default {
               // 需要完成安全培训
               this.$confirm(response.msg)
                 .then(_ => {
+                  localStorage.setItem('startLearningInfoId',response.data.courseId);
                   this.$router.push({
-                    path: `/safe/mytrain`,
-                    query:{
-                      id: response.data,
-                    }
+                    path: `/safetyEducationExam/safeLearning/safeLearning`,
+                    // query:{
+                    //   id: response.data.courseId,
+                    // }
                   })
                 })
                 .catch(_ => {});

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

@@ -488,6 +488,18 @@
       .exam-right-max-box{
         flex:1;
         padding:50px 60px;
+        word-wrap:break-word;
+        word-break:break-all;
+        overflow: hidden;
+        ::v-deep .el-radio{
+          margin-bottom:20px;
+        }
+        ::v-deep .el-radio__label {
+          width: 100% !important;
+          text-overflow: ellipsis;
+          white-space: normal;
+          line-height: 18px;
+        }
         .right-title-p{
           margin-bottom:40px;
           font-size:16px;

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

@@ -93,6 +93,7 @@
           placeholder="请输入题目名称"
           clearable
           size="small"
+          maxLength="1500"
         />
       </el-form-item>
       <el-form-item
@@ -129,6 +130,7 @@
             placeholder="请输入选项内容"
             clearable
             size="small"
+            maxLength="1500"
           />
           <i class="el-icon-remove del-i-box" @click="delOptions(index)"></i>
         </el-form-item>
@@ -201,6 +203,7 @@
           placeholder="请输入答案解析"
           clearable
           size="small"
+          maxLength="1500"
         />
       </el-form-item>
     </el-form>

src/views/secureAccess/whitelist/addPage.vue

@@ -485,8 +485,6 @@ import {
               this.subjectList.splice(index,1);
               return
             }
-
-
             _this.arr=[];
             _this.subjectList.forEach(function (item,index){
               _this.dialogTable.forEach(function (item2,index2){

src/views/securityCheck/checkRecord/unsubmittedInfo.vue

@@ -282,6 +282,8 @@
         imgIndex:"",
         //临时存储房间号
         fjNumber:"",
+        //临时存储隐患信息ID
+        hiddenDangerIdList:[],
         // 表单校验
         rules: {
           fjNumber: [
@@ -501,7 +503,9 @@
       },
       //删除隐患
       delDanger(index){
+        this.hiddenDangerIdList.push(this.form.detailsList[index].id)
         this.form.detailsList.splice(index,1)
+
         this.$forceUpdate();
       },
       //新增隐患项
@@ -587,6 +591,7 @@
               obj.detailsList[i].voice = null;
             }
             obj.zgStatus = 0;
+            obj.ids=this.hiddenDangerIdList
             if(type == 1){
               obj.isCg = 1;
               obj.isFabu = 0;