diff --git a/.history/src/views/TAN_20231202180219.vue b/.history/src/views/TAN_20231202180219.vue new file mode 100644 index 0000000..ef1957f --- /dev/null +++ b/.history/src/views/TAN_20231202180219.vue @@ -0,0 +1,2217 @@ + + + diff --git a/.history/src/views/TAN_20231202180244.vue b/.history/src/views/TAN_20231202180244.vue new file mode 100644 index 0000000..95830ea --- /dev/null +++ b/.history/src/views/TAN_20231202180244.vue @@ -0,0 +1,2218 @@ + + + diff --git a/.history/src/views/TAN_20231202180254.vue b/.history/src/views/TAN_20231202180254.vue new file mode 100644 index 0000000..865a9ef --- /dev/null +++ b/.history/src/views/TAN_20231202180254.vue @@ -0,0 +1,2218 @@ + + + diff --git a/.history/src/views/TAN_20231202180301.vue b/.history/src/views/TAN_20231202180301.vue new file mode 100644 index 0000000..da45ec4 --- /dev/null +++ b/.history/src/views/TAN_20231202180301.vue @@ -0,0 +1,2218 @@ + + + diff --git a/.history/src/views/TAN_20231202180319.vue b/.history/src/views/TAN_20231202180319.vue new file mode 100644 index 0000000..b9cfbf2 --- /dev/null +++ b/.history/src/views/TAN_20231202180319.vue @@ -0,0 +1,2218 @@ + + + diff --git a/.history/src/views/TAN_20231202180338.vue b/.history/src/views/TAN_20231202180338.vue new file mode 100644 index 0000000..97c28b6 --- /dev/null +++ b/.history/src/views/TAN_20231202180338.vue @@ -0,0 +1,2218 @@ + + + diff --git a/.history/src/views/TAN_20231202180355.vue b/.history/src/views/TAN_20231202180355.vue new file mode 100644 index 0000000..d145dc1 --- /dev/null +++ b/.history/src/views/TAN_20231202180355.vue @@ -0,0 +1,2219 @@ + + + diff --git a/.history/src/views/TAN_20231202180441.vue b/.history/src/views/TAN_20231202180441.vue new file mode 100644 index 0000000..0b7dd92 --- /dev/null +++ b/.history/src/views/TAN_20231202180441.vue @@ -0,0 +1,2219 @@ + + + diff --git a/.history/src/views/TAN_20231202180456.vue b/.history/src/views/TAN_20231202180456.vue new file mode 100644 index 0000000..cfef7d4 --- /dev/null +++ b/.history/src/views/TAN_20231202180456.vue @@ -0,0 +1,2219 @@ + + + diff --git a/.history/src/views/TAN_20231202180518.vue b/.history/src/views/TAN_20231202180518.vue new file mode 100644 index 0000000..2b418ef --- /dev/null +++ b/.history/src/views/TAN_20231202180518.vue @@ -0,0 +1,2219 @@ + + + diff --git a/.history/src/views/TAN_20231202180552.vue b/.history/src/views/TAN_20231202180552.vue new file mode 100644 index 0000000..b7e1dc7 --- /dev/null +++ b/.history/src/views/TAN_20231202180552.vue @@ -0,0 +1,2218 @@ + + + diff --git a/.history/src/views/TAN_20231202180621.vue b/.history/src/views/TAN_20231202180621.vue new file mode 100644 index 0000000..8a4a868 --- /dev/null +++ b/.history/src/views/TAN_20231202180621.vue @@ -0,0 +1,2217 @@ + + + diff --git a/.history/src/views/TAN_20231202180651.vue b/.history/src/views/TAN_20231202180651.vue new file mode 100644 index 0000000..1c02e13 --- /dev/null +++ b/.history/src/views/TAN_20231202180651.vue @@ -0,0 +1,2217 @@ + + + diff --git a/.history/src/views/TAN_20231202180735.vue b/.history/src/views/TAN_20231202180735.vue new file mode 100644 index 0000000..cab055e --- /dev/null +++ b/.history/src/views/TAN_20231202180735.vue @@ -0,0 +1,2217 @@ + + + diff --git a/.history/src/views/TAN_20231202180755.vue b/.history/src/views/TAN_20231202180755.vue new file mode 100644 index 0000000..ce2d7fc --- /dev/null +++ b/.history/src/views/TAN_20231202180755.vue @@ -0,0 +1,2217 @@ + + + diff --git a/.history/src/views/TAN_20231202180816.vue b/.history/src/views/TAN_20231202180816.vue new file mode 100644 index 0000000..ba1849b --- /dev/null +++ b/.history/src/views/TAN_20231202180816.vue @@ -0,0 +1,2217 @@ + + + diff --git a/.history/src/views/TAN_20231202180834.vue b/.history/src/views/TAN_20231202180834.vue new file mode 100644 index 0000000..5cf1743 --- /dev/null +++ b/.history/src/views/TAN_20231202180834.vue @@ -0,0 +1,2217 @@ + + + diff --git a/.history/src/views/TAN_20231202180846.vue b/.history/src/views/TAN_20231202180846.vue new file mode 100644 index 0000000..79a68fa --- /dev/null +++ b/.history/src/views/TAN_20231202180846.vue @@ -0,0 +1,2217 @@ + + + diff --git a/.history/src/views/TAN_20231202180954.vue b/.history/src/views/TAN_20231202180954.vue new file mode 100644 index 0000000..7377f82 --- /dev/null +++ b/.history/src/views/TAN_20231202180954.vue @@ -0,0 +1,2217 @@ + + + diff --git a/.history/src/views/TAN_20231202181028.vue b/.history/src/views/TAN_20231202181028.vue new file mode 100644 index 0000000..3a4a838 --- /dev/null +++ b/.history/src/views/TAN_20231202181028.vue @@ -0,0 +1,2217 @@ + + + diff --git a/.history/src/views/TAN_20231202181029.vue b/.history/src/views/TAN_20231202181029.vue new file mode 100644 index 0000000..3a4a838 --- /dev/null +++ b/.history/src/views/TAN_20231202181029.vue @@ -0,0 +1,2217 @@ + + + diff --git a/.history/src/views/TAN_20231202181103.vue b/.history/src/views/TAN_20231202181103.vue new file mode 100644 index 0000000..de49e2a --- /dev/null +++ b/.history/src/views/TAN_20231202181103.vue @@ -0,0 +1,2217 @@ + + + diff --git a/.history/src/views/TAN_20231202181110.vue b/.history/src/views/TAN_20231202181110.vue new file mode 100644 index 0000000..dd94220 --- /dev/null +++ b/.history/src/views/TAN_20231202181110.vue @@ -0,0 +1,2217 @@ + + + diff --git a/.history/src/views/TAN_20231202181202.vue b/.history/src/views/TAN_20231202181202.vue new file mode 100644 index 0000000..560fcd3 --- /dev/null +++ b/.history/src/views/TAN_20231202181202.vue @@ -0,0 +1,2217 @@ + + + diff --git a/.history/src/views/TAN_20231202181246.vue b/.history/src/views/TAN_20231202181246.vue new file mode 100644 index 0000000..ae04d3b --- /dev/null +++ b/.history/src/views/TAN_20231202181246.vue @@ -0,0 +1,2228 @@ + + + diff --git a/.history/src/views/TAN_20231202181306.vue b/.history/src/views/TAN_20231202181306.vue new file mode 100644 index 0000000..e700c6f --- /dev/null +++ b/.history/src/views/TAN_20231202181306.vue @@ -0,0 +1,2229 @@ + + + diff --git a/.history/src/views/TAN_20231202181408.vue b/.history/src/views/TAN_20231202181408.vue new file mode 100644 index 0000000..98187b2 --- /dev/null +++ b/.history/src/views/TAN_20231202181408.vue @@ -0,0 +1,2234 @@ + + + diff --git a/.history/src/views/TAN_20231202181412.vue b/.history/src/views/TAN_20231202181412.vue new file mode 100644 index 0000000..4f0d48f --- /dev/null +++ b/.history/src/views/TAN_20231202181412.vue @@ -0,0 +1,2235 @@ + + + diff --git a/.history/src/views/TAN_20231202181415.vue b/.history/src/views/TAN_20231202181415.vue new file mode 100644 index 0000000..4f0d48f --- /dev/null +++ b/.history/src/views/TAN_20231202181415.vue @@ -0,0 +1,2235 @@ + + + diff --git a/.history/src/views/TAN_20231202181441.vue b/.history/src/views/TAN_20231202181441.vue new file mode 100644 index 0000000..f4cf3cf --- /dev/null +++ b/.history/src/views/TAN_20231202181441.vue @@ -0,0 +1,2235 @@ + + + diff --git a/.history/src/views/TAN_20231202181452.vue b/.history/src/views/TAN_20231202181452.vue new file mode 100644 index 0000000..c46c2ad --- /dev/null +++ b/.history/src/views/TAN_20231202181452.vue @@ -0,0 +1,2235 @@ + + + diff --git a/.history/src/views/TAN_20231202181535.vue b/.history/src/views/TAN_20231202181535.vue new file mode 100644 index 0000000..0d77d43 --- /dev/null +++ b/.history/src/views/TAN_20231202181535.vue @@ -0,0 +1,2236 @@ + + + diff --git a/.history/src/views/TAN_20231202181554.vue b/.history/src/views/TAN_20231202181554.vue new file mode 100644 index 0000000..a6dd4cb --- /dev/null +++ b/.history/src/views/TAN_20231202181554.vue @@ -0,0 +1,2236 @@ + + + diff --git a/.history/src/views/TAN_20231202181624.vue b/.history/src/views/TAN_20231202181624.vue new file mode 100644 index 0000000..4437365 --- /dev/null +++ b/.history/src/views/TAN_20231202181624.vue @@ -0,0 +1,2236 @@ + + + diff --git a/.history/src/views/TAN_20231202181639.vue b/.history/src/views/TAN_20231202181639.vue new file mode 100644 index 0000000..25b5679 --- /dev/null +++ b/.history/src/views/TAN_20231202181639.vue @@ -0,0 +1,2236 @@ + + + diff --git a/.history/src/views/TAN_20231202181721.vue b/.history/src/views/TAN_20231202181721.vue new file mode 100644 index 0000000..f514422 --- /dev/null +++ b/.history/src/views/TAN_20231202181721.vue @@ -0,0 +1,2236 @@ + + + diff --git a/.history/src/views/XQXY_20231202162724.vue b/.history/src/views/XQXY_20231202162724.vue new file mode 100644 index 0000000..58828ce --- /dev/null +++ b/.history/src/views/XQXY_20231202162724.vue @@ -0,0 +1,1977 @@ + + + diff --git a/.history/src/views/XQXY_20231202162726.vue b/.history/src/views/XQXY_20231202162726.vue new file mode 100644 index 0000000..58828ce --- /dev/null +++ b/.history/src/views/XQXY_20231202162726.vue @@ -0,0 +1,1977 @@ + + + diff --git a/.history/src/views/XQXY_20231202162819.vue b/.history/src/views/XQXY_20231202162819.vue new file mode 100644 index 0000000..7e36eeb --- /dev/null +++ b/.history/src/views/XQXY_20231202162819.vue @@ -0,0 +1,1977 @@ + + + diff --git a/.history/src/views/XQXY_20231202163045.vue b/.history/src/views/XQXY_20231202163045.vue new file mode 100644 index 0000000..c89a685 --- /dev/null +++ b/.history/src/views/XQXY_20231202163045.vue @@ -0,0 +1,1977 @@ + + + diff --git a/.history/src/views/XQXY_20231202163054.vue b/.history/src/views/XQXY_20231202163054.vue new file mode 100644 index 0000000..5af0c83 --- /dev/null +++ b/.history/src/views/XQXY_20231202163054.vue @@ -0,0 +1,1977 @@ + + + diff --git a/.history/src/views/XQXY_20231202163111.vue b/.history/src/views/XQXY_20231202163111.vue new file mode 100644 index 0000000..a277f67 --- /dev/null +++ b/.history/src/views/XQXY_20231202163111.vue @@ -0,0 +1,1977 @@ + + + diff --git a/.history/src/views/XQXY_20231202163115.vue b/.history/src/views/XQXY_20231202163115.vue new file mode 100644 index 0000000..ef2b16e --- /dev/null +++ b/.history/src/views/XQXY_20231202163115.vue @@ -0,0 +1,1977 @@ + + + diff --git a/.history/src/views/XQXY_20231202163130.vue b/.history/src/views/XQXY_20231202163130.vue new file mode 100644 index 0000000..e22b954 --- /dev/null +++ b/.history/src/views/XQXY_20231202163130.vue @@ -0,0 +1,1977 @@ + + + diff --git a/.history/src/views/XQXY_20231202163148.vue b/.history/src/views/XQXY_20231202163148.vue new file mode 100644 index 0000000..836529c --- /dev/null +++ b/.history/src/views/XQXY_20231202163148.vue @@ -0,0 +1,1977 @@ + + + diff --git a/.history/src/views/XQXY_20231202163251.vue b/.history/src/views/XQXY_20231202163251.vue new file mode 100644 index 0000000..67413c6 --- /dev/null +++ b/.history/src/views/XQXY_20231202163251.vue @@ -0,0 +1,1986 @@ + + + diff --git a/.history/src/views/XQXY_20231202163326.vue b/.history/src/views/XQXY_20231202163326.vue new file mode 100644 index 0000000..b9443c1 --- /dev/null +++ b/.history/src/views/XQXY_20231202163326.vue @@ -0,0 +1,1986 @@ + + + diff --git a/.history/src/views/XQXY_20231202163341.vue b/.history/src/views/XQXY_20231202163341.vue new file mode 100644 index 0000000..1eab77b --- /dev/null +++ b/.history/src/views/XQXY_20231202163341.vue @@ -0,0 +1,1986 @@ + + + diff --git a/.history/src/views/XQXY_20231202163418.vue b/.history/src/views/XQXY_20231202163418.vue new file mode 100644 index 0000000..ef6fd84 --- /dev/null +++ b/.history/src/views/XQXY_20231202163418.vue @@ -0,0 +1,1987 @@ + + + diff --git a/.history/src/views/XQXY_20231202163545.vue b/.history/src/views/XQXY_20231202163545.vue new file mode 100644 index 0000000..e540eda --- /dev/null +++ b/.history/src/views/XQXY_20231202163545.vue @@ -0,0 +1,1987 @@ + + + diff --git a/.history/src/views/XQXY_20231202163645.vue b/.history/src/views/XQXY_20231202163645.vue new file mode 100644 index 0000000..39cddba --- /dev/null +++ b/.history/src/views/XQXY_20231202163645.vue @@ -0,0 +1,1988 @@ + + + diff --git a/.history/src/views/XQXY_20231202163709.vue b/.history/src/views/XQXY_20231202163709.vue new file mode 100644 index 0000000..288d0dd --- /dev/null +++ b/.history/src/views/XQXY_20231202163709.vue @@ -0,0 +1,1988 @@ + + + diff --git a/.history/src/views/XQXY_20231202163725.vue b/.history/src/views/XQXY_20231202163725.vue new file mode 100644 index 0000000..24bc295 --- /dev/null +++ b/.history/src/views/XQXY_20231202163725.vue @@ -0,0 +1,1988 @@ + + + diff --git a/.history/src/views/XQXY_20231202163740.vue b/.history/src/views/XQXY_20231202163740.vue new file mode 100644 index 0000000..99b895a --- /dev/null +++ b/.history/src/views/XQXY_20231202163740.vue @@ -0,0 +1,1988 @@ + + + diff --git a/.history/src/views/XQXY_20231202163816.vue b/.history/src/views/XQXY_20231202163816.vue new file mode 100644 index 0000000..a7c3e6a --- /dev/null +++ b/.history/src/views/XQXY_20231202163816.vue @@ -0,0 +1,1988 @@ + + + diff --git a/.history/src/views/XQXY_20231202163827.vue b/.history/src/views/XQXY_20231202163827.vue new file mode 100644 index 0000000..236673d --- /dev/null +++ b/.history/src/views/XQXY_20231202163827.vue @@ -0,0 +1,1988 @@ + + + diff --git a/.history/src/views/XQXY_20231202163837.vue b/.history/src/views/XQXY_20231202163837.vue new file mode 100644 index 0000000..82bf032 --- /dev/null +++ b/.history/src/views/XQXY_20231202163837.vue @@ -0,0 +1,1988 @@ + + + diff --git a/.history/src/views/XQXY_20231202163903.vue b/.history/src/views/XQXY_20231202163903.vue new file mode 100644 index 0000000..8d12da1 --- /dev/null +++ b/.history/src/views/XQXY_20231202163903.vue @@ -0,0 +1,1988 @@ + + + diff --git a/.history/src/views/XQXY_20231202163909.vue b/.history/src/views/XQXY_20231202163909.vue new file mode 100644 index 0000000..4fc1042 --- /dev/null +++ b/.history/src/views/XQXY_20231202163909.vue @@ -0,0 +1,1988 @@ + + + diff --git a/.history/src/views/XQXY_20231202163918.vue b/.history/src/views/XQXY_20231202163918.vue new file mode 100644 index 0000000..2b86dc7 --- /dev/null +++ b/.history/src/views/XQXY_20231202163918.vue @@ -0,0 +1,1988 @@ + + + diff --git a/.history/src/views/XQXY_20231202163925.vue b/.history/src/views/XQXY_20231202163925.vue new file mode 100644 index 0000000..0ab704e --- /dev/null +++ b/.history/src/views/XQXY_20231202163925.vue @@ -0,0 +1,1988 @@ + + + diff --git a/.history/src/views/XQXY_20231202164005.vue b/.history/src/views/XQXY_20231202164005.vue new file mode 100644 index 0000000..0b5fa98 --- /dev/null +++ b/.history/src/views/XQXY_20231202164005.vue @@ -0,0 +1,1988 @@ + + + diff --git a/.history/src/views/XQXY_20231202164034.vue b/.history/src/views/XQXY_20231202164034.vue new file mode 100644 index 0000000..dea5947 --- /dev/null +++ b/.history/src/views/XQXY_20231202164034.vue @@ -0,0 +1,1988 @@ + + + diff --git a/.history/src/views/XQXY_20231202164047.vue b/.history/src/views/XQXY_20231202164047.vue new file mode 100644 index 0000000..e4bab47 --- /dev/null +++ b/.history/src/views/XQXY_20231202164047.vue @@ -0,0 +1,1988 @@ + + + diff --git a/.history/src/views/XQXY_20231202164057.vue b/.history/src/views/XQXY_20231202164057.vue new file mode 100644 index 0000000..a9b0d55 --- /dev/null +++ b/.history/src/views/XQXY_20231202164057.vue @@ -0,0 +1,1988 @@ + + + diff --git a/.history/src/views/XQXY_20231202164137.vue b/.history/src/views/XQXY_20231202164137.vue new file mode 100644 index 0000000..ac905fb --- /dev/null +++ b/.history/src/views/XQXY_20231202164137.vue @@ -0,0 +1,1989 @@ + + + diff --git a/.history/src/views/XQXY_20231202164158.vue b/.history/src/views/XQXY_20231202164158.vue new file mode 100644 index 0000000..4071e49 --- /dev/null +++ b/.history/src/views/XQXY_20231202164158.vue @@ -0,0 +1,1989 @@ + + + diff --git a/.history/src/views/XQXY_20231202164222.vue b/.history/src/views/XQXY_20231202164222.vue new file mode 100644 index 0000000..4745cdd --- /dev/null +++ b/.history/src/views/XQXY_20231202164222.vue @@ -0,0 +1,1995 @@ + + + diff --git a/.history/src/views/XQXY_20231202164239.vue b/.history/src/views/XQXY_20231202164239.vue new file mode 100644 index 0000000..c3d7935 --- /dev/null +++ b/.history/src/views/XQXY_20231202164239.vue @@ -0,0 +1,1990 @@ + + + diff --git a/.history/src/views/XQXY_20231202164255.vue b/.history/src/views/XQXY_20231202164255.vue new file mode 100644 index 0000000..c3d7935 --- /dev/null +++ b/.history/src/views/XQXY_20231202164255.vue @@ -0,0 +1,1990 @@ + + + diff --git a/.history/src/views/XQXY_20231202164259.vue b/.history/src/views/XQXY_20231202164259.vue new file mode 100644 index 0000000..a3d77cf --- /dev/null +++ b/.history/src/views/XQXY_20231202164259.vue @@ -0,0 +1,1989 @@ + + + diff --git a/.history/src/views/XQXY_20231202164310.vue b/.history/src/views/XQXY_20231202164310.vue new file mode 100644 index 0000000..c3d7935 --- /dev/null +++ b/.history/src/views/XQXY_20231202164310.vue @@ -0,0 +1,1990 @@ + + + diff --git a/.history/src/views/XQXY_20231202164311.vue b/.history/src/views/XQXY_20231202164311.vue new file mode 100644 index 0000000..c3d7935 --- /dev/null +++ b/.history/src/views/XQXY_20231202164311.vue @@ -0,0 +1,1990 @@ + + + diff --git a/.history/src/views/XQXY_20231202164313.vue b/.history/src/views/XQXY_20231202164313.vue new file mode 100644 index 0000000..fa8d101 --- /dev/null +++ b/.history/src/views/XQXY_20231202164313.vue @@ -0,0 +1,1990 @@ + + + diff --git a/.history/src/views/XQXY_20231202164407.vue b/.history/src/views/XQXY_20231202164407.vue new file mode 100644 index 0000000..7770981 --- /dev/null +++ b/.history/src/views/XQXY_20231202164407.vue @@ -0,0 +1,1994 @@ + + + diff --git a/.history/src/views/XQXY_20231202164412.vue b/.history/src/views/XQXY_20231202164412.vue new file mode 100644 index 0000000..efeebfb --- /dev/null +++ b/.history/src/views/XQXY_20231202164412.vue @@ -0,0 +1,1993 @@ + + + diff --git a/.history/src/views/XQXY_20231202164432.vue b/.history/src/views/XQXY_20231202164432.vue new file mode 100644 index 0000000..a078b1e --- /dev/null +++ b/.history/src/views/XQXY_20231202164432.vue @@ -0,0 +1,1993 @@ + + + diff --git a/.history/src/views/XQXY_20231202164458.vue b/.history/src/views/XQXY_20231202164458.vue new file mode 100644 index 0000000..f02ab7e --- /dev/null +++ b/.history/src/views/XQXY_20231202164458.vue @@ -0,0 +1,1993 @@ + + + diff --git a/.history/src/views/XQXY_20231202164534.vue b/.history/src/views/XQXY_20231202164534.vue new file mode 100644 index 0000000..1e29182 --- /dev/null +++ b/.history/src/views/XQXY_20231202164534.vue @@ -0,0 +1,1994 @@ + + + diff --git a/.history/src/views/XQXY_20231202164747.vue b/.history/src/views/XQXY_20231202164747.vue new file mode 100644 index 0000000..1256d92 --- /dev/null +++ b/.history/src/views/XQXY_20231202164747.vue @@ -0,0 +1,1994 @@ + + + diff --git a/.history/src/views/XQXY_20231202164920.vue b/.history/src/views/XQXY_20231202164920.vue new file mode 100644 index 0000000..97b4b8f --- /dev/null +++ b/.history/src/views/XQXY_20231202164920.vue @@ -0,0 +1,1999 @@ + + + diff --git a/.history/src/views/XQXY_20231202164955.vue b/.history/src/views/XQXY_20231202164955.vue new file mode 100644 index 0000000..13d9f60 --- /dev/null +++ b/.history/src/views/XQXY_20231202164955.vue @@ -0,0 +1,1998 @@ + + + diff --git a/.history/src/views/XQXY_20231202165015.vue b/.history/src/views/XQXY_20231202165015.vue new file mode 100644 index 0000000..accae93 --- /dev/null +++ b/.history/src/views/XQXY_20231202165015.vue @@ -0,0 +1,1998 @@ + + + diff --git a/.history/src/views/XQXY_20231202165018.vue b/.history/src/views/XQXY_20231202165018.vue new file mode 100644 index 0000000..b1c8f0b --- /dev/null +++ b/.history/src/views/XQXY_20231202165018.vue @@ -0,0 +1,1998 @@ + + + diff --git a/.history/src/views/XQXY_20231202165033.vue b/.history/src/views/XQXY_20231202165033.vue new file mode 100644 index 0000000..ad641a5 --- /dev/null +++ b/.history/src/views/XQXY_20231202165033.vue @@ -0,0 +1,1998 @@ + + + diff --git a/.history/src/views/XQXY_20231202165112.vue b/.history/src/views/XQXY_20231202165112.vue new file mode 100644 index 0000000..9f0aebc --- /dev/null +++ b/.history/src/views/XQXY_20231202165112.vue @@ -0,0 +1,1998 @@ + + + diff --git a/.history/src/views/XQXY_20231202165127.vue b/.history/src/views/XQXY_20231202165127.vue new file mode 100644 index 0000000..bc32db5 --- /dev/null +++ b/.history/src/views/XQXY_20231202165127.vue @@ -0,0 +1,1998 @@ + + + diff --git a/.history/src/views/XQXY_20231202165252.vue b/.history/src/views/XQXY_20231202165252.vue new file mode 100644 index 0000000..1c6b20c --- /dev/null +++ b/.history/src/views/XQXY_20231202165252.vue @@ -0,0 +1,1998 @@ + + + diff --git a/.history/src/views/XQXY_20231202165322.vue b/.history/src/views/XQXY_20231202165322.vue new file mode 100644 index 0000000..b1b956b --- /dev/null +++ b/.history/src/views/XQXY_20231202165322.vue @@ -0,0 +1,1999 @@ + + + diff --git a/.history/src/views/XQXY_20231202165403.vue b/.history/src/views/XQXY_20231202165403.vue new file mode 100644 index 0000000..ee559bf --- /dev/null +++ b/.history/src/views/XQXY_20231202165403.vue @@ -0,0 +1,1999 @@ + + + diff --git a/.history/src/views/XQXY_20231202165412.vue b/.history/src/views/XQXY_20231202165412.vue new file mode 100644 index 0000000..5b3c074 --- /dev/null +++ b/.history/src/views/XQXY_20231202165412.vue @@ -0,0 +1,1999 @@ + + + diff --git a/.history/src/views/XQXY_20231202165429.vue b/.history/src/views/XQXY_20231202165429.vue new file mode 100644 index 0000000..7376dc6 --- /dev/null +++ b/.history/src/views/XQXY_20231202165429.vue @@ -0,0 +1,1999 @@ + + + diff --git a/.history/src/views/XQXY_20231202165446.vue b/.history/src/views/XQXY_20231202165446.vue new file mode 100644 index 0000000..265f96c --- /dev/null +++ b/.history/src/views/XQXY_20231202165446.vue @@ -0,0 +1,1999 @@ + + + diff --git a/.history/src/views/XQXY_20231202165501.vue b/.history/src/views/XQXY_20231202165501.vue new file mode 100644 index 0000000..265f96c --- /dev/null +++ b/.history/src/views/XQXY_20231202165501.vue @@ -0,0 +1,1999 @@ + + + diff --git a/.history/src/views/XQXY_20231202165525.vue b/.history/src/views/XQXY_20231202165525.vue new file mode 100644 index 0000000..86723eb --- /dev/null +++ b/.history/src/views/XQXY_20231202165525.vue @@ -0,0 +1,2000 @@ + + + diff --git a/.history/src/views/XQXY_20231202165546.vue b/.history/src/views/XQXY_20231202165546.vue new file mode 100644 index 0000000..6e32489 --- /dev/null +++ b/.history/src/views/XQXY_20231202165546.vue @@ -0,0 +1,2000 @@ + + + diff --git a/.history/src/views/XQXY_20231202165601.vue b/.history/src/views/XQXY_20231202165601.vue new file mode 100644 index 0000000..7bf98f6 --- /dev/null +++ b/.history/src/views/XQXY_20231202165601.vue @@ -0,0 +1,2000 @@ + + + diff --git a/.history/src/views/XQXY_20231202165647.vue b/.history/src/views/XQXY_20231202165647.vue new file mode 100644 index 0000000..a83710a --- /dev/null +++ b/.history/src/views/XQXY_20231202165647.vue @@ -0,0 +1,2000 @@ + + + diff --git a/.history/src/views/XQXY_20231202165701.vue b/.history/src/views/XQXY_20231202165701.vue new file mode 100644 index 0000000..5463997 --- /dev/null +++ b/.history/src/views/XQXY_20231202165701.vue @@ -0,0 +1,2000 @@ + + + diff --git a/.history/src/views/XQXY_20231202165711.vue b/.history/src/views/XQXY_20231202165711.vue new file mode 100644 index 0000000..ab877a4 --- /dev/null +++ b/.history/src/views/XQXY_20231202165711.vue @@ -0,0 +1,2000 @@ + + + diff --git a/.history/src/views/XQXY_20231202165724.vue b/.history/src/views/XQXY_20231202165724.vue new file mode 100644 index 0000000..a83710a --- /dev/null +++ b/.history/src/views/XQXY_20231202165724.vue @@ -0,0 +1,2000 @@ + + + diff --git a/.history/src/views/XQXY_20231202165728.vue b/.history/src/views/XQXY_20231202165728.vue new file mode 100644 index 0000000..4d3ea86 --- /dev/null +++ b/.history/src/views/XQXY_20231202165728.vue @@ -0,0 +1,1999 @@ + + + diff --git a/.history/src/views/XQXY_20231202165929.vue b/.history/src/views/XQXY_20231202165929.vue new file mode 100644 index 0000000..2fca046 --- /dev/null +++ b/.history/src/views/XQXY_20231202165929.vue @@ -0,0 +1,1998 @@ + + + diff --git a/.history/src/views/XQXY_20231202165944.vue b/.history/src/views/XQXY_20231202165944.vue new file mode 100644 index 0000000..8032838 --- /dev/null +++ b/.history/src/views/XQXY_20231202165944.vue @@ -0,0 +1,1999 @@ + + + diff --git a/.history/src/views/XQXY_20231202170008.vue b/.history/src/views/XQXY_20231202170008.vue new file mode 100644 index 0000000..2fca046 --- /dev/null +++ b/.history/src/views/XQXY_20231202170008.vue @@ -0,0 +1,1998 @@ + + + diff --git a/.history/src/views/XQXY_20231202170107.vue b/.history/src/views/XQXY_20231202170107.vue new file mode 100644 index 0000000..64ffcdc --- /dev/null +++ b/.history/src/views/XQXY_20231202170107.vue @@ -0,0 +1,1998 @@ + + + diff --git a/.history/src/views/XQXY_20231202170210.vue b/.history/src/views/XQXY_20231202170210.vue new file mode 100644 index 0000000..47544cd --- /dev/null +++ b/.history/src/views/XQXY_20231202170210.vue @@ -0,0 +1,1998 @@ + + + diff --git a/.history/src/views/XQXY_20231202170232.vue b/.history/src/views/XQXY_20231202170232.vue new file mode 100644 index 0000000..00b5493 --- /dev/null +++ b/.history/src/views/XQXY_20231202170232.vue @@ -0,0 +1,1998 @@ + + + diff --git a/.history/src/views/XQXY_20231202170312.vue b/.history/src/views/XQXY_20231202170312.vue new file mode 100644 index 0000000..0ffb5b6 --- /dev/null +++ b/.history/src/views/XQXY_20231202170312.vue @@ -0,0 +1,1998 @@ + + + diff --git a/.history/src/views/XQXY_20231202170313.vue b/.history/src/views/XQXY_20231202170313.vue new file mode 100644 index 0000000..0ffb5b6 --- /dev/null +++ b/.history/src/views/XQXY_20231202170313.vue @@ -0,0 +1,1998 @@ + + + diff --git a/.history/src/views/XQXY_20231202170342.vue b/.history/src/views/XQXY_20231202170342.vue new file mode 100644 index 0000000..1ade4c2 --- /dev/null +++ b/.history/src/views/XQXY_20231202170342.vue @@ -0,0 +1,1998 @@ + + + diff --git a/.history/src/views/XQXY_20231202170346.vue b/.history/src/views/XQXY_20231202170346.vue new file mode 100644 index 0000000..6068592 --- /dev/null +++ b/.history/src/views/XQXY_20231202170346.vue @@ -0,0 +1,1998 @@ + + + diff --git a/.history/src/views/XQXY_20231202170354.vue b/.history/src/views/XQXY_20231202170354.vue new file mode 100644 index 0000000..4aba365 --- /dev/null +++ b/.history/src/views/XQXY_20231202170354.vue @@ -0,0 +1,1998 @@ + + + diff --git a/.history/src/views/XQXY_20231202170505.vue b/.history/src/views/XQXY_20231202170505.vue new file mode 100644 index 0000000..dad72d2 --- /dev/null +++ b/.history/src/views/XQXY_20231202170505.vue @@ -0,0 +1,2006 @@ + + + diff --git a/.history/src/views/XQXY_20231202170527.vue b/.history/src/views/XQXY_20231202170527.vue new file mode 100644 index 0000000..8d6170d --- /dev/null +++ b/.history/src/views/XQXY_20231202170527.vue @@ -0,0 +1,2006 @@ + + + diff --git a/.history/src/views/XQXY_20231202170543.vue b/.history/src/views/XQXY_20231202170543.vue new file mode 100644 index 0000000..4a81068 --- /dev/null +++ b/.history/src/views/XQXY_20231202170543.vue @@ -0,0 +1,2007 @@ + + + diff --git a/.history/src/views/XQXY_20231202170555.vue b/.history/src/views/XQXY_20231202170555.vue new file mode 100644 index 0000000..fd3c8b5 --- /dev/null +++ b/.history/src/views/XQXY_20231202170555.vue @@ -0,0 +1,2007 @@ + + + diff --git a/.history/src/views/XQXY_20231202170630.vue b/.history/src/views/XQXY_20231202170630.vue new file mode 100644 index 0000000..2729308 --- /dev/null +++ b/.history/src/views/XQXY_20231202170630.vue @@ -0,0 +1,2024 @@ + + + diff --git a/.history/src/views/XQXY_20231202170734.vue b/.history/src/views/XQXY_20231202170734.vue new file mode 100644 index 0000000..88ec484 --- /dev/null +++ b/.history/src/views/XQXY_20231202170734.vue @@ -0,0 +1,2139 @@ + + + diff --git a/.history/src/views/XQXY_20231202170957.vue b/.history/src/views/XQXY_20231202170957.vue new file mode 100644 index 0000000..0405dbd --- /dev/null +++ b/.history/src/views/XQXY_20231202170957.vue @@ -0,0 +1,2139 @@ + + + diff --git a/.history/src/views/XQXY_20231202171013.vue b/.history/src/views/XQXY_20231202171013.vue new file mode 100644 index 0000000..ca1b950 --- /dev/null +++ b/.history/src/views/XQXY_20231202171013.vue @@ -0,0 +1,2139 @@ + + + diff --git a/.history/src/views/XQXY_20231202171035.vue b/.history/src/views/XQXY_20231202171035.vue new file mode 100644 index 0000000..ca1b950 --- /dev/null +++ b/.history/src/views/XQXY_20231202171035.vue @@ -0,0 +1,2139 @@ + + + diff --git a/.history/src/views/XQXY_20231202171137.vue b/.history/src/views/XQXY_20231202171137.vue new file mode 100644 index 0000000..15e3244 --- /dev/null +++ b/.history/src/views/XQXY_20231202171137.vue @@ -0,0 +1,2139 @@ + + + diff --git a/.history/src/views/XQXY_20231202171258.vue b/.history/src/views/XQXY_20231202171258.vue new file mode 100644 index 0000000..bc84ce9 --- /dev/null +++ b/.history/src/views/XQXY_20231202171258.vue @@ -0,0 +1,2139 @@ + + + diff --git a/.history/src/views/XQXY_20231202171313.vue b/.history/src/views/XQXY_20231202171313.vue new file mode 100644 index 0000000..3719ee7 --- /dev/null +++ b/.history/src/views/XQXY_20231202171313.vue @@ -0,0 +1,2139 @@ + + + diff --git a/.history/src/views/XQXY_20231202171423.vue b/.history/src/views/XQXY_20231202171423.vue new file mode 100644 index 0000000..91386ab --- /dev/null +++ b/.history/src/views/XQXY_20231202171423.vue @@ -0,0 +1,2139 @@ + + + diff --git a/.history/src/views/XQXY_20231202171425.vue b/.history/src/views/XQXY_20231202171425.vue new file mode 100644 index 0000000..0e4fc06 --- /dev/null +++ b/.history/src/views/XQXY_20231202171425.vue @@ -0,0 +1,2139 @@ + + + diff --git a/.history/src/views/XQXY_20231202171458.vue b/.history/src/views/XQXY_20231202171458.vue new file mode 100644 index 0000000..fa9129e --- /dev/null +++ b/.history/src/views/XQXY_20231202171458.vue @@ -0,0 +1,2139 @@ + + + diff --git a/.history/src/views/XQXY_20231202171518.vue b/.history/src/views/XQXY_20231202171518.vue new file mode 100644 index 0000000..0e4fc06 --- /dev/null +++ b/.history/src/views/XQXY_20231202171518.vue @@ -0,0 +1,2139 @@ + + + diff --git a/.history/src/views/XQXY_20231202171522.vue b/.history/src/views/XQXY_20231202171522.vue new file mode 100644 index 0000000..5134073 --- /dev/null +++ b/.history/src/views/XQXY_20231202171522.vue @@ -0,0 +1,2139 @@ + + + diff --git a/.history/src/views/XQXY_20231202171539.vue b/.history/src/views/XQXY_20231202171539.vue new file mode 100644 index 0000000..c70f0eb --- /dev/null +++ b/.history/src/views/XQXY_20231202171539.vue @@ -0,0 +1,2139 @@ + + + diff --git a/.history/src/views/XQXY_20231202171602.vue b/.history/src/views/XQXY_20231202171602.vue new file mode 100644 index 0000000..0ffb2bd --- /dev/null +++ b/.history/src/views/XQXY_20231202171602.vue @@ -0,0 +1,2139 @@ + + + diff --git a/.history/src/views/XQXY_20231202171631.vue b/.history/src/views/XQXY_20231202171631.vue new file mode 100644 index 0000000..96f4fa7 --- /dev/null +++ b/.history/src/views/XQXY_20231202171631.vue @@ -0,0 +1,2140 @@ + + + diff --git a/.history/src/views/XQXY_20231202171810.vue b/.history/src/views/XQXY_20231202171810.vue new file mode 100644 index 0000000..e4b8752 --- /dev/null +++ b/.history/src/views/XQXY_20231202171810.vue @@ -0,0 +1,2140 @@ + + + diff --git a/.history/src/views/XQXY_20231202171822.vue b/.history/src/views/XQXY_20231202171822.vue new file mode 100644 index 0000000..ab39e1b --- /dev/null +++ b/.history/src/views/XQXY_20231202171822.vue @@ -0,0 +1,2140 @@ + + + diff --git a/.history/src/views/XQXY_20231202171848.vue b/.history/src/views/XQXY_20231202171848.vue new file mode 100644 index 0000000..556e510 --- /dev/null +++ b/.history/src/views/XQXY_20231202171848.vue @@ -0,0 +1,2140 @@ + + + diff --git a/.history/src/views/XQXY_20231202171936.vue b/.history/src/views/XQXY_20231202171936.vue new file mode 100644 index 0000000..01d919e --- /dev/null +++ b/.history/src/views/XQXY_20231202171936.vue @@ -0,0 +1,2140 @@ + + + diff --git a/.history/src/views/XQXY_20231202172105.vue b/.history/src/views/XQXY_20231202172105.vue new file mode 100644 index 0000000..08dcd3e --- /dev/null +++ b/.history/src/views/XQXY_20231202172105.vue @@ -0,0 +1,2141 @@ + + + diff --git a/.history/src/views/XQXY_20231202172110.vue b/.history/src/views/XQXY_20231202172110.vue new file mode 100644 index 0000000..604bf35 --- /dev/null +++ b/.history/src/views/XQXY_20231202172110.vue @@ -0,0 +1,2142 @@ + + + diff --git a/.history/src/views/XQXY_20231202172258.vue b/.history/src/views/XQXY_20231202172258.vue new file mode 100644 index 0000000..2777090 --- /dev/null +++ b/.history/src/views/XQXY_20231202172258.vue @@ -0,0 +1,2143 @@ + + + diff --git a/.history/src/views/ZHDY_20231202172724.vue b/.history/src/views/ZHDY_20231202172724.vue new file mode 100644 index 0000000..7cc78a6 --- /dev/null +++ b/.history/src/views/ZHDY_20231202172724.vue @@ -0,0 +1,1975 @@ + + + diff --git a/.history/src/views/ZHDY_20231202172734.vue b/.history/src/views/ZHDY_20231202172734.vue new file mode 100644 index 0000000..f5388bd --- /dev/null +++ b/.history/src/views/ZHDY_20231202172734.vue @@ -0,0 +1,1975 @@ + + + diff --git a/.history/src/views/ZHDY_20231202172748.vue b/.history/src/views/ZHDY_20231202172748.vue new file mode 100644 index 0000000..782945a --- /dev/null +++ b/.history/src/views/ZHDY_20231202172748.vue @@ -0,0 +1,1975 @@ + + + diff --git a/.history/src/views/ZHDY_20231202172855.vue b/.history/src/views/ZHDY_20231202172855.vue new file mode 100644 index 0000000..453389a --- /dev/null +++ b/.history/src/views/ZHDY_20231202172855.vue @@ -0,0 +1,1976 @@ + + + diff --git a/.history/src/views/ZHDY_20231202172939.vue b/.history/src/views/ZHDY_20231202172939.vue new file mode 100644 index 0000000..c5bd042 --- /dev/null +++ b/.history/src/views/ZHDY_20231202172939.vue @@ -0,0 +1,1975 @@ + + + diff --git a/.history/src/views/ZHDY_20231202172946.vue b/.history/src/views/ZHDY_20231202172946.vue new file mode 100644 index 0000000..a3e0696 --- /dev/null +++ b/.history/src/views/ZHDY_20231202172946.vue @@ -0,0 +1,1975 @@ + + + diff --git a/.history/src/views/ZHDY_20231202172950.vue b/.history/src/views/ZHDY_20231202172950.vue new file mode 100644 index 0000000..8992ffe --- /dev/null +++ b/.history/src/views/ZHDY_20231202172950.vue @@ -0,0 +1,1975 @@ + + + diff --git a/.history/src/views/ZHDY_20231202173052.vue b/.history/src/views/ZHDY_20231202173052.vue new file mode 100644 index 0000000..30348bf --- /dev/null +++ b/.history/src/views/ZHDY_20231202173052.vue @@ -0,0 +1,1970 @@ + + + diff --git a/.history/src/views/ZHDY_20231202173121.vue b/.history/src/views/ZHDY_20231202173121.vue new file mode 100644 index 0000000..e562497 --- /dev/null +++ b/.history/src/views/ZHDY_20231202173121.vue @@ -0,0 +1,1970 @@ + + + diff --git a/.history/src/views/ZHDY_20231202173127.vue b/.history/src/views/ZHDY_20231202173127.vue new file mode 100644 index 0000000..1ade124 --- /dev/null +++ b/.history/src/views/ZHDY_20231202173127.vue @@ -0,0 +1,1970 @@ + + + diff --git a/.history/src/views/ZHDY_20231202173247.vue b/.history/src/views/ZHDY_20231202173247.vue new file mode 100644 index 0000000..0b3626d --- /dev/null +++ b/.history/src/views/ZHDY_20231202173247.vue @@ -0,0 +1,1970 @@ + + + diff --git a/.history/src/views/ZHDY_20231202173407.vue b/.history/src/views/ZHDY_20231202173407.vue new file mode 100644 index 0000000..5b51f87 --- /dev/null +++ b/.history/src/views/ZHDY_20231202173407.vue @@ -0,0 +1,1970 @@ + + + diff --git a/.history/src/views/ZHDY_20231202173428.vue b/.history/src/views/ZHDY_20231202173428.vue new file mode 100644 index 0000000..d5e4f1e --- /dev/null +++ b/.history/src/views/ZHDY_20231202173428.vue @@ -0,0 +1,1970 @@ + + + diff --git a/.history/src/views/ZHDY_20231202173438.vue b/.history/src/views/ZHDY_20231202173438.vue new file mode 100644 index 0000000..408df91 --- /dev/null +++ b/.history/src/views/ZHDY_20231202173438.vue @@ -0,0 +1,1970 @@ + + + diff --git a/.history/src/views/ZHDY_20231202173551.vue b/.history/src/views/ZHDY_20231202173551.vue new file mode 100644 index 0000000..c008378 --- /dev/null +++ b/.history/src/views/ZHDY_20231202173551.vue @@ -0,0 +1,1970 @@ + + + diff --git a/.history/src/views/ZHDY_20231202173554.vue b/.history/src/views/ZHDY_20231202173554.vue new file mode 100644 index 0000000..82405d7 --- /dev/null +++ b/.history/src/views/ZHDY_20231202173554.vue @@ -0,0 +1,1970 @@ + + + diff --git a/.history/src/views/ZHDY_20231202173648.vue b/.history/src/views/ZHDY_20231202173648.vue new file mode 100644 index 0000000..0ace54d --- /dev/null +++ b/.history/src/views/ZHDY_20231202173648.vue @@ -0,0 +1,1970 @@ + + + diff --git a/.history/src/views/ZHDY_20231202173718.vue b/.history/src/views/ZHDY_20231202173718.vue new file mode 100644 index 0000000..204ebeb --- /dev/null +++ b/.history/src/views/ZHDY_20231202173718.vue @@ -0,0 +1,1970 @@ + + + diff --git a/.history/src/views/ZHDY_20231202173747.vue b/.history/src/views/ZHDY_20231202173747.vue new file mode 100644 index 0000000..7322daa --- /dev/null +++ b/.history/src/views/ZHDY_20231202173747.vue @@ -0,0 +1,1970 @@ + + + diff --git a/src/views/TAN.vue b/src/views/TAN.vue index e00910b..f514422 100644 --- a/src/views/TAN.vue +++ b/src/views/TAN.vue @@ -1,53 +1,53 @@ - \ No newline at end of file diff --git a/src/views/XQXY.vue b/src/views/XQXY.vue index 1a9ee59..2777090 100644 --- a/src/views/XQXY.vue +++ b/src/views/XQXY.vue @@ -1000,15 +1000,26 @@ export default { }, }; let option = { + grid: { + left: "20%", // 调整饼状图的左边距 + top: "20%", // 调整饼状图的上边距 + right: "20%", // 调整饼状图的右边距 + bottom: "20%", // 调整饼状图的下边距 + }, title: { - text: "工业", - left: "center", - top: "51%", - padding: [10, 0], + subtext: "工业", + text: "85.2%", + left: "48", + align:"center", + top: "40%", + // padding: [10, 0], textStyle: { - color: "#6B9DD7", + color: "#fff", + fontSize: 14, + align: "center", + }, + subtextStyle: { fontSize: 12, - fontWeight: "normal", align: "center", }, }, @@ -1020,7 +1031,7 @@ export default { var percent = 0; var total = 0; for (var i = 0; i < echartData.length; i++) { - total += trafficWay[i].value; + total += echartData[i].value; } const item = echartData.filter((item) => item.name === name)[0]; console.log(item); @@ -1032,20 +1043,30 @@ export default { return ""; } }, - data: [echartData[0].name], - left: 320, - bottom: 145, + data: [ + { + name: "工业", + icon: "rect", + }, + { + name: "楼宇", + icon: "rect", + }, + ], + right: 20, + top: 40, + orient: "vertical", align: "left", textStyle: { - color: "#fff", + color: "#", rich: { name: { - fontSize: 16, - color: "#fff", + fontSize: 12, + // color: "#fff", }, num: { fontSize: 12, - color: color[1], + // color: "#fff", }, }, }, @@ -1054,9 +1075,10 @@ export default { { name: "", type: "pie", + center: ["25%", "50%"], radius: ["42%", "50%"], hoverAnimation: false, - color: ["#fc962c", "#d83472"], + color: ["#13AAF3", "#6FF0FD"], label: { show: false, }, @@ -1069,6 +1091,122 @@ export default { }; this.defineEcharts("gongye", option); }, + xuefeng() { + var echartData = [ + { + value: 85.2, + name: "削锋", + }, + { + value: 14.8, + name: "填谷", + }, + ]; + var rich = { + total: { + color: "#A2C7F3", + fontSize: 16, + align: "center", + }, + white: { + color: "#a2c7f3", + align: "center", + fontSize: 12, + padding: [8, 0], + }, + }; + let option = { + grid: { + left: "20%", // 调整饼状图的左边距 + top: "20%", // 调整饼状图的上边距 + right: "20%", // 调整饼状图的右边距 + bottom: "20%", // 调整饼状图的下边距 + }, + title: { + subtext: "削锋", + text: "85.2%", + left: "48", + top: "40%", + align:"center", + padding: [10, 0], + textStyle: { + color: "#fff", + fontSize: 14, + align: "center", + }, + subtextStyle: { + fontSize: 12, + align: "center", + }, + }, + legend: { + icon: "rect", + x: "right", + // selectedMode: false, + formatter: function (name) { + var percent = 0; + var total = 0; + for (var i = 0; i < echartData.length; i++) { + total += echartData[i].value; + } + const item = echartData.filter((item) => item.name === name)[0]; + console.log(item); + percent = ((item.value / total) * 100).toFixed(2); + if (name !== "") { + return `{name|${name}}` + "\t" + "\t" + `{num|${percent}}{num|%}`; + // return `{name|${name}` + `{num|${percent}}{name|kWh}`; + } else { + return ""; + } + }, + data: [ + { + name: "削锋", + icon: "rect", + }, + { + name: "填谷", + icon: "rect", + }, + ], + right: 20, + top: 40, + orient: "vertical", + align: "left", + textStyle: { + color: "#", + rich: { + name: { + fontSize: 12, + // color: "#fff", + }, + num: { + fontSize: 12, + // color: "#fff", + }, + }, + }, + }, + series: [ + { + name: "", + type: "pie", + center: ["25%", "50%"], + radius: ["42%", "50%"], + hoverAnimation: false, + color: ["#13AAF3", "#6FF0FD"], + label: { + show: false, + }, + labelLine: { + show: false, + }, + data: echartData, + }, + ], + }; + this.defineEcharts("xuefeng", option); + }, }, mounted() { this.defineEcharts("ndqylfb", this.option1); @@ -1848,11 +1986,39 @@ export default { width: 100%; height: 100%; .xyzy1 { + height: 100px; display: flex; justify-content: space-around; + p:nth-child(1) { + width: 103px; + height: 36px; + margin-top: 60px; + font-size: 14px; + font-weight: 400; + color: #ffffff; + line-height: 36px; + } #gongye { - width: 200px; - height: 200px; + width: 300px; + height: 160px; + } + } + .xyzy2 { + height: 100px; + display: flex; + justify-content: space-around; + p:nth-child(1) { + width: 103px; + height: 36px; + margin-top: 60px; + font-size: 14px; + font-weight: 400; + color: #ffffff; + line-height: 36px; + } + #xuefeng { + width: 300px; + height: 160px; } } } diff --git a/src/views/ZHDY.vue b/src/views/ZHDY.vue index d8e461d..7322daa 100644 --- a/src/views/ZHDY.vue +++ b/src/views/ZHDY.vue @@ -519,184 +519,133 @@ export default { }, // 年度售电量 ndsdl() { - // 假数据 - let left1 = { - code: 200, - msg: "人数趋势图获取成功", - data: { - count: [ - 153456, 143456, 163456, 183456, 163456, 153456, 163456, 133456, - 163456, 143456, 103456, 113456, 153456, 133456, 143456, - ], - time: [ - "01", - "02", - "03", - "04", - "05", - "06", - "07", - "08", - "09", - "10", - "11", - "12", - ], - }, - }; - //计算最大值 - function maxNumCount(num) { - let maxNum = ""; - //将数字转化为数组 - let max = num.toString().split(""); - for (var i = 0; i < max.length; i++) { - if (i > 1) { - maxNum += "0"; - } - } - //组装补0 - if (maxNum.length > 1) { - if (max[1] == "9") { - maxNum = parseInt(max[0]) + 1 + "0" + maxNum; - } else { - maxNum = max[0] + (parseInt(max[1]) + 1) + maxNum; - } - } else { - maxNum = "100"; - } - return maxNum; - } - //计算最小值 - function minNumCount(num) { - if (num < 10000) { - return "0"; - } - let minNum = ""; - //将数字转化为数组 - let min = num.toString().split(""); - for (var i = 0; i < min.length; i++) { - //组装补0 - if (i > 1) { - minNum += "0"; - } - } - if (min[1] == "0") { - minNum = parseInt(min[0]) - 1 + "9" + minNum; - } else { - minNum = min[0] + parseInt(min[1]) + minNum; - } + var colors = ["#00FFFF", "#02FF67", "#675bba"]; - return minNum; - } - - let maxNum = Math.max(...left1.data.count); - let minNum = Math.min(...left1.data.count); - maxNum = maxNumCount(maxNum); - minNum = minNumCount(minNum); - let yName = "人数(万)"; - if (maxNum > 9999999) { - yName = "人数(千万)"; - } - var option; - - option = { - grid: { - width: "84%", - height: "75%", - top: "20%", //生成的图片和顶部的间距 - left: "5%", - bottom: "0%", - right: "16%", - containLabel: true, //为ture才会生效 - }, + let option = { tooltip: { trigger: "axis", - // axisPointer: { - // type: "shadow", - // }, + axisPointer: { + type: "shadow", + }, }, - xAxis: { - // name: "日期", - nameTextStyle: { - color: "#03CECF", - fontSize: 14, - }, - type: "category", - boundaryGap: false, - data: left1.data.time, - axisLabel: { - color: "#03CECF", - fontSize: 14, - margin: 10, - // interval: 0, //使x轴上的文字显示完全, - }, - axisLine: { - show: true, - lineStyle: { - color: "rgb(37,52,82)", + grid: { + top: "25%", + right: "5%", + left: "15%", + bottom: "20%", + }, + + xAxis: [ + { + type: "category", + axisLabel: { + color: "#fff", }, + axisLine: { + show: true, + lineStyle: { + color: "#0a3e98", + }, + }, + axisTick: { + show: false, + }, + splitLine: { + show: false, + lineStyle: { + color: "#195384", + type: "dotted", + }, + }, + data: [ + "01", + "02", + "03", + "04", + "05", + "06", + "07", + "08", + "09", + "10", + "11", + "12", + ], }, - axisTick: { + ], + dataZoom: [ + { show: false, + realtime: false, + start: 0, + end: 100, }, - }, - yAxis: { - type: "value", - name: yName, - nameTextStyle: { - color: "#03CECF", - fontSize: 14, + { + type: "inside", + realtime: true, + start: 0, + end: 100, }, - min: minNum, - max: maxNum, - axisLine: { - lineStyle: { - color: "rgb(37,52,82)", + ], + yAxis: [ + { + type: "value", + name: "单位:户", + min: 0, + position: "left", + nameTextStyle: { + color: "#fff", + fontSize: 12, }, - show: true, - }, - splitLine: { - show: true, - lineStyle: { - color: "rgba(37,52,82)", + axisLine: { + lineStyle: { + color: "#0a3e98", + }, + }, + axisTick: { + show: false, + }, + splitLine: { + show: true, + lineStyle: { + color: "#0a3e98", + type: "dotted", + }, + }, + axisLabel: { + formatter: "{value}", + textStyle: { + color: "#fff", + }, }, }, - axisLabel: { - color: "#03CECF", - fontSize: 14, - interval: 20, - formatter: function (value, index) { - if (yName.indexOf("千万") && maxNum > 10000000) { - value = (value / 10000000).toFixed(2); - } else if (maxNum > 10000 && maxNum < 10000000) { - value = value / 10000; - } - return value; - }, - }, - }, - splitLine: { - show: false, - }, + ], series: [ { - data: left1.data.count, + name: "发放人数", type: "line", - showSymbol: true, - itemStyle: { - emphasis: { - color: "rgb(7,162,148)", - borderColor: "rgba(7,162,148,0.6)", - borderWidth: 20, - }, + // smooth: true, //是否平滑 + // showAllSymbol: true, + // symbol: 'image://./static/images/guang-circle.png', + symbol: "circle", + symbolSize: 2, + lineStyle: { normal: { - color: "rgb(62,195,221)", - borderColor: "rgb(6,65,95)", - lineStyle: { - color: "rgb(101,184,196)", - }, + color: "#14ADFD", }, }, + label: { + show: true, + position: "top", + textStyle: { + color: "#14ADFD", + }, + }, + itemStyle: { + color: "#fff", + borderColor: "#14ADFD", + borderWidth: 2, + }, areaStyle: { normal: { color: new echarts.graphic.LinearGradient( @@ -707,20 +656,24 @@ export default { [ { offset: 0, - color: "#68e3e5", + color: "rgba(78, 173, 244, 0.90)", }, { offset: 1, - color: "rgba(24, 68, 121,0)", + color: "rgba(37, 98, 179, 0.90)", }, ], false ), + shadowColor: "rgba(37, 98, 179, 0.90)", + shadowBlur: 20, }, }, + data: [300, 400, 200, 250, 320, 180, 190, 400, 160, 300, 480,300], }, ], }; + this.defineEcharts("ndsdl", option); }, //偏差分析 pcfx() { @@ -1109,6 +1062,7 @@ export default { this.qyyh(); this.pcfx(); this.yhhyzb(); + this.ndsdl(); var data = [ { name: "南京市",