Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg

src/renderer/src/assets/iconfont/demo.css

@@ -1,539 +0,0 @@
-/* Logo 字体 */
-@font-face {
-  font-family: "iconfont logo";
-  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834');
-  src: url('https://at.alicdn.com/t/font_985780_km7mi63cihi.eot?t=1545807318834#iefix') format('embedded-opentype'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.woff?t=1545807318834') format('woff'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.ttf?t=1545807318834') format('truetype'),
-    url('https://at.alicdn.com/t/font_985780_km7mi63cihi.svg?t=1545807318834#iconfont') format('svg');
-}
-
-.logo {
-  font-family: "iconfont logo";
-  font-size: 160px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-/* tabs */
-.nav-tabs {
-  position: relative;
-}
-
-.nav-tabs .nav-more {
-  position: absolute;
-  right: 0;
-  bottom: 0;
-  height: 42px;
-  line-height: 42px;
-  color: #666;
-}
-
-#tabs {
-  border-bottom: 1px solid #eee;
-}
-
-#tabs li {
-  cursor: pointer;
-  width: 100px;
-  height: 40px;
-  line-height: 40px;
-  text-align: center;
-  font-size: 16px;
-  border-bottom: 2px solid transparent;
-  position: relative;
-  z-index: 1;
-  margin-bottom: -1px;
-  color: #666;
-}
-
-
-#tabs .active {
-  border-bottom-color: #f00;
-  color: #222;
-}
-
-.tab-container .content {
-  display: none;
-}
-
-/* 页面布局 */
-.main {
-  padding: 30px 100px;
-  width: 960px;
-  margin: 0 auto;
-}
-
-.main .logo {
-  color: #333;
-  text-align: left;
-  margin-bottom: 30px;
-  line-height: 1;
-  height: 110px;
-  margin-top: -50px;
-  overflow: hidden;
-  *zoom: 1;
-}
-
-.main .logo a {
-  font-size: 160px;
-  color: #333;
-}
-
-.helps {
-  margin-top: 40px;
-}
-
-.helps pre {
-  padding: 20px;
-  margin: 10px 0;
-  border: solid 1px #e7e1cd;
-  background-color: #fffdef;
-  overflow: auto;
-}
-
-.icon_lists {
-  width: 100% !important;
-  overflow: hidden;
-  *zoom: 1;
-}
-
-.icon_lists li {
-  width: 100px;
-  margin-bottom: 10px;
-  margin-right: 20px;
-  text-align: center;
-  list-style: none !important;
-  cursor: default;
-}
-
-.icon_lists li .code-name {
-  line-height: 1.2;
-}
-
-.icon_lists .icon {
-  display: block;
-  height: 100px;
-  line-height: 100px;
-  font-size: 42px;
-  margin: 10px auto;
-  color: #333;
-  -webkit-transition: font-size 0.25s linear, width 0.25s linear;
-  -moz-transition: font-size 0.25s linear, width 0.25s linear;
-  transition: font-size 0.25s linear, width 0.25s linear;
-}
-
-.icon_lists .icon:hover {
-  font-size: 100px;
-}
-
-.icon_lists .svg-icon {
-  /* 通过设置 font-size 来改变图标大小 */
-  width: 1em;
-  /* 图标和文字相邻时，垂直对齐 */
-  vertical-align: -0.15em;
-  /* 通过设置 color 来改变 SVG 的颜色/fill */
-  fill: currentColor;
-  /* path 和 stroke 溢出 viewBox 部分在 IE 下会显示
-      normalize.css 中也包含这行 */
-  overflow: hidden;
-}
-
-.icon_lists li .name,
-.icon_lists li .code-name {
-  color: #666;
-}
-
-/* markdown 样式 */
-.markdown {
-  color: #666;
-  font-size: 14px;
-  line-height: 1.8;
-}
-
-.highlight {
-  line-height: 1.5;
-}
-
-.markdown img {
-  vertical-align: middle;
-  max-width: 100%;
-}
-
-.markdown h1 {
-  color: #404040;
-  font-weight: 500;
-  line-height: 40px;
-  margin-bottom: 24px;
-}
-
-.markdown h2,
-.markdown h3,
-.markdown h4,
-.markdown h5,
-.markdown h6 {
-  color: #404040;
-  margin: 1.6em 0 0.6em 0;
-  font-weight: 500;
-  clear: both;
-}
-
-.markdown h1 {
-  font-size: 28px;
-}
-
-.markdown h2 {
-  font-size: 22px;
-}
-
-.markdown h3 {
-  font-size: 16px;
-}
-
-.markdown h4 {
-  font-size: 14px;
-}
-
-.markdown h5 {
-  font-size: 12px;
-}
-
-.markdown h6 {
-  font-size: 12px;
-}
-
-.markdown hr {
-  height: 1px;
-  border: 0;
-  background: #e9e9e9;
-  margin: 16px 0;
-  clear: both;
-}
-
-.markdown p {
-  margin: 1em 0;
-}
-
-.markdown>p,
-.markdown>blockquote,
-.markdown>.highlight,
-.markdown>ol,
-.markdown>ul {
-  width: 80%;
-}
-
-.markdown ul>li {
-  list-style: circle;
-}
-
-.markdown>ul li,
-.markdown blockquote ul>li {
-  margin-left: 20px;
-  padding-left: 4px;
-}
-
-.markdown>ul li p,
-.markdown>ol li p {
-  margin: 0.6em 0;
-}
-
-.markdown ol>li {
-  list-style: decimal;
-}
-
-.markdown>ol li,
-.markdown blockquote ol>li {
-  margin-left: 20px;
-  padding-left: 4px;
-}
-
-.markdown code {
-  margin: 0 3px;
-  padding: 0 5px;
-  background: #eee;
-  border-radius: 3px;
-}
-
-.markdown strong,
-.markdown b {
-  font-weight: 600;
-}
-
-.markdown>table {
-  border-collapse: collapse;
-  border-spacing: 0px;
-  empty-cells: show;
-  border: 1px solid #e9e9e9;
-  width: 95%;
-  margin-bottom: 24px;
-}
-
-.markdown>table th {
-  white-space: nowrap;
-  color: #333;
-  font-weight: 600;
-}
-
-.markdown>table th,
-.markdown>table td {
-  border: 1px solid #e9e9e9;
-  padding: 8px 16px;
-  text-align: left;
-}
-
-.markdown>table th {
-  background: #F7F7F7;
-}
-
-.markdown blockquote {
-  font-size: 90%;
-  color: #999;
-  border-left: 4px solid #e9e9e9;
-  padding-left: 0.8em;
-  margin: 1em 0;
-}
-
-.markdown blockquote p {
-  margin: 0;
-}
-
-.markdown .anchor {
-  opacity: 0;
-  transition: opacity 0.3s ease;
-  margin-left: 8px;
-}
-
-.markdown .waiting {
-  color: #ccc;
-}
-
-.markdown h1:hover .anchor,
-.markdown h2:hover .anchor,
-.markdown h3:hover .anchor,
-.markdown h4:hover .anchor,
-.markdown h5:hover .anchor,
-.markdown h6:hover .anchor {
-  opacity: 1;
-  display: inline-block;
-}
-
-.markdown>br,
-.markdown>p>br {
-  clear: both;
-}
-
-
-.hljs {
-  display: block;
-  background: white;
-  padding: 0.5em;
-  color: #333333;
-  overflow-x: auto;
-}
-
-.hljs-comment,
-.hljs-meta {
-  color: #969896;
-}
-
-.hljs-string,
-.hljs-variable,
-.hljs-template-variable,
-.hljs-strong,
-.hljs-emphasis,
-.hljs-quote {
-  color: #df5000;
-}
-
-.hljs-keyword,
-.hljs-selector-tag,
-.hljs-type {
-  color: #a71d5d;
-}
-
-.hljs-literal,
-.hljs-symbol,
-.hljs-bullet,
-.hljs-attribute {
-  color: #0086b3;
-}
-
-.hljs-section,
-.hljs-name {
-  color: #63a35c;
-}
-
-.hljs-tag {
-  color: #333333;
-}
-
-.hljs-title,
-.hljs-attr,
-.hljs-selector-id,
-.hljs-selector-class,
-.hljs-selector-attr,
-.hljs-selector-pseudo {
-  color: #795da3;
-}
-
-.hljs-addition {
-  color: #55a532;
-  background-color: #eaffea;
-}
-
-.hljs-deletion {
-  color: #bd2c00;
-  background-color: #ffecec;
-}
-
-.hljs-link {
-  text-decoration: underline;
-}
-
-/* 代码高亮 */
-/* PrismJS 1.15.0
-https://prismjs.com/download.html#themes=prism&languages=markup+css+clike+javascript */
-/**
- * prism.js default theme for JavaScript, CSS and HTML
- * Based on dabblet (http://dabblet.com)
- * @author Lea Verou
- */
-code[class*="language-"],
-pre[class*="language-"] {
-  color: black;
-  background: none;
-  text-shadow: 0 1px white;
-  font-family: Consolas, Monaco, 'Andale Mono', 'Ubuntu Mono', monospace;
-  text-align: left;
-  white-space: pre;
-  word-spacing: normal;
-  word-break: normal;
-  word-wrap: normal;
-  line-height: 1.5;
-
-  -moz-tab-size: 4;
-  -o-tab-size: 4;
-  tab-size: 4;
-
-  -webkit-hyphens: none;
-  -moz-hyphens: none;
-  -ms-hyphens: none;
-  hyphens: none;
-}
-
-pre[class*="language-"]::-moz-selection,
-pre[class*="language-"] ::-moz-selection,
-code[class*="language-"]::-moz-selection,
-code[class*="language-"] ::-moz-selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-
-pre[class*="language-"]::selection,
-pre[class*="language-"] ::selection,
-code[class*="language-"]::selection,
-code[class*="language-"] ::selection {
-  text-shadow: none;
-  background: #b3d4fc;
-}
-
-@media print {
-
-  code[class*="language-"],
-  pre[class*="language-"] {
-    text-shadow: none;
-  }
-}
-
-/* Code blocks */
-pre[class*="language-"] {
-  padding: 1em;
-  margin: .5em 0;
-  overflow: auto;
-}
-
-:not(pre)>code[class*="language-"],
-pre[class*="language-"] {
-  background: #f5f2f0;
-}
-
-/* Inline code */
-:not(pre)>code[class*="language-"] {
-  padding: .1em;
-  border-radius: .3em;
-  white-space: normal;
-}
-
-.token.comment,
-.token.prolog,
-.token.doctype,
-.token.cdata {
-  color: slategray;
-}
-
-.token.punctuation {
-  color: #999;
-}
-
-.namespace {
-  opacity: .7;
-}
-
-.token.property,
-.token.tag,
-.token.boolean,
-.token.number,
-.token.constant,
-.token.symbol,
-.token.deleted {
-  color: #905;
-}
-
-.token.selector,
-.token.attr-name,
-.token.string,
-.token.char,
-.token.builtin,
-.token.inserted {
-  color: #690;
-}
-
-.token.operator,
-.token.entity,
-.token.url,
-.language-css .token.string,
-.style .token.string {
-  color: #9a6e3a;
-  background: hsla(0, 0%, 100%, .5);
-}
-
-.token.atrule,
-.token.attr-value,
-.token.keyword {
-  color: #07a;
-}
-
-.token.function,
-.token.class-name {
-  color: #DD4A68;
-}
-
-.token.regex,
-.token.important,
-.token.variable {
-  color: #e90;
-}
-
-.token.important,
-.token.bold {
-  font-weight: bold;
-}
-
-.token.italic {
-  font-style: italic;
-}
-
-.token.entity {
-  cursor: help;
-}

