Skip to content

F
founder_vue
Commit 81a12d4d by 张超军
Options

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

parents 932b4010 fff8ef89
Showing with 351 additions and 217 deletions
public/iconfont/demo_index.html
......@@ -55,6 +55,12 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont">&#xe645;</span>
<div class="name">撤销战果</div>
<div class="code-name">&amp;#xe645;</div>
</li>
<li class="dib">
<span class="icon iconfont">&#xe644;</span>
<div class="name">复核详情</div>
<div class="code-name">&amp;#xe644;</div>
......@@ -384,9 +390,9 @@
<pre><code class="language-css"
>@font-face {
font-family: 'iconfont';
src: url('iconfont.woff2?t=1639552343312') format('woff2'),
url('iconfont.woff?t=1639552343312') format('woff'),
url('iconfont.ttf?t=1639552343312') format('truetype');
src: url('iconfont.woff2?t=1639728205908') format('woff2'),
url('iconfont.woff?t=1639728205908') format('woff'),
url('iconfont.ttf?t=1639728205908') format('truetype');
}
</code></pre>
<h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
......@@ -413,6 +419,15 @@
<ul class="icon_lists dib-box">
<li class="dib">
<span class="icon iconfont icon-chexiaozhanguo"></span>
<div class="name">
撤销战果
</div>
<div class="code-name">.icon-chexiaozhanguo
</div>
</li>
<li class="dib">
<span class="icon iconfont icon-fuhexiangqing"></span>
<div class="name">
复核详情
......@@ -909,6 +924,14 @@
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-chexiaozhanguo"></use>
</svg>
<div class="name">撤销战果</div>
<div class="code-name">#icon-chexiaozhanguo</div>
</li>
<li class="dib">
<svg class="icon svg-icon" aria-hidden="true">
<use xlink:href="#icon-fuhexiangqing"></use>
</svg>
<div class="name">复核详情</div>
......
public/iconfont/iconfont.css
@font-face {
font-family: "iconfont"; /* Project id 2961960 */
src: url('iconfont.woff2?t=1639552343312') format('woff2'),
url('iconfont.woff?t=1639552343312') format('woff'),
url('iconfont.ttf?t=1639552343312') format('truetype');
src: url('iconfont.woff2?t=1639728205908') format('woff2'),
url('iconfont.woff?t=1639728205908') format('woff'),
url('iconfont.ttf?t=1639728205908') format('truetype');
}
.iconfont {
......@@ -13,6 +13,10 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-chexiaozhanguo:before {
content: "\e645";
}
.icon-fuhexiangqing:before {
content: "\e644";
}
......
public/iconfont/iconfont.json
......@@ -6,6 +6,13 @@
"description": "",
"glyphs": [
{
"icon_id": "26523809",
"name": "撤销战果",
"font_class": "chexiaozhanguo",
"unicode": "e645",
"unicode_decimal": 58949
},
{
"icon_id": "26504089",
"name": "复核详情",
"font_class": "fuhexiangqing",
......
src/App.vue
<!--
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-12-16 10:24:53
* @LastEditTime: 2021-12-18 11:08:03
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\App.vue
......@@ -59,6 +59,9 @@ export default {
width: 6px; // 横向滚动条
height: 6px; // 纵向滚动条 必写
}
.el-message {
z-index: 999999 !important;
}
// 滚动条的滑块
/deep/ .el-table__body-wrapper::-webkit-scrollbar-thumb {
background-color: #dadde0;
......
src/components/SelectCode.vue
<!--
* @Author: your name
* @Date: 2021-11-25 10:15:01
* @LastEditTime: 2021-12-17 10:18:53
* @LastEditTime: 2021-12-17 17:25:57
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\components\SelectCode.vue
......@@ -17,7 +17,7 @@
:multiple="multiple"
default-first-option
:popper-append-to-body="false"
:loading="options.length <= 0"
:loading="options.length <= 0 && loadingIndex == 0"
:placeholder="placeholder"
@focus="placeholder = '请输入'"
@blur="placeholder = '请选择'"
......@@ -55,6 +55,7 @@ export default {
checkList: [],
newForm: this.form,
allData: [],
loadingIndex: 0,
};
},
props: {
......@@ -124,6 +125,7 @@ export default {
},
getOptions() {
this.$axios.get(this.codeUrl).then((res) => {
this.loadingIndex++;
if (
(res.data.code == 0 || res.data.code == 200) &&
(res.data.message == "success" || res.data.info == "success")
......@@ -144,6 +146,9 @@ export default {
mounted() {
this.getOptions();
},
beforeDestroy() {
this.loadingIndex = 0;
},
};
</script>
<style>
......
src/router/modules/index.js
/*
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-12-17 14:26:13
* @LastEditTime: 2021-12-17 15:39:53
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js
......@@ -206,5 +206,23 @@ export default [
auth: "5"
},
component: () => import("@/views/rgrd/rgLL.vue")
},
{
path: "/rgLT",
name: "rgLT",
meta: {
title: "人工认定界面",
auth: "5"
},
component: () => import("@/views/rgrd/rgLT.vue")
},
{
path: "/rgTL",
name: "rgTL",
meta: {
title: "人工认定界面",
auth: "5"
},
component: () => import("@/views/rgrd/rgTL.vue")
}
];
src/utils/ZzjgUtil.js 0 → 100644
import PrintLog from './LogcatUtil'
const _DEFAULT_KEYS = [
'公安厅',
'公安局',
'分局',
'派出所',
'支队',
'大队',
'中队',
]
const _TAG = '\\src\\utils\\LogcatUtil.js'
export default {
last(content, defult = '...') {
if (content && content.length <= 10) {
return content
}
let result = this.lastZzjg(content, defult)
// PrintLog('last(content, defult)', result, _TAG)
return result
},
lastZzjg(content, defult = '...') {
let arrs = parseStr(_DEFAULT_KEYS, content)
let result
if (arrs && arrs.length > 0) {
result = defult + arrs[arrs.length - 1]
}
// PrintLog('lastZzjg(content, defult)', result, _TAG)
return result
},
parseAll(keyArr, content) {
let result = parseStr(keyArr, content)
// PrintLog('parseAll(keyArr, content)', result, _TAG)
return result
},
parseZzjg(content) {
let result = parseStr(_DEFAULT_KEYS, content)
// PrintLog('parseZzjg(content)', result, _TAG)
return result
},
}
let parseStr = function (keyArrs, content) {
if (!keyArrs) {
PrintLog('解析关键字', '解析关键字为空', _TAG)
return []
}
if (!content || content === '' || content === 'null') {
PrintLog('解析内容', '解析内容为空', _TAG)
return []
}
PrintLog('解析关键字', keyArrs, _TAG)
PrintLog('解析内容', content, _TAG)
let arrs = []
let temp = content
let tempArr
let index
keyArrs.forEach(item => {
if (!temp || temp === '') {
if (arrs.length === 0) {
arrs.push(content)
}
PrintLog('解析结果', arrs, _TAG)
return arrs
}
index = temp.indexOf(item)
if (index > 0) {
tempArr = temp.split(item)
if (tempArr && tempArr.length === 2) {
if (tempArr[0]) {
arrs.push(tempArr[0] + item)
}
temp = tempArr[1]
index = -1
}
}
})
if (arrs.length === 0) {
arrs.push(content)
}
PrintLog('解析结果', arrs, _TAG)
return arrs
}
src/views/AllPersonnelBase/modules/dcfptxAj.vue
......@@ -185,7 +185,12 @@ export default {
featureFlag: null // 导出特征 1导出 0不导出
}
reqParam.barcode = barcode
reqParam.seqNo = this.checkedTargets
if (barcode.length > 1) {
reqParam.seqNo = []
} else {
reqParam.seqNo = this.checkedTargets
}
reqParam.imageType = this.sjlx
reqParam.baseMsg = this.wzChecked == true ? 1 : 0;
reqParam.featureFlag = this.tz == true ? 1 : 0
......@@ -222,54 +227,7 @@ export default {
} else {
this.$message.error(response.data.message);
}
// if (response.status === 200) {
// if (response.data.code) {
// this.$message.error(response.data.message);
// } else {
// // 创建隐藏的可下载链接
// let eleLink = document.createElement('a')
// // let url = 'http://192.168.128.107:8099/api/export/person/' + this.rowData[0].barcode
// // let url = 'http://www.meetfood.cn:2390/api/export/case/' + this.rowData[0].ysxtAsjbh
// let url = 'http://192.168.128.110:8099/api/export/case/' + this.rowData[0].ysxtAsjbh
// eleLink.download = this.filenameexport
// eleLink.style.display = 'none'
// eleLink.href = url
// // 触发点击
// document.body.appendChild(eleLink)
// eleLink.click()
// // 然后移除
// document.body.removeChild(eleLink)
// this.dialogVisible = false;
// // this.$router.push('/dclb')
// this.$router.push({
// path: '/dclb',
// query: {
// id: 2
// }
// })
// }
// } else {
// this.$message.error(response.data.message);
// }
});
// // 创建隐藏的可下载链接
// let eleLink = document.createElement('a')
// // let url = 'http://192.168.128.107:8099/api/export/person/' + this.rowData[0].barcode
// // let url = 'http://www.meetfood.cn:2390/api/export/case/' + this.rowData[0].ysxtAsjbh
// let url = 'http://192.168.128.110:8099/api/export/case/' + this.rowData[0].ysxtAsjbh
// eleLink.download = this.filenameexport
// eleLink.style.display = 'none'
// eleLink.href = url
// // 触发点击
// document.body.appendChild(eleLink)
// eleLink.click()
// // 然后移除
// document.body.removeChild(eleLink)
// this.dialogVisible = false;
},
getFileName () {
var date = new Date();
......
src/views/AllPersonnelBase/modules/dcftpx.vue
......@@ -663,52 +663,7 @@ export default {
} else {
this.$message.error(response.data.message);
}
// if (response.status === 200) {
// if (response.data.code) {
// this.$message.error(response.data.message);
// } else {
// // 创建隐藏的可下载链接
// let eleLink = document.createElement('a')
// // let url = 'http://www.meetfood.cn:2390/api/export/person/' + barcode
// let url = 'http://192.168.128.166:8099/api/export/person/' + barcode
// eleLink.download = this.filenameexport
// eleLink.style.display = 'none'
// eleLink.href = url
// // 触发点击
// document.body.appendChild(eleLink)
// eleLink.click()
// // 然后移除
// document.body.removeChild(eleLink)
// this.dialogVisible = false;
// // this.$router.push('/dclb')
// this.$router.push({
// path: '/dclb',
// query: {
// id: 1
// }
// })
// }
// } else {
// this.$message.error(response.data.message);
// }
});
// // 创建隐藏的可下载链接
// let eleLink = document.createElement('a')
// // let url = 'http://192.168.128.107:8099/api/export/person/' + this.rowData[0].barcode
// // let url = 'http://www.meetfood.cn:2390/api/export/person/' + this.rowData[0].ysxtAsjxgrybh
// let url = 'http://192.168.128.110:8099/api/export/person/' + this.rowData[0].ysxtAsjxgrybh
// eleLink.download = this.filenameexport
// eleLink.style.display = 'none'
// eleLink.href = url
// // 触发点击
// document.body.appendChild(eleLink)
// eleLink.click()
// // 然后移除
// document.body.removeChild(eleLink)
// this.dialogVisible = false;
},
getFileName () {
var date = new Date();
......
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -110,9 +110,9 @@
</el-form-item>
<el-form-item
label="数据类型:"
prop="destPsnDataType"
prop="srcDataType "
>
<el-checkbox-group v-model="ruleForm.destPsnDataType">
<el-checkbox-group v-model="ruleForm.srcDataType ">
<el-checkbox label="1">滚动</el-checkbox>
<el-checkbox label="2">平面</el-checkbox>
<el-checkbox
......@@ -551,7 +551,7 @@ export default {
cxtype: [],
querytype: '', // 查询类型
},
destPsnDataType: [],// 目标数据类型
srcDataType: [],// 源数据类型
queryClass: '5', // 优先级
matchCount: '10',// 候选个数
},
......@@ -559,7 +559,7 @@ export default {
cxlx: [
{ required: true, message: '请选择活动资源', trigger: 'change' }
],
destPsnDataType: [
srcDataType: [
{ type: 'array', required: true, message: '请选择数据类型', trigger: 'change' }
],
queryClass: [
......@@ -810,7 +810,7 @@ export default {
this.$refs[formName].validate((valid) => {
if (valid) {
// alert('submit!');
// //console.log(this.ruleForm.destPsnDataType)
// //console.log(this.ruleForm.srcDataType)
this.search()
} else {
return false;
......@@ -843,7 +843,7 @@ export default {
//
queryClass: '', // 优先级
matchCount: '', // 候选个数
srcDataType: [1, 2],// 源数据类型1,2,3,7
srcDataType: [],// 源数据类型1,2,3,7
// queryRequest: [{ id: '5' }],// 本地资源库 远程资源库
// destPsnDataType: [],// 目标数据类型1,2,3，7 destPsnDataType
srcQueryDataList: [], // 源数据数组
......@@ -853,10 +853,15 @@ export default {
directionalBarcode: [], // 定向查询
excludeBarcode: [] // 排除查询
}
// 根据发查询类型 选择源数据类型和目标数据类型
if (this.ruleForm.cxlx.querytype) {
if (this.ruleForm.cxlx.querytype == '1') {
// let arr = [];
// arr.push(Number(this.ruleForm.destPsnDataType))
// let arr = this.ruleForm.srcDataType
// for (let i = 0; i < arr.length; i++) {
// if (arr[i] == 1 || arr[i] == 2) {
// }
// }
queryRequest['destCaseDataType'] = [7]
} else if (this.ruleForm.cxlx.querytype == '0') {
// let arr = [];
......@@ -864,6 +869,8 @@ export default {
queryRequest['destPsnDataType'] = this.ruleForm.destPsnDataType
}
}
queryRequest.srcDataType = this.ruleForm.srcDataType // 源数据类型
// queryRequest.querytype = this.ruleForm.cxlx.querytype
queryRequest.matchCount = this.ruleForm.matchCount
// queryRequest.destPsnDataType.push(Number(this.ruleForm.destPsnDataType))
......
src/views/Home.vue
......@@ -1185,7 +1185,7 @@ export default {
}
.loading {
z-index: 999999;
z-index: 999998;
position: fixed;
left: 0;
top: 0;
......
src/views/Home/Home.vue
......@@ -623,6 +623,9 @@ export default {
background: linear-gradient(133deg, #42bbf2 0%, #12a1e5 100%);
transform: scale(102%);
}
.xzimg {
margin-right: 5px;
}
}
.xzright {
width: 47%;
......@@ -636,6 +639,9 @@ export default {
background: linear-gradient(133deg, #42bbf2 0%, #12a1e5 100%);
transform: scale(102%);
}
.xzimg {
margin-right: 5px;
}
}
}
.xzbottom {
......
src/views/SystemManage/GroupManage.vue
......@@ -137,7 +137,7 @@
</div>
</template>
</el-table-column>
<el-table-column :width="width1">
<el-table-column :width="width4">
<template slot-scope="scope">
<div class="set-btn" @click="setRole(scope.row)">角色设置</div>
</template>
......@@ -160,6 +160,23 @@
</div>
</template>
</el-table-column>
<el-table-column
prop="permissionNames"
label="权限"
:width="width6"
show-overflow-tooltip
>
<template slot-scope="scope">
<div
v-for="(item, index) in scope.row.permissionNames &&
scope.row.permissionNames.split(',')"
:key="index"
>
{{ index > 0 ? "/" : "" }}
{{ item }}
</div>
</template>
</el-table-column>
<el-table-column prop="status" label="启用状态" width="auto">
<template slot-scope="scope">
<div v-if="scope.row.status === 0" class="circle-red"></div>
......@@ -670,6 +687,7 @@ export default {
let w2 = window.innerWidth;
this.height = (this.height * w2) / w1;
this.width1 = (this.width1 * w2) / w1;
this.width6 = (this.width6 * w2) / w1;
this.width2 = (this.width2 * w2) / w1;
this.width3 = (this.width3 * w2) / w1;
this.width4 = (this.width4 * w2) / w1;
......@@ -716,7 +734,8 @@ export default {
width3: 90,
width2: 400,
width1: 200,
width4: 150,
width6: 300,
width4: 120,
height: 550,
btnwidth: 200,
unitname: "",
......
src/views/bzxxgl/BzxxsfOpt.vue
......@@ -27,7 +27,7 @@
</svg>
</div>
</div>
<el-dropdown-menu slot="dropdown" class="select-list-content" style="margin-top: 0px;">
<el-dropdown-menu slot="dropdown" class="select-list-content">
<div v-for="item in curOpt" class="select-list-content-item" @click="clictItem(item,$event)">
<svg class="icon opt-select-right-svg" aria-hidden="true"
style="margin-right: 5px;width: 20px;height: 20px;">
......@@ -61,7 +61,7 @@ export default {
SHYX: {name: '审核有效', value: '2', icon: '#icon-shenheyouxiao'},
// CXSH: {name: "重新审核", value: "1", icon: "#icon-zhongxinshenhe"},
JRZG: {name: '计入战果', value: '1', icon: '#icon-jiruzhanguo'},
CXZG: {name: '撤销战果', value: '2', icon: '#icon-bujizhanguo'},
CXZG: {name: '撤销战果', value: '2', icon: '#icon-chexiaozhanguo'},
BJZG: {name: '不计战果', value: '0', icon: '#icon-bujizhanguo'},
SBST: {name: '上报省厅', value: '3', icon: '#icon-shangbaoshengxingzhuan'},
SBGAB: {name: '上报公安部', value: '3', icon: '#icon-shangbaoshengxingzhuan'},
......@@ -162,7 +162,6 @@ export default {
let _that = this
_that.curOpt = []
let shzt = _that.getShState()
console.log("shzt",shzt)
switch (shzt) {
case _that.SH_TYPE.FH.value :
_that.curOpt.push(_that.FH)
......@@ -229,7 +228,7 @@ export default {
}
if (_path) {
let query = {
isFromSh: true,
isFromSh: 'true',
isSh: isSh,
shxx: JSON.stringify(_that.shInfo)
}
......@@ -248,13 +247,12 @@ export default {
_that.$refs.dropdown.visible = false
}
//TODO... 业务逻辑
PrintLog('clictItem', JSON.stringify(type))
switch (type.name) {
case _that.FH.name:
_that.goFhOrSh(false)
_that.goFhOrSh('false')
break
case _that.SH.name:
_that.goFhOrSh(true)
_that.goFhOrSh('true')
break
case _that.CHEXSH.name:
case _that.SHWX.name:
......@@ -301,7 +299,7 @@ export default {
}
},
goNextAction(type, desc) {
PrintLog('goNextAction-type', type)
// PrintLog('goNextAction-type', type)
let _that = this
switch (type.name) {
case _that.CHEXSH.name:
......@@ -348,7 +346,6 @@ export default {
ruleForm.username = username
PrintLog(TITLE + '请求参数', ruleForm)
// PrintLog(TITLE + '接口', 'udateShzt')
bzxxSh(_that, ruleForm).then(res => {
PrintLog(TITLE + '返回结果', res, _that.TAG)
......@@ -502,6 +499,8 @@ export default {
}
.select-list-content {
margin-top: 0px;
width: 126px;
/*height: 100px;*/
display: block;
......@@ -525,7 +524,7 @@ export default {
position: relative;
z-index: 9999;
/*background: black;*/
margin-left: 20px;
padding-left: 20px;
display: flex;
align-items: center;
justify-content: left;
......
src/views/bzxxgl/fhxxLT.vue
......@@ -269,6 +269,7 @@ export default {
created () {
console.log(this.$route)
this.id = this.$route.params.id
// PrintLog('query', this.$route.query)
if (this.$route.query.isFromSh) {
this.isFromSh = this.$route.query.isFromSh
}
......@@ -288,10 +289,10 @@ export default {
methods: {
getShOrFhName () {
let _that = this
if (_that.isFromSh) {
return _that.isSh ? '审核' : '复核'
if (_that.isFromSh === 'true') {
return _that.isSh === 'true'? '审核' : '复核'
} else {
return '复核'
return '审核'
}
},
/**
......@@ -417,6 +418,7 @@ export default {
}
let tip = isPass ? '通过' : '不通过'
let yj = isPass ? '' : ' 意见：' + _that.fhyj
yj = '' // 暂时不显示
_that.$confirm(
'是否确定执行 "' + tip + '" 操作?' + yj,
'提示',
......@@ -445,7 +447,7 @@ export default {
*/
noPassChange () {
let self = this
if (self.isFromSh) {
if (self.isFromSh=== 'true') {
self.doSh(false)
return
}
......@@ -473,7 +475,7 @@ export default {
*/
passChange () {
let self = this
if (self.isFromSh) {
if (self.isFromSh=== 'true') {
self.doSh(true)
return
}
......@@ -540,7 +542,7 @@ export default {
let shzt // 1 审核无效 2 审核有效
let fhzt //1 代表 复核无效，2 代表 复核有效
if (_that.isSh) {
if (_that.isSh=== 'true') {
shzt = isPass ? '2' : '1'
fhzt = '2'
} else {
......@@ -579,7 +581,7 @@ export default {
@import "./scss/fhxxLT.scss";
// 加载动画
.loading {
z-index: 999999;
z-index: 999998;
position: fixed;
left: 0;
top: 0;
......
src/views/bzxxgl/fhxxTL.vue
......@@ -295,6 +295,7 @@ export default {
created () {
console.log(this.$route)
this.id = this.$route.params.id
// PrintLog('query', this.$route.query)
if (this.$route.query.isFromSh) {
this.isFromSh = this.$route.query.isFromSh
}
......@@ -309,10 +310,10 @@ export default {
methods: {
getShOrFhName () {
let _that = this
if (_that.isFromSh) {
return _that.isSh ? '审核' : '复核'
if (_that.isFromSh === 'true') {
return _that.isSh === 'true'? '审核' : '复核'
} else {
return '复核'
return '审核'
}
},
/**
......@@ -430,6 +431,7 @@ export default {
}
let tip = isPass ? '通过' : '不通过'
let yj = isPass ? '' : ' 意见：' + _that.fhyj
yj = '' // 暂时不显示
_that.$confirm(
'是否确定执行 "' + tip + '" 操作?' + yj,
'提示',
......@@ -458,7 +460,7 @@ export default {
*/
noPassChange () {
let self = this
if (self.isFromSh) {
if (self.isFromSh=== 'true') {
self.doSh(false)
return
}
......@@ -486,7 +488,7 @@ export default {
*/
passChange () {
let self = this
if (self.isFromSh) {
if (self.isFromSh=== 'true') {
self.doSh(true)
return
}
......@@ -553,7 +555,7 @@ export default {
let shzt // 1 审核无效 2 审核有效
let fhzt //1 代表 复核无效，2 代表 复核有效
if (_that.isSh) {
if (_that.isSh=== 'true') {
shzt = isPass ? '2' : '1'
fhzt = '2'
} else {
......@@ -591,7 +593,7 @@ export default {
@import "./scss/fhxxLT.scss";
// 加载动画
.loading {
z-index: 999999;
z-index: 999998;
position: fixed;
left: 0;
top: 0;
......
src/views/bzxxgl/fhxxTT copy.vue
......@@ -378,7 +378,7 @@ export default {
@import "./scss/fhxxLT.scss";
// 加载动画
.loading {
z-index: 999999;
z-index: 999998;
position: fixed;
left: 0;
top: 0;
......
src/views/bzxxgl/scss/bzxxsh.scss
......@@ -453,16 +453,16 @@ $tableHeight: var(--tableHeight, 450px);
}
.tip-history {
margin-left: 5px;
width: 12px;
height: 12px;
margin-left: 6px;
width: 16px;
height: 16px;
}
.cxfh-dialog {
z-index: 99;
position: absolute;
right: 175px;
right: 195px;
top: 280px;
width: 400px;
height: 326px;
......
src/views/cxyrd/LL.vue
......@@ -599,7 +599,7 @@ export default {
<style scoped lang="scss">
// 加载动画
.loading {
z-index: 999999;
z-index: 999998;
position: fixed;
left: 0;
top: 0;
......
src/views/cxyrd/LT.vue
......@@ -526,7 +526,7 @@ export default {
<style scoped lang="scss">
// 加载动画
.loading {
z-index: 999999;
z-index: 999998;
position: fixed;
left: 0;
top: 0;
......
src/views/cxyrd/QueryConfirm.vue
<template>
<el-container class="confirm-page" direction="vertical">
<div class="confirm_header_search">
<div class="display_style">
<span><b>查询条件</b></span>
<div class="clear_btn" @click="clearParams">清空</div>
</div>
<div
class="width100 margin_top24_bottom24"
style="display: flex; align-items: center"
......@@ -68,21 +64,7 @@
>
</el-date-picker>
</div>
<!-- <div class="display_style">-->
<!-- <el-dropdown trigger="click">-->
<!-- <span class="el-dropdown-link">-->
<!-- 更多<i-->
<!-- class="el-icon-arrow-down-->
<!-- el-icon&#45;&#45;right"-->
<!-- ></i>-->
<!-- </span>-->
<!-- <el-dropdown-menu slot="dropdown">-->
<!-- <el-dropdown-item>更多1</el-dropdown-item>-->
<!-- <el-dropdown-item>更多2</el-dropdown-item>-->
<!-- <el-dropdown-item>更多3</el-dropdown-item>-->
<!-- </el-dropdown-menu>-->
<!-- </el-dropdown>-->
<!-- </div>-->
<div class="clear_btn" @click="clearParams">清空</div>
<el-button type="primary" @click="search">筛选结果</el-button>
</div>
<div class="width100 margin_top24_bottom24">
......@@ -654,8 +636,13 @@ export default {
}
},
// 获取认定列表
search() {
search(type) {
this.getParam();
if (type) {
this.reqParam.page.currPage = 1;
this.reqParam.page.pageSize = 10;
this.reqParam.page.total = 0;
}
// //console.info("请求===>", this.reqParam.contrastCustomSearchReq);
this.$axios
.post("/api/queryque/standardQid", this.reqParam)
......@@ -759,7 +746,7 @@ export default {
this.reqParam.contrastCustomSearchReq[type] = JSON.parse(
JSON.stringify(list)
);
this.search();
this.search('yes');
},
// 格式化
dataFormat(row, prop) {
......@@ -1081,7 +1068,7 @@ export default {
this.reqParam.contrastCustomSearchReq[type].filter(
(item) => item !== value
);
this.search();
this.search('yes');
},
// 标签生成
tagClick(name) {
......@@ -1114,7 +1101,7 @@ export default {
});
this.dynamicTags = newdynamicTags;
this.$set(this.reqParam.contrastCustomSearchReq, "querystates", []);
this.search();
this.search('yes');
},
showHistory() {
this.historyDialogVisible = true;
......@@ -1123,7 +1110,7 @@ export default {
clearAll() {
this.dynamicTags = [];
this.clearParams();
this.search();
this.search('yes');
},
// 清空筛选条件
clearParams() {
......@@ -1172,7 +1159,7 @@ export default {
},
activated() {
this.$bus.on("enter", () => {
this.search();
this.search('yes');
});
},
deactivated() {
......@@ -1183,7 +1170,7 @@ export default {
},
mounted() {
this.$bus.on("enter", () => {
this.search();
this.search('yes');
});
//console.log(this.$moment, 222222222222);
// //console.log(window.innerHeight);
......@@ -1195,7 +1182,7 @@ export default {
// let h3 = document.querySelector('.confirm_main').offsetTop
// this.height = h1 -h2 -h3
// //console.log(this.height);
this.search();
this.search('yes');
},
};
// 用户ID 下拉的数据
......@@ -1573,7 +1560,7 @@ b {
border: none;
height: 22px;
padding: 0;
margin: 0 12px 0 12px;
margin: 0 12px 0 0;
font-size: 14px;
font-weight: 350;
color: #333333;
......
src/views/cxyrd/TL.vue
......@@ -522,7 +522,7 @@ export default {
<style scoped lang="scss">
// 加载动画
.loading {
z-index: 999999;
z-index: 999998;
position: fixed;
left: 0;
top: 0;
......
src/views/cxyrd/TT.vue
......@@ -2270,7 +2270,7 @@ div {
padding: 0;
}
.loading {
z-index: 999999;
z-index: 999998;
position: fixed;
left: 0;
top: 0;
......
src/views/cxyrd/modules/Fcxtj.vue
......@@ -33,7 +33,7 @@
label-width="6.25rem"
class="demo-ruleForm"
>
<el-form-item label="查询类型:" prop="cxlx">
<el-form-item label="查询类型:" prop="cxlx" class="fromItem1">
<el-radio-group v-model="ruleForm.cxlx.querytype">
<el-radio label="1" style="color: #e60012" class="color_e60012"
>倒查</el-radio
......@@ -113,12 +113,6 @@
class="demo-ruleForm"
>
<el-form-item label="目标逻辑库:" class="mbljk">
<el-checkbox
:indeterminate="isIndeterminate_mbljk"
v-model="checkAll_mbljk"
@change="handleCheckAllChange_ry"
>全选</el-checkbox
>
<el-checkbox-group
v-model="checkedTargets"
@change="handleCheckedTargetsChange_ry"
......@@ -238,7 +232,7 @@
label-width="6.25rem"
class="demo-ruleForm"
>
<el-form-item label="查询类型:" prop="cxlx">
<el-form-item label="查询类型:" prop="cxlx" class="fromItem1">
<el-radio-group v-model="ruleForm.cxlx.querytype">
<el-radio label="2" style="color: #00b47a" class="color_00b47a"
>正查</el-radio
......@@ -288,12 +282,6 @@
class="demo-ruleForm"
>
<el-form-item label="目标逻辑库:" class="mbljk">
<el-checkbox
:indeterminate="isIndeterminate_mbljk"
v-model="checkAll_mbljk"
@change="handleCheckAllChange_aj"
>全选</el-checkbox
>
<el-checkbox-group
v-model="checkedTargets"
@change="handleCheckedTargetsChange_aj"
......@@ -363,7 +351,7 @@
<span slot="footer" class="dialog-footer">
<el-button class="confirmBtn" @click="off()" type="primary"
>取 消</el-button
>关 闭</el-button
>
</span>
</el-dialog>
......@@ -834,10 +822,15 @@ export default {
top: 50%;
transform: translateX(-50%) translateY(-55%);
margin: 0;
background: #ffffff;
box-shadow: 0px 14px 30px 0px rgba(0, 21, 51, 0.2);
.el-dialog__body {
padding-top: 20px;
}
}
/deep/.el-dialog__header {
border-bottom: 1px solid #eee;
padding: 15px 20px 8px;
padding: 15px 34px 8px;
}
/deep/.el-dialog__title {
font-size: 16px;
......@@ -848,21 +841,24 @@ export default {
/deep/ .el-checkbox {
margin-right: 24px;
}
.mbljk /deep/ .el-checkbox {
width: 94px;
}
/deep/.el-radio__input.is-checked .el-radio__inner {
border-color: #055fe7;
background: #055fe7;
}
/deep/.color_e60012 .el-radio__input.is-checked + .el-radio__label {
color: #e60012;
/deep/.color_e60012 .el-radio__input + .el-radio__label {
color: #e60012 !important;
}
/deep/.color_fa9500 .el-radio__input.is-checked + .el-radio__label {
color: #fa9500;
/deep/.color_fa9500 .el-radio__input + .el-radio__label {
color: #fa9500 !important;
}
/deep/.color_00b47a .el-radio__input.is-checked + .el-radio__label {
color: #00b47a;
/deep/.color_00b47a .el-radio__input + .el-radio__label {
color: #00b47a !important;
}
/deep/.color_055fe7 .el-radio__input.is-checked + .el-radio__label {
color: #055fe7;
/deep/.color_055fe7 .el-radio__input + .el-radio__label {
color: #055fe7 !important;
}
/deep/.el-radio__input.is-checked + .el-radio__label {
color: #333333;
......@@ -885,6 +881,7 @@ export default {
/deep/.el-dialog__footer {
text-align: center;
padding-top: 0;
padding-bottom: 30px;
}
/deep/.el-form-item {
margin-bottom: 0;
......@@ -898,7 +895,10 @@ export default {
}
/deep/.el-collapse-item__header {
border-bottom: none;
height: 50px;
padding-top: 10px;
}
.top {
width: 828px;
height: 79px;
......@@ -1095,6 +1095,16 @@ export default {
}
}
}
.el-checkbox-group /deep/ {
.el-checkbox__input.is-disabled + span.el-checkbox__label {
color: #666666;
}
}
.el-radio-group /deep/ {
.el-radio__input.is-disabled + span.el-radio__label {
color: #666666;
}
}
.middle {
width: 827px;
margin: 0 auto;
......@@ -1195,6 +1205,7 @@ export default {
}
}
.mbljk {
padding-top: 0px;
/deep/.el-checkbox {
margin-right: 30px;
}
......@@ -1265,9 +1276,22 @@ export default {
border-color: #b1b6c2;
background-color: #b1b6c2;
&::after {
width: 7px !important;
height: 7px !important;
background-color: #fff;
}
}
}
}
.fromItem1 /deep/ {
.el-form-item__label {
transform: translateY(-2px);
}
.el-form-item__content {
line-height: 35px;
}
.el-checkbox-group {
transform: translateY(-2px);
}
}
</style>
\ No newline at end of file
src/views/cxyrd/modules/Recognition_dialog.vue
......@@ -21,7 +21,7 @@
type="text"
placeholder="请输入内容"
v-model="ruleForm.originCode"
maxlength="22"
maxlength="23"
show-word-limit
>
</el-input>
......@@ -39,7 +39,7 @@
type="text"
placeholder="请输入内容"
v-model="ruleForm.targetCode"
maxlength="22"
maxlength="23"
show-word-limit
>
</el-input>
......@@ -64,6 +64,7 @@
</template>
<script>
import qs from "qs";
export default {
name: "tjddl",
props: {},
......@@ -101,19 +102,36 @@ export default {
this.$refs.ruleForm.validate((boo) => {
if (boo) {
let form = this.ruleForm;
//人人查重
if (form.originCodeType == "0" && form.targetCodeType == "0") {
self.$router.pushToTab("/rgTT");
//人案倒查
} else if (form.originCodeType == "0" && form.targetCodeType == "1") {
self.$router.pushToTab("/rgTL");
//案人正查
} else if (form.originCodeType == "1" && form.targetCodeType == "0") {
self.$router.pushToTab("/rgLT");
//案案串查
} else if (form.originCodeType == "1" && form.targetCodeType == "1") {
self.$router.pushToTab("/rgLL");
}
self
.$axios({
method: "post",
url: "/api/queryIdentification/isExist",
data: JSON.stringify(form),
headers: {
"Content-Type": "application/json;charset=UTF-8",
},
})
.then((res) => {
if (res.data.code == 0 && res.data.message == 'success'){
//人人查重
if (form.originCodeType == "0" && form.targetCodeType == "0") {
self.$router.pushToTab("/rgTT");
//人案倒查
} else if (form.originCodeType == "0" && form.targetCodeType == "1") {
self.$router.pushToTab("/rgTL");
//案人正查
} else if (form.originCodeType == "1" && form.targetCodeType == "0") {
self.$router.pushToTab("/rgLT");
//案案串查
} else if (form.originCodeType == "1" && form.targetCodeType == "1") {
self.$router.pushToTab("/rgLL");
}
self.dialogVisible = false
} else{
this.$message.error(res.data.message)
}
});
}
});
},
......
src/views/rgrd/rgLL.vue
......@@ -599,7 +599,7 @@ export default {
<style scoped lang="scss">
// 加载动画
.loading {
z-index: 999999;
z-index: 999998;
position: fixed;
left: 0;
top: 0;
......
src/views/rgrd/rgTT.vue
......@@ -2229,7 +2229,7 @@ div {
padding: 0;
}
.loading {
z-index: 999999;
z-index: 999998;
position: fixed;
left: 0;
top: 0;
......
src/views/zljc/Index.vue
......@@ -414,6 +414,7 @@ export default {
if (this.multipleSelection.length === 0) {
this.$message.error("请选择需要复制条码号的数据！");
this.selectBoo = true;
this.isShowTip = true;
} else {
self.multipleSelection.forEach((item) => {
self.barcode.push(item.barcode);
......
src/views/zljc/jcxq.vue
......@@ -128,10 +128,12 @@
<span
:class="[faceStatus===1?'iconfont cgColors':'iconfont cgColors tmxz ']"
v-if="faceStatus!=null"
@click="tjRx1"
>&#xe629;</span>
<span
:class="[faceStatus===0?'iconfont sbColors':'iconfont sbColors tmxz ']"
v-if="faceStatus!=null"
@click="tjRx0"
>&#xe63c;</span>
<span
class="iconfont cgColor"
......@@ -450,6 +452,8 @@ export default {
display: flex;
.lableresult {
width: 129px;
padding: 0 24px;
box-sizing: border-box;
height: 100%;
display: flex;
justify-content: space-around;
......@@ -473,6 +477,9 @@ export default {
}
.tmxz {
opacity: 0.1;
&:hover {
opacity: 0.5;
}
}
}
}
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-18 10:25:32
* @LastEditTime: 2021-12-18 14:32:24
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......
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