Skip to content

F
founder_vue
Commit 582cd106 by 张超军
Options

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

parents cdde0d46 58bc35df
Showing with 141 additions and 52 deletions
src/plugins/axios.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-09 15:56:37
* @LastEditTime: 2021-11-09 17:33:31
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
......@@ -14,8 +14,8 @@ import NProgress from "nprogress";
import "nprogress/nprogress.css";
import store from "../store";
import { Loading } from 'element-ui';
let loadingInstance;
var loadingIndex = 0;
var loadingBoo;
// Full config: https://github.com/axios/axios#request-config
// axios.defaults.baseURL = process.env.baseURL || process.env.apiUrl || '';
......@@ -31,13 +31,18 @@ let config = {
// Authorization: localStorage.getItem("token") || ""
// }
};
const _axios = axios.create(config);
var loading;
_axios.interceptors.request.use(
function(config) {
function (config) {
loadingBoo = (!config.loading && typeof config.loading == 'boolean') ? config.loading : true;
// debugger;
// 进度条
loadingInstance = Loading.service({ fullscreen: true });
if (loadingBoo) {
if (!loading) loading = Loading.service({ fullscreen: true, text: '正在加载...' });
loadingIndex++;
}
NProgress.start();
// 在发送请求之前做些什么
// 判断是否存在token,如果存在将每个页面header添加token
......@@ -46,7 +51,7 @@ _axios.interceptors.request.use(
}
return config;
},
function(error) {
function (error) {
NProgress.start();
// Do something with request error
return Promise.reject(error);
......@@ -55,9 +60,13 @@ _axios.interceptors.request.use(
// Add a response interceptor
_axios.interceptors.response.use(
function(response) {
function (response) {
NProgress.done();
loadingInstance.close()
if (loadingBoo) loadingIndex--;
if (loadingIndex == 0) {
loading && loading.close();
loading = null
}
if (response.data.code === 401) {
localStorage.removeItem("token"); //删除名称为“token”的信息。
localStorage.removeItem("userName"); //删除名称为“userName”的信息。
......@@ -65,15 +74,19 @@ _axios.interceptors.response.use(
}
return response;
},
function(error) {
function (error) {
NProgress.done();
loadingInstance.close()
if (loadingBoo) loadingIndex--;
if (loadingIndex == 0) {
loading && loading.close();
loading = null;
}
// Do something with response error
return Promise.reject(error);
}
);
Plugin.install = function(Vue) {
Plugin.install = function (Vue) {
Vue.axios = _axios;
window.axios = _axios;
Object.defineProperties(Vue.prototype, {
......
src/views/AllPersonnelBase/AllPersonnelBase.vue
......@@ -110,6 +110,7 @@
:max-height="height"
ref="multipleTable"
:data="tableDate"
:row-key="getRowKeys"
tooltip-effect="dark"
style="width: 100%;"
@selection-change="handleSelectionChange"
......@@ -118,6 +119,7 @@
type="selection"
width="auto"
v-if="isSelected"
:reserve-selection="true"
>
</el-table-column>
<el-table-column
......@@ -133,7 +135,6 @@
>
</el-table-column>
<el-table-column
:formatter="zjhmFormat"
prop="zjhm"
label="身份证号"
:width="width3"
......@@ -188,7 +189,6 @@
prop="nydwGajgmc"
label="捺印单位"
:width="width3"
:formatter="nydwGajgmcFormat"
show-overflow-tooltip
>
</el-table-column>
......@@ -523,6 +523,10 @@ export default {
}
});
},
// 保存选中的数据,row-key就是要指定一个key标识这一行的数据
getRowKeys (row) {
return row.id
},
// 清空输入框
empty () {
this.reqParam.personStoreCustomSearch.ysxtAsjxgrybh = ''
......@@ -537,18 +541,6 @@ export default {
this.isShowXzry = val
this.search()
},
// 身份证格式化
zjhmFormat (row) {
let showProp = null
row.zjhm ? showProp = row.zjhm : showProp = '---'
return showProp
},
//捺印单位格式化
nydwGajgmcFormat (row) {
let showProp = null
row.nydwGajgmc ? showProp = row.nydwGajgmc : showProp = '---'
return showProp
},
// 时间格式化
dateTimeFormat (row, colnum) {
let prop = colnum.property;
......@@ -1016,6 +1008,7 @@ export default {
border: 1px solid #055fe7;
background: #055fe7;
}
/deep/.el-radio__inner {
width: 16px;
height: 16px;
......@@ -1196,4 +1189,25 @@ export default {
font-family: MicrosoftYaHei;
color: #333333;
}
/deep/.el-checkbox__input.is-checked .el-checkbox__inner,
.el-checkbox__input.is-indeterminate .el-checkbox__inner {
border-color: #055fe7;
background: #055fe7;
}
/deep/.el-checkbox__input.is-indeterminate .el-checkbox__inner {
border-color: #055fe7;
background: #055fe7;
}
/deep/.el-table {
.cell:empty::before {
content: "---";
color: gray;
}
.is-leaf {
.cell:empty::before {
content: "---";
color: gray;
}
}
}
</style>
src/views/AllPersonnelBase/modules/dcfptxAj.vue
<template>
<el-dialog
title="FPTX导出"
:title="title"
:visible.sync="dialogVisible"
width="36.375rem"
append-to-body
:before-close="handleClose"
:close-on-click-modal='false'
>
<div
slot="title"
class="header-title"
>
<span class="title">案件FPTX导出</span>
<span class='detail'>（导出{{this.rowData.length}}条）</span>
</div>
<el-form
label-width="6.25rem"
class="demo-ruleForm"
......@@ -203,6 +210,16 @@ export default {
</script>
<style lang="scss" scoped>
.title {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #282f3c;
}
.detail {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #999999;
}
/deep/.zzwxh .el-form-item__content {
display: flex;
.el-checkbox {
......
src/views/AllPersonnelBase/modules/dcftpx.vue
<template>
<el-dialog
title="FPTX导出"
:title="title"
:visible.sync="dialogVisible"
width="54.6875rem"
append-to-body
:before-close="handleClose"
:close-on-click-modal='false'
>
<div
slot="title"
class="header-title"
>
<span class="title">人员FPTX导出</span>
<span class='detail'>（导出{{this.rowData.length}}条）</span>
</div>
<div class="head">
文字:<el-checkbox v-model="wzChecked">基本信息</el-checkbox>
</div>
......@@ -646,6 +653,16 @@ export default {
</script>
<style lang="scss" scoped>
.title {
font-size: 16px;
font-family: MicrosoftYaHei;
color: #282f3c;
}
.detail {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #999999;
}
/deep/.el-dialog {
border-radius: 6px;
font-family: MicrosoftYaHei;
......@@ -763,7 +780,7 @@ export default {
right: 0px;
.el-checkbox__inner {
width: 13px;
height: 9px;
height: 11px;
border: 0;
border-radius: 10px 0 6px 0;
}
......@@ -787,7 +804,7 @@ export default {
right: 0px;
.el-checkbox__inner {
width: 13px;
height: 9px;
height: 11px;
border: 0;
border-radius: 10px 0 6px 0;
}
......@@ -833,7 +850,7 @@ export default {
right: 0px;
.el-checkbox__inner {
width: 13px;
height: 9px;
height: 11px;
border: 0;
border-radius: 10px 0 6px 0;
}
......
src/views/AllPersonnelBase/modules/gz.vue
......@@ -21,7 +21,7 @@
</el-table-column>
<el-table-column
prop="ysxtAsjxgrybh"
label="条码号"
label="人员编号"
width="240"
>
</el-table-column>
......@@ -58,7 +58,7 @@
</el-table-column>
<el-table-column
prop="ysxtAsjbh"
label="条码号"
label="案事件编号"
width="240"
>
</el-table-column>
......
src/views/AllPersonnelBase/modules/xzry.vue
......@@ -164,7 +164,7 @@
prop="csrq"
>
<el-date-picker
type="datetime"
type="date"
placeholder="请选择出生日期"
v-model="ruleForm.csrq"
style="width: 100%;"
......
src/views/AllPersonnelBase/qbalk.vue
......@@ -105,6 +105,7 @@
:max-height="height"
ref="multipleTable"
:data="tableDate"
:row-key="getRowKeys"
tooltip-effect="dark"
style="width: 100%;"
@selection-change="handleSelectionChange"
......@@ -113,6 +114,7 @@
type="selection"
width="auto"
v-if="isSelected"
:reserve-selection="true"
>
</el-table-column>
<el-table-column
......@@ -125,7 +127,6 @@
prop="caseTypeNames"
label="案件类型"
:width="width1"
:formatter="caseTypeNamesFormat"
show-overflow-tooltip
>
</el-table-column>
......@@ -480,6 +481,10 @@ export default {
}
});
},
// 保存选中的数据,row-key就是要指定一个key标识这一行的数据
getRowKeys (row) {
return row.id
},
// 清空输入框
empty () {
this.reqParam.caseStoreCustomSearchReq.ysxtAsjbh = ''
......@@ -527,12 +532,6 @@ export default {
let prop = colnum.property;
return row[prop] ? moment(row[prop]).format("YYYY-MM-DD") : "";
},
// 案件类型格式化
caseTypeNamesFormat (row) {
let showProp = null
row.caseTypeNames ? showProp = row.caseTypeNames : showProp = '---'
return showProp
},
// 是否命案 格式化
sfmaPdbzFormat (row, colnum) {
let prop = colnum.property;
......@@ -1087,4 +1086,25 @@ const datas1 = [
// top: 51px !important;
// }
// }
/deep/.el-checkbox__input.is-checked .el-checkbox__inner,
.el-checkbox__input.is-indeterminate .el-checkbox__inner {
border-color: #055fe7;
background: #055fe7;
}
/deep/.el-checkbox__input.is-indeterminate .el-checkbox__inner {
border-color: #055fe7;
background: #055fe7;
}
/deep/.el-table {
.cell:empty::before {
content: "---";
color: gray;
}
.is-leaf {
.cell:empty::before {
content: "---";
color: gray;
}
}
}
</style>
src/views/Editor/modules/imageEd.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-11-09 10:56:08
* @LastEditTime: 2021-11-09 17:26:00
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -1611,7 +1611,8 @@ export default {
if (flag) {
let res = await this.$axios({
method: 'get',
url: '/api/export/trait/xml/person/' + this.barcode + '/' + this.seq
url: '/api/export/trait/xml/person/' + this.barcode + '/' + this.seq,
loading: false
// url: 'http://www.meetfood.cn:2390/traint/export/xml/trait/' + this.barcode + '/' + this.seq
})
console.log(res);
......@@ -1857,7 +1858,8 @@ export default {
async directionChange () {
let res = await this.$axios({
method: 'get',
url: '/api/traint/export/xml/trait/' + this.barcode + '/' + this.seq
url: '/api/traint/export/xml/trait/' + this.barcode + '/' + this.seq,
loading: false
})
console.log(res);
let deg = res.data.fpt5FingerMsg.zwfx_tzfx
......@@ -2475,7 +2477,8 @@ export default {
},
// url: 'http://www.meetfood.cn:2390/traint/upload/persontrait?barcode=' + self.barcode + '&seq=' + self.seq,
url: '/api/upload/trait/person?barcode=' + self.barcode + '&seq=' + self.seq,
data: JSON.stringify(fpt5TraitMinutiaList)
data: JSON.stringify(fpt5TraitMinutiaList),
loading: false
}).then(res => {
console.log(res);
if (res.data.message == 'success') {
......
src/views/Editor/modules/ryzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-11-05 13:07:42
* @LastEditTime: 2021-11-09 17:29:05
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -255,7 +255,8 @@ export default {
let self = this
this.$axios({
method: 'get',
url: `/api/org/roll/${self.id}/${seq}?mnt=1`
url: `/api/org/roll/${self.id}/${seq}?mnt=1`,
loading: false
// url: `/api/org/roll/${1}/${seq}?mnt=1`
}).then(res => {
// console.log(res);
......@@ -282,7 +283,8 @@ export default {
let self = this
this.$axios({
method: 'get',
url: `/api/org/plain/${self.id}/${seq}?mnt=1`
url: `/api/org/plain/${self.id}/${seq}?mnt=1`,
loading: false
// url: `/api/org/plain/${1}/${seq}?mnt=1`
}).then(res => {
// console.log(res);
......@@ -314,7 +316,8 @@ export default {
})
let res = await this.$axios({
method: 'get',
url: '/api/org/roll/'+self.id+'?mnt=1'
url: '/api/org/roll/'+self.id+'?mnt=1',
loading: false
// url: '/api/png/roll/1?mnt=1'
})
// console.log(res);
......@@ -355,7 +358,8 @@ export default {
})
let res = await this.$axios({
method: 'get',
url: '/api/org/plain/'+self.id+'?mnt=1'
url: '/api/org/plain/'+self.id+'?mnt=1',
loading: false
// url: '/api/png/plain/1?mnt=1'
})
// console.log(res);
......
src/views/drFPTX/Index.vue
......@@ -561,8 +561,9 @@ export default {
},
// 获取文件列表
onChange (file, fileList) {
// console.log(fileList[0], 1111)
// console.log(file.raw, 2222233333)
console.log(fileList[0], 1111)
// 获取文件夹
// var folder = fileList[0].raw.webkitRelativePath.split("/");
// console.log('fffff', folder[0])
let that = this;
......
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