src/renderer/src/assets/iconfont/iconfont.css

@@ -1,9 +1,9 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2794390 */
-  src: url('iconfont.woff2?t=1723022855912') format('woff2'),
+  src: url('iconfont.woff2?t=1723186593107') format('woff2'),
-       url('iconfont.woff?t=1723022855912') format('woff'),
+       url('iconfont.woff?t=1723186593107') format('woff'),
-       url('iconfont.ttf?t=1723022855912') format('truetype'),
+       url('iconfont.ttf?t=1723186593107') format('truetype'),
-       url('iconfont.svg?t=1723022855912#iconfont') format('svg');
+       url('iconfont.svg?t=1723186593107#iconfont') format('svg');
 }
 
 .iconfont {
@@ -14,6 +14,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-xiangzuo:before {
+  content: "\e64d";
+}
+
 .icon-kechengziyuan1:before {
   content: "\e647";
 }
@@ -486,6 +490,10 @@
   content: "\e604";
 }
 
+.icon-zuoye2:before {
+  content: "\f48d";
+}
+
 .icon-zuoye1:before {
   content: "\e610";
 }

src/renderer/src/assets/iconfont/iconfont.json

@@ -5,6 +5,13 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "6176588",
+      "name": "向左",
+      "font_class": "xiangzuo",
+      "unicode": "e64d",
+      "unicode_decimal": 58957
+    },
     {
       "icon_id": "3053509",
       "name": "课程资源",
@@ -630,7 +637,7 @@
     },
     {
       "icon_id": "22779610",
-      "name": "数译_教学管理",
+      "name": "教学管理",
       "font_class": "shuyi_jiaoxueguanli",
       "unicode": "e678",
       "unicode_decimal": 59000
@@ -831,6 +838,13 @@
       "unicode": "e604",
       "unicode_decimal": 58884
     },
