|
@@ -6,58 +6,74 @@
|
|
<p class="button-p reset-button-one" @click="backPage">返回</p>
|
|
<p class="button-p reset-button-one" @click="backPage">返回</p>
|
|
</div>
|
|
</div>
|
|
<div class="supplier-page">
|
|
<div class="supplier-page">
|
|
- <el-form :model="queryParams" ref="queryForm" style="margin-top:20px;" :inline="true" label-width="120">
|
|
|
|
- <el-form-item label="关键字" prop="name">
|
|
|
|
- <el-input
|
|
|
|
- v-model="queryParams.searchValue"
|
|
|
|
- placeholder="请输入姓名/工号/学号"
|
|
|
|
- clearable
|
|
|
|
- maxLength="30"
|
|
|
|
- size="small"
|
|
|
|
- />
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="类别" prop="zgType" label-width="80px">
|
|
|
|
- <el-select v-model="queryParams.userType" placeholder="请选择" clearable size="small">
|
|
|
|
- <el-option label="学生" value="22" />
|
|
|
|
- <el-option label="教师" value="11" />
|
|
|
|
- </el-select>
|
|
|
|
- </el-form-item>
|
|
|
|
- <el-form-item label="授权时间段" prop="dateRange" style="margin-left:10px;">
|
|
|
|
- <el-date-picker
|
|
|
|
- :clearable="false"
|
|
|
|
- v-model="dateRange"
|
|
|
|
- size="small"
|
|
|
|
- style="width: 240px"
|
|
|
|
- value-format="yyyy-MM-dd HH:mm:ss"
|
|
|
|
- type="daterange"
|
|
|
|
- range-separator="-"
|
|
|
|
- start-placeholder="开始日期"
|
|
|
|
- end-placeholder="结束日期"
|
|
|
|
- ></el-date-picker>
|
|
|
|
- </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-item label="" prop="title" style="float: right">
|
|
|
|
- <p class="inquire-button-one"
|
|
|
|
- style="width: 120px;margin-left: 10px;"
|
|
|
|
- v-if="!admittance"
|
|
|
|
- @click="handleClick('','','addStudent')"
|
|
|
|
- ><i class="el-icon-plus"></i>新增学生授权</p>
|
|
|
|
- <p class="inquire-button-one"
|
|
|
|
- style="width: 120px;margin-left: 10px;"
|
|
|
|
- v-if="!whiteList"
|
|
|
|
- @click="handleClick('','','addTeacher')"
|
|
|
|
- ><i class="el-icon-plus"></i>新增教职工授权</p>
|
|
|
|
|
|
+<!-- <el-form :model="queryParams" ref="queryForm" style="margin-top:20px;" :inline="true" label-width="120">-->
|
|
|
|
+<!-- <el-form-item label="关键字" prop="name">-->
|
|
|
|
+<!-- <el-input-->
|
|
|
|
+<!-- v-model="queryParams.searchValue"-->
|
|
|
|
+<!-- placeholder="请输入姓名/工号/学号"-->
|
|
|
|
+<!-- clearable-->
|
|
|
|
+<!-- maxLength="30"-->
|
|
|
|
+<!-- size="small"-->
|
|
|
|
+<!-- />-->
|
|
|
|
+<!-- </el-form-item>-->
|
|
|
|
+<!-- <el-form-item label="类别" prop="zgType" label-width="80px">-->
|
|
|
|
+<!-- <el-select v-model="queryParams.userType" placeholder="请选择" clearable size="small">-->
|
|
|
|
+<!-- <el-option label="学生" value="22" />-->
|
|
|
|
+<!-- <el-option label="教师" value="11" />-->
|
|
|
|
+<!-- </el-select>-->
|
|
|
|
+<!-- </el-form-item>-->
|
|
|
|
+<!-- <el-form-item label="授权时间段" prop="dateRange" style="margin-left:10px;">-->
|
|
|
|
+<!-- <el-date-picker-->
|
|
|
|
+<!-- :clearable="false"-->
|
|
|
|
+<!-- v-model="dateRange"-->
|
|
|
|
+<!-- size="small"-->
|
|
|
|
+<!-- style="width: 240px"-->
|
|
|
|
+<!-- value-format="yyyy-MM-dd HH:mm:ss"-->
|
|
|
|
+<!-- type="daterange"-->
|
|
|
|
+<!-- range-separator="-"-->
|
|
|
|
+<!-- start-placeholder="开始日期"-->
|
|
|
|
+<!-- end-placeholder="结束日期"-->
|
|
|
|
+<!-- ></el-date-picker>-->
|
|
|
|
+<!-- </el-form-item>-->
|
|
|
|
+<!-- <el-form-item label="分类" prop="zgType" label-width="80px">-->
|
|
|
|
+<!-- <el-select v-model="queryParams.leadAuditStaus" placeholder="请选择" clearable size="small">-->
|
|
|
|
+<!-- <el-option label="全部" value="" />-->
|
|
|
|
+<!-- <el-option label="授权验证成功" value="0" />-->
|
|
|
|
+<!-- <el-option label="授权验证失败" value="1" />-->
|
|
|
|
+<!-- </el-select>-->
|
|
|
|
+<!-- </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-item label="" prop="title" style="float: right">-->
|
|
|
|
+<!-- <p class="inquire-button-one"-->
|
|
|
|
+<!-- style="width: 120px;margin-left: 10px;"-->
|
|
|
|
+<!-- v-if="!admittance"-->
|
|
|
|
+<!-- @click="handleClick('','','addStudent')"-->
|
|
|
|
+<!-- ><i class="el-icon-plus"></i>新增学生授权</p>-->
|
|
|
|
+<!-- <p class="inquire-button-one"-->
|
|
|
|
+<!-- style="width: 120px;margin-left: 10px;"-->
|
|
|
|
+<!-- v-if="!whiteList"-->
|
|
|
|
+<!-- @click="handleClick('','','addTeacher')"-->
|
|
|
|
+<!-- ><i class="el-icon-plus"></i>新增教职工授权</p>-->
|
|
|
|
|
|
- </el-form-item>
|
|
|
|
- </el-form>
|
|
|
|
|
|
+<!-- </el-form-item>-->
|
|
|
|
+<!-- </el-form>-->
|
|
|
|
+ <advanced-search :searchData="searchData"></advanced-search>
|
|
<el-table border v-loading="loading" :data="tableData">
|
|
<el-table border v-loading="loading" :data="tableData">
|
|
<el-table-column label="所属单位" align="left" prop="deptName"/>
|
|
<el-table-column label="所属单位" align="left" prop="deptName"/>
|
|
<el-table-column label="姓名" align="left" prop="nickName"></el-table-column>
|
|
<el-table-column label="姓名" align="left" prop="nickName"></el-table-column>
|
|
- <el-table-column label="验证方式" align="left" prop="verifyMode"></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>
|
|
|
|
+ </el-table-column>
|
|
<el-table-column label="类别" align="left" prop="userType"></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="verifyTime"></el-table-column>
|
|
<el-table-column label="授权人" align="left" prop="verifyUser"></el-table-column>
|
|
<el-table-column label="授权人" align="left" prop="verifyUser"></el-table-column>
|
|
@@ -80,8 +96,9 @@
|
|
v-if="(scope.row.userType=='学生' && !admittance) || (scope.row.userType=='教师' && !whiteList)"
|
|
v-if="(scope.row.userType=='学生' && !admittance) || (scope.row.userType=='教师' && !whiteList)"
|
|
@click="handleClick('',scope.row,'delete')"
|
|
@click="handleClick('',scope.row,'delete')"
|
|
>删除</p>
|
|
>删除</p>
|
|
- <p class="table-min-button" style="color: #333;cursor: text" v-if="scope.row.userType=='学生' && admittance">安全准入</p>
|
|
|
|
- <p class="table-min-button" style="color: #333;cursor: text" v-if="scope.row.userType=='教师' && whiteList">白名单</p>
|
|
|
|
|
|
+ <p class="table-min-button" style="color: #333;cursor: text" @click="handleClick('',scope.row,'again')">手动<i style="color: #0045AF;cursor: pointer;font-style: normal;text-decoration:underline">重试</i></p>
|
|
|
|
+ <p class="table-min-button" style="color: #333;cursor: text" @click="handleClick('',scope.row,'again')" v-if="scope.row.userType=='学生' && admittance">安全准入<i style="color: #0045AF;cursor: pointer;font-style: normal;text-decoration:underline">重试</i></p>
|
|
|
|
+ <p class="table-min-button" style="color: #333;cursor: text" @click="handleClick('',scope.row,'again')" v-if="scope.row.userType=='教师' && whiteList">白名单<i style="color: #0045AF;cursor: pointer;font-style: normal;text-decoration:underline">重试</i></p>
|
|
</div>
|
|
</div>
|
|
</template>
|
|
</template>
|
|
</el-table-column>
|
|
</el-table-column>
|
|
@@ -208,6 +225,7 @@
|
|
<script>
|
|
<script>
|
|
import { listStudentUser, listTeacherUser } from '@/api/system/user_student'
|
|
import { listStudentUser, listTeacherUser } from '@/api/system/user_student'
|
|
import { listDepartments } from '@/api/system/dept'
|
|
import { listDepartments } from '@/api/system/dept'
|
|
|
|
+import advancedSearch from "@/components/ZDcomponents/advancedSearch.vue"
|
|
import {
|
|
import {
|
|
AddImpowerHaikang,
|
|
AddImpowerHaikang,
|
|
delUserHaikang,
|
|
delUserHaikang,
|
|
@@ -218,8 +236,9 @@ import {
|
|
|
|
|
|
export default {
|
|
export default {
|
|
name: "Approval",
|
|
name: "Approval",
|
|
- components: {
|
|
|
|
|
|
|
|
|
|
+ components: {
|
|
|
|
+ advancedSearch
|
|
},
|
|
},
|
|
props:{
|
|
props:{
|
|
pageData:{},
|
|
pageData:{},
|
|
@@ -239,7 +258,6 @@ export default {
|
|
},
|
|
},
|
|
total:0,
|
|
total:0,
|
|
tableData:[],
|
|
tableData:[],
|
|
- oldTableData:[],
|
|
|
|
dateRange:[],
|
|
dateRange:[],
|
|
dialogForm:{
|
|
dialogForm:{
|
|
pageNum: 1,
|
|
pageNum: 1,
|
|
@@ -270,6 +288,68 @@ export default {
|
|
},
|
|
},
|
|
admittance:false,//智能门禁有没有勾选安全准入
|
|
admittance:false,//智能门禁有没有勾选安全准入
|
|
whiteList:false,//智能门禁有没有勾选白名单
|
|
whiteList:false,//智能门禁有没有勾选白名单
|
|
|
|
+ searchData:{
|
|
|
|
+ buttonList:[//按钮数组没有则为空
|
|
|
|
+ {
|
|
|
|
+ name:"新增教职工授权",//按钮名称 只有再状态 1 时需要
|
|
|
|
+ type:"1", //按钮类型 1.按钮 2.导入 3.导出
|
|
|
|
+ parameter:"add",//按钮字符用于返回方法时的判断
|
|
|
|
+ hasPermi:['chemical:hxpStock:detailExport'] // 权限字段 如果没有则传空字符 hasPermi:"",
|
|
|
|
+ },
|
|
|
|
+ {
|
|
|
|
+ name:"新增学生授权",//按钮名称 只有再状态 1 时需要
|
|
|
|
+ type:"1", //按钮类型 1.按钮 2.导入 3.导出
|
|
|
|
+ parameter:"add",//按钮字符用于返回方法时的判断
|
|
|
|
+ hasPermi:['chemical:hxpStock:detailExport'] // 权限字段 如果没有则传空字符 hasPermi:"",
|
|
|
|
+ },
|
|
|
|
+
|
|
|
|
+ ],
|
|
|
|
+ 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:"userType",//键名 用于返回数据
|
|
|
|
+ value:"",//内容 用于组件内绑定数据
|
|
|
|
+ placeholder:"请选择分类",//输入提示
|
|
|
|
+ level:"2",//1.普通搜索 2.高级搜索 普通搜索默认会在高级搜索时显示
|
|
|
|
+ type:"2",//类型 1.input 2.select 3.TimePicker
|
|
|
|
+ universal:[ //通用参数 select时为列表数据 //TimePicker时可不传
|
|
|
|
+ {label:"全部",value:""},{label:"授权验证成功",value:"0"},{label:"授权验证失败",value:"1"},
|
|
|
|
+ ],
|
|
|
|
+ width:'175',//el-form-item 长度 可传可不传 不传时input/select默认180长度 TimePicker默认240长度
|
|
|
|
+ },
|
|
|
|
+ ],
|
|
|
|
+ },
|
|
};
|
|
};
|
|
|
|
|
|
|
|
|
|
@@ -464,8 +544,7 @@ export default {
|
|
}
|
|
}
|
|
getHaikangUserList(_this.queryParams).then( response => {
|
|
getHaikangUserList(_this.queryParams).then( response => {
|
|
let res=response.rows;
|
|
let res=response.rows;
|
|
- _this.tableData=res;
|
|
|
|
- _this.oldTableData=res;
|
|
|
|
|
|
+ _this.tableData=[{}];
|
|
_this.total=response.total;
|
|
_this.total=response.total;
|
|
});
|
|
});
|
|
},
|
|
},
|