Skip to content

F
founder_vue
Commit 55c7a086 by liyuhang19990520
Options

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

parents 641c1b53 b939c996
Showing with 262 additions and 46 deletions
src/plugins/axios.js
......@@ -25,7 +25,7 @@ var timer;
let config = {
// baseURL: process.env.baseURL || process.env.apiUrl || ""
timeout: 60 * 1000 // Timeout
timeout: 60 * 5 * 1000 // Timeout
// withCredentials: true, // Check cross-site Access-Control
// Authorization: sessionStorage.getItem("token") || ""
// headers: {
......@@ -99,12 +99,12 @@ Plugin.install = function (Vue) {
window.axios = _axios;
Object.defineProperties(Vue.prototype, {
axios: {
get() {
get () {
return _axios;
}
},
$axios: {
get() {
get () {
return _axios;
}
}
......
src/router/modules/leftMenu.js
......@@ -170,6 +170,28 @@ export default [
component: () => import("@/views/AllPersonnelBase/qbalk.vue")
},
{
path: "/gzlb",
name: "gzlb",
hidden: false,
meta: {
title: "关注列表",
auth: "5",
parentId: 'AllPersonnelBaseIndex'
},
component: () => import("@/views/AllPersonnelBase/gzlb.vue")
},
{
path: "/dclb",
name: "dclb",
hidden: false,
meta: {
title: "导出列表",
auth: "5",
parentId: 'AllPersonnelBaseIndex'
},
component: () => import("@/views/AllPersonnelBase/dclb.vue")
},
{
path: "/SystemManage",
name: "SystemManage",
icon_d: "/img/manage_d.png",
......
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -93,7 +93,7 @@
</div>
<!--四 -->
<el-tag
style="width: 100%; color: #666666; margin-bottom: 1rem"
style="width: 100%; color: #666666;margin-bottom:1rem "
v-show="isShowTip"
>
<span v-html="'&nbsp;&nbsp;'"></span>
......@@ -112,6 +112,7 @@
@click="toggleSelection()"
>清除</el-link>
</el-tag>
<!-- 五 -->
<el-table
:max-height="height"
......@@ -662,6 +663,7 @@ export default {
}
},
closeTjddl (val) {
this.$bus.emit('isBlur', val)
console.log("添加到队列关闭", val);
this.isShowTjddl = val;
},
......@@ -688,6 +690,7 @@ export default {
// }
},
closeDcftpx (val) {
this.$bus.emit('isBlur', val)
console.log("导出FPTX关闭", val);
this.isShowDcftpx = val;
},
......@@ -753,6 +756,7 @@ export default {
this.isShowGgrytm = true;
},
closeGgrytm (val) {
this.$bus.emit('isBlur', val)
console.log("更改条码关闭", val);
this.isShowGgrytm = val;
this.search();
......@@ -765,6 +769,7 @@ export default {
this.isShowFztm = true;
},
closeFztm (val) {
this.$bus.emit('isBlur', val)
console.log("closeFztm复制条码关闭", val);
this.isShowFztm = val;
this.search();
......@@ -788,6 +793,7 @@ export default {
this.isShowFcx = true;
},
closeFcx (val) {
this.$bus.emit('isBlur', val)
console.log("发查询关闭", val);
this.isShowFcx = val;
// this.search()
......@@ -848,6 +854,7 @@ export default {
batch () {
this.disabled = !this.disabled;
this.selectBoo = !this.selectBoo;
this.isShowTip = !this.isShowTip;
this.toggleSelection();
// this.$set(this.multipleSelection, [])
},
......@@ -872,11 +879,11 @@ export default {
handleSelectionChange (val) {
this.multipleSelection = val;
console.log(this.multipleSelection);
if (this.multipleSelection.length) {
this.isShowTip = true;
} else {
this.isShowTip = false;
}
// if (this.multipleSelection.length) {
// this.isShowTip = true;
// } else {
// this.isShowTip = false;
// }
},
/**
* @description: pageSize 改变时会触发
......@@ -903,6 +910,7 @@ export default {
* @return {*}
*/
toggleSelection (rows) {
if (rows) {
rows.forEach((row) => {
this.$refs.multipleTable.toggleRowSelection(row);
......@@ -910,7 +918,7 @@ export default {
} else {
this.$refs.multipleTable.clearSelection();
}
console.log(this.multipleSelection);
// console.log(this.multipleSelection);
},
},
computed: {
......@@ -1012,8 +1020,6 @@ export default {
.delSelection /deep/ .el-table-column--selection .cell {
display: none;
}
.delSelection /deep/ .el-table-column--selection {
}
// 滚动条的宽度
/deep/ .el-table__body-wrapper::-webkit-scrollbar {
width: 6px; // 横向滚动条
......
src/views/AllPersonnelBase/modules/dcfptxAj.vue
......@@ -5,6 +5,7 @@
append-to-body
:before-close="handleClose"
:close-on-click-modal='false'
:modal='false'
>
<div
slot="title"
......@@ -164,7 +165,8 @@ export default {
// 创建隐藏的可下载链接
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://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
......
src/views/AllPersonnelBase/modules/dcftpx.vue
......@@ -5,6 +5,7 @@
append-to-body
:before-close="handleClose"
:close-on-click-modal='false'
:modal='false'
>
<div
slot="title"
......@@ -340,8 +341,8 @@ const gdysOptions = ['拇', '食', '中', '环', '小'];
const gdzsOptions = ['拇', '食', '中', '环', '小'];
const pmysOptions = ['拇', '食', '中', '环', '小'];
const pmzsOptions = ['拇', '食', '中', '环', '小'];
const ysOptions = ['半掌', '全掌', '侧掌'];
const zsOptions = ['半掌', '全掌', '侧掌'];
const ysOptions = ['半掌', '侧掌'];
const zsOptions = ['半掌', '侧掌'];
const rxOptions = ['正面照', '左侧照', '右侧照', '身份证']
export default {
name: "dcftpx",
......@@ -392,12 +393,12 @@ export default {
// 滚动指纹右手
zwysisIndeterminate: false,//滚动指纹右手状态
zwyscheckAll: true,// 滚动指纹右手全选
checkedyss: ['半掌', '全掌', '侧掌'],
checkedyss: ['半掌', '侧掌'],
yss: ysOptions,
// 滚动指纹右手
zwzsisIndeterminate: false,//滚动指纹左手状态
zwzscheckAll: true,// 滚动指纹左手全选
checkedzss: ['半掌', '全掌', '侧掌'],
checkedzss: ['半掌', '侧掌'],
zss: zsOptions,
// 人像
rxisIndeterminate: false,//滚动指纹左手状态
......@@ -550,7 +551,9 @@ export default {
// 创建隐藏的可下载链接
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://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
......
src/views/AllPersonnelBase/modules/fcx.vue
......@@ -7,6 +7,7 @@
append-to-body
:before-close="handleClose"
:close-on-click-modal='false'
:modal='false'
>
<div class="top">
<div class="left">
......
src/views/AllPersonnelBase/modules/fztm.vue
......@@ -6,6 +6,7 @@
append-to-body
:before-close="handleClose"
:close-on-click-modal='false'
:modal='false'
>
<el-form
:label-position="labelPosition"
......
src/views/AllPersonnelBase/modules/ggrytm.vue
......@@ -6,6 +6,7 @@
append-to-body
:before-close="handleClose"
:close-on-click-modal='false'
:modal='false'
>
<el-form
:label-position="labelPosition"
......
src/views/AllPersonnelBase/modules/gz.vue
......@@ -6,6 +6,7 @@
append-to-body
:before-close="handleClose"
:close-on-click-modal='false'
:modal='false'
>
<el-table
v-if="type=='ry'"
......
src/views/AllPersonnelBase/modules/tjddl.vue
......@@ -6,6 +6,7 @@
append-to-body
:before-close="handleClose"
:close-on-click-modal='false'
:modal='false'
>
<el-form
:model="ruleForm"
......
src/views/AllPersonnelBase/modules/xzaj.vue
......@@ -7,6 +7,7 @@
append-to-body
:before-close="handleClose"
:close-on-click-modal='false'
:modal='false'
>
<el-form
:label-position="labelPosition"
......
src/views/AllPersonnelBase/modules/xzry.vue
......@@ -7,6 +7,7 @@
append-to-body
:before-close="handleClose"
:close-on-click-modal="false"
:modal='false'
>
<el-form
:label-position="labelPosition"
......
src/views/AllPersonnelBase/qbalk.vue
......@@ -171,7 +171,10 @@
width="auto"
>
<template slot-scope="scope">
<div class="ops" @click="closeSelected">
<div
class="ops"
@click="closeSelected"
>
<el-tooltip
class="item"
effect="dark"
......@@ -468,7 +471,7 @@ export default {
};
},
methods: {
closeSelected() {
closeSelected () {
this.selectBoo = false;
this.toggleSelection();
},
......@@ -595,6 +598,7 @@ export default {
}
},
closeDcfptx (val) {
this.$bus.emit('isBlur', val)
console.log('导出FPTX关闭', val)
this.isShowDcfptx = val
},
......@@ -626,6 +630,7 @@ export default {
}
},
closeTjddl (val) {
this.$bus.emit('isBlur', val)
console.log('添加到队列关闭', val)
this.isShowTjddl = val
},
......@@ -661,6 +666,7 @@ export default {
this.isShowGz = true;
},
closeGz (val) {
this.$bus.emit('isBlur', val)
console.log('关注关闭', val)
this.isShowGz = val
this.search()
......@@ -687,6 +693,7 @@ export default {
this.isShowGgrytm = true;
},
closeGgrytm (val) {
this.$bus.emit('isBlur', val)
console.log('更改条码关闭', val)
this.isShowGgrytm = val
this.search()
......@@ -698,6 +705,7 @@ export default {
this.isShowFztm = true;
},
closeFztm (val) {
this.$bus.emit('isBlur', val)
console.log('closeFztm复制条码关闭', val)
this.isShowFztm = val
this.search()
......@@ -720,6 +728,7 @@ export default {
this.isShowFcx = true;
},
closeFcx (val) {
this.$bus.emit('isBlur', val)
console.log('发查询关闭', val)
this.isShowFcx = val
this.search()
......@@ -729,6 +738,7 @@ export default {
this.isShowXzaj = true;
},
closeXzaj (val) {
this.$bus.emit('isBlur', val)
console.log('新增案件关闭', val)
this.isShowXzaj = val
this.search()
......@@ -741,6 +751,7 @@ export default {
batch () {
this.disabled = !this.disabled
this.selectBoo = !this.selectBoo;
this.isShowTip = !this.isShowTip;
this.toggleSelection()
},
/**
......@@ -760,11 +771,11 @@ export default {
handleSelectionChange (val) {
this.multipleSelection = val;
console.log(this.multipleSelection);
if (this.multipleSelection.length) {
this.isShowTip = true;
} else {
this.isShowTip = false;
}
// if (this.multipleSelection.length) {
// this.isShowTip = true;
// } else {
// this.isShowTip = false;
// }
},
/**
* @description: pageSize 改变时会触发
......@@ -916,10 +927,10 @@ const datas1 = [
background-color: #dadde0;
border-radius: 3px;
}
.delSelection /deep/ .el-table-column--selection .cell{
.delSelection /deep/ .el-table-column--selection .cell {
display: none;
}
.delSelection /deep/ .el-table-column--selection{
.delSelection /deep/ .el-table-column--selection {
}
.AllPersonnelBase {
height: 100%;
......
src/views/Editor/modules/imageEd.vue
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/Editor/modules/imageEdAJ.scss
......@@ -816,6 +816,9 @@ $directionRotate: var(--directionRotate, 0deg);
// justify-content: center !important;
// align-items: center !important;
}
/deep/.lower-canvas {
background: #FFFFFF;
}
.blc {
position: absolute;
top: 0;
......@@ -883,6 +886,7 @@ $directionRotate: var(--directionRotate, 0deg);
}
}
.zzwswitch {
z-index: 9999;
position: absolute;
right: 8px;
top: 16px;
......
src/views/Editor/modules/imageEdAJ.vue
This source diff could not be displayed because it is too large. You can view the blob instead.
src/views/Home.vue
......@@ -191,7 +191,7 @@ export default {
});
if (pathName == this.$route.meta.title) {
if (this.paths.length > 0) {
debugger;
// debugger;
let routerIndex = this.paths.findIndex((i) => i.routeName == name);
if (routerIndex == 0) {
this.$router.push(this.paths[1].path);
......
src/views/drFPTX/Index.vue
......@@ -393,10 +393,10 @@
:modal-append-to-body="false"
>
<div v-if="showProgress">
<!-- <el-progress
<el-progress
type="circle"
:percentage="UploadPercent"
></el-progress> -->
></el-progress>
<div style="margin-top:.9375rem; margin-bottom:.9375rem;font-size: .875rem;font-family: MicrosoftYaHei;color: #909090;">正在解析指纹文件，点击“取消”可终止处理</div>
<el-button @click="abort">取 消</el-button>
</div>
......@@ -440,8 +440,8 @@ export default {
fptxWidth3: 100,
action: '',
fileList: [],
UploadPercent: null,
percentage: null,
UploadPercent: 0,
percentage: 0,
dialogVisible: false, // 进度条弹窗
showProgress: true, // 进度条（正在导入）
drlx: 3, // 导入类型
......@@ -562,7 +562,7 @@ export default {
// console.log(event)
this.dialogVisible = true;
// this.UploadPercent = Number(file.percentage.toFixed(0));
this.UploadPercent = Number(event.percent.toFixed())
// this.UploadPercent = Number(event.percent.toFixed())
// if (this.UploadPercent == 99) {
// // this.dialogVisible = false;
// // this.$refs.upload.clearFiles()
......@@ -678,6 +678,7 @@ export default {
},
// 上传
submitUpload () {
let that = this
if (this.nowSelectRightData.length == 0) {
this.$message.error('请选择要上传的文件')
} else {
......@@ -701,7 +702,15 @@ export default {
method: 'post',
url: this.action,
data: formData,
loading: false
loading: false,
onUploadProgress: function (progressEvent) {
// this.dialogVisible = true;
console.log(progressEvent, 1);
that.UploadPercent = ((progressEvent.loaded / 10 * 9.9) / progressEvent.total).toFixed(2) * 100
console.log(that.UploadPercent, 123)
// Number(event.percent.toFixed())
},
}).then(res => {
if (res.data.code === 0) {
// this.tableDate = response.data.ret.list;
......
src/views/drFPTX/RAList.vue
......@@ -258,13 +258,46 @@
<el-table-column
prop="taskNumber"
label="任务号"
width="220"
width="300"
>
<template slot-scope="scope">
<svg-icon
style="
width: 0.875rem;
height: 0.6875rem;
margin-bottom: 0.125rem;
margin-left: 0.3125rem;
"
v-if="scope.row.pcImportRecordGrandchildren || scope.row.pcImportRecordGrandchildren === null"
icon-class="tree_f"
>
</svg-icon>
<svg-icon
style="
width: 0.8125rem;
height: 0.375rem;
margin: 0 0 0.1875rem 0;
"
v-else-if="!scope.row.pcImportRecordGrandchildren || scope.row.pcImportRecordGrandchildren !== null"
icon-class="tree_c"
></svg-icon>
{{
scope.row.pcImportRecordGrandchildren || scope.row.pcImportRecordGrandchildren === null
? scope.row.taskNumber
: scope.row.taskNumber
}}
<div
v-show="scope.row.pcImportRecordGrandchildren && scope.row.pcImportRecordGrandchildren !== null"
class="children-count"
>
{{ scope.row.pcImportRecordGrandchildren ? scope.row.pcImportRecordGrandchildren.length : 0 }}
</div>
</template>
</el-table-column>
<el-table-column
prop="fileName"
label="文件名"
width="300"
width="320"
show-overflow-tooltip
>
</el-table-column>
......@@ -275,19 +308,19 @@
>
</el-table-column>
<el-table-column
prop="dataType"
prop="dataTypeName"
label="类型"
width="200"
width="100"
>
</el-table-column>
<el-table-column
prop="logicDatabase"
label="逻辑分库"
width="200"
width="100"
>
</el-table-column>
<el-table-column
prop="status"
prop="statusName"
label="状态"
width="auto"
>
......@@ -295,7 +328,7 @@
<el-table-column
fixed="right"
label="操作"
width="200"
width="auto"
>
<template slot-scope="scope">
<div class="ops">
......@@ -380,8 +413,41 @@
<el-table-column
prop="taskNumber"
label="任务号"
width="220"
width="300"
>
<template slot-scope="scope">
<svg-icon
style="
width: 0.875rem;
height: 0.6875rem;
margin-bottom: 0.125rem;
margin-left: 0.3125rem;
"
v-if="scope.row.affirmImportRecordGrandchildren || scope.row.affirmImportRecordGrandchildren === null"
icon-class="tree_f"
>
</svg-icon>
<svg-icon
style="
width: 0.8125rem;
height: 0.375rem;
margin: 0 0 0.1875rem 0;
"
v-else-if="!scope.row.affirmImportRecordGrandchildren || scope.row.affirmImportRecordGrandchildren !== null"
icon-class="tree_c"
></svg-icon>
{{
scope.row.affirmImportRecordGrandchildren || scope.row.affirmImportRecordGrandchildren === null
? scope.row.taskNumber
: scope.row.taskNumber
}}
<div
v-show="scope.row.affirmImportRecordGrandchildren && scope.row.affirmImportRecordGrandchildren !== null"
class="children-count"
>
{{ scope.row.affirmImportRecordGrandchildren ? scope.row.affirmImportRecordGrandchildren.length : 0 }}
</div>
</template>
</el-table-column>
<el-table-column
prop="fileName"
......@@ -391,7 +457,7 @@
>
</el-table-column>
<el-table-column
prop="queryType"
prop="dataTypeName"
label="查询类型"
width="200"
>
......@@ -409,11 +475,11 @@
<el-table-column
prop="logicDatabase"
label="逻辑分库"
width="200"
width="100"
>
</el-table-column>
<el-table-column
prop="status"
prop="statusName"
label="状态"
width="auto"
>
......@@ -421,7 +487,7 @@
<el-table-column
fixed="right"
label="操作"
width="200"
width="auto"
>
<template slot-scope="scope">
<div class="ops">
......@@ -542,6 +608,8 @@
</div>
</template>
<script>
import "@/icons/tree_f.svg";
import "@/icons/tree_c.svg";
import tjddl from "../AllPersonnelBase/modules/tjddl.vue"; // 添加到队列弹窗
import fztm from "../AllPersonnelBase/modules/fztm.vue"; // 复制数据弹窗
import fcx from "../AllPersonnelBase/modules/fcx.vue"; // 发查询弹窗
......@@ -1237,3 +1305,87 @@ export default {
color: #333333;
}
</style>
<!--table树-->
<style scoped lang="scss">
.children-count {
width: 34px;
font-size: 12px;
text-align: center;
background: #f6f8fa;
border-radius: 11px;
position: absolute;
right: 10px;
top: 25%;
}
.el-tree /deep/ .el-tree-node__expand-icon.expanded {
-webkit-transform: rotate(0deg);
transform: rotate(0deg);
}
/*有子节点 且未展开*/
.el-table /deep/ .el-icon-arrow-right:before {
// background: url("../../icons/tree_f.svg") no-repeat 0 3px;
content: "";
display: block;
width: 16px;
height: 16px;
font-size: 16px;
background-size: 16px;
}
/*有子节点 且已展开*/
.el-table /deep/ .el-table__expand-icon--expanded {
.el-icon-arrow-right:before {
// background: url("../../icons/tree_c.svg") no-repeat 0 3px;
content: "";
display: block;
width: 15px;
height: 20px;
font-size: 18px;
background-size: 21px;
}
}
/*没有子节点*/
.el-tree
/deep/
.el-tree-node__expand-icon.is-leaf::before
.el-table
/deep/
.el-table__placeholder::before {
// background: url("../../icons/tree_f.svg") no-repeat 0 3px;
content: "";
display: block;
width: 16px;
height: 18px;
font-size: 16px;
background-size: 16px;
}
/deep/.el-table--enable-row-hover .el-table__body tr:hover {
cursor: pointer;
}
</style>
<style lang="scss" >
.el-table__expand-icon {
position: absolute;
right: 45px;
cursor: pointer;
color: #b51f1f;
transition: transform 0.2s ease-in-out;
width: 11px;
height: 11px;
/* border: black 1px solid; */
margin: 0;
background-image: url("../../assets/img/confirm/expend.png");
background-position: center;
background-size: 11px;
background-repeat: no-repeat;
}
.el-table__expand-icon.el-table__expand-icon--expanded {
width: 11px;
height: 11px;
background-image: url("../../assets/img/confirm/shrink.png");
background-position: center;
background-size: 11px;
background-repeat: no-repeat;
transform: rotate(180deg) !important;
}
</style>
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