+    {
+      "icon_id": "41372607",
+      "name": "作业-2",
+      "font_class": "zuoye2",
+      "unicode": "f48d",
+      "unicode_decimal": 62605
+    },
     {
       "icon_id": "8023423",
       "name": "作业",

src/renderer/src/assets/iconfont/iconfont.svg

@@ -14,6 +14,8 @@
     />
       <missing-glyph />
       
+      <glyph glyph-name="xiangzuo" unicode="&#58957;" d="M774.89 725L399.08 380.75l375.81-344.21a39.28 39.28 0 0 0 13.11-29c0-36.51-48.19-54.79-76.38-29L335.8 322.8c-34.94 32-34.94 83.9 0 115.9l375.82 344.22c28.19 25.81 76.38 7.53 76.38-29A39.3 39.3 0 0 0 774.89 725z"  horiz-adv-x="1024" />
+      
       <glyph glyph-name="kechengziyuan1" unicode="&#58951;" d="M530.299631 315.712191a54.537462 54.537462 0 0 0-34.299976 12.187492L19.862486 563.299519l-3.749997 3.749997a55.187462 55.187462 0 0 0 0 77.949946l3.749997 3.749998L495.687155 883.836796A54.537462 54.537462 0 0 0 530.299631 895.999288a54.562462 54.562462 0 0 0 34.299976-12.162492l476.137169-235.424836 3.749997-3.749998a55.199962 55.199962 0 0 0 0-77.949945l-3.749997-3.749998-476.137169-235.399836a54.562462 54.562462 0 0 0-34.299976-11.849992z m-455.874683 289.999798l455.874683-225.449843 455.874683 225.437343-455.874683 225.749843z m0 0M530.299631 94.012346a54.574962 54.574962 0 0 0-34.299976 12.162491L24.537483 339.149675a31.174978 31.174978 0 1 0 27.749981 55.812461l474.899669-234.849836 3.112498-1.874999 3.124998 1.874999 474.887169 235.112336a31.174978 31.174978 0 0 0 27.749981-55.812461L564.599607 105.862337a54.562462 54.562462 0 0 0-34.299976-11.849991z m0 0M530.299631-128a54.862462 54.862462 0 0 0-34.299976 12.149992L24.537483 116.46233a31.174978 31.174978 0 1 0 27.749981 55.812461l474.899669-233.862337 3.112498-1.874999 3.124998 1.874999 474.887169 235.112336a31.724978 31.724978 0 1 0 27.749981-57.06246L564.599607-115.850008a55.199962 55.199962 0 0 0-34.299976-12.149992z m0 0"  horiz-adv-x="1060" />
       
       <glyph glyph-name="tubiaozhizuomobanyihuifu-" unicode="&#59037;" d="M695.48 353.85m-15 0a15 15 0 1 1 30 0 15 15 0 1 1-30 0ZM586.39 17.63A28.63 28.63 0 0 0 557.76-11H122.39V424.37A28.63 28.63 0 0 0 151 453h156.39v79H152A108.63 108.63 0 0 1 43.39 423.37V-91h514.37a108.63 108.63 0 0 1 108.63 108.63V174h-80zM359.39 749v-523h523a100 100 0 0 1 100 100V849h-523a100 100 0 0 1-100-100z m523-443h-443V749a20 20 0 0 0 20 20h443v-443a20 20 0 0 0-20-20zM751.9 339h102a15.5 15.5 0 0 1 15.5 15.5V581.9a5.25 5.25 0 0 1-1.54 3.75c-13 12.72-28.46 3.75-28.46-8.84v-202.64a5.17 5.17 0 0 0-5.17-5.17H746.8a5.25 5.25 0 0 1-3.75-1.54c-12.71-12.95-3.74-28.46 8.85-28.46z"  horiz-adv-x="1024" />
@@ -250,6 +252,8 @@
       
       <glyph glyph-name="zhuye2" unicode="&#58884;" d="M1012.646039 436.69265 535.153 887.123741c-10.824779 11.426156-28.264701 12.027532-39.690857 0.601377L12.556714 437.895403c-7.216519-6.013766-12.027532-16.237169-12.027532-27.663325 0-19.244052 13.831662-34.278468 30.670208-34.278468l108.849169 0 0-354.812208c0-40.89361 15.034416-78.178961 39.089481-105.240909 24.055065-27.061948 57.130779-43.900494 93.814753-43.900494l312.114468 0c30.670208 0 58.934909 14.433039 79.381714 36.683974 20.446805 22.852312 33.075714 54.123896 33.075714 89.00374l0 290.464909c0 30.068831-10.824779 57.130779-28.264701 76.976208-17.439922 19.845429-41.494987 31.872961-68.556935 31.872961l-108.247792 0-66.151429 0-6.615143 0c-19.244052 0-34.879844-15.635792-34.879844-34.879844s15.635792-34.879844 34.879844-34.879844l73.367948 0c2.405506 0 4.811013 0.601377 7.216519 0.601377l100.429896 0c9.622026 0 18.642675-4.811013 25.257818-12.027532 6.615143-7.216519 10.223403-17.439922 10.223403-28.264701l0-290.464909c0-15.635792-6.013766-30.068831-15.034416-40.292234-9.020649-10.223403-22.250935-16.838545-36.082597-16.838545L389.619857-60.044441l0 164.777195L389.619857 191.932364l0 59.536286 0 39.089481c0 16.838545-13.831662 30.670208-30.670208 30.670208l0 0c-16.838545 0-30.670208-13.831662-30.670208-30.670208l0-17.439922L328.279441 191.932364l0-250.774052-55.928026 0c-19.845429 0-37.285351 9.020649-50.515636 23.453688-12.628909 14.433039-21.048182 34.879844-21.048182 56.529403L200.787597 410.833455c0 19.244052-13.831662 34.278468-30.670208 34.278468l-54.725273 0 398.712702 371.650754L908.607883 445.111923l-55.326649 0c-16.838545 0-30.670208-15.635792-30.670208-34.278468l0-446.221455c0-6.013766-2.405506-12.027532-6.013766-16.237169-3.60826-4.209636-9.020649-6.615143-14.433039-6.615143l-7.817896 0c-16.838545 0-30.670208-15.635792-30.670208-34.278468 0-19.244052 13.831662-34.278468 30.670208-34.278468l7.817896 0c22.250935 0 42.69774 10.223403 57.732156 27.061948 15.034416 16.838545 24.055065 39.690857 24.055065 64.948675L883.951442 375.953611 992.800611 375.953611l0 0c9.020649 0 17.439922 4.209636 23.453688 12.027532C1027.079078 403.015559 1025.274949 424.665117 1012.646039 436.69265z"  horiz-adv-x="1024" />
       
+      <glyph glyph-name="zuoye2" unicode="&#62605;" d="M839.415605-127.976172H184.563842A111.949251 111.949251 0 0 0 70.355065-18.697271V687.096536a111.949251 111.949251 0 0 0 114.208777 109.278902h133.928278a30.81172 30.81172 0 0 0 0-61.623441H184.563842A50.32581 50.32581 0 0 1 131.978506 687.096536v-705.793807a50.32581 50.32581 0 0 1 52.585336-47.655461h654.851763A50.32581 50.32581 0 0 1 892.000941-18.697271V687.096536a50.32581 50.32581 0 0 1-52.585336 47.655461h-121.809001a30.81172 30.81172 0 0 0 0 61.623441h121.809001A111.949251 111.949251 0 0 0 953.624381 687.096536v-705.793807a111.949251 111.949251 0 0 0-114.208776-109.278901zM662.145507 834.376559a20.541147 20.541147 0 0 0 20.541147-20.541147v-82.164587a20.541147 20.541147 0 0 0-20.541147-20.541147h-287.576056a20.541147 20.541147 0 0 0-20.541147 20.541147V813.835412a20.541147 20.541147 0 0 0 20.541147 20.541147h287.576056m0 61.623441h-287.576056a82.164588 82.164588 0 0 1-82.164588-82.164588v-82.164587a82.164588 82.164588 0 0 1 82.164588-82.164588h287.576056a82.164588 82.164588 0 0 1 82.164588 82.164588V813.835412a82.164588 82.164588 0 0 1-82.164588 82.164588zM757.251017 265.386791H274.534065a30.81172 30.81172 0 0 0 0 61.62344h482.716952a30.81172 30.81172 0 0 0 0-61.62344zM538.898626 429.715966H274.534065a30.81172 30.81172 0 0 0 0 61.62344h264.364561a30.81172 30.81172 0 0 0 0-61.62344zM662.145507 121.598762H274.534065a30.81172 30.81172 0 0 0 0 61.623441h387.611442a30.81172 30.81172 0 1 0 0-61.623441z"  horiz-adv-x="1024" />
+      
       <glyph glyph-name="zuoye1" unicode="&#58896;" d="M839.415605-127.976172H184.563842A111.949251 111.949251 0 0 0 70.355065-18.697271V687.096536a111.949251 111.949251 0 0 0 114.208777 109.278902h133.928278a30.81172 30.81172 0 0 0 0-61.623441H184.563842A50.32581 50.32581 0 0 1 131.978506 687.096536v-705.793807a50.32581 50.32581 0 0 1 52.585336-47.655461h654.851763A50.32581 50.32581 0 0 1 892.000941-18.697271V687.096536a50.32581 50.32581 0 0 1-52.585336 47.655461h-121.809001a30.81172 30.81172 0 0 0 0 61.623441h121.809001A111.949251 111.949251 0 0 0 953.624381 687.096536v-705.793807a111.949251 111.949251 0 0 0-114.208776-109.278901zM662.145507 834.376559a20.541147 20.541147 0 0 0 20.541147-20.541147v-82.164587a20.541147 20.541147 0 0 0-20.541147-20.541147h-287.576056a20.541147 20.541147 0 0 0-20.541147 20.541147V813.835412a20.541147 20.541147 0 0 0 20.541147 20.541147h287.576056m0 61.623441h-287.576056a82.164588 82.164588 0 0 1-82.164588-82.164588v-82.164587a82.164588 82.164588 0 0 1 82.164588-82.164588h287.576056a82.164588 82.164588 0 0 1 82.164588 82.164588V813.835412a82.164588 82.164588 0 0 1-82.164588 82.164588zM757.251017 265.386791H274.534065a30.81172 30.81172 0 0 0 0 61.62344h482.716952a30.81172 30.81172 0 0 0 0-61.62344zM538.898626 429.715966H274.534065a30.81172 30.81172 0 0 0 0 61.62344h264.364561a30.81172 30.81172 0 0 0 0-61.62344zM662.145507 121.598762H274.534065a30.81172 30.81172 0 0 0 0 61.623441h387.611442a30.81172 30.81172 0 1 0 0-61.623441z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="xiazai9" unicode="&#58891;" d="M102.4 486.4C46.08 486.4 0 440.32 0 384s46.08-102.4 102.4-102.4 102.4 46.08 102.4 102.4C204.8 440.32 158.72 486.4 102.4 486.4zM921.6 486.4c-56.32 0-102.4-46.08-102.4-102.4s46.08-102.4 102.4-102.4S1024 327.68 1024 384C1024 440.32 977.92 486.4 921.6 486.4zM512 486.4c-56.32 0-102.4-46.08-102.4-102.4s46.08-102.4 102.4-102.4 102.4 46.08 102.4 102.4C614.4 440.32 568.32 486.4 512 486.4z"  horiz-adv-x="1024" />

src/renderer/src/views/prepare/container/set-homework.vue

@@ -1,9 +1,9 @@
 <template>
   <el-dialog v-model="dialogVisible" center top="10vh" width="600px" :show-close="false" append-to-body
-    style="border-radius: 10px; padding: 10px 15px;">
+  :z-index="999999" style="border-radius: 10px; padding: 10px 15px;">
     <template #header>
       <div class="homerwork-header flex">
-        <span>布置作业</span>
+        <span>{{ title }}</span>
         <i class="iconfont icon-guanbi" @click="cloneDialog"></i>
       </div>
     </template>
@@ -41,8 +41,8 @@
     </div>
     <template #footer>
       <div class="dialog-footer">
-        <el-button @click="cloneDialog">取消</el-button>
+        <el-button @click.stop="cloneDialog">取消</el-button>
-        <el-button type="primary" @click="onSubmit('ruleForm')">
+        <el-button type="primary" @click.stop="onSubmit('ruleForm')">
           确定
         </el-button>
       </div>
@@ -68,6 +68,10 @@ export default {
     },
     row: {
       default: ''
+    },
+    title: {
+      type: String,
+      default: '布置作业'
     }
   },
   data() {
@@ -229,7 +233,9 @@ export default {
               msgcontent: '',
               teachername: this.userInfo.nickName,
               unixstamp: new Date().getTime(),
+              worktype: this.row.worktype
             }
+            
             ary.push(obj)
           }
           this.setLoading = true
