Skip to content

F
founder_vue
Commit 1c4866ed by 张超军
Options

加载动画

parent b5b91f95
Showing with 309 additions and 37 deletions
src/App.vue
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-06-15 15:12:19 * @Date: 2021-06-15 15:12:19
* @LastEditTime: 2021-08-11 09:30:34 * @LastEditTime: 2021-09-27 09:51:42
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\App.vue * @FilePath: \founder_vue\src\App.vue
...@@ -45,6 +45,10 @@ export default { ...@@ -45,6 +45,10 @@ export default {
</script> </script>
<style lang="scss"> <style lang="scss">
@font-face {
font-family: 'Microsoft YaHei';
src: url('./assets/fonts/Microsoft YaHei.ttf') format('truetype');
}
/*每个页面公共css */ /*每个页面公共css */
// @import url("assets/styles/iconfont.css"); // @import url("assets/styles/iconfont.css");
// @import "assets/styles/main.scss"; // @import "assets/styles/main.scss";
......
src/main.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-06-15 15:12:19 * @Date: 2021-06-15 15:12:19
* @LastEditTime: 2021-09-03 09:48:17 * @LastEditTime: 2021-09-27 10:33:28
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\src\main.js * @FilePath: \founder_vue\src\main.js
...@@ -25,7 +25,7 @@ Vue.prototype.$lrz = lrz ...@@ -25,7 +25,7 @@ Vue.prototype.$lrz = lrz
// Vue.prototype.$video = Video // Vue.prototype.$video = Video
//调用指纹采集接口 //调用指纹采集接口
import axios from 'axios' import axios from 'axios'
axios.defaults.retry = 2; axios.defaults.retry = 9;
axios.defaults.retryDelay = 1000; axios.defaults.retryDelay = 1000;
axios.interceptors.response.use(undefined, function axiosRetryInterceptor (err) { axios.interceptors.response.use(undefined, function axiosRetryInterceptor (err) {
......
src/views/zwxt/fingerprint.scss
...@@ -113,11 +113,29 @@ $dialogBtnHoverSpan: var(--dialogBtnHoverSpan, #dddddd); // #323942 ...@@ -113,11 +113,29 @@ $dialogBtnHoverSpan: var(--dialogBtnHoverSpan, #dddddd); // #323942
$finger: var(--finger, #ffc005); $finger: var(--finger, #ffc005);
$lookingBg: var(--lookingBg, #161712); $lookingBg: var(--lookingBg, #161712);
// 上传时的边框
$uploadingBorder: var(--uploadingBorder, 0); // 2px
// el-dialog背景色
$elDialog: var(--elDialog, #3f3f3f); // #CCD2D8
* { * {
margin: 0; margin: 0;
padding: 0; padding: 0;
box-sizing: border-box; box-sizing: border-box;
} }
/deep/.el-dialog {
background: $elDialog;
}
// .fade-enter-active, .fade-leave-active {
// transition: opacity .5s;
// }
// .fade-enter, .fade-leave-to /* .fade-leave-active in <2.1.8 */ {
// opacity: 0;
// }
.fingerprint { .fingerprint {
// width: 1920px; // width: 1920px;
...@@ -125,6 +143,9 @@ $lookingBg: var(--lookingBg, #161712); ...@@ -125,6 +143,9 @@ $lookingBg: var(--lookingBg, #161712);
// height: 100%; // height: 100%;
background-color: $bigBg; background-color: $bigBg;
position: relative; position: relative;
button {
outline: none;
}
.color-switch { .color-switch {
position: absolute; position: absolute;
top: 48px; top: 48px;
...@@ -1255,7 +1276,30 @@ $lookingBg: var(--lookingBg, #161712); ...@@ -1255,7 +1276,30 @@ $lookingBg: var(--lookingBg, #161712);
border: 2px solid $pichover; border: 2px solid $pichover;
} }
.pic.noget { .pic.noget {
background-color: #fff; background: #292929;
position: relative;
span {
font-size: 12px;
font-family: Microsoft YaHei;
color: #17d010;
line-height: 16px;
}
.correct {
position: absolute;
bottom: 0px;
right: 0px;
width: 20px;
height: 20px;
background: #17d010;
border-radius: 8px 0px 1px 0px;
display: flex;
justify-content: center;
align-items: center;
img {
width: 14px;
height: 10px;
}
}
} }
.pic.noget:hover { .pic.noget:hover {
cursor: pointer; cursor: pointer;
...@@ -1288,15 +1332,30 @@ $lookingBg: var(--lookingBg, #161712); ...@@ -1288,15 +1332,30 @@ $lookingBg: var(--lookingBg, #161712);
cursor: pointer; cursor: pointer;
border: 2px solid $pichover; border: 2px solid $pichover;
} }
.desc { .pic.get {
margin-top: 2px; border: 2px solid #e82510;
height: 21px; display: flex;
font-size: 16px; justify-content: center;
font-family: Microsoft YaHei; align-items: center;
font-weight: 400; background-color: $anaphoraBg;
line-height: 21px; position: relative;
color: $boxdesc; span {
opacity: 1; position: absolute;
color: #e82510;
}
.desc {
position: absolute;
width: 42px;
height: 20px;
background: #e82510;
font-family: Microsoft YaHei;
font-size: 12px;
color: #000000;
border-radius: 1px 0px 8px 0px;
border: 1px solid #e82510;
left: 0;
top: 0;
}
} }
} }
} }
...@@ -2404,7 +2463,7 @@ $lookingBg: var(--lookingBg, #161712); ...@@ -2404,7 +2463,7 @@ $lookingBg: var(--lookingBg, #161712);
margin-left: 5px; margin-left: 5px;
font-size: 18px; font-size: 18px;
font-weight: 900; font-weight: 900;
font-family: MicrosoftYaHei; font-family: Microsoft YaHei;
color: #ffc005; color: #ffc005;
} }
} }
...@@ -2420,7 +2479,7 @@ $lookingBg: var(--lookingBg, #161712); ...@@ -2420,7 +2479,7 @@ $lookingBg: var(--lookingBg, #161712);
} }
.line-second { .line-second {
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei; font-family: Microsoft YaHei;
color: #ffc005; color: #ffc005;
margin-left: 20px; margin-left: 20px;
margin-top: 5px; margin-top: 5px;
...@@ -2433,7 +2492,7 @@ $lookingBg: var(--lookingBg, #161712); ...@@ -2433,7 +2492,7 @@ $lookingBg: var(--lookingBg, #161712);
top: 50px; top: 50px;
left: calc(50% - 212px); left: calc(50% - 212px);
width: 424px; width: 424px;
background-color: #1A4019; background-color: #1a4019;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding: 12px; padding: 12px;
...@@ -2456,8 +2515,8 @@ $lookingBg: var(--lookingBg, #161712); ...@@ -2456,8 +2515,8 @@ $lookingBg: var(--lookingBg, #161712);
margin-left: 5px; margin-left: 5px;
font-size: 18px; font-size: 18px;
font-weight: 900; font-weight: 900;
font-family: MicrosoftYaHei; font-family: Microsoft YaHei;
color: #17D010; color: #17d010;
} }
} }
.close { .close {
...@@ -2472,8 +2531,8 @@ $lookingBg: var(--lookingBg, #161712); ...@@ -2472,8 +2531,8 @@ $lookingBg: var(--lookingBg, #161712);
} }
.line-second { .line-second {
font-size: 14px; font-size: 14px;
font-family: MicrosoftYaHei; font-family: Microsoft YaHei;
color: #17D010; color: #17d010;
margin-left: 20px; margin-left: 20px;
margin-top: 5px; margin-top: 5px;
font-weight: 900; font-weight: 900;
...@@ -2488,4 +2547,205 @@ $lookingBg: var(--lookingBg, #161712); ...@@ -2488,4 +2547,205 @@ $lookingBg: var(--lookingBg, #161712);
} }
} }
} }
.repeatDialog {
/deep/ .el-dialog {
border-radius: 6px 6px 0px 0px;
}
/deep/ .el-dialog__header {
width: 480px;
height: 39px;
background: $btndialogBg;
border: 1px solid $btndialogBg;
opacity: 1;
border-radius: 4px 4px 0px 0px;
display: flex;
justify-content: space-between;
align-items: center;
padding: 0;
margin: 0;
box-sizing: border-box;
.el-dialog__title {
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
line-height: 21px;
color: $btndialogTitle;
}
.el-dialog__headerbtn {
top: 14px;
right: 16px;
}
}
/deep/ .el-dialog__body {
height: 111px;
background-color: $btndialogbodyBg;
padding-left: 28px !important;
padding-top: 43px !important;
span {
display: block;
width: 336px;
height: 21px;
font-size: 16px;
font-family: Microsoft YaHei;
font-weight: 400;
line-height: 28px;
color: $btndialogbodyTxt;
}
}
/deep/ .el-dialog__footer {
background-color: $btndialogbodyBg;
padding-bottom: 20px !important;
padding-right: 20px !important;
.dialog-footer {
.el-button.el-button--default {
width: 30px;
height: 20px;
span {
font-size: 15px;
font-family: Microsoft YaHei;
font-weight: 400;
line-height: 20px;
color: $btndialogbodyTxt;
}
}
.el-button.el-button--primary {
width: 88px;
height: 32px;
background: $btndialogBg;
opacity: 1;
border: none;
border-radius: 18px;
span {
font-size: 15px;
font-family: Microsoft YaHei;
font-weight: 400;
line-height: 20px;
color: $btndialogbodyTxt;
}
}
.el-button.el-button--primary:hover {
border: 1px solid $btndialogbodyTxt;
}
}
}
}
.uploading {
z-index: 10000;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
background-color: rgba(216, 216, 216, 0.4);;
display: flex;
justify-content: center;
align-items: center;
/deep/.el-progress__text {
color: #fff;
}
/deep/.el-progress-circle__track {
stroke: #333;
}
.pro {
border: $uploadingBorder solid #26D31F;
border-radius: 50%;
}
.uploading-finish {
top: 425px;
position: absolute;
width: 48px;
height: 34px;
display: flex;
img {
object-fit: contain;
}
}
.uploading-error-img {
top: 425px;
position: absolute;
width: 5px;
height: 25px;
display: flex;
img {
object-fit: contain;
}
}
.uploading-finished {
width: 480px;
height: 286px;
background: #3f3f3f;
border-radius: 0px 0px 4px 4px;
border: 1px solid #535353;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
img {
width: 96px;
height: 96px;
}
.uploading-finished-title {
margin-top: 30px;
font-size: 24px;
font-family: Microsoft YaHei;
color: #D8D8D8;
}
.uploading-finished-tip {
margin-top: 12px;
font-size: 12px;
font-family: Microsoft YaHei;
color: #909090;
}
}
.uploading-error {
width: 480px;
height: 286px;
background: #3f3f3f;
border-radius: 0px 0px 4px 4px;
border: 1px solid #535353;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
img {
width: 96px;
height: 96px;
}
.uploading-error-title {
margin-top: 30px;
font-size: 24px;
font-family: Microsoft YaHei;
color: #E82510;
}
.uploading-error-tip {
margin-top: 12px;
font-size: 12px;
font-family: Microsoft YaHei;
color: #909090;
}
}
.uploading-content {
width: 480px;
height: 286px;
background: #3f3f3f;
border-radius: 0px 0px 4px 4px;
border: 1px solid #535353;
display: flex;
justify-content: center;
align-items: center;
flex-direction: column;
.uploading-title {
margin-top: 38px;
font-size: 16px;
font-family: Microsoft YaHei;
color: #d8d8d8;
}
.uploading-tip {
margin-top: 12px;
font-size: 12px;
font-family: MicrosoftYaHei;
color: #909090;
}
}
}
} }
src/views/zwxt/fingerprint6.vue
This source diff could not be displayed because it is too large. You can view the blob instead.
vue.config.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-06-15 15:12:19 * @Date: 2021-06-15 15:12:19
* @LastEditTime: 2021-09-26 15:05:51 * @LastEditTime: 2021-09-30 10:34:08
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\vue.config.js * @FilePath: \founder_vue\vue.config.js
...@@ -124,22 +124,22 @@ module.exports = { ...@@ -124,22 +124,22 @@ module.exports = {
// }, // },
// 阿里--周晓 // 阿里--周晓
"/apiInfo": { // "/apiInfo": {
target: "http://47.92.226.24:9080/", //统一的请求头部每次修改都要重启才会生效 // target: "http://47.92.226.24:9080/", //统一的请求头部每次修改都要重启才会生效
ws: true, // ws: true,
changeOrigin: true, // changeOrigin: true,
pathRewrite: { // pathRewrite: {
'^/apiInfo': '' // '^/apiInfo': ''
} // }
}, // },
"/apiDelImg": { // "/apiDelImg": {
target: "http://47.92.226.24:8091/", //统一的请求头部每次修改都要重启才会生效 // target: "http://47.92.226.24:8091/", //统一的请求头部每次修改都要重启才会生效
ws: true, // ws: true,
changeOrigin: true, // changeOrigin: true,
pathRewrite: { // pathRewrite: {
'^/apiDelImg': '' // '^/apiDelImg': ''
} // }
}, // },
"/apiSaveImg": { "/apiSaveImg": {
target: "http://localhost:8088/", //统一的请求头部每次修改都要重启才会生效 target: "http://localhost:8088/", //统一的请求头部每次修改都要重启才会生效
ws: true, ws: true,
...@@ -148,6 +148,14 @@ module.exports = { ...@@ -148,6 +148,14 @@ module.exports = {
'^/apiSaveImg': '' '^/apiSaveImg': ''
} }
}, },
// "/apiZwxt": {
// target: "http://65.28.26.209:8080/", //统一的请求头部每次修改都要重启才会生效
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// '^/apiZwxt': '/'
// }
// },
"/apiZwxt": { "/apiZwxt": {
target: "http://localhost:8080/", //统一的请求头部每次修改都要重启才会生效 target: "http://localhost:8080/", //统一的请求头部每次修改都要重启才会生效
ws: true, ws: true,
......
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