Skip to content

F
founder_vue
Commit 29807522 by 米嘉伟
Options

Merge branch 'dev_zwpt' of http://39.99.224.27:9022/changchao/founder_vue into dev_zwpt

parents 46389ccf 80df2ee4
Showing with 246 additions and 37 deletions
babel.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2022-06-13 14:42:08
* @LastEditTime: 2022-06-16 13:27:36
* @LastEditors: error: git config user.name && git config user.email & please set dead value or install git
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\babel.config.js
......@@ -12,7 +12,7 @@
let plugins = [];
if (process.env.NODE_ENV === "production") { // todo if判断是否打包,打包环境下控制台去掉console.log,也可去掉if判断，整个项目不会出现console.log(不建议)
plugins.push("transform-remove-console");
// plugins.push("transform-remove-console");
}
module.exports = {
presets: ["@vue/cli-plugin-babel/preset"],
......
src/components/Cascader.vue
<!--
* @Author: your name
* @Date: 2021-11-15 14:15:58
* @LastEditTime: 2022-05-27 18:15:43
* @LastEditTime: 2022-06-16 10:19:50
* @LastEditors: error: git config user.name && git config user.email & please set dead value or install git
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\confrim.vue
......@@ -51,12 +51,15 @@ export default {
watch: {
job: {
handler (val) {
console.log(val);
//保存选中的label
setTimeout(() => {
//获取提示的中文
this.valStr = $(this.$refs.cascader.$el).find("input").val();
console.log(this.valStr);
//如果是单位，从后截图6位中文然后赋值
if (!this.codeName) {
console.log(this.codeName);
this.valTempStr = this.getTemplateStr(this.valStr);
$(this.$refs.cascader.$el).find("input").val(this.valTempStr);
}
......@@ -98,7 +101,7 @@ export default {
console.log("this.name:" + this.name, "this.id:" + this.id)
console.log("this.form[this.name]:" + this.form[this.name], "this.form[this.id]:" + this.form[this.id])
if (this.name && this.id && this.form[this.name] && this.form[this.id]) {
document.getElementsByTagName('body')[0].style.setProperty('--placeholderColor', '#606266');
// document.getElementsByTagName('body')[0].style.setProperty('--placeholderColor', '#606266');
this.valStr = this.form[this.name] + '[' + this.form[this.id] + ']';
console.log(this.valStr);
let name = this.form[this.name]
......@@ -107,10 +110,10 @@ export default {
}
return name + '[' + this.form[this.id] + ']';
} else if (this.id && this.form[this.id]) {
document.getElementsByTagName('body')[0].style.setProperty('--placeholderColor', '#606266');
// document.getElementsByTagName('body')[0].style.setProperty('--placeholderColor', '#606266');
return this.form[this.id]
} else {
document.getElementsByTagName('body')[0].style.setProperty('--placeholderColor', '#b2b2b2');
// document.getElementsByTagName('body')[0].style.setProperty('--placeholderColor', '#b2b2b2');
return this.$t('Common.please_select')
}
},
......@@ -150,7 +153,7 @@ export default {
this.$refs.cascader.dropDownVisible = false;
this.name = null
document.getElementsByTagName('body')[0].style.setProperty('--placeholderColor', '#b2b2b2');
// document.getElementsByTagName('body')[0].style.setProperty('--placeholderColor', '#b2b2b2');
},
getTemplateStr (str) {
let newStr;
......@@ -192,7 +195,6 @@ export default {
this.options = self.getTreeData(res.data);
}
}
console.log(this.options);
});
} else {
this.$axios.get(`JsonData/${this.codeName}.json`).then((res) => {
......@@ -201,14 +203,13 @@ export default {
}
});
}
console.log(this.form[this.id]);
},
};
</script>
<style lang="scss" scoped>
$placeholderColor: var(--placeholderColor, #606266);
// $placeholderColor: var(--placeholderColor, #606266);
.el-cascader /deep/ {
width: 100% !important;
.el-input__suffix-inner {
......@@ -217,7 +218,7 @@ $placeholderColor: var(--placeholderColor, #606266);
}
}
}
/deep/::-webkit-input-placeholder {
color: $placeholderColor;
}
// /deep/::-webkit-input-placeholder {
// color: $placeholderColor;
// }
</style>
src/views/Editor/modules/rydaxx.scss
......@@ -46,6 +46,7 @@
height: 1400px;
.ayzzwjbxx {
margin-bottom: 100px;
padding: 24px 32px;
/deep/.el-input.is-disabled .el-input__inner {
background-color: #ecedf1;
......
src/views/login/modules/AccountsLogin.vue
......@@ -91,18 +91,6 @@ export default {
},
async mounted() {
let self = this
window.onbeforeunload = function (e) {
e = e || window.event;
console.log(e);
// 兼容IE8和Firefox 4之前的版本
if (e) {
e.returnValue = '关闭提示';
}
// Chrome, Safari, Firefox 4+, Opera 12+ , IE 9+
return '关闭提示';
};
function getIPs(callback) {
var ip_dups = {}
......
src/views/zzwcj/fingerprint copy.vue 0 → 100644
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/zzwcj/fingerprint.scss
......@@ -1505,7 +1505,7 @@ $foundColor: var(--foundColor, #ffffff); //ffc005
margin-bottom: 12px;
}
.plane {
margin-bottom: 40px;
margin-bottom: 10px;
}
.title-hand {
display: block;
......@@ -1514,6 +1514,111 @@ $foundColor: var(--foundColor, #ffffff); //ffc005
color: #909090;
font-size: 16px;
}
.hands-print {
display: flex;
align-items: center;
.left-hand-print {
display: flex;
flex-direction: column;
margin-right: 30px;
.title {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #333333;
margin-bottom: 10px;
}
.print-picture {
display: flex;
.left-half-hand {
display: flex;
flex-direction: column;
align-items: center;
.left-half-picture {
width: 200px;
height: 200px;
background: #FFFFFF;
border-radius: 2px;
border: 1px solid #CCCCCC;
}
p {
margin-top: 5px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #666666;
}
}
.left-side-hand {
margin-left: 18px;
display: flex;
flex-direction: column;
align-items: center;
.left-side-picture {
width: 104px;
height: 200px;
background: #FFFFFF;
border-radius: 2px;
border: 1px solid #CCCCCC;
}
p {
margin-top: 5px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #666666;
}
}
}
}
.right-hand-print {
display: flex;
flex-direction: column;
.title {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #333333;
margin-bottom: 10px;
}
.print-picture {
display: flex;
.right-half-hand {
display: flex;
flex-direction: column;
align-items: center;
.right-half-picture {
width: 200px;
height: 200px;
background: #FFFFFF;
border-radius: 2px;
border: 1px solid #CCCCCC;
}
p {
margin-top: 5px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #666666;
}
}
.right-side-hand {
margin-left: 18px;
display: flex;
flex-direction: column;
align-items: center;
.right-side-picture {
width: 104px;
height: 200px;
background: #FFFFFF;
border-radius: 2px;
border: 1px solid #CCCCCC;
}
p {
margin-top: 5px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #666666;
}
}
}
}
}
}
}
.btns-dialog {
......@@ -2628,7 +2733,7 @@ $foundColor: var(--foundColor, #ffffff); //ffc005
margin-top: 23px;
}
.logo {
margin-left: 34px;
// margin-left: 34px;
margin-top: 660px;
width: 166px;
height: 20px;
......
src/views/zzwcj/fingerprint.vue
......@@ -206,6 +206,7 @@
<div class="txt">{{$t('FingerPrint.right_hand')}}</div>
</div>
</div>
<!-- 提示文字 -->
<div class="tip-txt">
<div class="title">{{ tipTitle }}</div>
......@@ -391,6 +392,42 @@
<span class="desc">{{ item.name }}</span>
</div>
</div>
<!-- TODO -->
<!-- 掌纹 -->
<div class="hands-print">
<!-- 左手 -->
<div class="left-hand-print">
<div class="title">左手</div>
<div class="print-picture">
<!-- 左半掌 -->
<div class="left-half-hand">
<img class="left-half-picture" src="" alt="">
<p>左半掌</p>
</div>
<!-- 左侧掌 -->
<div class="left-side-hand">
<img class="left-side-picture" src="" alt="">
<p>左侧掌</p>
</div>
</div>
</div>
<!-- 右手 -->
<div class="right-hand-print">
<div class="title">右手</div>
<div class="print-picture">
<!-- 右半掌 -->
<div class="right-half-hand">
<img class="right-half-picture" src="" alt="">
<p>右半掌</p>
</div>
<!-- 右侧掌 -->
<div class="right-side-hand">
<img class="right-side-picture" src="" alt="">
<p>右侧掌</p>
</div>
</div>
</div>
</div>
</div>
</div>
<!-- 完成按钮 -->
......@@ -6480,17 +6517,17 @@ export default {
self.samllData["fingerIndex"] = rightList[index].code + 10;
self.samllData["imageType"] = model;
self.samllData["contrast"] = contrast;
// self.samllData["frameWidth"] = parseInt(self.frameWidth);
// self.samllData["frameHeight"] = parseInt(self.frameHeight);
self.samllData["frameWidth"] = 640;
self.samllData["frameHeight"] = 640;
self.samllData["frameWidth"] = parseInt(self.frameWidth);
self.samllData["frameHeight"] = parseInt(self.frameHeight);
// self.samllData["frameWidth"] = 640;
// self.samllData["frameHeight"] = 640;
let json = JSON.stringify(self.samllData)
//console.log(json)
self.ws.send(json);
// 获取结果
self.ws.onmessage = function (ev) {
let json = JSON.parse(ev.data);
console.log(json);
// console.log(json);
if (json.code == 0) {
let data = json.data
......@@ -6526,6 +6563,7 @@ export default {
// var base64 = btoa(encode);
// console.log(base64);
// image.src = base64;
// console.log(data.previewImage);
image.src = temporaryImage;
if (self.checked) {
self.preStatusL = 4
......@@ -10513,6 +10551,81 @@ export default {
this.suffix = '.jpg'
}
this.defaultScore = this.settingData.score
// 存在在最后采集完毕设置分数后，最后一个指纹的状态没有同步过来
// 之前的指纹的下标
// preIndex: null,
// preIndexR: null,
// preIndexL: null,
console.log(this.preIndexR);
console.log(this.preIndexL);
if (this.preIndexR) {
// 右手滚动
if (this.preIndexR >=0 && this.preIndexR <=4) {
if (this.fingersRight[this.preIndexR].scoreR >= this.defaultScore) {
this.preStatusR = 3
} else {
this.preStatusR = 2
}
}
// 左手滚动
if (this.preIndexR >=5 && this.preIndexR <=9) {
if (this.fingersLeft[this.preIndexR-5].scoreR >= this.defaultScore) {
this.preStatusR = 3
} else {
this.preStatusR = 2
}
}
}
if (this.preIndexL) {
// 右手平面
if (this.preIndexL >=0 && this.preIndexL <=4) {
if (this.fingersRight[this.preIndexL].scoreL >= this.defaultScore) {
this.preStatusL = 3
} else {
this.preStatusL = 2
}
}
// 左手平面
if (this.preIndexL >=5 && this.preIndexL <=9) {
if (this.fingersLeft[this.preIndexL-5].scoreL >= this.defaultScore) {
this.preStatusL = 3
} else {
this.preStatusL = 2
}
}
}
if (this.preIndex) {
// 右手
if (this.preIndex >= 0 && this.preIndex <= 4) {
if (this.fingersRight[this.preIndex].scoreL >= this.defaultScore) {
this.preStatusL = 3
} else {
this.preStatusL = 2
}
if (this.fingersRight[this.preIndex].scoreR >= this.defaultScore) {
this.preStatusR = 3
} else {
this.preStatusR = 2
}
}
// 左手
if (this.preIndex >= 5 && this.preIndex <= 9) {
if (this.fingersLeft[this.preIndex-5].scoreL >= this.defaultScore) {
this.preStatusL = 3
} else {
this.preStatusL = 2
}
if (this.fingersLeft[this.preIndex-5].scoreR >= this.defaultScore) {
this.preStatusR = 3
} else {
this.preStatusR = 2
}
}
}
// 指纹状态重新渲染
this.fingersRight.forEach((item, index) => {
if (item.scoreL != '') {
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2022-06-15 18:15:43
* @LastEditTime: 2022-06-16 17:33:25
* @LastEditors: error: git config user.name && git config user.email & please set dead value or install git
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -112,7 +112,8 @@ module.exports = {
proxy: {
'/api': {
// target: "http://192.168.0.137:8080/", // 统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
target: "http://172.18.108.98:8099/", // 张 认定
// target: "http://172.18.108.98:8099/", // 张 认定
// target: "http://172.18.110.145:8099/", // 张 认定
// target: "http://192.168.0.104:8099", // 湖南-马
// target: "http://192.168.128.1136:8099", // 湖南-王
// target: "http://192.168.128.109:8099", // 湖南-张呈光
......@@ -126,7 +127,7 @@ module.exports = {
// target: "http://192.168.0.109:8099", // 西藏 张
// target: "http://192.168.0.143:8099", // 西藏 马
// target: "http://192.168.0.130:8099", // 西藏 刘
// target: "http://172.18.109.63:8099", // 北京 张
target: "http://172.18.109.63:8099", // 北京 张
// target: "http://8.144.175.212:8099", // 北京
ws: true,
changeOrigin: true,
......@@ -136,14 +137,14 @@ module.exports = {
},
'/security': {
// target: "http://192.168.128.106:8765", // 湖南-王
target: "http://172.18.108.98:8765/", // 张 认定
// target: "http://172.18.108.98:8765/", // 张 认定
// target: "http://www.meetfood.cn:2390", // 湖南-王
// target: 'http://zwpt.xzclub.top:9333/',
// target: "http://192.168.128.109:8765",
// target: "http://172.18.109.63:8765", // 北京 张
// target: "http://192.168.0.165:8765", // 西藏 马
// target: "http://192.168.0.107:8765", // 西藏 张
// target: "http://172.18.109.63:8765", // 北京 张
target: "http://172.18.109.63:8765", // 北京 张
// target: "http://8.144.175.212:8765", // 北京
ws: true,
changeOrigin: true,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment