Skip to content

F
founder_vue
Commit f84b55ce by 张超军
Options

编辑指纹

parent c059f13c
Showing with 326 additions and 71 deletions
package-lock.json
......@@ -1866,7 +1866,6 @@
"thread-loader": "^2.1.3",
"url-loader": "^2.2.0",
"vue-loader": "^15.9.2",
"vue-loader-v16": "npm:vue-loader@^16.0.0-beta.7",
"vue-style-loader": "^4.1.2",
"webpack": "^4.0.0",
"webpack-bundle-analyzer": "^3.8.0",
......@@ -13001,63 +13000,6 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.5.0",
"resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.5.0.tgz",
"integrity": "sha1-CcTgcSRmiZ40uZpoZSTxkWX7KJI=",
"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/views/Home.vue
......@@ -199,6 +199,7 @@ export default {
<style scoped lang="scss">
#home {
height: 100%;
// filter: blur(5px);
}
.layout-container {
width: 100%;
......
src/views/cxyrd/LTz.scss
......@@ -85,13 +85,11 @@ div {
}
.rotate,
.screenshot,
.bzd,
.circle {
.bzd {
margin-right: 40px;
}
.size,
.line,
.circle {
.line {
&::after {
width: 10.25px;
height: 5.84px;
......@@ -257,11 +255,6 @@ div {
color: #333333;
}
}
.tui-brush-color-picker {
position: absolute;
right: -187px;
top: -8px;
}
}
.line_dash {
box-sizing: border-box;
......@@ -308,15 +301,245 @@ div {
height: 4px;
}
}
.normalActiveIcon, .thinActiveIcon, .mediumActiveIcon, .boldActiveIcon {
.normalActiveIcon,
.thinActiveIcon,
.mediumActiveIcon,
.boldActiveIcon {
background-color: #333333 !important;
}
.normalActiveName, .thinActiveName, .mediumActiveName, .boldActiveName {
.normalActiveName,
.thinActiveName,
.mediumActiveName,
.boldActiveName {
color: #333333 !important;
}
}
}
}
.clearConfirm {
z-index: 10;
position: absolute;
top: 50px;
right: 204px;
width: 300px;
height: 114px;
background: #ffffff;
box-shadow: 0px 18px 28px 10px rgba(0, 21, 51, 0.08);
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
padding: 20px 30px;
.tips {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.btn-bottom {
margin-top: 17px;
display: flex;
.btn-confirm,
.btn-cancel {
cursor: pointer;
width: 72px;
height: 32px;
background: #ffffff;
border-radius: 4px;
border: 1px solid #aeb5c2;
display: flex;
justify-content: center;
align-items: center;
&:hover {
background: #377fec;
color: #ffffff;
}
&:active {
background: #044cb9;
color: #ffffff;
}
}
.btn-confirm {
margin-right: 24px;
}
}
}
.tui-brush-color-picker {
z-index: 100;
background: #ffffff;
padding: 5px;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
border: 1px solid #e6e6e8;
position: absolute;
right: 390px;
top: 97px;
}
.circle_mix {
margin-right: 8px;
position: relative;
width: 64px;
height: 32px;
.icon_circle {
width: 64px;
height: 32px;
background: rgba(5, 95, 231, 0.05);
border-radius: 4px;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
img {
width: 20px;
height: 20px;
object-fit: contain;
}
.circle {
margin-right: 15px;
}
.arrow {
width: 10.25px;
height: 5.84px;
img {
object-fit: contain;
}
}
}
.circleOptions {
padding: 14px 24px;
z-index: 1;
position: absolute;
top: 35px;
left: 0;
width: 240px;
height: 194px;
background: #ffffff;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
border-radius: 4px;
border: 1px solid #e6e6e8;
.circle_top {
display: flex;
justify-content: space-between;
align-items: center;
width: 100%;
.circle_left {
display: flex;
align-items: center;
span {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
margin-right: 10px;
}
.circle_switch {
display: flex;
box-sizing: border-box;
width: 30px;
height: 16px;
/deep/.el-switch__core {
box-sizing: border-box;
width: 30px !important;
height: 16px;
&::after {
width: 16px;
height: 16px;
top: -1px;
}
}
}
}
.circle_right {
cursor: pointer;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #ff3644;
}
}
.circle_solid {
width: 192px;
height: 1px;
background: #e6e6e8;
}
.circle_size {
display: flex;
justify-content: space-between;
align-items: center;
.circle_size_item {
display: flex;
flex-direction: column;
align-items: center;
cursor: pointer;
.item_top {
width: 20px;
height: 20px;
border: 1px solid #999999;
border-radius: 50%;
display: flex;
justify-content: center;
align-items: center;
.mr_size {
width: 6px;
height: 6px;
border-radius: 50%;
background: #e60012;
}
.samll_size {
width: 8px;
height: 8px;
border-radius: 50%;
background: #e60012;
}
.medium_size {
width: 10px;
height: 10px;
border-radius: 50%;
background: #e60012;
}
.big_size {
width: 12px;
height: 12px;
border-radius: 50%;
background: #e60012;
}
}
.item_name {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #999999;
}
}
.mr_size_active,
.small_size_active,
.medium_size_active,
.big_size_active {
.item_top {
border: 1px solid #666;
}
.item_name {
color: #333333;
}
}
}
.circle_color {
cursor: pointer;
display: flex;
flex-direction: column;
justify-content: center;
.circle_color_top {
width: 20px;
height: 20px;
background: #e60012;
border-radius: 50%;
margin-left: 2px;
}
.circle_color_name {
width: 28px;
height: 19px;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
}
}
}
.size_mix {
margin-right: 8px;
position: relative;
......@@ -610,6 +833,7 @@ div {
}
}
.lt_main_middle .lt_main_footer {
position: relative;
margin-top: 24px;
height: 70px;
width: 100%;
......@@ -624,7 +848,7 @@ div {
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8),
-4px -4px 4px 0px #ffffff;
border-radius: 4px;
padding: 9px 13px;
padding: 9px 12px;
margin-right: 16px;
&:last-child {
margin-right: 0;
......@@ -642,6 +866,85 @@ div {
background: #d8d8d8;
margin: 0 46px;
}
.grayActive,
.vintageActive,
.horseshoeMirrorActive,
.equalizationActive,
.sharpenActive,
.embossActive,
.invertActive,
.removeWhiteActive,
.colorFilterActive,
.multiplyActive,
.blendActive,
.brightnessActive {
background: #055fe7;
box-shadow: 4px 4px 4px 0px rgba(193, 216, 251, 0.8),
-4px -4px 4px 0px #ffffff;
color: #ffffff;
}
.remove-white, .color-filter, .multiply, .blend, .brightness {
box-sizing: border-box;
position: absolute;
top: -84px;
right: 59px;
width: 240px;
height: 82px;
background: #ffffff;
box-shadow: 0px 6px 10px 2px rgba(0, 21, 51, 0.06);
border: 1px solid #e6e6e8;
padding: 17px 24px;
.title {
font-size: 14px;
font-family: MicrosoftYaHei;
color: #333333;
}
.content {
display: flex;
justify-content: space-between;
align-items: center;
.range-narrow {
width: 142px;
height: 3px;
}
.qb_v {
width: 34px;
height: 21px;
background: #ffffff;
border-radius: 2px;
border: 1px solid #e6e9ec;
}
}
}
.color-filter {
right: 315px;
}
.brightness {
right: 0;
}
.multiply {
right: 155px;
width: 200px;
right: 250px;
.content {
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
}
}
.blend {
width: 200px;
right: 250px;
.content {
display: flex;
justify-content: center;
align-items: center;
width: 100%;
height: 100%;
}
}
}
.lt_main_middle .lt_middle_main {
width: 100%;
......@@ -687,6 +990,10 @@ div {
width: 520px;
height: 520px;
display: flex;
.tui-image-editor2 {
width: 520px;
height: 520px;
}
}
}
}
......@@ -729,6 +1036,10 @@ div {
width: 520px;
height: 520px;
display: flex;
.tui-image-editor2 {
width: 520px;
height: 520px;
}
}
}
}
......
src/views/cxyrd/LTz2.vue
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-09-11 16:49:36
* @LastEditTime: 2021-09-15 08:56:14
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
......@@ -798,6 +798,7 @@ export default {
}
file = event.target.files[0];
console.log(file);
imageEditor.loadImageFromFile(file).then(function (result) {
console.log(result);
imageEditor.clearUndoStack();
......
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