|
@@ -27,16 +27,16 @@
|
|
|
v-hasPermi="['iscs:map:add']"
|
|
v-hasPermi="['iscs:map:add']"
|
|
|
>新增</el-button>
|
|
>新增</el-button>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
-<!-- <el-button-->
|
|
|
|
|
-<!-- v-no-more-click-->
|
|
|
|
|
-<!-- type="info"-->
|
|
|
|
|
-<!-- plain-->
|
|
|
|
|
-<!-- icon="el-icon-upload2"-->
|
|
|
|
|
-<!-- size="mini"-->
|
|
|
|
|
-<!-- @click="handleOpenImport"-->
|
|
|
|
|
-
|
|
|
|
|
-<!-- >导入</el-button-->
|
|
|
|
|
-<!-- >-->
|
|
|
|
|
|
|
+ <el-button
|
|
|
|
|
+ v-no-more-click
|
|
|
|
|
+ type="info"
|
|
|
|
|
+ plain
|
|
|
|
|
+ icon="el-icon-upload2"
|
|
|
|
|
+ size="mini"
|
|
|
|
|
+ @click="handleOpenImport"
|
|
|
|
|
+ v-show="sysAttrValue=='true'"
|
|
|
|
|
+ >指纹人脸导入</el-button
|
|
|
|
|
+ >
|
|
|
<el-col :span="1.5">
|
|
<el-col :span="1.5">
|
|
|
<el-button v-no-more-click
|
|
<el-button v-no-more-click
|
|
|
type="danger"
|
|
type="danger"
|
|
@@ -179,15 +179,36 @@
|
|
|
<el-input v-model="ImportForm.userName" placeholder="请输入userName" />
|
|
<el-input v-model="ImportForm.userName" placeholder="请输入userName" />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
<el-button
|
|
<el-button
|
|
|
- v-no-more-click
|
|
|
|
|
type="info"
|
|
type="info"
|
|
|
plain
|
|
plain
|
|
|
icon="el-icon-upload2"
|
|
icon="el-icon-upload2"
|
|
|
size="mini"
|
|
size="mini"
|
|
|
- @click="handleImport"
|
|
|
|
|
- v-hasPermi="['iscs:sop:import']"
|
|
|
|
|
- >导入</el-button
|
|
|
|
|
- >
|
|
|
|
|
|
|
+ @click="handleImport('fingerprint')"
|
|
|
|
|
+ >指纹导入</el-button>
|
|
|
|
|
+
|
|
|
|
|
+ <el-button
|
|
|
|
|
+ type="info"
|
|
|
|
|
+ plain
|
|
|
|
|
+ icon="el-icon-upload2"
|
|
|
|
|
+ size="mini"
|
|
|
|
|
+ @click="handleImport('face')"
|
|
|
|
|
+ >人脸导入</el-button>
|
|
|
|
|
+
|
|
|
|
|
+ <el-button
|
|
|
|
|
+ type="success"
|
|
|
|
|
+ plain
|
|
|
|
|
+ icon="el-icon-user"
|
|
|
|
|
+ size="mini"
|
|
|
|
|
+ @click="handleImport('loginFingerprint')"
|
|
|
|
|
+ >指纹登录</el-button>
|
|
|
|
|
+
|
|
|
|
|
+ <el-button
|
|
|
|
|
+ type="success"
|
|
|
|
|
+ plain
|
|
|
|
|
+ icon="el-icon-user-solid"
|
|
|
|
|
+ size="mini"
|
|
|
|
|
+ @click="handleImport('loginFace')"
|
|
|
|
|
+ >人脸登录</el-button>
|
|
|
</el-form>
|
|
</el-form>
|
|
|
|
|
|
|
|
</el-dialog>
|
|
</el-dialog>
|
|
@@ -198,7 +219,9 @@
|
|
|
:limit="1"
|
|
:limit="1"
|
|
|
accept=".xlsx, .xls,.png,.jpg,.jpeg,.doc,.docx,.pdf"
|
|
accept=".xlsx, .xls,.png,.jpg,.jpeg,.doc,.docx,.pdf"
|
|
|
:headers="upload.headers"
|
|
:headers="upload.headers"
|
|
|
- :action="upload.url + '?userName=' + upload.userName"
|
|
|
|
|
|
|
+ :action="upload.needUserName
|
|
|
|
|
+ ? upload.url + '?userName=' + upload.userName
|
|
|
|
|
+ : upload.url"
|
|
|
:disabled="upload.isUploading"
|
|
:disabled="upload.isUploading"
|
|
|
:on-progress="handleFileUploadProgress"
|
|
:on-progress="handleFileUploadProgress"
|
|
|
:on-success="handleFileSuccess"
|
|
:on-success="handleFileSuccess"
|
|
@@ -226,6 +249,7 @@
|
|
|
|
|
|
|
|
import { deleteIsMapByIds, getIsMapPage, insertIsMap, selectIsMapById, updateIsMap } from '@/api/system/mapconfig'
|
|
import { deleteIsMapByIds, getIsMapPage, insertIsMap, selectIsMapById, updateIsMap } from '@/api/system/mapconfig'
|
|
|
import { getToken } from '@/utils/auth'
|
|
import { getToken } from '@/utils/auth'
|
|
|
|
|
+import { getIsSystemAttributeByKey } from '@/api/system/configuration'
|
|
|
|
|
|
|
|
export default {
|
|
export default {
|
|
|
name: "autoCodeRule",
|
|
name: "autoCodeRule",
|
|
@@ -271,11 +295,13 @@ export default {
|
|
|
isUploading: false,
|
|
isUploading: false,
|
|
|
// 是否更新已经存在的用户数据
|
|
// 是否更新已经存在的用户数据
|
|
|
userName: 0,
|
|
userName: 0,
|
|
|
|
|
+ needUserName:true,
|
|
|
// 设置上传的请求头部
|
|
// 设置上传的请求头部
|
|
|
headers: { Authorization: "Bearer " + getToken() },
|
|
headers: { Authorization: "Bearer " + getToken() },
|
|
|
// 上传的地址
|
|
// 上传的地址
|
|
|
- url: process.env.VUE_APP_BASE_API + "/system/user/characteristic/insertUserFingerprintDat"
|
|
|
|
|
|
|
+ url: ''
|
|
|
},
|
|
},
|
|
|
|
|
+ sysAttrValue:null,//判断是否显示导入按钮
|
|
|
// 表单校验
|
|
// 表单校验
|
|
|
rules: {
|
|
rules: {
|
|
|
name: [
|
|
name: [
|
|
@@ -292,11 +318,22 @@ export default {
|
|
|
},
|
|
},
|
|
|
methods: {
|
|
methods: {
|
|
|
// 车总测试用的
|
|
// 车总测试用的
|
|
|
- handleImport() {
|
|
|
|
|
|
|
+ handleImport(type) {
|
|
|
this.upload.title = "导入";
|
|
this.upload.title = "导入";
|
|
|
this.upload.open = true;
|
|
this.upload.open = true;
|
|
|
this.upload.userName=this.ImportForm.userName;
|
|
this.upload.userName=this.ImportForm.userName;
|
|
|
|
|
+ this.upload.needUserName = type === "fingerprint" || type === "face";
|
|
|
|
|
+ this.upload.url =
|
|
|
|
|
+ process.env.VUE_APP_BASE_API +
|
|
|
|
|
+ (type === "fingerprint"
|
|
|
|
|
+ ? "/system/user/characteristic/insertUserFingerprintDat"
|
|
|
|
|
+ : type === "face"
|
|
|
|
|
+ ? "/system/user/characteristic/insertUserFace"
|
|
|
|
|
+ : type === "loginFingerprint"
|
|
|
|
|
+ ? "/loginByFingerprintDat"
|
|
|
|
|
+ : "/loginByArcFace");
|
|
|
},
|
|
},
|
|
|
|
|
+
|
|
|
handleOpenImport(){
|
|
handleOpenImport(){
|
|
|
this.ImportVisible = true;
|
|
this.ImportVisible = true;
|
|
|
},
|
|
},
|
|
@@ -324,7 +361,6 @@ export default {
|
|
|
this.$refs.upload.submit();
|
|
this.$refs.upload.submit();
|
|
|
},
|
|
},
|
|
|
// 上面都是车总测试
|
|
// 上面都是车总测试
|
|
|
-
|
|
|
|
|
handleDetail(row){
|
|
handleDetail(row){
|
|
|
selectIsMapById(row.id).then((res)=>{
|
|
selectIsMapById(row.id).then((res)=>{
|
|
|
console.log(res);
|
|
console.log(res);
|
|
@@ -339,6 +375,11 @@ export default {
|
|
|
this.loading = false;
|
|
this.loading = false;
|
|
|
}
|
|
}
|
|
|
);
|
|
);
|
|
|
|
|
+ const sysAttrKey ='sys.finger.face'
|
|
|
|
|
+ getIsSystemAttributeByKey(sysAttrKey).then(response => {
|
|
|
|
|
+ console.log(response, '获取物资柜底图')
|
|
|
|
|
+ this.sysAttrValue = response.data.sysAttrValue
|
|
|
|
|
+ })
|
|
|
},
|
|
},
|
|
|
// 取消按钮
|
|
// 取消按钮
|
|
|
cancel() {
|
|
cancel() {
|