Skip to content

F
founder_vue
Commit bee64ecb by 张超军
Options

svg

parent 975875e4
Showing with 191 additions and 82 deletions
package-lock.json
......@@ -1875,37 +1875,6 @@
"webpack-merge": "^4.2.2"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz",
"integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz",
"integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"debug": {
"version": "4.2.0",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-4.2.0.tgz?cache=0&sync_timestamp=1600502871403&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.2.0.tgz",
......@@ -1915,35 +1884,11 @@
"ms": "2.1.2"
}
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
"integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
"integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
"dev": true
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.1",
"resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.1.tgz?cache=0&sync_timestamp=1632349895587&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.8.1.tgz",
"integrity": "sha1-NU8SvAiXlUFYtxWQ+AApVxOneS0=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
}
}
}
},
......@@ -8244,10 +8189,16 @@
"resolved": "https://registry.npm.taobao.org/nan/download/nan-2.14.1.tgz",
"integrity": "sha1-174036MQW5FJTDFHCJMV7/iHSwE="
},
"nanocolors": {
"version": "0.2.11",
"resolved": "https://registry.npmmirror.com/nanocolors/download/nanocolors-0.2.11.tgz",
"integrity": "sha1-8lc+aHLxtwBnQj/Gi7ydDeLzu+4=",
"dev": true
},
"nanoid": {
"version": "3.1.25",
"resolved": "https://registry.nlark.com/nanoid/download/nanoid-3.1.25.tgz?cache=0&sync_timestamp=1628771925127&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnanoid%2Fdownload%2Fnanoid-3.1.25.tgz",
"integrity": "sha1-CcoydHwOVD8OGBS303k0d/nI4VI=",
"version": "3.1.28",
"resolved": "https://registry.npmmirror.com/nanoid/download/nanoid-3.1.28.tgz?cache=0&sync_timestamp=1632644966429&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fnanoid%2Fdownload%2Fnanoid-3.1.28.tgz",
"integrity": "sha1-PAG6wUy2xWgFaQFMxlovJkJMa9Q=",
"dev": true
},
"nanomatch": {
......@@ -9715,20 +9666,14 @@
"postcss": "^8.3.6"
},
"dependencies": {
"colorette": {
"version": "1.3.0",
"resolved": "https://registry.nlark.com/colorette/download/colorette-1.3.0.tgz",
"integrity": "sha1-/0XS8O2yRAadO3cq3rBP7TjQoK8=",
"dev": true
},
"postcss": {
"version": "8.3.6",
"resolved": "https://registry.nlark.com/postcss/download/postcss-8.3.6.tgz?cache=0&sync_timestamp=1626882960231&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss%2Fdownload%2Fpostcss-8.3.6.tgz",
"integrity": "sha1-JzDddql5afN/U7mmCWGXvjEcxOo=",
"version": "8.3.8",
"resolved": "https://registry.npmmirror.com/postcss/download/postcss-8.3.8.tgz",
"integrity": "sha1-nr4qEnOWtLRXCun3dw5/uD2yusE=",
"dev": true,
"requires": {
"colorette": "^1.2.2",
"nanoid": "^3.1.23",
"nanocolors": "^0.2.2",
"nanoid": "^3.1.25",
"source-map-js": "^0.6.2"
}
}
......@@ -12001,7 +11946,7 @@
},
"postcss": {
"version": "5.2.18",
"resolved": "https://registry.nlark.com/postcss/download/postcss-5.2.18.tgz?cache=0&sync_timestamp=1626882960231&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss%2Fdownload%2Fpostcss-5.2.18.tgz",
"resolved": "https://registry.npmmirror.com/postcss/download/postcss-5.2.18.tgz",
"integrity": "sha1-ut+hSX1GJE9jkPWLMZgw2RB4U8U=",
"dev": true,
"requires": {
......@@ -12019,7 +11964,7 @@
},
"strip-ansi": {
"version": "3.0.1",
"resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-3.0.1.tgz?cache=0&sync_timestamp=1618553320591&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-3.0.1.tgz",
"resolved": "https://registry.npmmirror.com/strip-ansi/download/strip-ansi-3.0.1.tgz",
"integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
"dev": true,
"requires": {
......@@ -13066,6 +13011,63 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.1",
"resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.1.tgz?cache=0&sync_timestamp=1632349895587&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fvue-loader%2Fdownload%2Fvue-loader-16.8.1.tgz",
"integrity": "sha1-NU8SvAiXlUFYtxWQ+AApVxOneS0=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995625950&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
"integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.nlark.com/chalk/download/chalk-4.1.2.tgz?cache=0&sync_timestamp=1627646697260&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fchalk%2Fdownload%2Fchalk-4.1.2.tgz",
"integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"loader-utils": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/loader-utils/download/loader-utils-2.0.0.tgz",
"integrity": "sha1-5MrOW4FtQloWa18JfhDNErNgZLA=",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
}
}
},
"vue-router": {
"version": "3.4.6",
"resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.6.tgz?cache=0&sync_timestamp=1602077426782&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.6.tgz",
......
src/main.js
/*
* @Author: your name
* @Date: 2021-09-07 14:39:52
* @LastEditTime: 2021-09-22 15:58:14
* @LastEditors: your name
* @LastEditTime: 2021-09-28 09:31:22
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\main.js
*/
......@@ -22,6 +22,12 @@ import "./assets/css/el-table-style.css";
import VueClipboard from "vue-clipboard2";
import VueBus from 'vue-bus';
//引入svg组件
import IconSvg from './utils/IconSvg.vue'
// //全局注册svg-icon
Vue.component('svg-icon', IconSvg)
Vue.prototype.$driver = new Driver({
className: "scoped-class", // className to wrap driver.js popover
animate: true, // Animate while changing highlighted element
......
src/router/modules/index.js
/*
* @Author: your name
* @Date: 2021-09-07 09:58:13
* @LastEditTime: 2021-09-09 17:39:31
* @LastEditTime: 2021-09-28 09:47:41
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\src\router\modules\index.js
......
src/utils/IconSvg.vue 0 → 100644
<!--
* @Author: your name
* @Date: 2021-09-28 09:30:35
* @LastEditTime: 2021-09-28 10:12:45
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\utils\IconSvg.vue
-->
<template>
<svg class="svg-icon" aria-hidden="true" v-on="$listeners">
<use :xlink:href="iconName" />
</svg>
</template>
<script>
export default {
name: "icon-svg",
props: {
iconClass: {
type: String,
required: true
},
className: {
type: String,
default: ""
}
},
computed: {
iconName () {
return `#icon-${this.iconClass}`;
},
svgClass () {
if (this.className) {
return "svg-icon " + this.className;
} else {
return "svg-icon";
}
}
}
};
</script>
<style>
.svg-icon {
width: 100%;
height: 100%;
fill: currentColor;
overflow: hidden;
}
</style>
\ No newline at end of file
src/views/Home.vue
......@@ -207,11 +207,19 @@ export default {
overflow: hidden;
display: flex;
}
/deep/.el-menu.el-menu--inline {
.el-menu-item {
padding-left: 50px !important;
}
.el-menu-item.is-active {
padding-left: 46px !important;
}
}
.el-menu-vertical-demo:not(.el-menu--collapse) {
.el-submenu, .el-menu-item {
img {
width: 16px;
height: 14px;
// width: 16px;
height: 16px;
}
span {
margin-left: 16px;
......@@ -221,8 +229,8 @@ export default {
.el-menu--collapse {
.el-submenu, .el-menu-item {
img {
width: 16px;
height: 14px;
// width: 16px;
height: 16px;
}
}
/deep/.el-submenu__title {
......@@ -264,6 +272,9 @@ export default {
box-sizing: border-box;
background-color: #15243C !important;
border-left: 4px solid #148BE0;
img {
margin-left: -4px;
}
}
.search {
width: 100%;
......
src/views/cxyrd/modules/LTCandidate.vue
......@@ -154,6 +154,10 @@ export default {
console.log(row);
return "Identification"
}
// 浏览过的
if (row.clickLog == 1) {
return "looked"
}
},
/**
* @description: 切换指位选择
......@@ -1118,5 +1122,10 @@ const candidates = [
color: #055FE7;
}
}
.looked {
.cell {
color: #999;
}
}
}
</style>
src/views/cxyrd/modules/LTSrc.vue
......@@ -90,6 +90,10 @@ export default {
console.log(row);
return "Identification"
}
// 浏览过的
if(row.clickLog == 1) {
return "looked"
}
},
/**
* @description: 选择切换
......@@ -129,7 +133,7 @@ export default {
getDetailData () {
let self = this
this.$axios
.post("/api/queryque/standardAll", {})
.post("/api/queryque/standardAll", {contrastCustomSearchReq:{querytype: "2"}})
.then(response => {
console.log(response);
self.sourceDataList = response.data.ret
......@@ -286,6 +290,11 @@ const datas = [
color: #055FE7;
}
}
.looked {
.cell {
color: #999;
}
}
.finger_print_number {
width: 100%;
height: 40px;
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-09-24 11:23:06
* @LastEditTime: 2021-09-28 10:26:02
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -39,6 +39,27 @@ module.exports = {
},
lintOnSave: false, //关闭eslint
chainWebpack: config => {
// 配置svg
const svgRule = config.module.rule('svg')
// 清除已有的所有 loader,否则接下来的 loader 会附加在该规则现有的 loader 之后。
svgRule.uses.clear()
svgRule
.test(/\.svg$/)
.include.add(path.resolve(__dirname, './src/icons'))// 配置icons的目录
.end()
.use('svg-sprite-loader')
.loader('svg-sprite-loader')
.options({
symbolId: 'icon-[name]'
})
const fileRule = config.module.rule('file')
fileRule.uses.clear()
fileRule
.test(/\.svg$/)
.exclude.add(path.resolve(__dirname, './src/icons')) // 配置icons的目录
.end()
.use('file-loader')
.loader('file-loader')
const oneOfsMap = config.module.rule("scss").oneOfs.store;
oneOfsMap.forEach(item => {
item
......@@ -59,8 +80,8 @@ module.exports = {
proxy: {
"/api": {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://172.18.108.213:8099/", // 张 认定
target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
target: "http://172.18.108.213:8099/", // 张 认定
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
ws: true,
changeOrigin: true,
pathRewrite: {
......
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