Skip to content

F
founder_vue
Commit f9950612 by liyuhang19990520
Options

Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

parents 2e16b983 c65cbe6e
Showing with 357 additions and 174 deletions
src/netmgr/bzxxgl/bzxxsh.js 0 → 100644
const api = {
bzxxsh: '/api/hit',
}
export default api
export function queryShList(_that, _parameter) {
return _that.$axios({
method: 'post',
url: api.bzxxsh + '/queryAllSh',
headers: {
'Content-Type': 'application/json'
},
data: _parameter
})
}
export function bzxxSh(_that, _parameter) {
return _that.$axios({
method: 'post',
url: api.bzxxsh + '/udateShzt',
headers: {
'Content-Type': 'application/json'
},
data: _parameter
})
}
export function bzxxZg(_that, _parameter) {
return _that.$axios({
method: 'post',
url: api.bzxxsh + '/updateJrzg',
headers: {
'Content-Type': 'application/json'
},
data: _parameter
})
}
export function bzxxPlSb(_that, _parameter) { // 批量上报
return _that.$axios({
method: 'post',
url: api.bzxxsh + '/insertBeach',
headers: {
'Content-Type': 'application/json'
},
data: _parameter
})
}
src/utils/LogcatUtil.js
export default function PrintLog(title, content, tag) {
if (!title && !content) {
return
......@@ -18,3 +20,21 @@ export default function PrintLog(title, content, tag) {
console.log('----------------------------' + tag + '----------------------------')
console.log('')
}
export function PrintNetInfo(url, request, response) {
var tag = '^_^'
// console.log('')
console.log('----------------------------' + tag + '----------------------------')
if (url) {
console.log(' 请求接口：', url)
}
if (request) {
console.log(' 请求参数：', request)
}
if (response) {
console.log(' 请求结果：', response)
}
console.log('----------------------------' + tag + '----------------------------')
console.log('')
}
src/utils/UserUtil.js 0 → 100644
export default function stRole() {
let userInfo = JSON.parse(localStorage.getItem('userInfo'))
// console.log('用户信息：', userInfo)
let username = userInfo.username
// console.log('用户名称：', username)
if (username === '123123') {// 省级 123123，市级 321321
return true
} else {
return false
}
}
src/views/Editor/modules/imageEd.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-14 19:28:08
* @LastEditTime: 2021-12-15 16:29:42
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -3137,7 +3137,7 @@ export default {
minutia_append.push({
zhwtzd_tzxzb: item2.zwtzd_tzxzb,
zhwtzd_tzyzb: item2.zwtzd_tzyzb,
zhwtzd_tzfx: Math.floor(item2.zwtzd_tzfx),
zhwtzd_tzfx: item2.zwtzd_tzfx,
});
});
}
......
src/views/bzxxgl/scss/bzxxsh.scss
......@@ -15,7 +15,7 @@ $tableHeight: var(--tableHeight, 450px);
}
/deep/ .el-form-item__content {
margin-left: 75px !important;
margin-left: 85px !important;
}
/deep/ .el-input.is-disabled .el-input__inner {
......@@ -25,7 +25,7 @@ $tableHeight: var(--tableHeight, 450px);
}
/deep/ .el-form-item.is-error .el-input__inner {
width: 156px;
width: 256px;
height: 32px;
background: #ffffff;
border-radius: 4px;
......@@ -33,7 +33,7 @@ $tableHeight: var(--tableHeight, 450px);
}
/deep/ .el-input {
width: 156px;
width: 256px;
height: 32px;
.el-input__inner {
......@@ -52,7 +52,7 @@ $tableHeight: var(--tableHeight, 450px);
height: auto;
}
.line1 {
.cxtj-row1 {
display: flex;
align-items: center;
margin-bottom: 20px;
......@@ -95,7 +95,7 @@ $tableHeight: var(--tableHeight, 450px);
}
}
.line2 {
.cxtj-row2 {
.el-date-editor--daterange.el-input,
.el-date-editor--daterange.el-input__inner,
.el-date-editor--timerange.el-input,
......@@ -113,39 +113,12 @@ $tableHeight: var(--tableHeight, 450px);
/deep/ .el-form-item__label {
text-align: left;
}
.clear-btn {
cursor: pointer;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #055fe7;
margin-right: 8px;
}
.select-btn {
cursor: pointer;
width: 96px;
height: 32px;
background: #055fe7;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
display: flex;
align-items: center;
justify-content: center;
&:hover {
background: #377fec;
}
&:active {
background: #044cb9;
}
}
}
.line3 {
.cxtj-row3 {
//width: 70%;
float: left;
.fhyh {
/deep/ .el-form-item__label {
width: 84px !important;
......@@ -195,9 +168,48 @@ $tableHeight: var(--tableHeight, 450px);
}
}
.clear-btn {
height: 32px;
cursor: pointer;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #055fe7;
margin-right: 8px;
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 20px;
}
.select-btn {
cursor: pointer;
width: 96px;
height: 32px;
background: #055fe7;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
display: flex;
align-items: center;
justify-content: center;
margin-bottom: 20px;
&:hover {
background: #377fec;
}
&:active {
background: #044cb9;
}
}
.bzxxsh-content {
width: 100%;
padding: 0 24px;
clear: both;
.bzxxsh-content-top {
display: flex;
......@@ -287,18 +299,18 @@ $tableHeight: var(--tableHeight, 450px);
margin-right: 32px;
}
.dfh {
.dsh {
cursor: pointer;
width: 72px;
height: 28px;
border-radius: 4px;
border: 1px solid #fe0000;
//border-radius: 4px;
//border: 1px solid #fe0000;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #fe0000;
display: flex;
align-items: center;
justify-content: center;
//align-items: center;
//justify-content: center;
}
.cxfh {
......@@ -440,6 +452,13 @@ $tableHeight: var(--tableHeight, 450px);
display: none;
}
.tip-history {
margin-left: 5px;
width: 12px;
height: 12px;
}
.cxfh-dialog {
z-index: 99;
position: absolute;
......
src/views/zljc/jcxq.vue
......@@ -17,7 +17,17 @@
@click="yjhg"
v-if="roleArr.includes('D-1-9')"
>一键合格</el-button>
<el-button :class="[personStatus!=null&&leftStatus!=null&&rightStatus!=null&&palmStatus!=null&&faceStatus!=null?'bhg':'jh']">提交结果</el-button>
<el-button
class='bhg'
v-if="personStatus!=null&&leftStatus!=null&&rightStatus!=null&&palmStatus!=null&&faceStatus!=null"
@click="tjjg"
>提交结果</el-button>
<el-button
class='jh'
v-else
>提交结果</el-button>
<!-- <el-button :class="[?'bhg':'jh']">提交结果</el-button> -->
</div>
</div>
<div class="headResults ">
......@@ -178,6 +188,7 @@
</template>
<script>
import qs from 'qs'
import ryxx from "./modules/ryxx.vue"
import nyzw from "./modules/nyzw.vue"
import zw from "./modules/zw.vue"
......@@ -193,6 +204,7 @@ export default {
console.log(this.$route.params, '跳转参数到详情页')
this.rowData.barcode = this.$route.params.barcode
this.rowData.id = this.$route.params.id
this.hqyhxx()
},
computed: {
roleArr() {
......@@ -215,6 +227,25 @@ export default {
}
},
methods: {
// 获取用户操作状态（自动保存）
hqyhxx () {
this.$axios({
url: '/api/zljc/result/queryRyzljcxx',
method: 'post',
headers: {
'Content-Type': 'application/x-www-form-urlencoded'
},
data: qs.stringify({ personId: this.rowData.id })
}).then((response) => {
// console.log(response)
this.personStatus = response.data.ret.personStatus
this.leftStatus = response.data.ret.leftStatus
this.rightStatus = response.data.ret.rightStatus
this.palmStatus = response.data.ret.palmStatus
this.faceStatus = response.data.ret.faceStatus
})
},
// 人员信息提交
tjRyxx1 () {
this.$refs.ryxx.saveRyxx(1)
......@@ -314,11 +345,19 @@ export default {
this.rightStatus = response.data.ret.rightStatus
this.palmStatus = response.data.ret.palmStatus
this.faceStatus = response.data.ret.faceStatus
this.$emit('personStatus', response.data.ret.personStatus)
this.$message.success('一键合格成功')
// this.$store.commit('layout/delcachePageName', 'zljc');
// this.$router.push('/zljc')
})
}
},
// 提交结果
tjjg () {
this.$message.success('保存成功')
this.$store.commit('layout/delcachePageName', 'zljc');
this.$store.commit('layout/delcachePageName', 'jcxq');
this.$router.push('/zljc')
}
}
}
</script>
......@@ -387,7 +426,7 @@ export default {
}
/deep/.bhg {
width: 96px;
background: #ff0039;
background: #055fe7;
}
/deep/.jh {
width: 96px;
......
src/views/zljc/modules/nyzw.vue
......@@ -30,7 +30,7 @@
<div class='Top'>
<p>{{ item.text }}</p>
<div class="imgbox">
<div class="tpType">
<!-- <div class="tpType">
<img
src="@/assets/img/zljc/hg.png"
alt=""
......@@ -39,7 +39,7 @@
src="@/assets/img/zljc/bhg.png"
alt=""
>
</div>
</div> -->
<img
:src="'data:image/jpeg;base64,' + item.gdImg"
alt=""
......@@ -445,7 +445,6 @@ export default {
box-sizing: border-box;
}
.imgbox {
position: relative;
width: 660px;
height: 554px;
// border-radius: 8px;
......@@ -457,13 +456,21 @@ export default {
height: 554px;
}
.tpType {
position: absolute;
left: 50%;
top: 50%;
margin-top: -48px; /* 高度的一半 */
margin-left: -66px; /* 宽度的一半 */
width: 132px;
height: 96px;
// float: left;
// width: 100%;
// height: 100%;
// background: rgba(0, 0, 0, 0.4);
// position: relative;
// img {
// position: absolute;
// left: 50%;
// top: 50%;
// margin-top: -48px; /* 高度的一半 */
// margin-left: -66px; /* 宽度的一半 */
// width: 132px;
// height: 96px;
// }
img {
height: 96px;
}
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-15 18:30:20
* @LastEditTime: 2021-12-15 18:35:21
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -91,7 +91,7 @@ module.exports = {
"/api": {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://192.168.128.166:8099/", // 张 认定
target: "http://192.168.128.121:8099/", // 湖南-张
// target: "http://192.168.128.121:8099/", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.118:8764", // 湖南-张呈光
......@@ -100,7 +100,7 @@ module.exports = {
// target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上
// target:"http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.115:8099", // 江
target: "http://192.168.128.115:8099", // 江
ws: true,
changeOrigin: true,
pathRewrite: {
......@@ -110,7 +110,7 @@ module.exports = {
// "/login": {
// // target: "http://www.meetfood.cn:2390/", // 登录
// target: "http://zwpt.xzclub.top:9333",
// // target: "http://192.168.128.124:8764/", // 登录
// target: "http://192.168.128.124:8765/", // 登录
// // target: "http://192.168.128.114:8099", // 登录-马
// 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