From d1ce83391deac7bbafe7316e91ede5edd6ca30c9 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 30 十二月 2022 11:12:00 +0800
Subject: [PATCH] 1.基础设置模块下的变换肤色完成
---
src/views/jcsz/zzjg.vue | 4
src/icons/svg/tree.svg | 2
src/views/jcsz/wldw.vue | 4
src/icons/svg/home.svg | 2
src/views/jcsz/yhqd.vue | 50 +++++++----
src/views/jcsz/jsqd.vue | 27 +++---
src/icons/svg/tree2.svg | 1
src/layout/components/Sidebar/index.vue | 71 ++++++++++-------
src/components/ThemePicker/index.vue | 2
src/layout/components/TagsView/index.vue | 1
src/views/jcsz/adsz.vue | 19 ++--
src/router/index.js | 2
12 files changed, 108 insertions(+), 77 deletions(-)
diff --git a/src/components/ThemePicker/index.vue b/src/components/ThemePicker/index.vue
index ddda8a9..d42a48e 100644
--- a/src/components/ThemePicker/index.vue
+++ b/src/components/ThemePicker/index.vue
@@ -1,7 +1,7 @@
<template>
<el-color-picker
v-model="theme"
- :predefine="['#409EFF', '#1890ff', '#304156','#212121','#11a983', '#13c2c2', '#6959CD', '#f5222d', ]"
+ :predefine="['#409EFF', '#1890ff', '#304156','#212121','#42B983','#11a983', '#13c2c2', '#6959CD', '#f5222d', ]"
class="theme-picker"
popper-class="theme-picker-dropdown"
/>
diff --git a/src/icons/svg/home.svg b/src/icons/svg/home.svg
index 41733d0..7c09a33 100644
--- a/src/icons/svg/home.svg
+++ b/src/icons/svg/home.svg
@@ -7,4 +7,4 @@
<rect id="鐭╁舰" x="0" y="0" width="20" height="20"></rect>
<path d="M15.4667218,18.9453146 C15.4288032,18.9453146 15.3983216,18.9442715 15.3764745,18.9431705 L3.82986779,18.9431705 C3.05639166,18.9431705 2.61116286,18.6173957 2.37387749,18.3441041 C1.85389337,17.7452309 1.89565591,16.9332761 1.91910628,16.7079863 L1.91910628,9.76308164 L3.15537002,9.76308164 L3.15537002,16.7926511 L3.1495364,16.8290243 C3.13483645,16.95267 3.13344566,17.3366071 3.30965187,17.5361865 C3.34693295,17.5784126 3.46037946,17.7069068 3.82988711,17.7069068 L15.4258092,17.7069068 L15.4402966,17.7084907 C15.4818853,17.7099588 15.871347,17.7168741 16.1163011,17.4852485 C16.2796038,17.3308315 16.3623948,17.0755044 16.3623948,16.7263371 L16.3623948,9.75775026 L17.5986586,9.75775026 L17.5986586,16.7263371 C17.5986586,17.6124099 17.2461882,18.1243003 16.9504894,18.3977078 C16.4186255,18.8895089 15.7448231,18.9453146 15.4667218,18.9453146 Z M2.53721884,10.3432177 L0.637448489,10.3432177 C0.380711281,10.3432177 0.150727593,10.184551 0.0595724588,9.94454198 C-0.0315633585,9.70453297 0.0351176168,9.43319239 0.227124828,9.26278116 L9.34880022,1.16737852 C9.58098601,0.961308808 9.9299794,0.95941578 10.1644059,1.16299365 L19.412837,9.19467076 C19.6051339,9.36168226 19.6753112,9.62954584 19.5896034,9.86938101 C19.5038955,10.1092162 19.2798613,10.2719394 19.025249,10.2792604 L16.9982014,10.3374421 C16.9921553,10.3376352 16.9861478,10.3377125 16.9801211,10.3377125 C16.6469673,10.3377125 16.3722077,10.0725146 16.3625687,9.73731327 C16.3527752,9.39606585 16.6214694,9.11149339 16.9627168,9.10169986 L17.4056662,9.08898953 L9.76354739,2.45220424 L2.26518286,9.10695398 L2.53721884,9.10695398 C2.87860148,9.10695398 3.1553507,9.38370321 3.1553507,9.72508585 C3.1553507,10.0664685 2.87860148,10.3432177 2.53721884,10.3432177 Z M7.68801511,18.3308916 C7.39996566,18.3308916 7.16646635,18.0973923 7.16646635,17.8093428 L7.16646635,13.4467612 C7.16646635,13.3527666 7.19030306,12.9657774 7.55320441,12.5969265 C7.99362337,12.1493025 8.7403653,11.9223322 9.77270347,11.9223322 C10.7894918,11.9223322 11.5281207,12.1524124 11.9680761,12.6061985 C12.3394381,12.9892084 12.3633714,13.3925009 12.3626528,13.4994763 L12.3626528,17.7925953 C12.3626528,18.0806447 12.129138,18.3141441 11.8410886,18.3141441 C11.5530391,18.3141441 11.3195398,18.0806447 11.3195398,17.7925953 L11.3195398,13.505619 C11.3160822,13.4830765 11.2942737,13.3877103 11.1646785,13.2826859 C11.018471,13.1641977 10.6431877,12.9654297 9.77268415,12.9654297 C8.76296575,12.9654297 8.4041402,13.2193467 8.29673978,13.3284856 C8.24400541,13.3820892 8.22186856,13.4276957 8.21257727,13.4564968 C8.21116715,13.4608431 8.21020132,13.464436 8.20954456,13.4671016 L8.20954456,17.8093428 C8.20956387,18.0973923 7.97606456,18.3308916 7.68801511,18.3308916 Z" id="褰㈢姸" fill="#00A79D" fill-rule="nonzero"></path>
</g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/icons/svg/tree.svg b/src/icons/svg/tree.svg
index d535ade..f7ee5bd 100644
--- a/src/icons/svg/tree.svg
+++ b/src/icons/svg/tree.svg
@@ -1 +1 @@
-<svg t="1556618636358" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10538" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 307.2c-112.9216 0-204.8 91.8784-204.8 204.8 0 112.9216 91.8784 204.8 204.8 204.8 112.9216 0 204.8-91.8784 204.8-204.8C716.8 399.0784 624.9216 307.2 512 307.2zM512 665.6c-84.8256 0-153.6-68.7744-153.6-153.6 0-84.8256 68.7744-153.6 153.6-153.6s153.6 68.7744 153.6 153.6C665.6 596.8256 596.8256 665.6 512 665.6zM985.6 384l-71.872 0c-34.2144 0-51.3408-41.3568-27.1488-65.5488l50.8288-50.8288c15.0016-15.0016 15.0016-39.3088 0-54.3104l-126.7072-126.72c-7.5008-7.5008-17.3312-11.2512-27.1488-11.2512s-19.6608 3.7504-27.1488 11.2512l-50.8288 50.8288c-7.8208 7.8208-17.4464 11.328-26.88 11.328-19.7376 0-38.6816-15.3344-38.6816-38.4768L640.0128 38.4c0-21.2096-17.1904-38.4-38.4-38.4L422.4 0c-21.2096 0-38.4 17.1904-38.4 38.4l0 71.872c0 23.1424-18.944 38.4768-38.6816 38.4768-9.4336 0-19.0464-3.4944-26.88-11.328l-50.8288-50.8288c-7.5008-7.5008-17.3312-11.2512-27.1488-11.2512s-19.6608 3.7504-27.1488 11.2512l-126.7072 126.72c-15.0016 15.0016-15.0016 39.3088 0 54.3104l50.8288 50.8288C161.6128 342.6432 144.4864 384 110.272 384L38.4 384c-21.2096 0-38.4 17.1904-38.4 38.4l0 179.2c0 21.2096 17.1904 38.4 38.4 38.4l71.872 0c34.2144 0 51.3408 41.3568 27.1488 65.5488l-50.8288 50.8288c-15.0016 15.0016-15.0016 39.3088 0 54.3104l126.7072 126.72c7.5008 7.5008 17.3312 11.2512 27.1488 11.2512s19.6608-3.7504 27.1488-11.2512l50.8288-50.8288c7.8208-7.8208 17.4464-11.328 26.88-11.328 19.7376 0 38.6816 15.3344 38.6816 38.4768L383.9872 985.6c0 21.2096 17.1904 38.4 38.4 38.4l179.2 0c21.2096 0 38.4-17.1904 38.4-38.4l0-71.872c0-23.1424 18.944-38.4768 38.6816-38.4768 9.4336 0 19.0464 3.4944 26.88 11.328l50.8288 50.8288c7.5008 7.5008 17.3312 11.2512 27.1488 11.2512s19.6608-3.7504 27.1488-11.2512l126.7072-126.72c15.0016-15.0016 15.0016-39.3088 0-54.3104l-50.8288-50.8288C862.3872 681.3568 879.5136 640 913.728 640L985.6 640c21.2096 0 38.4-17.1904 38.4-38.4L1024 422.4C1024 401.1904 1006.8096 384 985.6 384zM972.8 588.8l-59.072 0c-36.3648 0-68.864 21.7088-82.7776 55.3088s-6.2976 71.9232 19.4176 97.6384l41.7664 41.7664-108.608 108.608-41.7664-41.7664c-16.9728-16.9728-39.3728-26.3168-63.0784-26.3168-49.5616 0-89.8816 40.2304-89.8816 89.6768L588.8 972.8 435.2 972.8l0-59.072c0-49.4464-40.32-89.6768-89.8816-89.6768-23.7056 0-46.1056 9.344-63.0784 26.3168l-41.7664 41.7664-108.608-108.608 41.7664-41.7664c25.7152-25.7152 33.344-64.0512 19.4176-97.6512S146.6496 588.8 110.272 588.8L51.2 588.8 51.2 435.2l59.072 0c36.3648 0 68.864-21.7088 82.7776-55.3088 13.9136-33.6 6.2976-71.9232-19.4176-97.6512l-41.7664-41.7664 108.608-108.608 41.7664 41.7664c16.9728 16.9728 39.3728 26.3168 63.0784 26.3168 49.5616 0 89.8816-40.2304 89.8816-89.6768L435.2 51.2l153.6 0 0 59.072c0 49.4464 40.32 89.6768 89.8816 89.6768 23.7056 0 46.1056-9.344 63.0784-26.3168l41.7664-41.7664 108.608 108.608-41.7664 41.7664c-25.7152 25.7152-33.344 64.0512-19.4176 97.6512C844.864 413.4912 877.3504 435.2 913.728 435.2L972.8 435.2 972.8 588.8z" p-id="10539"></path></svg>
\ No newline at end of file
+<svg t="1556618636358" class="icon" style="" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10538" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 307.2c-112.9216 0-204.8 91.8784-204.8 204.8 0 112.9216 91.8784 204.8 204.8 204.8 112.9216 0 204.8-91.8784 204.8-204.8C716.8 399.0784 624.9216 307.2 512 307.2zM512 665.6c-84.8256 0-153.6-68.7744-153.6-153.6 0-84.8256 68.7744-153.6 153.6-153.6s153.6 68.7744 153.6 153.6C665.6 596.8256 596.8256 665.6 512 665.6zM985.6 384l-71.872 0c-34.2144 0-51.3408-41.3568-27.1488-65.5488l50.8288-50.8288c15.0016-15.0016 15.0016-39.3088 0-54.3104l-126.7072-126.72c-7.5008-7.5008-17.3312-11.2512-27.1488-11.2512s-19.6608 3.7504-27.1488 11.2512l-50.8288 50.8288c-7.8208 7.8208-17.4464 11.328-26.88 11.328-19.7376 0-38.6816-15.3344-38.6816-38.4768L640.0128 38.4c0-21.2096-17.1904-38.4-38.4-38.4L422.4 0c-21.2096 0-38.4 17.1904-38.4 38.4l0 71.872c0 23.1424-18.944 38.4768-38.6816 38.4768-9.4336 0-19.0464-3.4944-26.88-11.328l-50.8288-50.8288c-7.5008-7.5008-17.3312-11.2512-27.1488-11.2512s-19.6608 3.7504-27.1488 11.2512l-126.7072 126.72c-15.0016 15.0016-15.0016 39.3088 0 54.3104l50.8288 50.8288C161.6128 342.6432 144.4864 384 110.272 384L38.4 384c-21.2096 0-38.4 17.1904-38.4 38.4l0 179.2c0 21.2096 17.1904 38.4 38.4 38.4l71.872 0c34.2144 0 51.3408 41.3568 27.1488 65.5488l-50.8288 50.8288c-15.0016 15.0016-15.0016 39.3088 0 54.3104l126.7072 126.72c7.5008 7.5008 17.3312 11.2512 27.1488 11.2512s19.6608-3.7504 27.1488-11.2512l50.8288-50.8288c7.8208-7.8208 17.4464-11.328 26.88-11.328 19.7376 0 38.6816 15.3344 38.6816 38.4768L383.9872 985.6c0 21.2096 17.1904 38.4 38.4 38.4l179.2 0c21.2096 0 38.4-17.1904 38.4-38.4l0-71.872c0-23.1424 18.944-38.4768 38.6816-38.4768 9.4336 0 19.0464 3.4944 26.88 11.328l50.8288 50.8288c7.5008 7.5008 17.3312 11.2512 27.1488 11.2512s19.6608-3.7504 27.1488-11.2512l126.7072-126.72c15.0016-15.0016 15.0016-39.3088 0-54.3104l-50.8288-50.8288C862.3872 681.3568 879.5136 640 913.728 640L985.6 640c21.2096 0 38.4-17.1904 38.4-38.4L1024 422.4C1024 401.1904 1006.8096 384 985.6 384zM972.8 588.8l-59.072 0c-36.3648 0-68.864 21.7088-82.7776 55.3088s-6.2976 71.9232 19.4176 97.6384l41.7664 41.7664-108.608 108.608-41.7664-41.7664c-16.9728-16.9728-39.3728-26.3168-63.0784-26.3168-49.5616 0-89.8816 40.2304-89.8816 89.6768L588.8 972.8 435.2 972.8l0-59.072c0-49.4464-40.32-89.6768-89.8816-89.6768-23.7056 0-46.1056 9.344-63.0784 26.3168l-41.7664 41.7664-108.608-108.608 41.7664-41.7664c25.7152-25.7152 33.344-64.0512 19.4176-97.6512S146.6496 588.8 110.272 588.8L51.2 588.8 51.2 435.2l59.072 0c36.3648 0 68.864-21.7088 82.7776-55.3088 13.9136-33.6 6.2976-71.9232-19.4176-97.6512l-41.7664-41.7664 108.608-108.608 41.7664 41.7664c16.9728 16.9728 39.3728 26.3168 63.0784 26.3168 49.5616 0 89.8816-40.2304 89.8816-89.6768L435.2 51.2l153.6 0 0 59.072c0 49.4464 40.32 89.6768 89.8816 89.6768 23.7056 0 46.1056-9.344 63.0784-26.3168l41.7664-41.7664 108.608 108.608-41.7664 41.7664c-25.7152 25.7152-33.344 64.0512-19.4176 97.6512C844.864 413.4912 877.3504 435.2 913.728 435.2L972.8 435.2 972.8 588.8z" p-id="10539"></path></svg>
diff --git a/src/icons/svg/tree2.svg b/src/icons/svg/tree2.svg
new file mode 100644
index 0000000..1a3d6a9
--- /dev/null
+++ b/src/icons/svg/tree2.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1672365911577" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4800" xmlns:xlink="http://www.w3.org/1999/xlink" width="128" height="128"><path d="M545.784454 962.539206l-65.943898 0c-29.341259 0-54.624085-25.281803-54.624085-54.615898L425.216471 868.462574c0-9.623171-7.826246-20.911262-16.690124-23.680329l-1.566682-0.611937-55.725162-23.104207-0.880043-0.494257c-8.153704-4.41045-22.017456-2.376117-28.55229 4.187369l-28.17469 28.123524c-9.930163 9.977235-23.239284 15.494902-37.432541 15.494902-14.195304 0-27.507494-5.517667-37.487799-15.541975l-46.682205-46.630017c-20.60427-20.603247-20.6319-54.233182-0.069585-74.974575l28.15013-28.106128c6.637164-6.574742 8.676613-20.599154 4.253884-28.909423l-0.831948-1.768273-23.164582-56.128345-0.26913-0.682545c-2.803859-9.03477-14.279215-17.394159-23.611767-17.394159l-39.631626 0c-29.391401 0-52.861952-24.065092-52.861952-53.193503l0-65.943898c0-28.770254 22.998807-51.754734 52.919257-51.754734l39.575344 0c9.081843 0 20.803815-8.830109 23.666002-18.057261l0.567935-1.476631 23.163559-57.088206 0.505513-0.913812c4.40431-8.220219 2.319835-22.224164-4.2897-28.830629l-28.04166-28.087709c-9.964956-9.921977-15.486716-23.216771-15.502066-37.396725-0.01535-14.201443 5.492084-27.53717 15.507182-37.552268l46.6556-46.614667c9.94142-9.985422 23.248494-15.503089 37.432541-15.503089 0.001023 0 0 0 0.001023 0 14.184047 0 27.490098 5.51869 37.46938 15.540951l28.039613 28.05087c6.557346 6.525624 20.500916 8.596795 28.655643 4.231371l0.893346-0.478907 57.375755-23.64963c8.836249-2.731204 16.634866-14.037714 16.634866-23.719214l0-39.632649c0-28.967752 24.777313-52.095495 54.624085-52.095495L545.784454 64.076364c29.161157 0 52.370765 22.636556 52.370765 52.095495l0 39.632649c0 9.127891 8.709359 20.85498 17.767666 23.674189l1.51654 0.577145 56.639998 23.113417 0.923022 0.509606c8.202822 4.424776 22.184255 2.353604 28.788673-4.254907l28.163433-27.912723c9.895371-9.94142 23.179932-15.33936 37.352723-15.33936 0.019443 0 0.040932 0 0.060375 0 14.18814 0 27.508517 5.375427 37.516452 15.384385l46.709835 46.554292c10.004865 9.960863 15.524578 23.254633 15.524578 37.47552 0 14.18814-5.498224 27.506471-15.479553 37.532825l-28.16855 28.152177c-6.580882 6.610558-8.640798 20.771069-4.204765 29.107945l0.478907 0.896416 23.654746 57.956993c2.902096 9.255805 14.635325 18.114566 23.686469 18.114566l39.132252 0 0-0.573051c27.629267 0 52.188616 22.984481 52.188616 52.327786l0 65.998133c0 29.590945-22.985504 53.138244-51.746548 53.138244l-39.630602 0c-9.337669 0-20.84884 8.372691-23.686469 17.423835l-0.580215 1.51654-23.086811 56.240909-0.468674 0.860601c-4.419659 8.30413-2.393513 22.320355 4.169973 28.855188l28.135804 28.02017c10.031471 10.029424 15.539928 23.350824 15.537881 37.541011-0.004093 14.186094-5.514597 27.505447-15.518438 37.505195l-46.747697 46.682205c-9.920954 9.964956-23.219841 15.506159-37.406958 15.506159-0.019443 0-0.040932 0-0.060375 0-14.192234 0-27.514657-5.514597-37.518498-15.517415l-28.039613-28.095895c-6.490831-6.490831-20.807908-8.575306-28.887934-4.206812l-0.951675 0.514723-57.93755 23.680329c-9.087982 2.859118-17.823947 14.594393-17.823947 23.691585l0 39.460734C598.155219 937.76394 574.45954 962.539206 545.784454 962.539206zM421.86719 806.892287c25.192775 8.370645 44.282552 34.650171 44.282552 61.570287l0 39.460734c0 7.114025 6.569626 13.68365 13.691837 13.68365L545.784454 921.606958c6.496971 0 12.461823-6.043646 12.461823-13.68365L558.246277 868.462574c0-26.273387 19.516496-53.131081 44.901653-61.58052l53.859675-22.062482c23.62814-12.116969 56.342216-7.098675 75.118861 11.6749l28.009937 28.1532c2.432399 2.430352 5.678326 3.837398 9.179057 3.837398 0.00614 0 0.011256 0 0.01535 0 3.482311 0 6.726192-1.39886 9.135054-3.820002l46.780443-46.738487c2.436492-2.436492 3.783163-5.724375 3.78521-9.224082 0-3.495614-1.344624-6.774287-3.787256-9.216919l-28.106128-27.998681c-18.693758-18.609847-23.762193-51.349505-11.773138-75.036997l22.083971-53.603849c8.374738-25.167193 35.224246-44.51382 61.578474-44.51382l39.630602 0c7.745405 0 10.8143-7.086395 10.8143-13.229303l0-65.998133c0-6.862291-5.116531-12.07399-11.256368-12.302187l0 1.479701-39.132252 0c-26.236548 0-53.099359-20.149922-61.585637-45.735647l-22.083971-54.261834c-11.960403-23.654746-6.913457-56.502875 11.728112-75.228355l28.16855-28.192086c2.430352-2.441609 3.78828-5.764284 3.78828-9.295714 0-3.498684-1.334391-6.762007-3.759627-9.17394l-46.741557-46.577828c-2.462075-2.462075-5.736655-3.734044-9.234315-3.734044-0.004093 0-0.010233 0-0.013303 0-3.465938 0-6.700609 1.255597-9.105379 3.671623l-28.198226 28.037567c-18.703991 18.710131-51.417043 23.734564-75.000158 11.69025l-53.865815-22.072715c-25.403576-8.388041-44.934398-35.255968-44.934398-61.60508l0-39.632649c0-7.253194-5.517667-12.186554-12.461823-12.186554l-65.943898 0c-7.517207 0-13.691837 5.51869-13.691837 12.186554l0 39.632649c0 27.027563-19.107173 53.336766-44.325531 61.643965l-53.501518 21.99699c-23.834848 12.168134-55.857169 7.234775-74.878384-11.69639l-28.130687-28.115338c-2.441609-2.451842-5.690606-3.787256-9.152451-3.787256-3.462868-0.001023-6.704702 1.334391-9.117658 3.758604l-46.690392 46.64639c-2.438539 2.438539-3.784186 5.710049-3.781116 9.207709 0.004093 3.474125 1.339508 6.716982 3.762697 9.128915l28.068266 28.121478c18.698874 18.690688 23.782659 51.389414 11.808954 74.973552l-22.124903 54.813397c-8.413624 25.616424-35.281551 45.783743-61.603033 45.783743l-39.575344 0c-6.630001 0-13.010315 3.411703-13.010315 10.822486l0 65.943898c0 6.942109 5.753027 13.284561 12.95301 13.284561l39.631626 0c26.380834 0 53.195549 19.35072 61.524239 44.537356l22.182208 53.629431c12.027941 23.731494 6.918573 56.449663-11.863189 75.05644l-28.022217 27.949562c-5.021364 5.066389-5.048993 13.348006 0.010233 18.409279l46.713928 46.653553c2.452865 2.464121 5.695722 3.794419 9.168824 3.794419 3.472078 0 6.711865-1.336438 9.124821-3.759627l28.181853-28.122501c18.641569-18.730597 51.440579-23.752983 75.011414-11.642155L421.86719 806.892287z" fill="#42b983" p-id="4801"></path><path d="M513.734504 731.880873c-120.639614 0-218.786958-98.147344-218.786958-218.786958s98.147344-218.786958 218.786958-218.786958 218.786958 98.147344 218.786958 218.786958S634.375142 731.880873 513.734504 731.880873zM513.734504 334.324368c-98.573039 0-178.769546 80.195483-178.769546 178.769546s80.195483 178.769546 178.769546 178.769546 178.769546-80.195483 178.769546-178.769546S612.308567 334.324368 513.734504 334.324368z" fill="#42b983" p-id="4802"></path></svg>
\ No newline at end of file
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index 55495dd..eb4bfcf 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -22,13 +22,21 @@
<!-- :item="route"-->
<!-- :base-path="route.path"-->
<!-- />-->
- <sidebar-item v-for="route in permission_routes" :key="route.path" :item="route" :base-path="route.path" />
+
+ <sidebar-item
+ v-for="route in permission_routes"
+ :key="route.path"
+ :item="route"
+ :base-path="route.path"
+ />
</el-menu>
</el-scrollbar>
<div style="position: absolute;bottom: 20px;left: 30px;">
<div>
- <el-button v-if="$store.state.app.sidebar.opened" type="text" style="font-size: 14px;cursor: pointer">鏂板嚡杩埗閫燰1.0.01</el-button>
+ <el-button v-if="$store.state.app.sidebar.opened" type="text" style="font-size: 14px;cursor: pointer">
+ 鏂板嚡杩埗閫燰1.0.01
+ </el-button>
<!-- <el-button type="text"><a href="http://www.ykxkd.com/" target="_blank">鏂板嚡杩埗閫燰1.0.01</a></el-button>-->
</div>
</div>
@@ -74,6 +82,10 @@
return this.$store.state.settings.sidebarLogo
},
variables() {
+ console.log(variables, 2333)
+ // 鍏堣緭鍑鸿繖涓獀ariables鍊� 鐒跺悗淇敼鍏跺睘鎬у��
+ variables.menuActiveText = this.$store.state.settings.theme
+
return variables
},
isCollapse() {
@@ -83,7 +95,7 @@
}
</script>
<style lang="scss">
-$main_color: #42b983;
+//$main_color: #42b983;
.layoutLogo {
position: absolute;
@@ -110,50 +122,51 @@
}
-#app .sidebar-container .el-submenu .el-menu-item {
- background-color: transparent !important;
-}
+//#app .sidebar-container .el-submenu .el-menu-item {
+// background-color: transparent !important;
+//}
-#app .sidebar-container .el-submenu .el-menu-item.is-active {
- background: $main_color !important;
- color: #fff !important;
-}
-
-#app .sidebar-container .el-submenu .el-menu-item:hover {
- background: $main_color !important;
+//#app .sidebar-container .el-submenu .el-menu-item.is-active {
+ //background: $main_color !important;
//color: #fff !important;
-}
+ //font-weight: bolder !important;
+//}
+//
+//#app .sidebar-container .el-submenu .el-menu-item:hover {
+// background: $main_color !important;
+// //color: #fff !important;
+//}
.el-submenu__title {
font-weight: bolder;
}
-.sub-el-icon::before {
- color: $main_color;
-}
-
-.svg-icon {
- color: $main_color;
-}
+//.sub-el-icon::before {
+// color: $main_color;
+//}
+//
+//.svg-icon {
+// color: $main_color;
+//}
.submenu-title-noDropdown {
font-weight: bolder;
}
-.router-link-exact-active > .submenu-title-noDropdown {
- color: $main_color !important;
-}
-
-.el-menu-item.is-active {
- color: $main_color !important;
-}
+//.router-link-exact-active > .submenu-title-noDropdown {
+// color: $main_color !important;
+//}
+//
+//.el-menu-item.is-active {
+// color: $main_color !important;
+//}
.el-button--text:hover {
color: #ffffff;
cursor: default;
}
-.el-menu{
+.el-menu {
background-color: #213145 !important;
}
</style>
diff --git a/src/layout/components/TagsView/index.vue b/src/layout/components/TagsView/index.vue
index 14bf3bd..b173a80 100644
--- a/src/layout/components/TagsView/index.vue
+++ b/src/layout/components/TagsView/index.vue
@@ -9,6 +9,7 @@
:to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
tag="span"
class="tags-view-item"
+ :style="{background:isActive(tag)?$store.state.settings.theme:'',border:isActive(tag)?'1px solid'+$store.state.settings.theme:''}"
@click.middle.native="!isAffix(tag)?closeSelectedTag(tag):''"
@contextmenu.prevent.native="openMenu(tag,$event)"
>
diff --git a/src/router/index.js b/src/router/index.js
index acc04fd..db1d8c5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -123,7 +123,7 @@
redirect: '/jcsz/zzjg',
name: '鍩虹璁剧疆',
code: '1001',
- meta: { code: '1001', title: '鍩虹璁剧疆', icon: 'tree' },
+ meta: { code: '1001', title: '鍩虹璁剧疆', icon: 'tree2' },
alwaysShow: true, // 褰揷hildren鍙湁涓�涓椂锛屼篃鏄剧ず鐖惰彍鍗�
children: [
{
diff --git a/src/views/jcsz/adsz.vue b/src/views/jcsz/adsz.vue
index e0f4dab..a92b549 100644
--- a/src/views/jcsz/adsz.vue
+++ b/src/views/jcsz/adsz.vue
@@ -3,7 +3,7 @@
<div class="body" :style="{height:mainHeight+'px'}">
<div class="body_left">
<div style="margin:10px 0">
- <i class="el-icon-s-comment" style="color:#42b983;" /> 杞﹂棿淇℃伅锛�
+ <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" /> 杞﹂棿淇℃伅锛�
</div>
<el-input
v-model="filterText"
@@ -29,12 +29,12 @@
<div :style="{height: (contentHeight+51)+'px'}">
<div class="pane_top">
<div style="display: flex;align-items: center">
- <div class="bar" />
+ <div class="bar" :style="{background:$store.state.settings.theme}" />
<div>鍝嶅簲浜哄憳</div>
<el-button
icon="el-icon-circle-plus-outline"
:disabled="allowClose"
- :style="{color:allowClose?'#6f6e6f':'#42b983'}"
+ :style="{color:allowClose?'#6f6e6f':$store.state.settings.theme}"
style="height: 30px;line-height: 30px;font-size: 22px;padding:10px;background-color: #fafafa"
@click="responseUserClick"
/>
@@ -45,7 +45,7 @@
</div>
<div style="margin-left: 5px;cursor: pointer">
<el-tooltip class="item" effect="dark" content="褰撳墠鍛煎彨绫诲瀷(鍚敤/鍏抽棴)" placement="top">
- <i class="el-icon-question" />
+ <i class="el-icon-question" :style="{color:$store.state.settings.theme}" />
</el-tooltip>
</div>
</div>
@@ -58,6 +58,7 @@
:closable="!allowClose"
type="success"
style="margin-right: 10px;margin-bottom: 10px"
+ :style="{color:$store.state.settings.theme}"
@close="val=>tagClose(val,item,tag)"
>
{{ tag.username }}
@@ -182,13 +183,14 @@
closable
type="success"
style="margin-right: 10px;margin-bottom: 10px"
+ :style="{color:$store.state.settings.theme}"
@close="val=>userTagClose(val,tag)"
>
{{ tag.username }}
</el-tag>
</div>
<div>
- <i class="el-icon-s-comment" style="color:#42b983;margin: 20px 10px 20px 0" />浜哄憳锛�
+ <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" style="margin: 20px 10px 20px 0" />浜哄憳锛�
</div>
<div
style=" background-color: #fafafa; padding: 10px; min-height: 420px;"
@@ -524,7 +526,6 @@
<!--鏈〉闈㈠崟鐙牱寮�-->
<style lang="scss" scoped>
$main_color: #42b983;
-//$main_color: var(theme);
.body {
display: flex;
flex-direction: row;
@@ -557,7 +558,7 @@
width: 4px;
height: 20px;
border-radius: 2px;
- background-color: $main_color;
+ //background-color: $main_color;
margin-right: 10px;
}
}
@@ -570,9 +571,9 @@
.body_left_tree {
::v-deep .is-current > .el-tree-node__content {
- background-color: $main_color !important;
+ background-color: #dedcdc !important;
font-weight: bolder;
- color: #FFFFFF;
+ //color: #FFFFFF;
}
}
</style>
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 0288111..2fac1c1 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -557,26 +557,29 @@
@click="myCheckboxClick(item)"
>
- <input
- class="myCheckboxInput"
- type="checkbox"
- :disabled="rightFrom.usercode==='S001'"
- :value="item.code"
- :name="item.name"
- :style="{color:item.isSelected2?'#42b983':'#fff'}"
- @click="myCheckboxInputClick(item)"
- >{{ item.name }}
+ <!-- <input-->
+ <!-- class="myCheckboxInput"-->
+ <!-- type="checkbox"-->
+ <!-- :disabled="rightFrom.usercode==='S001'"-->
+ <!-- :value="item.code"-->
+ <!-- :name="item.name"-->
+ <!-- :style="{color:item.isSelected2?'#42b983':'#fff'}"-->
+ <!-- @click="myCheckboxInputClick(item)"-->
+ <!-- >{{ item.name }}-->
- <!-- :style="{color:item.isSelected2?'#42b983':'#fff'}"-->
<!-- 鐖跺瓙鐐瑰嚮浜嬩欢涓嶅奖鍝�-->
<!-- onClick="event.cancelBubble = true"-->
<!--鏄庡ぉ鍐嶇湅涓�涓媔nput鍜宔l-checkbox涔嬮棿鐨勫尯鍒�-->
+
<el-checkbox
+ :key="item.code"
v-model="item.isSelected2"
class="myCheckboxInput"
:value="item.code"
:name="item.name"
:disabled="rightFrom.usercode==='S001'"
+ :checked="item.isSelected2"
+ @change="myCheckboxInputClick(item)"
>{{ item.name }}
</el-checkbox>
@@ -1551,8 +1554,8 @@
},
// 灏忕洅瀛愮偣鍑讳簨浠�
myCheckboxInputClick(val) {
- console.log(val, 777777)
- val.isSelected2 = !val.isSelected2
+ val.isSelected2 = !!val.isSelected2
+
this.dialogFormRight.rightCurrentCode = val.code
// 1.绗竴绉嶆儏鍐� 灏忕洅瀛愪粠娌￠�変腑鍒伴�変腑
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index f069f48..8743044 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -196,10 +196,10 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
- <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-edit-outline" @click="edit('edit',row)" />
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" @click="del(row)" />
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row)" />
</el-tooltip>
</div>
</template>
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index e2c654f..b137601 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -209,11 +209,13 @@
>
<template slot-scope="{row}">
<div v-if="row.enable==='Y'">
- <svg-icon icon-class="circleYes" style="margin-right: 2px" />
+ <!-- <svg-icon icon-class="circleYes" style="margin-right: 2px" />-->
+ <i class="el-icon-success" :style="{color:$store.state.settings.theme}" style="margin-right: 2px" />
鍦ㄨ亴
</div>
<div v-if="row.enable==='N'">
- <svg-icon icon-class="circleNo" style="margin-right: 2px" />
+ <!--/* <svg-icon icon-class="circleNo" style="margin-right: 2px" />*/-->
+ <i class="el-icon-info" style="margin-right: 2px" />
绂昏亴
</div>
</template>
@@ -239,7 +241,7 @@
width="110"
>
<template slot-scope="{row}">
- <i v-if="row.is_role==='Y'" class="el-icon-share" @click="roleClick({row})" />
+ <i v-if="row.is_role==='Y'" :style="{color:$store.state.settings.theme}" class="el-icon-share" @click="roleClick({row})" />
<i
v-if="row.is_role==='N'"
class="el-icon-share"
@@ -256,10 +258,10 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
- <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-edit-outline" @click="edit('edit',row)" />
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" @click="del(row.id)" />
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row.id)" />
</el-tooltip>
</div>
</template>
@@ -393,38 +395,48 @@
<!-- @opened="handleOpenedRoles"-->
<div>
- <i class="el-icon-s-comment" style="color:#42b983;" /> 鐢ㄦ埛鍚嶇О锛歿{ dialogFormRoles.username }}
+ <i class="el-icon-s-comment" :style="{color:$store.state.settings.theme}" /> 鐢ㄦ埛鍚嶇О锛歿{ dialogFormRoles.username }}
</div>
<el-divider />
<div>
<div style="margin-bottom:20px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 瑙掕壊绫诲瀷闆嗗悎锛�
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 瑙掕壊绫诲瀷闆嗗悎锛�
</div>
<div class="myCheckboxGroup">
<div
v-for="item in dialogFormRoles.rolesArr"
:key="item.code"
- :style="{border:item.isSelected1?'1px solid #42b983':'1px solid #eee'}"
+ :style="{border:item.isSelected1?'1px solid '+ $store.state.settings.theme :'1px solid #eee'}"
class="myCheckbox"
@click="myCheckboxClick(item)"
>
- <input
- class="myCheckboxInput"
- type="checkbox"
- :value="item.code"
- :name="item.name"
- :style="{color:item.isSelected2?'#42b983':'#fff'}"
- @click="myCheckboxInputClick(item)"
- >{{ item.name }}
+ <!-- <input-->
+ <!-- class="myCheckboxInput"-->
+ <!-- type="checkbox"-->
+ <!-- :value="item.code"-->
+ <!-- :name="item.name"-->
+ <!-- :style="{color:item.isSelected2?'#42b983':'#fff'}"-->
+ <!-- @click="myCheckboxInputClick(item)"-->
+ <!-- >{{ item.name }}-->
<!-- 鐖跺瓙鐐瑰嚮浜嬩欢涓嶅奖鍝�-->
<!-- onClick="event.cancelBubble = true"-->
+ <el-checkbox
+ :key="item.code"
+ v-model="item.isSelected2"
+ class="myCheckboxInput"
+ :value="item.code"
+ :name="item.name"
+ :checked="item.isSelected2"
+ @change="myCheckboxInputClick(item)"
+ >{{ item.name }}
+ </el-checkbox>
</div>
</div>
</div>
<el-divider />
<div>
<div style="margin-bottom:20px">
- <i class="el-icon-s-operation" style="color:#42b983;" /> 瑙掕壊锛�
+ <i class="el-icon-s-operation" :style="{color:$store.state.settings.theme}" /> 瑙掕壊锛�
</div>
<el-tree
ref="roleTree"
@@ -1192,7 +1204,7 @@
},
// myCheckBoxInput鐐瑰嚮浜嬩欢 灏忕洅瀛愮偣鍑�(input)
myCheckboxInputClick(item) {
- item.isSelected2 = !item.isSelected2
+ item.isSelected2 = !!item.isSelected2
this.dialogFormRoles.rolesArrSelectedArr = [...new Set(this.dialogFormRoles.rolesArrSelectedArr)]// 鏁扮粍鍘婚噸
if (item.isSelected2) { // 浠庢病閫変腑鍒伴�変腑
console.log('浠庢病閫変腑鍒伴�変腑')
@@ -1374,7 +1386,7 @@
.myCheckbox {
border: 1px solid #eee;
display: flex;
- min-width: 100px;
+ min-width: 110px;
padding: 10px;
margin: 10px 30px 0 0;
border-radius: 5px;
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index a68274b..1bae116 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -137,10 +137,10 @@
<template slot-scope="{row}">
<div class="operationClass">
<el-tooltip class="item" effect="dark" content="缂栬緫" placement="top">
- <i class="el-icon-edit-outline" @click="edit('edit',row)" />
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-edit-outline" @click="edit('edit',row)" />
</el-tooltip>
<el-tooltip v-del-tab-index class="item" effect="dark" content="鍒犻櫎" placement="top">
- <i class="el-icon-delete" @click="del(row.id)" />
+ <i :style="{color:$store.state.settings.theme}" class="el-icon-delete" @click="del(row.id)" />
</el-tooltip>
<!-- <el-button type="primary" size="mini" />-->
<!-- <el-button type="danger" size="mini">鍒犻櫎</el-button>-->
--
Gitblit v1.9.3