Skip to content

F
founder_vue
Commit 99eb75ec by liyuhang19990520
Options

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

parents e371365a 8d33005b
Showing with 106 additions and 139 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/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,16 @@ 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 +870,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/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/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 {
......
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 {
......
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/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"
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-18 10:48:57
* @LastEditTime: 2021-12-16 14:43:29
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -91,15 +91,16 @@ 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.166: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", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099",
// 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://zwpt.xzclub.top:9333/",
target: "http://192.168.128.115:8099", // 江
ws: true,
changeOrigin: true,
pathRewrite: {
......@@ -130,9 +131,9 @@ module.exports = {
"/security": {
//target: "http://192.168.128.106:8765", // 湖南-王
target: "http://192.168.128.117:8765", // 湖南-张
// target: "http://192.168.128.121:8765", // 湖南-张
// target: "http://www.meetfood.cn:2390", // 湖南-王
// target: "http://zwpt.xzclub.top:9333",
target: "http://zwpt.xzclub.top:9333",
ws: true,
changeOrigin: true,
pathRewrite: {
......
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