Skip to content

F
founder_vue
Commit 629da991 by 张超军
Options

恢复的信息

parent 52b3b243
Showing with 77 additions and 50 deletions
src/views/zwxt/fingerprint.scss
......@@ -119,6 +119,12 @@ $uploadingBorder: var(--uploadingBorder, 0); // 2px
// el-dialog背景色
$elDialog: var(--elDialog, #3f3f3f); // #CCD2D8
// 采集完成是否可以点
$finishTrue: var(--finishTrue, #464646); // 2px
// 设备信息颜色
$versionColor: var(--versionColor, #fff); // #000
* {
margin: 0;
......@@ -356,7 +362,7 @@ $elDialog: var(--elDialog, #3f3f3f); // #CCD2D8
border-right: 1px solid $bgBorder;
background: $deepBg;
.version {
color: #fff;
color: $versionColor;
font-size: 14px;
margin-left: 50px;
margin-bottom: 30px;
......@@ -402,9 +408,12 @@ $elDialog: var(--elDialog, #3f3f3f); // #CCD2D8
font-family: Microsoft YaHei;
font-weight: 400;
line-height: 21px;
color: $checkSelect;
color: $checkSelect !important;
margin-bottom: 24px;
}
/deep/.el-checkbox__input.is-disabled+span.el-checkbox__label {
color: $checkSelect !important;
}
/deep/ .el-checkbox__inner {
border: 1px solid #404040;
background-color: $checkInner;
......@@ -1151,21 +1160,21 @@ $elDialog: var(--elDialog, #3f3f3f); // #CCD2D8
width: 90px;
height: 90px;
}
.desc {
display: flex;
justify-content: center;
align-items: center;
width: 68px;
height: 28px;
// background: #e82510;
opacity: 1;
border-radius: 4px;
font-size: 14px;
font-family: Microsoft YaHei;
font-weight: 400;
line-height: 19px;
color: $boxdesc;
}
}
.desc {
display: flex;
justify-content: center;
align-items: center;
width: 68px;
height: 28px;
// background: #e82510;
opacity: 1;
border-radius: 4px;
font-size: 14px;
font-family: Microsoft YaHei;
font-weight: 400;
line-height: 19px;
color: $boxdesc;
}
.pic:hover {
cursor: pointer;
......@@ -2410,10 +2419,12 @@ $elDialog: var(--elDialog, #3f3f3f); // #CCD2D8
outline: none;
cursor: pointer;
}
.finish:hover,
.save:hover {
border: 2px solid $btnhover;
}
.finish:hover {
border: 2px solid $finishTrue; //2px
}
.save {
margin-top: 23px;
}
......
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
* @Date: 2021-06-15 15:12:19
* @LastEditTime: 2021-09-30 10:34:08
* @LastEditTime: 2022-02-18 16:14:26
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\vue.config.js
*/
const path = require("path");
/*const CompressionPlugin = require('compression-webpack-plugin');
const productionGzipExtensions = /\.(js|css|json|txt|html|ico|svg)(\?.*)?$/i;*/
// const CompressionPlugin = require('compression-webpack-plugin');
// const productionGzipExtensions = /\.(js|css|json|txt|html|ico|svg)(\?.*)?$/i;
// function resolve(dir) {
// return path.join(__dirname, dir);
// }
module.exports = {
// 若是上线环境，加./
publicPath: process.env.NODE_ENV === "development" ? "/" : "./",
assetsDir: "static",
configureWebpack: config => {
......@@ -38,6 +37,7 @@ module.exports = {
}
});
},
lintOnSave: false, //关闭eslint
chainWebpack: config => {
const oneOfsMap = config.module.rule("scss").oneOfs.store;
oneOfsMap.forEach(item => {
......@@ -49,23 +49,9 @@ module.exports = {
})
.end();
});
// if (process.env.NODE_ENV === 'production') {
// config.plugin('compressionPlugin')
// .use(new CompressionPlugin({
// filename: '[file].gz[query]',
// algorithm: 'gzip',
// test: productionGzipExtensions,
// threshold: 10240,
// minRatio: 0.8,
// deleteOriginalAssets: true
// }));
// }
},
// 不需要格式化
lintOnSave: false,
productionSourceMap: false, //关闭生产映射
devServer: {
port: 8089,
overlay: {
warnings: false,
errors: false
......@@ -100,6 +86,7 @@ module.exports = {
//******公安網絡 */
// "/apiDelImg": {
// target: "http://65.26.10.99:8091/", //统一的请求头部每次修改都要重启才会生效
// // target: "http://192.168.128.118:9201/", //统一的请求头部每次修改都要重启才会生效
// ws: true,
// changeOrigin: true,
// pathRewrite: {
......@@ -108,6 +95,7 @@ module.exports = {
// },
// "/apiMachine": {
// target: "http://65.26.10.121/", //统一的请求头部每次修改都要重启才会生效
// // target: "http://192.168.128.118:9201/", //统一的请求头部每次修改都要重启才会生效
// ws: true,
// changeOrigin: true,
// pathRewrite: {
......@@ -115,7 +103,8 @@ module.exports = {
// }
// },
// "/apiInfo": {
// target: "http://65.26.10.121/", //统一的请求头部每次修改都要重启才会生效
// target: "http://65.26.10.121/", // 统一的请求头部每次修改都要重启才会生效
// // target: "http://192.168.128.118:9201/", //统一的请求头部每次修改都要重启才会生效
// ws: true,
// changeOrigin: true,
// pathRewrite: {
......@@ -123,9 +112,30 @@ module.exports = {
// }
// },
// 新系统
"/apiInfo": {
target: "http://47.92.226.24:9080/", //统一的请求头部每次修改都要重启才会生效
// target: "http://192.168.128.105:8091", // 新系统
// target: "http://39.103.132.86:9200", // 新系统
ws: true,
changeOrigin: true,
pathRewrite: {
'^/apiInfo': ''
}
},
"/apiDelImg": {
// target: "http://47.92.226.24:8091/", //统一的请求头部每次修改都要重启才会生效
target: "http://192.168.128.105:8091", //新系统
ws: true,
changeOrigin: true,
pathRewrite: {
'^/apiDelImg': ''
}
},
// 阿里--周晓
// "/apiInfo": {
// target: "http://47.92.226.24:9080/", //统一的请求头部每次修改都要重启才会生效
// target: "http://47.92.226.24:9080/", // 统一的请求头部每次修改都要重启才会生效
// ws: true,
// changeOrigin: true,
// pathRewrite: {
......@@ -133,21 +143,22 @@ module.exports = {
// }
// },
// "/apiDelImg": {
// target: "http://47.92.226.24:8091/", //统一的请求头部每次修改都要重启才会生效
// target: "http://47.92.226.24:8091/", // 统一的请求头部每次修改都要重启才会生效
// // target: "http://192.168.128.106:8091/", // 统一的请求头部每次修改都要重启才会生效
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// '^/apiDelImg': ''
// }
// },
"/apiSaveImg": {
target: "http://localhost:8088/", //统一的请求头部每次修改都要重启才会生效
ws: true,
changeOrigin: true,
pathRewrite: {
'^/apiSaveImg': ''
}
},
// "/apiSaveImg": {
// target: "http://localhost:8088/", // 统一的请求头部每次修改都要重启才会生效
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// '^/apiSaveImg': ''
// }
// },
// "/apiZwxt": {
// target: "http://65.28.26.209:8080/", //统一的请求头部每次修改都要重启才会生效
// ws: true,
......@@ -158,6 +169,7 @@ module.exports = {
// },
"/apiZwxt": {
target: "http://localhost:8080/", //统一的请求头部每次修改都要重启才会生效
// target: "http://172.18.108.206:8080/",
ws: true,
changeOrigin: true,
pathRewrite: {
......@@ -169,9 +181,13 @@ module.exports = {
ws: true,
changeOrigin: true,
pathRewrite: {
'^/apiZwxtGaw': '/'
'^/api': '/'
}
},
}
}
},
},
css: {
sourceMap: process.env.NODE_ENV === "development" ?true:false // 在开发环境下开启 CSS sourcemaps
}
};
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