@@ -282,6 +288,7 @@ export default {
     modelValue(val) {
       this.dialogVisible = val
       if (val) {
+        console.log(this.row,10000)
         this.getGradeList()
       }
     }

src/renderer/src/views/prepare/index.vue

@@ -23,13 +23,7 @@
           <el-popover placement="top-start" :width="250" trigger="hover">
             <template #default>
               <div>
-                <el-button
+                <el-button v-if="lastAsyncAllTime" type="success" size="small" :icon="Check" circle />
-                  v-if="lastAsyncAllTime"
-                  type="success"
-                  size="small"
-                  :icon="Check"
-                  circle
-                />
                 {{ lastAsyncAllTime ? toTimeText(lastAsyncAllTime) + '同步成功' : '' }}
               </div>
             </template>
@@ -47,60 +41,24 @@
           <el-button @click="handleOutLink('feedback')">作业反馈</el-button>
           <el-button @click="handleOutLink('homeWork')">布置作业</el-button>
           <el-button @click="isDialogOpen = true">上传资料</el-button>
-          <el-button type="primary" style="margin-left: 10px" @click="createFile"
+          <el-button type="primary" style="margin-left: 10px" @click="createFile">新建课件</el-button>
-            >新建课件</el-button
-          >
         </div>
       </div>
-      <el-checkbox-group
+      <el-checkbox-group v-model="checkFileList" class="prepare-body-main"
-        v-model="checkFileList"
+        :style="{ 'margin-bottom': checkFileList.length > 0 ? '40px' : '0' }">
-        class="prepare-body-main"
+        <file-list-item v-for="(item, index) in currentFileList" :key="index" :item="item" :index="index"
-        :style="{ 'margin-bottom': checkFileList.length > 0 ? '40px' : '0' }"
+          @on-move="onMoveSingleFile" @on-delete="deleteTalk" @on-set="openSet" @on-delhomework="delhomework">
-      >
+          <el-checkbox label="" :value="item" v-if="!item.uniquekey" />
-        <file-list-item
-          v-for="(item, index) in currentFileList"
-          :key="index"
-          :item="item"
-          :index="index"
-          @on-move="onMoveSingleFile"
-          @on-delete="deleteTalk"
-          @on-set="openSet"
-          @on-delhomework="delhomework"
-        >
-          <el-checkbox v-if="!item.uniquekey" label="" :value="item" />
-        </file-list-item>
-        <file-list-item
-          v-for="(item, index) in currentWorkList"
-          :key="'work_' + index"
-          :item="item"
-          :index="index"
-          @on-move="onMoveSingleFile"
-          @on-delete="deleteTalk"
-          @on-set="openSet"
-          @on-delhomework="delhomework"
-        >
-          <el-checkbox v-if="!item.uniquekey" label="" :value="item" />
         </file-list-item>
       </el-checkbox-group>
-      <file-oper-batch
+      <file-oper-batch v-show="checkFileList.length > 0"
-        v-show="checkFileList.length > 0"
         :indeterminate="checkFileList.length > 0 && checkFileList.length < currentFileList.length"
-        :choose="checkFileList"
+        :choose="checkFileList" :check-all="isCheckAll" @click-delete="clickDelete" @click-move="clickMove"
-        :check-all="isCheckAll"
+        @cancel="checkFileList = []" @click-choose="clickChoose"></file-oper-batch>
-        @click-delete="clickDelete"
-        @click-move="clickMove"
-        @cancel="checkFileList = []"
-        @click-choose="clickChoose"
-      ></file-oper-batch>
     </div>
     <MoveFile v-model="isMoveDialogOpen" @on-submit="chooseMoveCata" />
     <uploadDialog v-model="isDialogOpen" @submit-file="submitFile" />
-    <SetHomework
+    <SetHomework v-model="setDialog" :entpcourseid="entpcourseid" :row="row" @on-close="closeHomework" />
-      v-model="setDialog"
-      :entpcourseid="entpcourseid"
-      :row="row"
-      @on-close="closeHomework"
-    />
   </div>
   <reserv ref="reservDialog"></reserv>
 </template>
@@ -129,7 +87,7 @@ import outLink from '@/utils/linkConfig'
 import { createWindow } from '@/utils/tool'
 import { uniqBy, cloneDeep } from 'lodash'
 import { delClasswork, addEntpcourse } from '@/api/teaching/classwork'
-const fs = require('fs')
+const fs = require('fs');
 const { ipcRenderer } = window.electron || {}
 
 export default {
@@ -155,7 +113,6 @@ export default {
       fileList: [],
       currentNode: {},
       currentFileList: [],
-      currentWorkList: [],
       curBookPath: '',
       lastAsyncAllTime: '',
       uploadData: {
@@ -199,7 +156,7 @@ export default {
     })
     this.lastAsyncAllTime = localStorage.getItem('lastAsyncAllTime')
   },
-  mounted() {},
+  mounted() { },
   activated() {
     if (this.uploadData.textbookId !== null) {
       this.asyncAllFile()
@@ -211,7 +168,7 @@ export default {
       let fileName = this.curBookPath
       if (!fileName) return
       fileName = fileName.replace('.txt', '.pdf')
-      return new Promise((resolve, reject) => {
+      return new Promise((resolve, reject)=>{
         const userDataPath = Remote.app.getPath('userData')
         const appRootFilePath = userDataPath + '\\selfFile\\'
         let filePath = appRootFilePath + fileName
@@ -226,14 +183,14 @@ export default {
             ipcRenderer.once('download-file-default' + fileName, (e, isSuccess) => {
               if (isSuccess === true) {
                 resolve(appRootFilePath + fileName)
-              } else {
+              }else {
                 ElMessage({
                   type: 'info',
                   message: `下载教材失败！`
                 })
               }
             })
-          } else {
+          }else {
             resolve(appRootFilePath + fileName)
           }
         })
@@ -370,9 +327,9 @@ export default {
       this.uploadData.textbookId = data.textBook.curBookId
       this.initHomeWork()
       await this.asyncAllFile()
+
     },
     async initHomeWork() {
-      this.currentWorkList = []
       if (this.timerId) {
         clearInterval(this.timerId)
       }
@@ -381,10 +338,11 @@ export default {
         let { rows } = await this.getChapterId()
         if (rows.length > 0) {
           this.entpcourseid = rows[0].id
-        } else {
+        }
-          await this.createEntpcourse()
+        else{
-          let { rows } = await this.getChapterId()
+           await this.createEntpcourse()
-          this.entpcourseid = rows[0].id
+           let { rows } = await this.getChapterId()
+           this.entpcourseid = rows[0].id
         }
 
         // 查询作业
@@ -393,27 +351,28 @@ export default {
     },
     // 创建新的entpcourse
     createEntpcourse() {
-      var cform = {}
+      // 参照 web AIx 传入参数
-      cform.entpid = this.userStore.deptId
+      var cform = {};
-      cform.level = 1
+      cform.entpid = this.userStore.deptId;
-      cform.parentid = 0
+      cform.level = 1;
-      cform.dictid = 0
+      cform.parentid = 0;
-      cform.evalid = this.currentNode.id
+      cform.dictid = 0;
-      cform.evalparentid = 0
+      cform.evalid = this.currentNode.id;
-      cform.edusubject = this.currentNode.edusubject
+      cform.evalparentid = 0;
-      cform.edudegree = this.currentNode.edudegree
+      cform.edusubject = this.currentNode.edusubject;
-      cform.edustage = this.currentNode.edustage
+      cform.edudegree = this.currentNode.edudegree;
-      cform.coursetype = '课标学科'
+      cform.edustage = this.currentNode.edustage;
-      cform.coursetitle = this.currentNode.itemtitle
+      cform.coursetype = '课标学科';
-      cform.coursedesc = ''
+      cform.coursetitle = this.currentNode.itemtitle;
-      cform.status = ''
+      cform.coursedesc = '';
-      cform.dflag = 0
+      cform.status = '';
-      cform.edituserid = this.userStore.userId
+      cform.dflag = 0;
-      cform.createblankfile = 'yes'
+      cform.edituserid = this.userStore.userId;
+      cform.createblankfile = 'yes';
       return addEntpcourse(cform)
     },
-    openReserv() {
+    openReserv(){
-      this.$refs['reservDialog'].openDialog()
+      // this.$refs['reservDialog'].openDialog()
     },
     // 打开外部链接
     handleOutLink(key) {
@@ -505,9 +464,9 @@ export default {
           }
         }
         // 去重
-        let ary = uniqBy([...list], 'id')
+        let ary = uniqBy([...this.currentFileList, ...list], 'id')
         // 深度克隆
-        this.currentWorkList = cloneDeep(ary)
+        this.currentFileList = cloneDeep(ary)
       })
     },
     // 打开布置作业窗口
@@ -518,16 +477,14 @@ export default {
     // 删除作业
     delhomework(item) {
       this.isLoading = true
-      delClasswork(item.id)
+      delClasswork(item.id).then(async res => {
-        .then(async (res) => {
+        ElMessage.success('操作成功')
-          ElMessage.success('操作成功')
+        this.isLoading = false
-          this.isLoading = false
+        await this.asyncAllFile()
-          await this.asyncAllFile()
+        this.getHomeWorkList()
-          this.getHomeWorkList()
+      }).catch(() => {
-        })
+        this.isLoading = false
-        .catch(() => {
+      })
-          this.isLoading = false
-        })
     },
     closeHomework() {
       this.setDialog = false
@@ -547,7 +504,7 @@ export default {
     openLesson() {
       const toolStore = useToolState()
       if (toolStore.isToolWin) return this.$message.error('您当前已开始上课，请勿重复操作')
-      createWindow('tool-sphere', { url: '/tool/sphere' })
+      createWindow('tool-sphere', { url: '/tool/sphere?entpcourseid=' + this.entpcourseid +'&label=' + this.currentNode.label })
     }
   }
 }

src/renderer/src/views/tool/components/homework.vue

@@ -0,0 +1,322 @@
+<template>
+  <div class="page-homework">
+
+    <transition name="slide" @before-enter="beforeEnter" @enter="enter" @leave="leave">
+      <div v-if="showLeft" class="homework homework-content">
+        <div class="homework-top flex">
+          <div>
+            <h3 class="title">{{ lesson }}</h3>
+            <div class="grade">{{ usertore.edusubject }}</div>
+          </div>
+          <!-- <i class="iconfont icon-xiangyou"></i> -->
+        </div>
+        <div class="homework-list" v-loading="loading">
+          <el-scrollbar height="360px">
+            <ul>
+              <!--资源-->
+              <li class="item flex" v-for="item in resourceList" :key="item.id">
+                <div class="item-left flex">
+                  <FileImage :size="50" :file-name="item.fileShowName" />
+                  <div class="item-info flex">
+                    <span class="item-name">{{ item.fileShowName }}</span>
+                    <div class="item-student">
+                      <span class="item-option">{{ item.fileFlag }}</span>
+                      <span>{{ item.fileSuffix }}</span>
+                    </div>
+                  </div>
+                </div>
+              </li>
+              <!--作业-->
+              <li class="item flex" v-for="item in dataList" :key="item.id">
+                <div class="item-left flex">
+                  <svg class="icon homework-icon" aria-hidden="true">
+                    <use xlink:href="#icon-zuoye2"></use>
+                  </svg>
+                  <div class="item-info flex">
+                    <span class="item-name">{{ item.uniquekey }}</span>
+                    <div class="item-student">
+                      <span class="item-option">作业</span>
+                      <span>{{ item.worktype }}</span>
+                    </div>
+                  </div>
+                </div>
+                <el-button color="#349d44" @click="sendHomework(item)">推送</el-button>
+              </li>
+            </ul>
+          </el-scrollbar>
+        </div>
+        <SetHomework v-model="setDialog" :title="'推送作业'" :entpcourseid="entpcourseid" :row="curRow"
+          @on-close="closeHomework" />
+      </div>
+      <div class="homework" @click="showLeft = !showLeft" v-else>
+        <div class="unit-top flex">
+          <div class="unit-top-left">
+            <i class="iconfont icon-xiangzuo"></i>
+            <span>返回</span>
+          </div>
+          <span class="unit-top-center">选择目录</span>
+        </div>
+        <div>
+          <!-- <Lesson/> -->
+        </div>
+      </div>
+    </transition>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted, toRaw } from 'vue';
+import { useRoute } from 'vue-router';
+import useUserStore from '@/store/modules/user'
+import { homeworklist } from '@/api/teaching/classwork'
+import { getSmarttalkPage, getPrepareById } from '@/api/file'
+import SetHomework from '@/views/prepare/container/set-homework.vue'
+import FileImage from '@/components/file-image/index.vue'
+import { ipcMsgSend } from '@/utils/tool'
+import { useToolState } from '@/store/modules/tool'
+import { asyncLocalFile } from '@/utils/talkFile'
+import Lesson from './lesson.vue';
+
+const { ipcRenderer } = window.electron || {}
+const route = useRoute();
+const usertore = useUserStore().user
+const toolStore = useToolState()
+const entpcourseid = ref('')
+const lesson = ref('')
+const loading = ref(false)
+const showLeft = ref(true)
+//作业数据
+const dataList = ref([])
+const setDialog = ref(false)
+// 资源数据
+const resourceList = ref([])
+
+//
+const curRow = ref('')
+
+
+const sendHomework = (row) => {
+  curRow.value = row
+  setTimeout(() => {
+    ipcMsgSend('tool-sphere:set:ignore', false)
+  }, 200)
+  setDialog.value = true
+}
+//
+const closeHomework = () => {
+  ipcMsgSend('tool-sphere:set:ignore', true)
+  setDialog.value = false
+}
+
+// 获取资源数据
+const getResource = () => {
+  let data = toRaw(toolStore.curSubjectNode)
+  data.orderByColumn = 'uploadTime'
+  data.isAsc = 'desc'
+  data.pageSize = 500
+  getSmarttalkPage(data).then(res => {
+    resourceList.value = res.rows
+  })
+
+}
+
+// 获取作业数据
+const getHomework = () => {
+  loading.value = true
+  try {
+    homeworklist({
+      entpcourseid: entpcourseid.value,
+      edituserid: usertore.userId,
+      pageSize: 100
+    }).then(res => {
+      //以下代码 参照AIx web端 作业布置
+      let list = []
+      for (var i = 0; i < res.rows.length; i++) {
+        res.rows[i].taskconfig = []
+
+        // 找child
+        for (var j = 0; j < res.rows.length; j++) {
+          if (res.rows[j].parentid == res.rows[i].id) {
+            var ss = []
+            if (res.rows[j].classworkdatastudentids != null) {
+              ss = JSON.parse('[' + res.rows[j].classworkdatastudentids + ']')
+            }
+            var js = {
+              id: res.rows[j].id,
+              classid: res.rows[j].classid,
+              classcaption: res.rows[j].classcaption,
+              parentid: 0,
+              worktype: '',
+              workkey: res.rows[j].workkey,
+              worktag: '',
+              entpcourseid: 0,
+              evalid: 0,
+              edusubject: '',
+              edudegree: '',
+              workdate: '',
+              title: '',
+              workcodes: '',
+              studentlist: ss,
+              deaddate: res.rows[j].deaddate,
+              timelength: res.rows[j].timelength,
+              weights: res.rows[j].weights,
+              feedtype: res.rows[j].feedtype
+            }
+            res.rows[i].taskconfig.push(js)
+          }
+        }
+        res.rows[i].fileShowName = res.rows[i].uniquekey
+
+        // 注意slideid>0的，这一些作业是添加到PPT页面的，所以在作业管理中不能出现
+        // 2024-05-15，酉阳，jackyshen
+        if (res.rows[i].classid == 0 && res.rows[i].slideid == 0) {
+          list.push(res.rows[i])
+        }
+
+        // 如果是习题训练任务，则检查一共有多少道
+        if (res.rows[i].entpcourseworklist != '') {
+          res.rows[i].entpcourseworklistarray = JSON.parse(
+            '[' + res.rows[i].entpcourseworklist + ']'
+          )
+        } else {
+          res.rows[i].entpcourseworklistarray = []
+        }
+      }
+
+      dataList.value = list
+    })
+  } finally {
+    loading.value = false
+  }
+}
+function beforeEnter(el) {
+  el.style.transform = 'translateX(100%)';
+}
+
+function enter(el, done) {
+  el.offsetHeight; // trigger reflow
+  el.style.transition = 'transform 0.5s ease';
+  el.style.transform = 'translateX(0)';
+  done();
+}
+
+function leave(el, done) {
+  el.style.transition = 'transform 0.5s ease';
+  el.style.transform = 'translateX(-100%)';
+  done();
+}
+
+onMounted(() => {
+  entpcourseid.value = route.query.entpcourseid
+  lesson.value = route.query.label
+  getHomework()
+  setTimeout(() => {
+    getResource()
+  }, 5000)
+})
+</script>
+
+<style lang="scss" scoped>
+.page-homework {
+  position: relative;
+  height: 435px;
+}
+
+.homework {
+  width: 100%;
+  position: absolute;
+
+}
+
+.homework-content {
+  padding: 0 15px;
+  color: #fff;
+
+  .homework-top {
+    margin-bottom: 20px;
+    align-items: center;
+    justify-content: space-between;
+
+    .icon-xiangyou {
+      font-size: 26px;
+      cursor: pointer;
+    }
+
+    .title {
+      font-size: 20px;
+      font-weight: bold;
+    }
+
+    .grade {
+      margin-top: 5px;
+      color: #cecece;
+      font-size: 15px;
+    }
+  }
+
+  .item {
+    background-color: #384342;
+    padding: 15px 10px;
+    margin-bottom: 10px;
+    justify-content: space-between;
+    align-items: center;
+
+    .item-left {
+      .homework-icon {
+        font-size: 50px;
+      }
+
+      .item-info {
+        margin-left: 8px;
+        flex-direction: column;
+        justify-content: space-between;
+
+        .item-name {
+          font-size: 20px;
+          font-weight: bold;
+        }
+
+        .item-student {
+          font-size: 13px;
+          color: #d7d7d7;
+
+          .item-option {
+            margin-right: 10px;
+          }
+        }
+      }
+    }
+  }
+}
+
+.slide-enter-active,
+.slide-leave-active {
+  transition: transform 0.5s ease;
+}
+
+.slide-enter,
+.slide-leave-to
+
+/* .slide-leave-active in <2.1.8 */
+  {
+  transform: translateX(100%);
+}
+
+.unit-top {
+  color: #fff;
+  padding: 10px 0;
+  justify-content: space-between;
+  align-items: center;
+  .unit-top-left {
+    cursor: pointer;
+
+    .icon-xiangzuo {
+      margin-right: 5px;
+    }
+  }
+  .unit-top-center{
+    margin: 0 auto;
+  }
+
+}
+</style>

src/renderer/src/views/tool/components/lesson.vue

@@ -0,0 +1,129 @@
+<template>
+  <div>
+    <el-tree ref="refTree" :data="treeData" :props="defaultProps" node-key="id"
+      :default-expanded-keys="defaultExpandedKeys" :current-node-key="currentNodeId" highlight-current
+      @node-click="handleNodeClick">
+      <template #default="{ node }">
+        <span :title="node.label" class="tree-label">{{ node.label }}</span>
+      </template>
+    </el-tree>
+  </div>
+</template>
+
+<script setup>
+import { ref, onMounted, nextTick, markRaw, toRaw } from 'vue'
+import { useToolState } from '@/store/modules/tool'
+
+
+const toolStore = useToolState()
+const treeData = ref([])
+const defaultProps = {
+  children: 'children',
+  label: 'label',
+  class: 'textbook-tree'
+}
+// 当前选中的节点ID
+const currentNodeId = ref(0)
+// 当前选中的节点名称
+const currentNodeName = ref('')
+// 默认展开的节点
+const defaultExpandedKeys = ref([])
+// tree
+const refTree = ref(null)
+// 教材ID
+const curBookId = ref('')
+// 
+const evaluationList = ref([])
+
+const getTreeData = () => {
+  evaluationList.value = JSON.parse(localStorage.getItem('evaluationList'))
+
+    //上册
+  let volumeOne = evaluationList.value.filter(item => item.level == 1 && item.semester == '上册')
+  //下册
+  let volumeTwo = evaluationList.value.filter(item => item.level == 1 && item.semester == '下册')
+  //数据过滤
+  console.log(volumeOne,1)
+  console.log(volumeTwo,2)
+  let upData = transData(volumeOne)
+  let downData = transData(volumeTwo)
+  console.log(upData)
+  console.log(downData)
+  if(upData.length && downData.length){
+    treeData.value = [...upData,...downData]
+  }
+  else if(upData.length || downData.length){
+    treeData.value = upData.length ? upData : downData
+  }
+  else{
+    treeData.value = []
+    return
+  }
+  nextTick(() => {
+    let defaultKey
+    if(toolStore.curSubjectNode.levelSecondId){
+      defaultKey = toolStore.curSubjectNode.levelSecondId
+    }
+    else{
+      defaultKey = toolStore.curSubjectNode.levelFirstId
+    }
+    defaultExpandedKeys.value = defaultKey
+    // currentNode.data = getLastLevelData(treeData.value)[0]
+    // currentNodeId.value = getLastLevelData(treeData.value)[0].id
+    // currentNodeName.value = getLastLevelData(treeData.value)[0].label
+ 
+  })
+
+}
+
+const handleNodeClick = ()=>{}
+
+const transData = (data) => {
+  let ary = []
+  data.forEach(item => {
+    let obj = {}
+    console.log(item.rootid, '==========>',curBookId.value)
+    if (item.rootid == curBookId.value) {
+      obj.label = item.itemtitle
+      obj.id = item.id
+      obj.itemtitle = item.itemtitle
+      obj.edudegree = item.edudegree
+      obj.edustage = item.edustage
+      obj.edusubject = item.edusubject
+      let ary2 = []
+      evaluationList.value.forEach(el => {
+        let obj2 = {}
+        if (item.id == el.parentid) {
+          obj2 = {
+            label: el.itemtitle,
+            id: el.id,
+            itemtitle : el.itemtitle,
+            edudegree : el.edudegree,
+            edustage : el.edustage,
+            edusubject : el.edusubject,
+          }
+          ary2.push(obj2)
+        }
+        obj.children = ary2
+      })
+      ary.push(obj)
+    }
+  })
+  return ary
+}
+
+
+onMounted(()=>{
+  // console.log(toolStore.curSubjectNode,111)
+
+  // let data = toRaw(toolStore.curSubjectNode)
+  // console.log(data,222)
+
+
+  // curBookId.value = toolStore.curSubjectNode.textbookId
+  // getTreeData()
+  
+})
+</script>
+
+<style lang="scss" scoped></style>

src/renderer/src/views/tool/components/side.vue

@@ -17,13 +17,17 @@
     <!-- 内容部分 -->
     <transition name="el-fade-in">
       <div class="c-popover" :style="`--top: ${topPos}px;--height:${hPost}px;`" v-show="isVisible">
-        <div class="content">{{activeObj}}</div>
+        <div class="content">
+          <homework/>
+        </div>
       </div>
     </transition>
   </div>
 </template>
 <script setup>
 import { computed, defineProps, ref, reactive, watchEffect, onMounted } from 'vue'
+import homework from './homework.vue';
+
 // 功能说明：侧边-工具栏
 const colors = ['#00f389', '#ff7f00', '#ffff00', '#409EFF', '#00baff', '#13b189', '#F56C6C']
 const emit = defineEmits(['update:modelValue','change'])

src/renderer/src/views/tool/components/upvote.vue

@@ -0,0 +1,87 @@
+<template>
+  <button v-if="props.test" @click="trigger">测试</button>
+  <div ref="warpRef" class="c-warp">
+    <template v-for="i in sum">
+      <slot><el-icon><Star /></el-icon></slot>
+    </template>
+  </div>
+</template>
+<script setup>
+// 功能说明：动画-点赞
+import { nextTick, ref } from 'vue'
+import {Star} from '@element-plus/icons-vue'
+const warpRef = ref(null)
+const props = defineProps({ test: Boolean })
+const sum = ref(0)
+// === 方法 ===
+const trigger = () => {
+  sum.value++
+  nextTick(() => {
+    const el = warpRef.value.lastElementChild // 获取最后一个新加的元素
+    animInit(el)
+  })
+}
+// 初始化动画
+const animInit = (el) => {
+  const { height, width } = el.getBoundingClientRect()
+  const sumH = warpRef.value.clientHeight
+  const sumW = warpRef.value.clientWidth
+  const maxH = sumH - height  // 最大高度
+  const maxw = sumW - width   // 最大宽度
+  let bottom = 0              // 底部距离
+  let opacity = 0             // 透明度
+  let scale = 0               // 缩放
+  let transform = ''          // 旋转 缩放 偏移等操作
+  let right = getRandom(5, maxw, false, true)   // 随机-右距离
+  let isPlus = getRandomBool()?'':'-'           // 随机-方向
+  let rotate = getRandom(0, 60, false, true)    // 随机-旋转
+  let scaleMax = getRandom(0, 1, true, true)+1  // 随机-缩放倍数
+  setStatic(el,'position','absolute')           // 设置-定位
+  setStatic(el, 'right', right, 'px')           // 设置-右距离
+  const amFn = () => { //  opacity: 0.5;
+    // 到顶了- 移除元素
+    if (bottom > maxH) {el.remove();return}
+    // 透明度: 进入-慢慢出现
+    if (bottom < 101 && opacity < 1) opacity = toNumber(opacity + 0.01)
+    else if (bottom > maxH - 100 && opacity > 0) opacity = toNumber(opacity - 0.01)
+    // 缩放：进入-慢慢放大
+    if (bottom < (scaleMax/0.1) && scale < scaleMax) scale = toNumber(scale + 0.1)
+    // 缩放：退出-慢慢缩小
+    else if (bottom > maxH - (scaleMax/0.1) && scale > 0) scale = toNumber(scale - 0.1)
+    bottom++
+    // console.log('zdg: ', scale)
+    // 设置样式
+    transform = `rotate(${isPlus}${rotate}deg) scale(${scale})`
+    setStatic(el, 'bottom', bottom, 'px')
+    setStatic(el, 'opacity', opacity)
+    setStatic(el, 'transform', transform)
+    requestAnimationFrame(amFn)
+  }
+  amFn() // 初次执行
+}
+// 设置-静态样式
+const setStatic = (el, type, val, end) => el.style[type] = val + (end || '')
+// 随机数 isFloat：是否小数 isMax：是否包含最大值
+const getRandom = (min, max, isFloat, isMax, pos=2) => {
+  const maxVal = isMax ? max - min + 1 : max - min
+  const getVal = () => Math.random() * maxVal + min
+  return isFloat ? toNumber(getVal(), pos) : toNumber(getVal(), 0)
+}
+// 随机布尔值
+const getRandomBool = () => Math.random() > 0.5
+// 转换数字-(小数精度丢失)
+const toNumber = (v, pos = 2) => Number(v.toFixed(pos))
+// 暴露方法
+defineExpose({ trigger })
+</script>
+
+<style lang="scss" scoped>
+.c-warp {
+  position: fixed;
+  right: 0;
+  bottom: 0;
+  width: 30%;
+  height: 50%;
+  pointer-events: none;
+}
+</style>

src/renderer/src/views/tool/sphere.vue

@@ -2,8 +2,13 @@
   <div class="warp-all">
     <!-- 画板 -->
     <board-vue v-model="tabActive" v-show="isShow" ref="boardVueRef"></board-vue>
+
     <!-- 侧边工具栏 -->
     <side-vue v-ignore @ignore-mounted="sideMouse" @change="sideChange"></side-vue>
+
+    <!-- 点赞组件 -->
+    <upvote-vue></upvote-vue>
+
     <!-- 底部工具栏  :style="dataPos.style"-->
     <div class="tool-bottom-all" @mouseenter="mouseChange(0)" @mouseleave="mouseChange(1)">
       <div v-drag="{handle:'.tool-bottom-all', dragtime}"
@@ -30,12 +35,14 @@
 <script setup>
 // 功能说明：electron 悬浮球
 import { onMounted, ref, reactive, watchEffect } from 'vue'
-import logo from '@root/resources/icon.png' // logo
+
-import boardVue from './components/board.vue'  // 画板-子组件
+import logo from '@root/resources/icon.png'     // logo
-import sideVue from './components/side.vue'  // 画板-子组件
+import boardVue from './components/board.vue'   // 画板-子组件
-import vDrag from './directive/drag' // 自定义指令-拖拽
+import sideVue from './components/side.vue'     // 画板-子组件
-import vIgnore from './directive/ignore' // 自定义指令-穿透
+import upvoteVue from './components/upvote.vue' // 点赞-子组件
-import { useToolState } from '@/store/modules/tool'
+import vDrag from './directive/drag'            // 自定义指令-拖拽
+import vIgnore from './directive/ignore'        // 自定义指令-穿透
+import { useToolState } from '@/store/modules/tool' // 数据状态-缓存
 import { ipcMsgSend, ipcHandle, ipcMain, ipcMsgInvoke } from '@/utils/tool' // 相关工具
 const tabActive = ref('select')   // 工具栏当前选中项
 const isFold = ref(false)         // 折叠工具栏