Skip to content

F
founder_vue
Commit 9c2c8905 by liyuhang19990520
Options

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

parents 1fb4d9c4 4429963f
Showing with 1000 additions and 218 deletions
src/components/ImageEd.scss
...@@ -22,7 +22,7 @@ div { ...@@ -22,7 +22,7 @@ div {
} }
.lt { .lt {
width: 100%; width: 100%;
background-color: #ffffff; // background-color: #ffffff;
/*padding: 24px;*/ /*padding: 24px;*/
margin: 0; margin: 0;
padding: 0 24px 24px 24px; padding: 0 24px 24px 24px;
...@@ -1122,6 +1122,7 @@ div { ...@@ -1122,6 +1122,7 @@ div {
} }
.lt_main_middle .lt_main_header { .lt_main_middle .lt_main_header {
height: 60px; height: 60px;
width: 1120px;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
...@@ -1152,7 +1153,7 @@ div { ...@@ -1152,7 +1153,7 @@ div {
position: relative; position: relative;
margin-top: 10px; margin-top: 10px;
height: 70px; height: 70px;
width: 100%; width: 1105px;
background: #f6f8fa; background: #f6f8fa;
border-radius: 8px; border-radius: 8px;
display: flex; display: flex;
...@@ -1408,39 +1409,39 @@ div { ...@@ -1408,39 +1409,39 @@ div {
margin: 60px 0 0 225px; margin: 60px 0 0 225px;
} }
.drawing { .drawing {
width: 520px; width: 540px;
height: 520px; height: 540px;
// background: rgba(0, 0, 0, 0.8); // background: rgba(0, 0, 0, 0.8);
// margin-left: 14px; // margin-left: 14px;
margin-top: 60px; margin-top: 60px;
.body-container { .body-container {
width: 520px; width: 540px;
height: 520px; height: 540px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.tui-image-editor { .tui-image-editor {
width: 520px !important; width: 540px !important;
height: 520px !important; height: 540px !important;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.tui-image-editor2 { .tui-image-editor2 {
width: 520px !important; width: 540px !important;
height: 520px !important; height: 540px !important;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
/deep/.tui-image-editor-canvas-container { /deep/.tui-image-editor-canvas-container {
max-height: 520px !important; max-height: 540px !important;
max-width: 520px !important; max-width: 540px !important;
} }
/deep/.lower-canvas, /deep/.lower-canvas,
/deep/.upper-canvas { /deep/.upper-canvas {
max-height: 520px !important; max-height: 540px !important;
max-width: 520px !important; max-width: 540px !important;
height: 100%; height: 100%;
width: auto !important; width: auto !important;
// display: flex !important; // display: flex !important;
...@@ -1527,39 +1528,39 @@ div { ...@@ -1527,39 +1528,39 @@ div {
margin: 60px 0 0 225px; margin: 60px 0 0 225px;
} }
.drawing { .drawing {
width: 520px; width: 540px;
height: 520px; height: 540px;
// background: rgba(0, 0, 0, 0.2); // background: rgba(0, 0, 0, 0.2);
// margin-left: 14px; // margin-left: 14px;
margin-top: 60px; margin-top: 60px;
.body-container { .body-container {
width: 520px; width: 540px;
height: 520px; height: 540px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
.tui-image-editor { .tui-image-editor {
width: 520px; width: 540px;
height: 520px !important; height: 540px !important;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.tui-image-editor2 { .tui-image-editor2 {
width: 520px; width: 540px;
height: 520px; height: 540px;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
/deep/.tui-image-editor-canvas-container { /deep/.tui-image-editor-canvas-container {
max-height: 520px !important; max-height: 540px !important;
max-width: 520px !important; max-width: 540px !important;
} }
/deep/.lower-canvas, /deep/.lower-canvas,
/deep/.upper-canvas { /deep/.upper-canvas {
max-height: 520px !important; max-height: 540px !important;
max-width: 520px !important; max-width: 540px !important;
height: 100%; height: 100%;
width: auto !important; width: auto !important;
// display: flex !important; // display: flex !important;
......
src/components/ImageEd.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-09 09:28:46 * @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-12-01 15:21:02 * @LastEditTime: 2021-12-03 21:30:36
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue * @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
...@@ -1886,6 +1886,8 @@ export default { ...@@ -1886,6 +1886,8 @@ export default {
imageEditor.loadImageFromURL("data:image/jpeg;base64," + sourceImage, "SampleImage").then(function(sizeValue) { imageEditor.loadImageFromURL("data:image/jpeg;base64," + sourceImage, "SampleImage").then(function(sizeValue) {
// //console.log(sizeValue); // //console.log(sizeValue);
imageEditor.clearUndoStack(); imageEditor.clearUndoStack();
}).catch(err => {
console.log(err);
}); });
}); });
this.$bus.on("changImageEditTarget", (targetImage) => { this.$bus.on("changImageEditTarget", (targetImage) => {
...@@ -1893,7 +1895,9 @@ export default { ...@@ -1893,7 +1895,9 @@ export default {
imageEditor2.loadImageFromURL("data:image/jpeg;base64," + targetImage, "SampleImage").then(function(sizeValue) { imageEditor2.loadImageFromURL("data:image/jpeg;base64," + targetImage, "SampleImage").then(function(sizeValue) {
// //console.log(sizeValue); // //console.log(sizeValue);
imageEditor2.clearUndoStack(); imageEditor2.clearUndoStack();
}); }).catch(err => {
console.log(err);
})
}); });
...@@ -1932,11 +1936,15 @@ export default { ...@@ -1932,11 +1936,15 @@ export default {
imageEditor.loadImageFromURL("xxx.jpg", "SampleImage").then(function(sizeValue) { imageEditor.loadImageFromURL("xxx.jpg", "SampleImage").then(function(sizeValue) {
// //console.log(sizeValue); // //console.log(sizeValue);
imageEditor.clearUndoStack(); imageEditor.clearUndoStack();
}).catch(err => {
console.log(err);
}); });
imageEditor2.loadImageFromURL("xxx.jpg", "SampleImage").then(function(sizeValue) { imageEditor2.loadImageFromURL("xxx.jpg", "SampleImage").then(function(sizeValue) {
// //console.log(sizeValue); // //console.log(sizeValue);
imageEditor2.clearUndoStack(); imageEditor2.clearUndoStack();
}); }).catch(err => {
console.log(err);
});;
} else { } else {
self.isDelete = false self.isDelete = false
self.delMsg = '' self.delMsg = ''
......
src/plugins/axios.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-30 17:46:05 * @LastEditTime: 2021-12-03 20:45:45
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\plugins\axios.js * @FilePath: \指纹系统\founder_vue\src\plugins\axios.js
...@@ -57,17 +57,18 @@ _axios.interceptors.request.use( ...@@ -57,17 +57,18 @@ _axios.interceptors.request.use(
} }
// 判断当前请求是否设置了不显示Loading,默认显示 // 判断当前请求是否设置了不显示Loading,默认显示
console.log(config);
if (config.loading !== false) { if (config.loading !== false) {
showLoading(config.loadingTarget); // 如果设置了targer,使用设置的target,比如el-table showLoading(config.loadingTarget); // 如果设置了targer,使用设置的target,比如el-table
// console.log(document.querySelector('.loading')); // console.log(document.querySelector('.loading'));
// document.querySelector('.contain').appendChild(document.querySelector('.loading')) // document.querySelector('.contain').appendChild(document.querySelector('.loading'))
// store.commit('loading/setLoading', true) // store.commit('loading/setLoading', true)
} }
NProgress.start(); // NProgress.start();
return config; return config;
}, },
function (error) { function (error) {
NProgress.start(); // NProgress.start();
// Do something with request error // Do something with request error
return Promise.reject(error); return Promise.reject(error);
} }
...@@ -93,11 +94,11 @@ _axios.interceptors.response.use( ...@@ -93,11 +94,11 @@ _axios.interceptors.response.use(
hideLoading(response.config.loadingTarget); hideLoading(response.config.loadingTarget);
// console.log(response.config.loadingTarget); // console.log(response.config.loadingTarget);
} }
NProgress.done(); // NProgress.done();
return response; return response;
}, },
function (error) { function (error) {
NProgress.done(); // NProgress.done();
return Promise.reject(error); return Promise.reject(error);
} }
); );
......
src/router/modules/index.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:58:13 * @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-12-03 16:40:26 * @LastEditTime: 2021-12-04 14:17:55
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js * @FilePath: \founder_vue\src\router\modules\index.js
...@@ -152,5 +152,14 @@ export default [ ...@@ -152,5 +152,14 @@ export default [
auth: "5" auth: "5"
}, },
component: () => import("@/views/cxyrd/LTz2.vue") component: () => import("@/views/cxyrd/LTz2.vue")
},
{
path: "/fhxxLT",
name: "fhxxLT",
meta: {
title: "复核信息-正查",
auth: "5",
},
component: () => import("@/views/bzxxgl/fhxxLT.vue")
} }
]; ];
src/router/modules/leftMenu.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:58:13 * @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-12-02 22:44:12 * @LastEditTime: 2021-12-03 15:39:11
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js * @FilePath: \founder_vue\src\router\modules\index.js
...@@ -311,5 +311,5 @@ export default [ ...@@ -311,5 +311,5 @@ export default [
parentId: 'bzxxgl' parentId: 'bzxxgl'
}, },
component: () => import("@/views/bzxxgl/bzxxfh.vue") component: () => import("@/views/bzxxgl/bzxxfh.vue")
} },
] ]
src/store/modules/loading.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-11-04 11:12:33 * @Date: 2021-11-04 11:12:33
* @LastEditTime: 2021-11-29 18:20:54 * @LastEditTime: 2021-12-04 10:22:29
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\modules\zwbj.js * @FilePath: \指纹系统\founder_vue\src\store\modules\zwbj.js
*/ */
import { SET_LOADING, SET_JUMPROUTE, SET_PREROUTE, SET_WILLROUTE, SET_SMALLLOADING } from "./mutations-types"; import { SET_LOADING, SET_JUMPROUTE, SET_PREROUTE, SET_WILLROUTE, SET_SMALLLOADING, SET_LOADINGSD } from "./mutations-types";
const state = { const state = {
// 是否处于加载中 // 是否处于加载中
loading: false, loading: false,
...@@ -17,6 +17,8 @@ const state = { ...@@ -17,6 +17,8 @@ const state = {
preRoute: '', preRoute: '',
// 即将要跳转的路由 // 即将要跳转的路由
willRoute: '', willRoute: '',
// 手动路由加载
loading_sd: ''
}; };
const mutations = { const mutations = {
...@@ -34,7 +36,10 @@ const mutations = { ...@@ -34,7 +36,10 @@ const mutations = {
}, },
[SET_SMALLLOADING] (state, content) { [SET_SMALLLOADING] (state, content) {
state.smallLoading = content state.smallLoading = content
} },
[SET_LOADINGSD] (state, content) {
state.loading_sd = content
},
}; };
const actions = { const actions = {
......
src/store/modules/mutations-types.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-11-04 13:14:49 * @Date: 2021-11-04 13:14:49
* @LastEditTime: 2021-12-03 10:30:40 * @LastEditTime: 2021-12-04 10:22:25
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\store\modules\mutations-types.js * @FilePath: \指纹系统\founder_vue\src\store\modules\mutations-types.js
...@@ -38,3 +38,5 @@ export const SET_RXINFO = 'setRxInfo' ...@@ -38,3 +38,5 @@ export const SET_RXINFO = 'setRxInfo'
export const SET_ENLARGEFACE = 'setEnlargeFace' export const SET_ENLARGEFACE = 'setEnlargeFace'
// 设置单个人像信息 // 设置单个人像信息
export const SET_RXINFOENLARGE = 'setRxInfoEnlarge' export const SET_RXINFOENLARGE = 'setRxInfoEnlarge'
// 手动路由加载
export const SET_LOADINGSD = 'setLoadingSd'
src/utils/requestLoading.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-11-26 16:37:59 * @Date: 2021-11-26 16:37:59
* @LastEditTime: 2021-11-30 09:13:55 * @LastEditTime: 2021-12-04 11:02:16
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \founder_vue\src\utils\requestLoading.js * @FilePath: \founder_vue\src\utils\requestLoading.js
...@@ -29,10 +29,11 @@ export function showLoading(target) { ...@@ -29,10 +29,11 @@ export function showLoading(target) {
// background: "rgba(255, 255, 255, 0.7)", // background: "rgba(255, 255, 255, 0.7)",
// target: target || document.body // target: target || document.body
// }); // });
// store.commit('loading/setLoading', true)
if (target) { if (target) {
store.commit('loading/setSmallLoading', true) store.commit('loading/setSmallLoading', true)
} else { } else {
store.commit('loading/setLoading', true) store.commit('loading/setLoadingSd', true)
} }
} }
needLoadingRequestCount++; needLoadingRequestCount++;
...@@ -44,25 +45,30 @@ export function hideLoading(loadingTarget) { ...@@ -44,25 +45,30 @@ export function hideLoading(loadingTarget) {
needLoadingRequestCount = Math.max(needLoadingRequestCount, 0); // 做个保护 needLoadingRequestCount = Math.max(needLoadingRequestCount, 0); // 做个保护
if (needLoadingRequestCount === 0) { if (needLoadingRequestCount === 0) {
// 关闭loading // 关闭loading
// toHideLoading(loadingTarget); toHideLoading(loadingTarget);
// if(loadingTarget) { // if(loadingTarget) {
// store.commit('loading/setSmallLoading', false) // store.commit('loading/setSmallLoading', false)
// } else { // } else {
// store.commit('loading/setLoading', false) // store.commit('loading/setLoading', false)
// } // }
store.commit('loading/setSmallLoading', false) // store.commit('loading/setSmallLoading', false)
store.commit('loading/setLoading', false) // store.commit('loading/setLoading', false)
} }
} }
// 防抖：将 300ms 间隔内的关闭 loading 便合并为一次。防止连续请求时， loading闪烁的问题。 // 防抖：将 300ms 间隔内的关闭 loading 便合并为一次。防止连续请求时， loading闪烁的问题。
let toHideLoading = utils.debounce((loadingTarget) => { let toHideLoading = utils.debounce((loadingTarget) => {
// loading.close(); // loading.close();
loading = null; // loading = null;
console.log(loadingTarget); // console.log(loadingTarget);
if (loadingTarget) { // store.commit('loading/setLoading', false)
store.commit('loading/setSmallLoading', false) store.commit('loading/setSmallLoading', false)
} else { store.commit('loading/setLoadingSd', false)
store.commit('loading/setLoading', false) // if (loadingTarget) {
} // store.commit('loading/setSmallLoading', false)
// } else {
// store.commit('loading/setLoading', false)
// }
}, 500); }, 500);
src/views/Editor/modules/ajdaxx.vue
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
<div class="ryljfk"> <div class="ryljfk">
<el-form-item prop="logicdbtype2" class="fk"> <el-form-item prop="logicdbtype2" class="fk">
<el-checkbox-group v-model="ruleForm.logicdbtype2"> <el-checkbox-group v-model="ruleForm.logicdbtype2">
<el-checkbox v-for="(item,index) in ryljfkArr" :label="item" :key="index">{{item}}</el-checkbox> <el-checkbox v-for="(item,index) in ryljfkArr" :label="item.value" :key="index">{{item.label}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
</div> </div>
...@@ -88,8 +88,7 @@ ...@@ -88,8 +88,7 @@
</div> </div>
<div class="ayzzwjbxx-item"> <div class="ayzzwjbxx-item">
<el-form-item label="提取时间：" prop="tqsj"> <el-form-item label="提取时间：" prop="tqsj">
<el-date-picker type="date" placeholder="请输入提取时间" v-model="ruleForm.tqsj" <el-date-picker type="date" placeholder="请输入提取时间" v-model="ruleForm.tqsj" :picker-options="{
:picker-options="{
disabledDate: disabledDate, disabledDate: disabledDate,
}"></el-date-picker> }"></el-date-picker>
</el-form-item> </el-form-item>
...@@ -152,7 +151,17 @@ export default { ...@@ -152,7 +151,17 @@ export default {
arrow: 'bottom', arrow: 'bottom',
width1: 80, width1: 80,
drawer: false, drawer: false,
ryljfkArr: ['本地案件库', '比中案件库', '已破案件库', '重大案件库', 'B类案件库', 'C类案件库', '勘查案件库', '协查案件库', '协查案件库'], // ryljfkArr: ['本地案件库', '比中案件库', '已破案件库', '重大案件库', 'B类案件库', 'C类案件库', '勘查案件库', '协查案件库'],
ryljfkArr: [
{ label: '本地案件库', value: '1' },
{ label: '比中案件库', value: '2' },
{ label: '已破案件库', value: '3' },
{ label: '重大案件库', value: '4' },
{ label: 'B类案件库', value: '5' },
{ label: 'C类案件库', value: '6' },
{ label: '勘查案件库', value: '7' },
{ label: '协查案件库', value: '8' },
],
ruleForm: { ruleForm: {
id: '', id: '',
ysxtAsjbh: '', ysxtAsjbh: '',
...@@ -163,8 +172,7 @@ export default { ...@@ -163,8 +172,7 @@ export default {
sfmaPdbz: '0', sfmaPdbz: '0',
ajlbdm: '', ajlbdm: '',
jyaq: '', jyaq: '',
logicdbtype2: ['本地案件库', '比中案件库'], logicdbtype2: ['1', '2'],
logicdbtype: "000",
tqdwGajgjgdm: '430000000000', tqdwGajgjgdm: '430000000000',
tqryXm: '', tqryXm: '',
tqsj: '', tqsj: '',
...@@ -301,14 +309,17 @@ export default { ...@@ -301,14 +309,17 @@ export default {
this.ruleForm.sfmaPdbz = this.ajInfo.sfmaPdbz this.ruleForm.sfmaPdbz = this.ajInfo.sfmaPdbz
this.ruleForm.ajlbdm = this.ajInfo.ajlbdm this.ruleForm.ajlbdm = this.ajInfo.ajlbdm
this.ruleForm.jyaq = this.ajInfo.jyaq this.ruleForm.jyaq = this.ajInfo.jyaq
this.ruleForm.logicdbtype = this.ajInfo.logicdbtype // this.ruleForm.logicdbtype = this.ajInfo.logicdbtype
if(this.ajInfo.logicDatabaseCode && this.ajInfo.logicDatabaseCode.length > 0) {
this.ruleForm.logicdbtype2 = this.ajInfo.logicDatabaseCode.split(',')
} else {
this.ruleForm.logicdbtype2 = []
}
this.ruleForm.tqdwGajgjgdm = this.ajInfo.tqdwGajgjgdm this.ruleForm.tqdwGajgjgdm = this.ajInfo.tqdwGajgjgdm
this.ruleForm.tqryXm = this.ajInfo.tqryXm this.ruleForm.tqryXm = this.ajInfo.tqryXm
this.ruleForm.tqsj = this.ajInfo.tqsj this.ruleForm.tqsj = this.ajInfo.tqsj
this.ruleForm.tqryGmsfhm = this.ajInfo.tqryGmsfhm this.ruleForm.tqryGmsfhm = this.ajInfo.tqryGmsfhm
this.ruleForm.tqryLxdh = this.ajInfo.tqryLxdh this.ruleForm.tqryLxdh = this.ajInfo.tqryLxdh
console.log(this.ruleForm.tqdwGajgjgdm);
}, },
/** /**
* 关闭抽屉 * 关闭抽屉
...@@ -329,6 +340,7 @@ export default { ...@@ -329,6 +340,7 @@ export default {
let self = this let self = this
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
self.ruleForm.logicList = self.ruleForm.logicdbtype2
self.$axios({ self.$axios({
method: 'post', method: 'post',
headers: { headers: {
......
src/views/Editor/modules/ajzwbjLeft.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 09:42:07 * @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-11-30 18:15:14 * @LastEditTime: 2021-12-04 10:33:06
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
...@@ -204,7 +204,7 @@ export default { ...@@ -204,7 +204,7 @@ export default {
*/ */
getCaseOrigin (seq) { getCaseOrigin (seq) {
let self = this let self = this
self.$store.commit('loading/setLoading', true) self.$store.commit('loading/setLoadingSd', true)
this.$store.commit('zwbj/setSeq', seq) this.$store.commit('zwbj/setSeq', seq)
this.$axios({ this.$axios({
method: 'post', method: 'post',
...@@ -228,7 +228,7 @@ export default { ...@@ -228,7 +228,7 @@ export default {
}) })
clearTimeout(self.timer) clearTimeout(self.timer)
self.timer = setTimeout(() => { self.timer = setTimeout(() => {
self.$store.commit('loading/setLoading', false) self.$store.commit('loading/setLoadingSd', false)
}, 500); }, 500);
}, },
/** /**
...@@ -242,7 +242,7 @@ export default { ...@@ -242,7 +242,7 @@ export default {
url: `/api/org/caseBybarcode/barcode`, url: `/api/org/caseBybarcode/barcode`,
data: { data: {
barcode: self.barcode barcode: self.barcode
} },
}).then(res => { }).then(res => {
console.log(res); console.log(res);
if (res.data.code === 0) { if (res.data.code === 0) {
......
src/views/Editor/modules/imageEd.scss
...@@ -1043,16 +1043,26 @@ $transOrigin: var(--transOrigin, 0px, 0px); ...@@ -1043,16 +1043,26 @@ $transOrigin: var(--transOrigin, 0px, 0px);
} }
} }
.preview-source { .preview-source {
z-index: 9999; z-index: 99999;
position: absolute; position: absolute;
left: 25px; left: 0;
top: 55px; top: 0;
border: 1px solid #ccc; border: 1px solid #ccc;
width: 80px; width: 144px;
height: 80px; height: 144px;
box-shadow: 0px 2px 4px 0px rgba(0, 0, 0, 0.5);
overflow: hidden;
img { img {
object-fit: contain; object-fit: contain;
} }
.block_small {
width: 100%;
height: 100%;
border: 1px solid #055fe7;
position: absolute;
top: 0;
left: 0;
}
} }
} }
} }
......
src/views/Editor/modules/imageEdAJ.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 11:36:10 * @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-03 11:20:56 * @LastEditTime: 2021-12-04 14:10:46
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
...@@ -5230,6 +5230,7 @@ export default { ...@@ -5230,6 +5230,7 @@ export default {
self.$message.success("保存成功！"); self.$message.success("保存成功！");
// 记录session保存的个数 // 记录session保存的个数
self.sessionCount++; self.sessionCount++;
self.judgeJumpRoute()
} }
}); });
} }
...@@ -5515,6 +5516,7 @@ export default { ...@@ -5515,6 +5516,7 @@ export default {
console.log(res); console.log(res);
// 计算session的个数 // 计算session的个数
self.sessionCount = self.sessionCount + Number(sessionArr.length); self.sessionCount = self.sessionCount + Number(sessionArr.length);
self.judgeJumpRoute()
}); });
// console.log(allTZData); // console.log(allTZData);
} }
...@@ -5723,7 +5725,7 @@ export default { ...@@ -5723,7 +5725,7 @@ export default {
xczhw_xcwzbh: self.seq > 9 ? self.seq : "0" + self.seq xczhw_xcwzbh: self.seq > 9 ? self.seq : "0" + self.seq
}; };
self.$store.commit('loading/setLoading', true) self.$store.commit('loading/setLoadingSd', true)
this.$axios({ this.$axios({
method: "post", method: "post",
headers: { headers: {
...@@ -5742,6 +5744,7 @@ export default { ...@@ -5742,6 +5744,7 @@ export default {
self.$message.success("特征保存成功！"); self.$message.success("特征保存成功！");
// 记录session保存的个数 // 记录session保存的个数
self.sessionCount++; self.sessionCount++;
self.judgeJumpRoute()
} else { } else {
self.$message.error("特征保存失败！"); self.$message.error("特征保存失败！");
} }
...@@ -5812,7 +5815,7 @@ export default { ...@@ -5812,7 +5815,7 @@ export default {
} else { } else {
self.$message.error("图片保存失败！"); self.$message.error("图片保存失败！");
} }
self.$store.commit('loading/setLoading', false) self.$store.commit('loading/setLoadingSd', false)
}); });
} }
}, },
...@@ -6422,7 +6425,14 @@ export default { ...@@ -6422,7 +6425,14 @@ export default {
} }
//console.log(sessionArr); //console.log(sessionArr);
//console.log(this.sessionCount); //console.log(this.sessionCount);
if (sessionArr.length == this.sessionCount) { let judgeArr = []
isOptionsArr.forEach(item => {
if(item === true) {
judgeArr.push(item)
}
})
console.log(judgeArr.length);
if (judgeArr.length <= this.sessionCount) {
this.$store.commit('loading/setJumpRoute', true) this.$store.commit('loading/setJumpRoute', true)
return; return;
} else { } else {
......
src/views/Editor/modules/rydaxx.vue
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
<div class="ryljfk"> <div class="ryljfk">
<el-form-item prop="logicdbtype2" class="fk"> <el-form-item prop="logicdbtype2" class="fk">
<el-checkbox-group v-model="ruleForm.logicdbtype2"> <el-checkbox-group v-model="ruleForm.logicdbtype2">
<el-checkbox v-for="(item,index) in ryljfkArr" :label="item" :key="index">{{item}}</el-checkbox> <el-checkbox v-for="(item,index) in ryljfkArr" :label="item.value" :key="index">{{item.label}}</el-checkbox>
</el-checkbox-group> </el-checkbox-group>
</el-form-item> </el-form-item>
</div> </div>
...@@ -207,7 +207,16 @@ export default { ...@@ -207,7 +207,16 @@ export default {
arrow: 'bottom', arrow: 'bottom',
width1: 80, width1: 80,
drawer: false, drawer: false,
ryljfkArr: ['基本人员库', '高危人员库', '非违人员库', '在逃人员库', '布控人员库', '前科人员库', '协查人员库'], // ryljfkArr: ['基本人员库', '高危人员库', '非违人员库', '在逃人员库', '布控人员库', '前科人员库', '协查人员库'],
ryljfkArr: [
{label: '基本人员库', value: '1'},
{label: '高危人员库', value: '2'},
{label: '非违人员库', value: '3'},
{label: '在逃人员库', value: '4'},
{label: '布控人员库', value: '5'},
{label: '前科人员库', value: '6'},
{label: '协查人员库', value: '7'},
],
ruleForm: { ruleForm: {
id: '', id: '',
rybh: '', rybh: '',
...@@ -228,8 +237,8 @@ export default { ...@@ -228,8 +237,8 @@ export default {
xzzXzqhdm: '', xzzXzqhdm: '',
xzzDzmc: '', xzzDzmc: '',
bz: '', bz: '',
logicdbtype2: ['基本人员库', '高危人员库'], logicdbtype2: ['1', '2'],
logicdbtype: "000", // logicdbtype: "000",
nydwGajgjgdm: '430000000000', nydwGajgjgdm: '430000000000',
nyryXm: '', nyryXm: '',
nysj: '', nysj: '',
...@@ -408,7 +417,11 @@ export default { ...@@ -408,7 +417,11 @@ export default {
// 人员逻辑分库 // 人员逻辑分库
// let ryljfk = this.ryInfo.logicdbtype.split('') // let ryljfk = this.ryInfo.logicdbtype.split('')
// this.ruleForm.logicdbtype = ryljfk // this.ruleForm.logicdbtype = ryljfk
this.ruleForm.logicdbtype = this.ryInfo.logicdbtype if(this.ryInfo.logicDatabaseCode && this.ryInfo.logicDatabaseCode.length > 0) {
this.ruleForm.logicdbtype2 = this.ryInfo.logicDatabaseCode.split(',')
} else {
this.ruleForm.logicdbtype2 = []
}
this.ruleForm.nydwGajgjgdm = this.ryInfo.nydwGajgjgdm this.ruleForm.nydwGajgjgdm = this.ryInfo.nydwGajgjgdm
this.ruleForm.nyryXm = this.ryInfo.nyryXm this.ruleForm.nyryXm = this.ryInfo.nyryXm
this.ruleForm.nysj = this.ryInfo.nysj this.ruleForm.nysj = this.ryInfo.nysj
...@@ -432,15 +445,17 @@ export default { ...@@ -432,15 +445,17 @@ export default {
*/ */
submitForm (formName) { submitForm (formName) {
let self = this let self = this
console.log(self.ruleForm);
this.$refs[formName].validate((valid) => { this.$refs[formName].validate((valid) => {
if (valid) { if (valid) {
let logicList = this.ruleForm.logicdbtype2
self.$axios({ self.$axios({
method: 'post', method: 'post',
headers: { headers: {
"Content-Type": "application/json;charset=UTF-8" "Content-Type": "application/json;charset=UTF-8"
}, },
url: '/api/personstore/person/file', url: '/api/personstore/person/file',
data: JSON.stringify(self.ruleForm) data: JSON.stringify({personDo: self.ruleForm, logicList: logicList})
}).then(res => { }).then(res => {
if (res.data.code === 0) { if (res.data.code === 0) {
self.$message.success('保存成功！') self.$message.success('保存成功！')
......
src/views/Editor/modules/ryzwbjLeft.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 09:42:07 * @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-12-03 11:29:52 * @LastEditTime: 2021-12-04 10:24:45
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
...@@ -519,7 +519,7 @@ export default { ...@@ -519,7 +519,7 @@ export default {
*/ */
getRollFingerOrigin (seq) { getRollFingerOrigin (seq) {
let self = this let self = this
self.$store.commit('loading/setLoading', true) self.$store.commit('loading/setLoadingSd', true)
this.$store.commit('zwbj/setSeq', seq) this.$store.commit('zwbj/setSeq', seq)
// ip:port/api/org/roll/{id}/{seq} // ip:port/api/org/roll/{id}/{seq}
this.$axios({ this.$axios({
...@@ -545,7 +545,7 @@ export default { ...@@ -545,7 +545,7 @@ export default {
}) })
clearTimeout(self.timer) clearTimeout(self.timer)
self.timer = setTimeout(() => { self.timer = setTimeout(() => {
self.$store.commit('loading/setLoading', false) self.$store.commit('loading/setLoadingSd', false)
}, 500); }, 500);
}, },
/** /**
...@@ -555,7 +555,7 @@ export default { ...@@ -555,7 +555,7 @@ export default {
*/ */
getPainFingerOrigin (seq) { getPainFingerOrigin (seq) {
let self = this let self = this
self.$store.commit('loading/setLoading', true) self.$store.commit('loading/setLoadingSd', true)
this.$store.commit('zwbj/setSeq', seq) this.$store.commit('zwbj/setSeq', seq)
// ip:port/api/org/plain/{id}/{seq} // ip:port/api/org/plain/{id}/{seq}
this.$axios({ this.$axios({
...@@ -581,7 +581,7 @@ export default { ...@@ -581,7 +581,7 @@ export default {
}) })
clearTimeout(self.timer) clearTimeout(self.timer)
self.timer = setTimeout(() => { self.timer = setTimeout(() => {
self.$store.commit('loading/setLoading', false) self.$store.commit('loading/setLoadingSd', false)
}, 500); }, 500);
}, },
/** /**
...@@ -591,7 +591,7 @@ export default { ...@@ -591,7 +591,7 @@ export default {
*/ */
async getRollFingers () { async getRollFingers () {
let self = this let self = this
self.$store.commit('loading/setLoading', true) self.$store.commit('loading/setLoadingSd', true)
// 请求之前先清空图片数据 // 请求之前先清空图片数据
self.rollFingersLeft.forEach((item) => { self.rollFingersLeft.forEach((item) => {
item.image = null item.image = null
...@@ -694,7 +694,7 @@ export default { ...@@ -694,7 +694,7 @@ export default {
} }
clearTimeout(self.timer) clearTimeout(self.timer)
self.timer = setTimeout(() => { self.timer = setTimeout(() => {
self.$store.commit('loading/setLoading', false) self.$store.commit('loading/setLoadingSd', false)
}, 500); }, 500);
}, },
/** /**
......
src/views/Home.vue
<template> <template>
<div id="home-div"> <div id="home-div">
<div id="home" :class="{ zhanshi: isCropper || loading }"> <div id="home" :class="{ zhanshi: isCropper || loading_sd }">
<el-container class="layout-container"> <el-container class="layout-container">
<transition name="slide"> <transition name="slide">
<el-aside :width="isCollapse ? '4rem' : '17.5rem'" class="aside"> <el-aside :width="isCollapse ? '4rem' : '17.5rem'" class="aside">
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
</el-dialog> </el-dialog>
<div class="shadow" v-show="isCropper"></div> <div class="shadow" v-show="isCropper"></div>
<div class="loading" v-show="loading"> <div class="loading" v-show="loading_sd">
<div class="loading-finger"> <div class="loading-finger">
<img src="../assets/img/loadingfinger.gif" alt="" /> <img src="../assets/img/loadingfinger.gif" alt="" />
</div> </div>
...@@ -191,6 +191,7 @@ export default { ...@@ -191,6 +191,7 @@ export default {
jumproute: (state) => state.loading.jumproute, jumproute: (state) => state.loading.jumproute,
smallLoading: (state) => state.loading.smallLoading, smallLoading: (state) => state.loading.smallLoading,
enLargeFace: (state) => state.ryzwbj.enLargeFace, enLargeFace: (state) => state.ryzwbj.enLargeFace,
loading_sd: (state) => state.loading.loading_sd,
}), }),
cachePageName () { cachePageName () {
return this.$store.state.layout.cachePageName; return this.$store.state.layout.cachePageName;
......
src/views/bzxxgl/bzxxfh.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-01 15:25:22 * @Date: 2021-12-01 15:25:22
* @LastEditTime: 2021-12-02 23:06:47 * @LastEditTime: 2021-12-04 13:26:54
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\AllPersonnelBase\bzxxfh.vue * @FilePath: \指纹系统\founder_vue\src\views\AllPersonnelBase\bzxxfh.vue
...@@ -77,7 +77,6 @@ ...@@ -77,7 +77,6 @@
<div class="jcbzgx btn">解除比中关系</div> <div class="jcbzgx btn">解除比中关系</div>
<div class="cxfh btn">撤销复核</div> <div class="cxfh btn">撤销复核</div>
<div class="fztm btn">复制条码</div> <div class="fztm btn">复制条码</div>
<div class="dy btn">打印</div>
<div class="sc btn">删除</div> <div class="sc btn">删除</div>
</div> </div>
</div> </div>
...@@ -120,7 +119,7 @@ ...@@ -120,7 +119,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="nydwGajgmc" label="操作" width="auto"> <el-table-column prop="nydwGajgmc" label="操作" width="auto">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-show="scope.row.nydwGajgmc==='待复核'" :class="{dfh: scope.row.nydwGajgmc==='待复核'}">{{scope.row.nydwGajgmc}}</div> <div @click="$router.push('/fhxxLT')" v-show="scope.row.nydwGajgmc==='待复核'" :class="{dfh: scope.row.nydwGajgmc==='待复核'}">{{scope.row.nydwGajgmc}}</div>
<div @click="cxfhChange($event,scope.row)" v-show="scope.row.nydwGajgmc==='撤销复核'" :class="{cxfh: scope.row.nydwGajgmc==='撤销复核'}">{{scope.row.nydwGajgmc}}</div> <div @click="cxfhChange($event,scope.row)" v-show="scope.row.nydwGajgmc==='撤销复核'" :class="{cxfh: scope.row.nydwGajgmc==='撤销复核'}">{{scope.row.nydwGajgmc}}</div>
</template> </template>
</el-table-column> </el-table-column>
......
src/views/bzxxgl/fhxxLT.vue 0 → 100644
<!--
* @Author: your name
* @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-03 19:53:07
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
-->
<template>
<div class="fhxxLT" id="fhxxLT">
<div class="fhxxLT-left">
<div class="line-imageEd"></div>
<ImageEd class="fhxxLT-imageEd"></ImageEd>
</div>
<div class="fhxxLT-right">
<div class="fhxx-top">
<div class="fhxx-title">复核信息-正查</div>
<div class="scroll-content">
<div class="fhxx-top-top">
<div class="fhxx-top-top-left">
<div class="fhxx-top-top-left-title">
<div class="title-line"></div>
<div class="title-name">案件信息</div>
</div>
<div class="fhxx-top-top-left-content">
<div class="content-item">
<div class="label-name">案事件编号：</div>
<div class="label-value">A1231231231231231231232</div>
</div>
<div class="content-item">
<div class="label-name">现场勘验编号：</div>
<div class="label-value">A1231231231231231231232</div>
</div>
<div class="content-item">
<div class="label-name">案发地点：</div>
<div class="label-value">湖南省长沙市芙蓉区八一路如家</div>
</div>
<div class="content-item">
<div class="label-name">发案日期：</div>
<div class="label-value">2021-12-24</div>
</div>
<div class="content-item">
<div class="label-name">现场指纹枚数：</div>
<div class="label-value">1枚</div>
</div>
<div class="content-item">
<div class="label-name">案件名称：</div>
<div class="label-value">杀人未遂案</div>
</div>
<div class="content-item">
<div class="label-name">案件类别：</div>
<div class="label-value">刑事案件</div>
</div>
<div class="content-item">
<div class="label-name">源逻辑库：</div>
<div class="label-value">本地案件库</div>
</div>
<div class="content-item">
<div class="label-name">案件级别：</div>
<div class="label-value">特大刑事案件</div>
</div>
<div class="content-area">
<el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="textarea1">
</el-input>
</div>
</div>
</div>
<div class="fhxx-top-top-right">
<div class="fhxx-top-top-left-title">
<div class="title-line"></div>
<div class="title-name">人员信息</div>
</div>
<div class="fhxx-top-top-left-content">
<div class="content-item">
<div class="label-name">人员编号：</div>
<div class="label-value">A1231231231231231231232</div>
</div>
<div class="content-item content-item2">
<div class="label-name">姓名：</div>
<div class="label-value">
<span>张三</span>
<div class="label-name2">别名/绰号：</div>
<div class="label-value2">张小三</div>
</div>
</div>
<div class="content-item">
<div class="label-name">性别：</div>
<div class="label-value">男</div>
</div>
<div class="content-item">
<div class="label-name">民族：</div>
<div class="label-value">汉族</div>
</div>
<div class="content-item">
<div class="label-name">籍贯：</div>
<div class="label-value">湖南省</div>
</div>
<div class="content-item">
<div class="label-name">出生日期：</div>
<div class="label-value">1980-12-12</div>
</div>
<div class="content-item">
<div class="label-name">案件类别：</div>
<div class="label-value">杀人未遂案</div>
</div>
<div class="content-item">
<div class="label-name">目标逻辑库：</div>
<div class="label-value">基本人员库</div>
</div>
<div class="content-item">
<div class="label-name">现住址详情：</div>
<div class="label-value">湖南省长沙市芙蓉区八一路如家</div>
</div>
<div class="content-item">
<div class="label-name">户籍地详址：</div>
<div class="label-value">湖南省长沙市芙蓉区八一路如家</div>
</div>
<div class="content-area2">
<el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="textarea2">
</el-input>
</div>
</div>
</div>
</div>
<div class="fhxx-top-line"></div>
<div class="fhxx-top-bottom">
<div class="fhxx-top-top-left-title">
<div class="title-line"></div>
<div class="title-name">案件信息</div>
</div>
<div class="fhxx-top-bottom-content">
<div class="fhxx-top-bottom-left">
<div class="content-item">
<div class="label-name red">序号：</div>
<div class="label-value red">01</div>
</div>
<div class="content-item">
<div class="label-name">比中单位：</div>
<div class="label-value">杀人未遂案</div>
</div>
<div class="content-item">
<div class="label-name">单位代码：</div>
<div class="label-value">23746728764284</div>
</div>
<div class="content-item">
<div class="label-name">比中时间：</div>
<div class="label-value">2020-12-14 12:34</div>
</div>
</div>
<div class="fhxx-top-bottom-right">
<div class="content-item">
<div class="label-name red">指位：</div>
<div class="label-value red">滚动-右拇</div>
</div>
<div class="content-item">
<div class="label-name">比中人：</div>
<div class="label-value">张三</div>
</div>
<div class="content-item">
<div class="label-name">比中人身份证号：</div>
<div class="label-value">472748377829873738</div>
</div>
<div class="content-item">
<div class="label-name">比中人联系电话：</div>
<div class="label-value">13083748372</div>
</div>
</div>
</div>
<div class="bzxx-textarea">
<el-input type="textarea" :rows="3" placeholder="请输入内容" v-model="textarea3">
</el-input>
</div>
</div>
</div>
</div>
<div class="fhxx-bottom">
<div class="fhxx-bottom-title">复核意见</div>
<div class="fhxx-bottom-textarea">
<el-input type="textarea" :rows="3" placeholder="在此输入复核意见" v-model="fhyj">
</el-input>
</div>
</div>
<div class="fhxx-btns">
<div class="pass">通过</div>
<div class="no-pass">未通过</div>
<div class="relieve">解除比中关系</div>
</div>
</div>
</div>
</template>
<script>
import ImageEd from '@/components/ImageEd.vue'
export default {
name: 'fhxxLT',
data () {
return {
textarea1: '2021年8月5日晚21点时分，北京市昌平区东小口镇天通苑二区疫情通报，现确诊4人；',
textarea2: '暂无犯罪描述；',
textarea3: '2021年8月5日晚21点时分，北京市昌平区东小口镇天通苑二区疫情通报，现确诊4人；',
fhyj: ''
}
},
components: {
ImageEd,
},
}
</script>
<style lang="scss" scoped>
@import "./scss/fhxxLT.scss";
</style>
src/views/bzxxgl/scss/fhxxLT.scss 0 → 100644
.fhxxLT {
width: 100%;
height: 100vh;
overflow: hidden;
display: flex;
.drawing {
width: 100px;
}
/* 设置滚动条的样式 */
::-webkit-scrollbar {
width: 0;
}
/* 滚动槽 */
::-webkit-scrollbar-track {
-webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.3);
border-radius: 6px;
}
/* 滚动条滑块 */
::-webkit-scrollbar-thumb {
border-radius: 6px;
background: rgba(0, 0, 0, 0.1);
-webkit-box-shadow: inset006pxrgba(0, 0, 0, 0.5);
}
.fhxxLT-left {
width: 1160px;
position: relative;
.line-imageEd {
position: absolute;
top: 55px;
left: 25px;
width: 1090px;
height: 2px;
background: #eeeeee;
}
.lt_main_header {
width: 100%;
}
.lt_middle_main {
display: flex;
align-items: center;
justify-content: space-between !important;
margin-left: 30px !important;
}
.lt_main_footer {
width: 100%;
.btn {
width: 64px;
height: 40px;
}
}
}
.fhxxLT-right {
.fhxx-top {
margin-top: 14px;
padding: 20px 32px;
width: 712px;
height: 730px;
background: #f6f8fa;
box-shadow: 0px 1px 2px 0px rgba(5, 95, 231, 0.4),
0px -1px 2px 0px rgba(5, 95, 231, 0.19);
border-radius: 8px;
.fhxx-title {
font-size: 16px;
font-family: MicrosoftYaHei;
font-weight: bold;
color: #00b48f;
}
.scroll-content {
overflow-y: scroll;
height: 675px;
}
.fhxx-top-top {
display: flex;
margin-top: 15px;
.fhxx-top-top-left {
.fhxx-top-top-left-title {
display: flex;
align-items: center;
.title-line {
width: 4px;
height: 16px;
background: #055fe7;
border-radius: 2px;
}
.title-name {
margin-left: 10px;
font-size: 16px;
font-family: MicrosoftYaHei;
color: #282f3c;
}
}
}
.fhxx-top-top-right {
margin-left: 55px;
.fhxx-top-top-left-title {
display: flex;
align-items: center;
.title-line {
width: 4px;
height: 16px;
background: #055fe7;
border-radius: 2px;
}
.title-name {
margin-left: 10px;
font-size: 16px;
font-family: MicrosoftYaHei;
color: #282f3c;
}
}
.content-area2 {
margin-top: 16px;
/deep/.el-textarea {
/deep/.el-textarea__inner {
width: 297px;
height: 70px;
background: #ffffff;
box-shadow: 0px 1px 2px 0px rgba(5, 95, 231, 0.18);
border-radius: 4px;
}
}
}
}
.fhxx-top-top-left-content {
margin-top: 20px;
display: flex;
flex-direction: column;
.content-item {
display: flex;
align-items: center;
margin-bottom: 14px;
.label-name {
width: 98px;
height: 19px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #999999;
}
.label-value {
width: 191px;
height: 19px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
.content-area {
margin-top: 51px;
/deep/.el-textarea {
/deep/.el-textarea__inner {
width: 297px;
height: 70px;
background: #ffffff;
box-shadow: 0px 1px 2px 0px rgba(5, 95, 231, 0.18);
border-radius: 4px;
}
}
}
}
.content-item2 {
display: flex;
.label-value {
display: flex;
span {
margin-right: 32px;
}
.label-name2 {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #999999;
margin-right: 12px;
}
}
}
}
.fhxx-top-line {
margin-top: 20px;
margin-bottom: 20px;
width: 100%;
height: 1px;
background: #eeeeee;
}
.fhxx-top-bottom {
.fhxx-top-top-left-title {
display: flex;
align-items: center;
.title-line {
width: 4px;
height: 16px;
background: #055fe7;
border-radius: 2px;
}
.title-name {
margin-left: 10px;
font-size: 16px;
font-family: MicrosoftYaHei;
color: #282f3c;
}
}
.fhxx-top-bottom-content {
display: flex;
justify-content: space-between;
.fhxx-top-bottom-left,
.fhxx-top-bottom-right {
margin-top: 20px;
.content-item {
display: flex;
align-items: center;
margin-bottom: 16px;
.label-name {
width: 120px;
height: 19px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #999999;
}
.label-value {
width: 148px;
height: 19px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.red {
color: #ff2035;
}
}
}
.fhxx-top-bottom-right {
}
}
}
}
}
.fhxx-bottom {
.fhxx-bottom-title {
margin-top: 20px;
margin-bottom: 10px;
margin-left: 24px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
/deep/.el-textarea__inner {
width: 712px;
height: 70px;
background: #f6f8fa;
box-shadow: 0px 1px 2px 0px rgba(5, 95, 231, 0.18);
border-radius: 5px;
}
}
.fhxx-btns {
margin-top: 20px;
display: flex;
justify-content: flex-end;
align-items: center;
.pass {
margin-right: 24px;
width: 72px;
height: 40px;
background: #055fe7;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
}
.no-pass {
margin-right: 24px;
width: 86px;
height: 40px;
background: #ff2035;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ffffff;
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
}
.relieve {
width: 128px;
height: 40px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #ff6300;
display: flex;
justify-content: center;
align-items: center;
cursor: pointer;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ff6300;
}
}
/deep/.el-textarea__inner {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #999999;
}
}
src/views/cxyrd/LT.vue
<template> <template>
<div class="ltDiv"> <div class="ltDiv">
<div class="lt" :class="{ bzActive: isShowbzDialogBg }"> <div class="lt-dom" :class="{ bzActive: isShowbzDialogBg || loading_sd }">
<div class="header"> <div class="header">
<div class="label">正查</div> <div class="label">正查</div>
<div class="btns"> <div class="btns">
...@@ -24,6 +24,15 @@ ...@@ -24,6 +24,15 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 加载动画 -->
<div class="loading" v-show="loading_sd">
<div class="loading-finger">
<img src="@/assets/img/loadingfinger.gif" alt="" />
</div>
<div class="loading-name">
<img src="@/assets/img/loadingtxt.gif" alt="" />
</div>
</div>
<!-- 比中弹窗 --> <!-- 比中弹窗 -->
<!-- <div class="bzDialog" v-show="isShowbzDialogBg" @click="cancelbz"></div> --> <!-- <div class="bzDialog" v-show="isShowbzDialogBg" @click="cancelbz"></div> -->
<div class="bzDialog" v-show="isShowbzDialogBg"></div> <div class="bzDialog" v-show="isShowbzDialogBg"></div>
...@@ -135,6 +144,7 @@ ...@@ -135,6 +144,7 @@
</template> </template>
<script> <script>
import { mapState } from "vuex";
import "@/icons/error.svg"; import "@/icons/error.svg";
import Utils from "@/utils/util.js"; import Utils from "@/utils/util.js";
import LTSrc from "./modules/LTSrc.vue"; import LTSrc from "./modules/LTSrc.vue";
...@@ -478,6 +488,11 @@ export default { ...@@ -478,6 +488,11 @@ export default {
} }
} }
}, },
computed: {
...mapState({
loading_sd: (state) => state.loading.loading_sd,
}),
},
beforeDestroy() { beforeDestroy() {
//组件销毁前需要解绑事件。否则会出现重复触发事件的问题 //组件销毁前需要解绑事件。否则会出现重复触发事件的问题
this.$bus.off("updateFinderSource"); this.$bus.off("updateFinderSource");
...@@ -486,6 +501,38 @@ export default { ...@@ -486,6 +501,38 @@ export default {
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
// 加载动画
.loading {
z-index: 999999;
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
background: rgba($color: #fff, $alpha: 0.65);
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.loading-finger {
width: 100px;
height: 100px;
img {
width: 100%;
height: 100%;
}
}
.loading-name {
width: 100px;
height: auto;
margin-top: 20px;
img {
width: 100%;
height: 100%;
}
}
}
.ltDiv { .ltDiv {
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -498,7 +545,7 @@ div { ...@@ -498,7 +545,7 @@ div {
display: inline-block; display: inline-block;
border: none; border: none;
} }
.lt { .lt-dom {
width: 100%; width: 100%;
background-color: #ffffff; background-color: #ffffff;
/*padding: 24px;*/ /*padding: 24px;*/
...@@ -582,8 +629,10 @@ div { ...@@ -582,8 +629,10 @@ div {
} }
.lt_main { .lt_main {
width: 100%; width: 100%;
// width: 1124px;
display: flex; display: flex;
flex-direction: row; // flex-direction: row;
justify-content: space-between;
} }
.lt_main_left { .lt_main_left {
width: 352px; width: 352px;
...@@ -596,6 +645,7 @@ div { ...@@ -596,6 +645,7 @@ div {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-top: -65px; margin-top: -65px;
margin-left: -16px;
} }
.lt_main_middle .lt_main_header { .lt_main_middle .lt_main_header {
height: 70px; height: 70px;
......
src/views/cxyrd/TL.vue
<template> <template>
<div class="tlDiv"> <div class="tlDiv">
<div class="tl" :class="{ bzActive: isShowbzDialogBg }"> <div class="tl" :class="{ bzActive: isShowbzDialogBg || loading_sd}">
<div class="header"> <div class="header">
<div class="label">倒查</div> <div class="label">倒查</div>
<div class="btns"> <div class="btns">
...@@ -21,6 +21,15 @@ ...@@ -21,6 +21,15 @@
</div> </div>
</div> </div>
</div> </div>
<!-- 加载动画 -->
<div class="loading" v-show="loading_sd">
<div class="loading-finger">
<img src="@/assets/img/loadingfinger.gif" alt="" />
</div>
<div class="loading-name">
<img src="@/assets/img/loadingtxt.gif" alt="" />
</div>
</div>
<!-- 比中弹窗 --> <!-- 比中弹窗 -->
<div class="bzDialog" v-show="isShowbzDialogBg" @click="cancelbz"></div> <div class="bzDialog" v-show="isShowbzDialogBg" @click="cancelbz"></div>
<div class="bzcontent" v-show="isShowbzDialog"> <div class="bzcontent" v-show="isShowbzDialog">
...@@ -83,11 +92,7 @@ ...@@ -83,11 +92,7 @@
</div> </div>
<div class="bzitem"> <div class="bzitem">
<div class="bzname">比中人联系电话：</div> <div class="bzname">比中人联系电话：</div>
<el-input <el-input class="bzphone" v-model="phone" placeholder="请输入内容"></el-input>
class="bzphone"
v-model="phone"
placeholder="请输入内容"
></el-input>
<div class="input-error" v-show="isPhoneError"> <div class="input-error" v-show="isPhoneError">
<!-- <img src="@/assets/img/inputerror.png" alt=""> --> <!-- <img src="@/assets/img/inputerror.png" alt=""> -->
<svg-icon icon-class="error" class="icon" /> <svg-icon icon-class="error" class="icon" />
...@@ -100,12 +105,7 @@ ...@@ -100,12 +105,7 @@
<div class="line"></div> <div class="line"></div>
<div class="bzfooter"> <div class="bzfooter">
<div class="footer-title">备注</div> <div class="footer-title">备注</div>
<el-input <el-input type="textarea" :rows="5" placeholder="在此输入备注信息" v-model="textarea">
type="textarea"
:rows="5"
placeholder="在此输入备注信息"
v-model="textarea"
>
</el-input> </el-input>
</div> </div>
<div class="bzbtns"> <div class="bzbtns">
...@@ -116,11 +116,7 @@ ...@@ -116,11 +116,7 @@
</div> </div>
<!-- 认定完成确认框 --> <!-- 认定完成确认框 -->
<div <div class="rdwcDialog" v-show="isShowrdwcDialogBg" @click="cancelrdwc"></div>
class="rdwcDialog"
v-show="isShowrdwcDialogBg"
@click="cancelrdwc"
></div>
<div class="rdwccontent" v-show="isShowrdwcDialog"> <div class="rdwccontent" v-show="isShowrdwcDialog">
<div class="title">当前候选未全部查看，是否确认认定完成？</div> <div class="title">当前候选未全部查看，是否确认认定完成？</div>
<div class="rdwcbtns"> <div class="rdwcbtns">
...@@ -132,6 +128,7 @@ ...@@ -132,6 +128,7 @@
</template> </template>
<script> <script>
import { mapState } from "vuex";
import "@/icons/error.svg"; import "@/icons/error.svg";
import Utils from "@/utils/util.js"; import Utils from "@/utils/util.js";
import ImageEd from "../../components/ImageEd.vue"; import ImageEd from "../../components/ImageEd.vue";
...@@ -144,7 +141,7 @@ export default { ...@@ -144,7 +141,7 @@ export default {
TLSrc, TLSrc,
TLCandidate TLCandidate
}, },
data() { data () {
return { return {
dialog: false, dialog: false,
text: "", text: "",
...@@ -170,7 +167,7 @@ export default { ...@@ -170,7 +167,7 @@ export default {
}; };
}, },
watch: { watch: {
phone(newValue, oldValue) { phone (newValue, oldValue) {
if (newValue.length < 7) { if (newValue.length < 7) {
this.isPhoneError = true; this.isPhoneError = true;
document document
...@@ -190,7 +187,7 @@ export default { ...@@ -190,7 +187,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
confirmrdwc() { confirmrdwc () {
let self = this; let self = this;
this.isShowrdwcDialogBg = false; this.isShowrdwcDialogBg = false;
this.isShowrdwcDialog = false; this.isShowrdwcDialog = false;
...@@ -232,7 +229,7 @@ export default { ...@@ -232,7 +229,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
cancelrdwc() { cancelrdwc () {
this.isShowrdwcDialogBg = false; this.isShowrdwcDialogBg = false;
this.isShowrdwcDialog = false; this.isShowrdwcDialog = false;
}, },
...@@ -241,7 +238,7 @@ export default { ...@@ -241,7 +238,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
cancelbz() { cancelbz () {
this.isShowbzDialogBg = false; this.isShowbzDialogBg = false;
this.isShowbzDialog = false; this.isShowbzDialog = false;
}, },
...@@ -250,7 +247,7 @@ export default { ...@@ -250,7 +247,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
confirmbz() { confirmbz () {
let self = this; let self = this;
//console.log("比中"); //console.log("比中");
let affirmstatus = "1"; let affirmstatus = "1";
...@@ -308,7 +305,7 @@ export default { ...@@ -308,7 +305,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
getUserInfo2() { getUserInfo2 () {
let self = this; let self = this;
let destbarcode = sessionStorage.getItem("destbarcode") || ""; let destbarcode = sessionStorage.getItem("destbarcode") || "";
//console.log(destbarcode); //console.log(destbarcode);
...@@ -330,7 +327,7 @@ export default { ...@@ -330,7 +327,7 @@ export default {
* @param {*} id * @param {*} id
* @return {*} * @return {*}
*/ */
getUserInfo(id = 1234) { getUserInfo (id = 1234) {
let self = this; let self = this;
this.$axios({ this.$axios({
method: "post", method: "post",
...@@ -363,7 +360,7 @@ export default { ...@@ -363,7 +360,7 @@ export default {
* @param {*} * @param {*}
* @return {*} * @return {*}
*/ */
Bz() { Bz () {
//console.info("比中"); //console.info("比中");
this.isShowbzDialogBg = true; this.isShowbzDialogBg = true;
this.isShowbzDialog = true; this.isShowbzDialog = true;
...@@ -380,7 +377,7 @@ export default { ...@@ -380,7 +377,7 @@ export default {
// 比中人 // 比中人
this.userdesc = sessionStorage.getItem("userdesc"); this.userdesc = sessionStorage.getItem("userdesc");
}, },
Rdwc() { Rdwc () {
//console.info("认定完成"); //console.info("认定完成");
//console.log("认定完成"); //console.log("认定完成");
let qqid = sessionStorage.getItem("qqid") || ""; let qqid = sessionStorage.getItem("qqid") || "";
...@@ -404,7 +401,7 @@ export default { ...@@ -404,7 +401,7 @@ export default {
} }
}); });
}, },
hideDialog() { hideDialog () {
this.dialog = true; this.dialog = true;
}, },
/** /**
...@@ -413,7 +410,7 @@ export default { ...@@ -413,7 +410,7 @@ export default {
* @param {*} date * @param {*} date
* @return {*} * @return {*}
*/ */
dateFormat(fmt, date) { dateFormat (fmt, date) {
let ret; let ret;
const opt = { const opt = {
"Y+": date.getFullYear().toString(), // 年 "Y+": date.getFullYear().toString(), // 年
...@@ -440,7 +437,7 @@ export default { ...@@ -440,7 +437,7 @@ export default {
* @param {*} code * @param {*} code
* @return {*} * @return {*}
*/ */
judgeZw(code) { judgeZw (code) {
//console.log(code); //console.log(code);
switch (code) { switch (code) {
case 1: case 1:
...@@ -505,11 +502,47 @@ export default { ...@@ -505,11 +502,47 @@ export default {
break; break;
} }
} }
} },
computed: {
...mapState({
loading_sd: (state) => state.loading.loading_sd,
}),
},
}; };
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
// 加载动画
.loading {
z-index: 999999;
position: fixed;
left: 0;
top: 0;
width: 100%;
height: 100%;
background: rgba($color: #fff, $alpha: 0.65);
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.loading-finger {
width: 100px;
height: 100px;
img {
width: 100%;
height: 100%;
}
}
.loading-name {
width: 100px;
height: auto;
margin-top: 20px;
img {
width: 100%;
height: 100%;
}
}
}
div { div {
margin: 0; margin: 0;
padding: 0; padding: 0;
...@@ -526,7 +559,7 @@ div { ...@@ -526,7 +559,7 @@ div {
} }
.tl { .tl {
width: 100%; width: 100%;
background-color: #ffffff; // background-color: #ffffff;
/*padding: 24px;*/ /*padding: 24px;*/
margin: 0; margin: 0;
padding: 0 24px 24px 24px; padding: 0 24px 24px 24px;
...@@ -587,7 +620,7 @@ div { ...@@ -587,7 +620,7 @@ div {
.main { .main {
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; justify-content: space-between;
.main-left { .main-left {
width: 352px; width: 352px;
border: none; border: none;
...@@ -600,10 +633,11 @@ div { ...@@ -600,10 +633,11 @@ div {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin-top: -65px; margin-top: -65px;
margin-left: -10px;
} }
.main-right { .main-right {
margin-top: 50px; margin-top: 50px;
margin-left: 16px; margin-left: 20px;
width: 380px; width: 380px;
border: none; border: none;
} }
......
src/views/cxyrd/modules/TLCandidate.vue
...@@ -101,7 +101,7 @@ export default { ...@@ -101,7 +101,7 @@ export default {
self.total = self.tableData.total; self.total = self.tableData.total;
clearTimeout(self.timer) clearTimeout(self.timer)
self.timer = setTimeout(() => { self.timer = setTimeout(() => {
self.$store.commit('loading/setLoading', false) self.$store.commit('loading/setLoadingSd', false)
}, 500); }, 500);
}); });
}, },
...@@ -127,7 +127,7 @@ export default { ...@@ -127,7 +127,7 @@ export default {
sessionStorage.setItem("backcheckXh", val.destseqno); sessionStorage.setItem("backcheckXh", val.destseqno);
// this.$axios.get(`/api/api/org/plainByBarcode/R1100002487002018050034/1/`) // this.$axios.get(`/api/api/org/plainByBarcode/R1100002487002018050034/1/`)
if (!self.isFirstMounted) { if (!self.isFirstMounted) {
self.$store.commit('loading/setLoading', true) self.$store.commit('loading/setLoadingSd', true)
} }
this.$axios this.$axios
...@@ -142,7 +142,7 @@ export default { ...@@ -142,7 +142,7 @@ export default {
if (!self.isFirstMounted) { if (!self.isFirstMounted) {
clearTimeout(self.timer) clearTimeout(self.timer)
self.timer = setTimeout(() => { self.timer = setTimeout(() => {
self.$store.commit('loading/setLoading', false) self.$store.commit('loading/setLoadingSd', false)
}, 500); }, 500);
} }
} else { } else {
......
src/views/cxyrd/modules/TLSrc.vue
...@@ -465,7 +465,7 @@ export default { ...@@ -465,7 +465,7 @@ export default {
async handleCurrentChange(val, old) { async handleCurrentChange(val, old) {
let self = this; let self = this;
// 发送请求 // 发送请求
self.$store.commit('loading/setLoading', true) self.$store.commit('loading/setLoadingSd', true)
// 被删除 // 被删除
if(val.removeFlag === 1) { if(val.removeFlag === 1) {
self.painFlag = false self.painFlag = false
...@@ -846,14 +846,14 @@ export default { ...@@ -846,14 +846,14 @@ export default {
clearTimeout(self.timer) clearTimeout(self.timer)
self.timer = setTimeout(() => { self.timer = setTimeout(() => {
self.$store.commit('loading/setLoading', false) self.$store.commit('loading/setLoadingSd', false)
}, 500); }, 500);
}, },
// 获取列表数据 // 获取列表数据
async getDetailData() { async getDetailData() {
let self = this; let self = this;
// 发送请求 // 发送请求
self.$store.commit('loading/setLoading', true) self.$store.commit('loading/setLoadingSd', true)
NProgress.start(); NProgress.start();
//console.info(this.dataList); //console.info(this.dataList);
if (self.type == "father") { if (self.type == "father") {
...@@ -1044,7 +1044,7 @@ export default { ...@@ -1044,7 +1044,7 @@ export default {
} }
NProgress.start(); NProgress.start();
if (!this.isFirstMounted) { if (!this.isFirstMounted) {
self.$store.commit('loading/setLoading', true) self.$store.commit('loading/setLoadingSdSd', true)
} }
this.$axios({ this.$axios({
method: "post", method: "post",
...@@ -1070,7 +1070,7 @@ export default { ...@@ -1070,7 +1070,7 @@ export default {
if (!this.isFirstMounted) { if (!this.isFirstMounted) {
clearTimeout(self.timer) clearTimeout(self.timer)
self.timer = setTimeout(() => { self.timer = setTimeout(() => {
self.$store.commit('loading/setLoading', false) self.$store.commit('loading/setLoadingSdSd', false)
}, 500); }, 500);
} }
...@@ -1109,7 +1109,7 @@ export default { ...@@ -1109,7 +1109,7 @@ export default {
} }
NProgress.start(); NProgress.start();
if (!this.isFirstMounted) { if (!this.isFirstMounted) {
self.$store.commit('loading/setLoading', true) self.$store.commit('loading/setLoadingSdSd', true)
} }
this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.code}`, { srcbarcode: sessionStorage.getItem("srcbarcode") }, { this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.code}`, { srcbarcode: sessionStorage.getItem("srcbarcode") }, {
loading: false, loading: false,
...@@ -1130,7 +1130,7 @@ export default { ...@@ -1130,7 +1130,7 @@ export default {
if (!this.isFirstMounted) { if (!this.isFirstMounted) {
clearTimeout(self.timer) clearTimeout(self.timer)
self.timer = setTimeout(() => { self.timer = setTimeout(() => {
self.$store.commit('loading/setLoading', false) self.$store.commit('loading/setLoadingSdSd', false)
}, 500); }, 500);
} }
...@@ -1168,7 +1168,7 @@ export default { ...@@ -1168,7 +1168,7 @@ export default {
} }
NProgress.start(); NProgress.start();
if(!this.isFirstMounted) { if(!this.isFirstMounted) {
self.$store.commit('loading/setLoading', true) self.$store.commit('loading/setLoadingSdSd', true)
} }
this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.code}`, { srcbarcode: sessionStorage.getItem("srcbarcode") }, { this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.code}`, { srcbarcode: sessionStorage.getItem("srcbarcode") }, {
loading: false, loading: false,
...@@ -1189,7 +1189,7 @@ export default { ...@@ -1189,7 +1189,7 @@ export default {
if(!this.isFirstMounted) { if(!this.isFirstMounted) {
clearTimeout(self.timer) clearTimeout(self.timer)
self.timer = setTimeout(() => { self.timer = setTimeout(() => {
self.$store.commit('loading/setLoading', false) self.$store.commit('loading/setLoadingSdSd', false)
}, 500); }, 500);
} }
...@@ -1228,7 +1228,7 @@ export default { ...@@ -1228,7 +1228,7 @@ export default {
} }
NProgress.start(); NProgress.start();
if(!this.isFirstMounted) { if(!this.isFirstMounted) {
self.$store.commit('loading/setLoading', true) self.$store.commit('loading/setLoadingSdSd', true)
} }
this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.code}`, { "srcbarcode": sessionStorage.getItem("srcbarcode") }, { this.$axios.post(`/api/query/matchcand/dest/${self.qqid}/${imageInfo.code}`, { "srcbarcode": sessionStorage.getItem("srcbarcode") }, {
...@@ -1250,7 +1250,7 @@ export default { ...@@ -1250,7 +1250,7 @@ export default {
if(!this.isFirstMounted) { if(!this.isFirstMounted) {
clearTimeout(self.timer) clearTimeout(self.timer)
self.timer = setTimeout(() => { self.timer = setTimeout(() => {
self.$store.commit('loading/setLoading', false) self.$store.commit('loading/setLoadingSdSd', false)
}, 500); }, 500);
} }
......
src/views/index/error.vue
<!--
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-04 13:22:41
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\index\error.vue
-->
<template> <template>
<div class="error-wrap"> <div class="error-wrap">
<!-- <i class="iconfont icon404"></i> <!-- <i class="iconfont icon404"></i>
<h2>抱歉！页面无法访问……</h2> --> <h2>抱歉！页面无法访问……</h2> -->
<div> <div class="content">
<img src="@/assets/img/404.png" /> <!-- <img src="@/assets/img/404.png" /> -->
<img class="top" src="@/assets/img/404/top.png" alt="">
<div class="center">
<img class="center-img" src="@/assets/img/404/404.png" alt="">
<div class="tip">
<div class="line"></div>
<div class="txt">页面信息丢失，建议尝试以下方法解决问题</div>
<div class="line"></div>
</div> </div>
<el-link :underline="false" @click="$router.go(-1)" class="go-back" <div class="btns">
<div @click="$router.push('/')" class="fhmh">返回门户</div>
<el-link :underline="false" @click="$router.go(-1)" class="go-back">后退一步</el-link>
</div>
</div>
<img class="bottom" src="@/assets/img/404/bottom.png" alt="">
</div>
<!-- <el-link :underline="false" @click="$router.go(-1)" class="go-back"
>返回上一页</el-link >返回上一页</el-link
> >
<router-link to="/" class="go-index">返回首页</router-link> <router-link to="/" class="go-index">返回首页</router-link> -->
</div> </div>
</template> </template>
...@@ -19,33 +41,100 @@ export default { ...@@ -19,33 +41,100 @@ export default {
data: () => { data: () => {
return {}; return {};
}, },
created() {}, created () { },
methods: {} methods: {}
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.error-wrap { .content {
text-align: center; height: 100vh;
padding: 40px; display: flex;
position: absolute; flex-direction: column;
top: 50%; align-items: center;
left: 50%; justify-content: space-between;
transform: translate(-50%, -50%); }
div { .top {
margin-bottom: 30px; width: 1792px;
}
.center {
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
.center-img {
width: 332px;
height: 133px;
}
.tip {
margin-top: 40px;
display: flex;
align-items: center;
.line {
width: 60px;
height: 1px;
background: #979797;
} }
i { .txt {
font-size: 60px; font-size: 16px;
font-family: PingFang-SC-Regular, PingFang-SC;
font-weight: 400;
color: #333333;
margin: 0 20px;
} }
h2 { }
margin: 0 0 30px; .btns {
margin-top: 50px;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
.fhmh {
width: 96px;
height: 40px;
background: #055FE7;
border-radius: 4px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #FFFFFF;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
} }
.go-back { .go-back {
margin-right: 10px; margin-top: 20px;
color: $base-color; font-size: 14px;
font-family: MicrosoftYaHei;
color: #055FE7;
cursor: pointer;
} }
.go-index {
color: $base-color;
} }
} }
.bottom {
width: 1710px;
}
// .error-wrap {
// text-align: center;
// padding: 40px;
// position: absolute;
// top: 50%;
// left: 50%;
// transform: translate(-50%, -50%);
// div {
// margin-bottom: 30px;
// }
// i {
// font-size: 60px;
// }
// h2 {
// margin: 0 0 30px;
// }
// .go-back {
// margin-right: 10px;
// color: $base-color;
// }
// .go-index {
// color: $base-color;
// }
// }
</style> </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