src/renderer/src/api/classManage/index.js

@@ -130,19 +130,3 @@ export function addStudentmainByNameArray(data) {
     data: data
   })
 }
-//新增课程预约
-export function addSmartClassReserv(data) {
-  return request({
-    url: '/smarttalk/classReserv/addSmartClassReserv',
-    method: 'post',
-    data: data
-  })
-}
-//查询课程预约
-export function getSelfReserv() {
-  return request({
-    url: '/smarttalk/classReserv/getSelfReserv',
-    method: 'get'
-  })
-}
-

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

@@ -0,0 +1,539 @@
+/* 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=1723099371232') format('woff2'),
+  src: url('iconfont.woff2?t=1723022855912') format('woff2'),
-       url('iconfont.woff?t=1723099371232') format('woff'),
+       url('iconfont.woff?t=1723022855912') format('woff'),
-       url('iconfont.ttf?t=1723099371232') format('truetype'),
+       url('iconfont.ttf?t=1723022855912') format('truetype'),
-       url('iconfont.svg?t=1723099371232#iconfont') format('svg');
+       url('iconfont.svg?t=1723022855912#iconfont') format('svg');
 }
 
 .iconfont {
@@ -486,10 +486,6 @@
   content: "\e604";
 }
 
-.icon-zuoye2:before {
-  content: "\f48d";
-}
-
 .icon-zuoye1:before {
   content: "\e610";
 }

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

@@ -831,13 +831,6 @@
       "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

@@ -250,8 +250,6 @@
       
       <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/components/pdf/index.vue

@@ -120,13 +120,6 @@ const renderPage = async (canvasobj) => {
 }
 // 保存数据
 const savaDataStore = () => {
-  if(!toolState.isToolWin){
-    toolState.isPdfWin=false
-      toolState.showBoardAll=true //恢复默认值
-      ipcRenderer.invoke('tool-sphere:reset') //重置tool状态
-      ipcRenderer.send('open-PDF:minimize')
-      return
-  } 
   imgarr.value.forEach((a) => {
     if (a.index == 0) {
       a.JSONdata = canvasFabricVue.value.canvas.toJSON()
@@ -177,8 +170,7 @@ const initPdf = async (type = 'default') => {
       a.JSONdata = canvas1FabricVue.value.canvas.toJSON()
     }
   })
-  // 判断是否翻页以及工具窗口是否打开  满足 翻页+打开工具才能保存数据
+  if (type != 'default') {
-  if (type != 'default' && toolState.isToolWin) {
     const nameMap = new Map(canvsStore.pageArr.map((item) => [item.page, item.id]))
     // 创建一个用于存储所有异步操作的数组
     let promises = []

src/renderer/src/layout/components/Header.vue

@@ -35,7 +35,6 @@
             <template #dropdown>
               <el-dropdown-menu>
                 <el-dropdown-item @click="changePage('/profile')">个人中心</el-dropdown-item>
-                <el-dropdown-item @click="changePage('/classReserv')">课程预约</el-dropdown-item>
                 <el-dropdown-item @click="changePage('/class')">班级中心</el-dropdown-item>
                 <el-dropdown-item divided command="logout">
                   <span>退出登录</span>

src/renderer/src/router/index.js

@@ -45,12 +45,6 @@ export const constantRoutes = [
         name: 'profile',
         meta: {title: '个人中心'}
       },
-      {
-        path: '/classReserv',
-        component: () => import('@/views/classManage/classReserv.vue'),
-        name: 'classReserv',
-        meta: {title: '课程预约'}
-      },
       {
         path: '/class',
         component: () => import('@/views/classManage/index.vue'),

src/renderer/src/views/classBegins/index.vue

@@ -50,8 +50,7 @@ const isOnLoadShow = ref(false) //加载完毕显示
 // 传过去的参数
 const pdfObj = reactive({
   numberOfPdf: 2, //显示几页
-  // pdfUrl: getStaticUrl('aaa.pdf', 'user', 'selfFile', true),//本地
+  pdfUrl: getStaticUrl('aaa.pdf', 'user', 'selfFile', true),
-  pdfUrl: null,
   allPageData:[],
   bookId:null,
   numPages: 1 //当前页数
@@ -108,7 +107,7 @@ const switchPageMode = () => {
 }
 onMounted(async () => { 
   toolState.isPdfWin=true
-  pdfObj.pdfUrl = getStaticUrl(route.query.path, 'user', 'selfFile', true)
+  console.log(toolState.showBoardAll,"c初始")
   textbookId.value = route.query.textbookId
   pdfObj.bookId=textbookId.value
   getBookMarkById(textbookId.value).then(res=>{

src/renderer/src/views/classManage/classReserv.vue

@@ -1,56 +0,0 @@
-<template>
-  <el-container class="class-reserv-wrap">
-    <div class="class-reserv-tabs">
-      <el-segmented block v-model="tabActive" :options="tabOptions" size="large" />
-    </div>
-    <div class="class-reserv-body">
-      <reserv-item v-for="(item, index) in activeDataList" :key="index" :item="item" v-show="tabActive === '进行中'"></reserv-item>
-      <reserv-item v-for="(item, index) in doneDataList" :key="index" :item="item" v-show="tabActive === '已结束'"></reserv-item>
-    </div>
-  </el-container>
-</template>
-
-<script setup>
-import { ref, onMounted, computed } from 'vue'
-import { getSelfReserv } from '@/api/classManage'
-import ReservItem from '@/views/classManage/reserv-item.vue'
-
-const tabOptions = ref(['进行中','已结束'])
-const tabActive = ref('进行中')
-const dataList = ref([])
-
-const activeDataList = computed(() => {
-  return dataList.value.filter(item => {
-    return item.status !== "已结束"
-  })
-})
-const doneDataList = computed(() => {
-  return dataList.value.filter(item => {
-    return item.status === "已结束"
-  })
-})
-onMounted(() => {
-  getSelfReserv().then(res => {
-    dataList.value = res.data
-  })
-})
-</script>
-
-<style scoped lang="scss">
-.class-reserv-wrap{
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  padding: 15px 30px;
-  .class-reserv-tabs{
-    width: 30%;
-    text-align: left;
-  }
-  .class-reserv-body{
-    height: 100%;
-    flex: 1;
-    overflow: auto;
-    padding: 10px 0;
-  }
-}
-</style>

src/renderer/src/views/classManage/reserv-item.vue

@@ -1,72 +0,0 @@
-<template>
-  <div class="class-reserv-item">
-    <div class="class-reserv-item-img">
-      <img :src="basePath + item.bookImg" alt="封面"/>
-    </div>
-    <div class="class-reserv-item-body">
-      <div class="class-reserv-item-title1">
-        <label>{{item.className}}</label>
-        <el-tag style="margin-left: 5px;" type="primary"> {{ item.classType }}</el-tag>
-        <el-tag style="margin-left: 5px;" type="primary"> {{ item.classSubject }}</el-tag>
-      </div>
-      <div class="class-reserv-item-title2">
-        {{item.classDay}}&nbsp;{{item.startTime}} ~ {{item.classDay}}&nbsp;{{item.endTime}} {{item.createUserName}}老师
-      </div>
-      <div class="class-reserv-item-title3">
-        <span style="margin-left: 5px;" v-for="(tag, index) in item.classItemList" :key="index"> {{ index===0? tag.name:'、'+tag.name }}</span>
-      </div>
-    </div>
-    <div class="class-reserv-item-tool">
-      <el-button type="primary">上课</el-button>
-      <el-button>编辑</el-button>
-      <el-button type="info">下课</el-button>
-      <el-button type="danger">删除</el-button>
-    </div>
-  </div>
-</template>
-<script setup>
-import { ref } from 'vue'
-const props = defineProps({
-  item: {
-    type: Object,
-    default: () => {}
-  }
-})
-const basePath = import.meta.env.VITE_APP_BUILD_BASE_PATH
-</script>
-<style scoped lang="scss">
-.class-reserv-item{
-  display: flex;
-  background-color: white;
-  border-radius: 10px;
-  padding: 5px;
-  margin-bottom: 10px;
-  .class-reserv-item-img{
-    width: 80px;
-    padding-left: 20px;
-    img{
-      width: 100%;
-    }
-  }
-  .class-reserv-item-body{
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    text-align: left;
-    padding-left: 30px;
-    font-size: 14px;
-    .class-reserv-item-title1{
-      flex: 1;
-      label{
-        font-size: 20px;
-        font-weight: bold;
-      }
-    }
-  }
-  .class-reserv-item-tool{
-    margin-left: 15px;
-    display: flex;
-    align-items: center;
-  }
-}
-</style>

src/renderer/src/views/prepare/container/reserv.vue

@@ -78,19 +78,8 @@
 </template>
 <script setup>
 import { ref, defineExpose, onMounted, reactive, computed } from 'vue'
-import { addSmartClassReserv, listClassmain } from '@/api/classManage'
+import { listClassmain } from '@/api/classManage'
 import useUserStore from '@/store/modules/user'
-import { ElMessage } from 'element-plus'
-const props = defineProps({
-  subject: {
-    type: String,
-    default: ''
-  },
-  bookId: {
-    type: Number,
-    default: ''
-  }
-})
 const ruleFormDialog = ref(null)
 const userStore = useUserStore().user
 const centerDialogVisible = ref(false)
@@ -98,7 +87,7 @@ const form = reactive({
   name: '',
   type: '常规课',
   day: '',
-  time: [],
+  time: '',
   resource: [],
   classRoom: ''
 })
@@ -152,39 +141,10 @@ const submitForm = async () => {
   if (!formEl) return
   await formEl.validate((valid) => {
     if (valid) {
-      addClassReserv(form)
       centerDialogVisible.value = false
     }
   })
 }
-const addClassReserv = (formData) => {
-  let ids = formData.resource.join(",")
-  let param = {
-    className: formData.name,
-    classType: formData.type,
-    classDay: formData.day,
-    startTime: formData.time[0],
-    endTime: formData.time[1],
-    classList: ids,
-    classRoom: formData.classRoom,
-    classSubject: props.subject,
-    ex1: props.bookId
-   }
-  addSmartClassReserv(param).then((res) => {
-    if (res.data === true) {
-      closeDialog();
-      ElMessage({
-        type: 'success',
-        message: '预约成功！'
-      })
-    } else {
-      ElMessage({
-        type: 'error',
-        message: res.message
-      })
-    }
-  })
-}
 defineExpose({
   openDialog,
   closeDialog

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
-  :z-index="999999" style="border-radius: 10px; padding: 10px 15px;">
+    style="border-radius: 10px; padding: 10px 15px;">
     <template #header>
       <div class="homerwork-header flex">
-        <span>{{ title }}</span>
+        <span>布置作业</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.stop="cloneDialog">取消</el-button>
+        <el-button @click="cloneDialog">取消</el-button>
-        <el-button type="primary" @click.stop="onSubmit('ruleForm')">
+        <el-button type="primary" @click="onSubmit('ruleForm')">
           确定
         </el-button>
       </div>
@@ -68,10 +68,6 @@ export default {
     },
     row: {
       default: ''
-    },
-    title: {
-      type: String,
-      default: '布置作业'
     }
   },
   data() {
@@ -233,9 +229,7 @@ export default {
               msgcontent: '',
               teachername: this.userInfo.nickName,
               unixstamp: new Date().getTime(),
-              worktype: this.row.worktype
             }
-            
             ary.push(obj)
           }
           this.setLoading = true
@@ -288,7 +282,6 @@ export default {
     modelValue(val) {
       this.dialogVisible = val
       if (val) {
-        console.log(this.row,10000)
         this.getGradeList()
       }
     }

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

@@ -102,7 +102,7 @@
       @on-close="closeHomework"
     />
   </div>
-  <reserv :subject="currentNode.edusubject" :book-id="uploadData.textbookId" ref="reservDialog"></reserv>
+  <reserv ref="reservDialog"></reserv>
 </template>
 <script setup>
 import { Check } from '@element-plus/icons-vue'
@@ -225,7 +225,7 @@ export default {
             })
             ipcRenderer.once('download-file-default' + fileName, (e, isSuccess) => {
               if (isSuccess === true) {
-                resolve(fileName)
+                resolve(appRootFilePath + fileName)
               } else {
                 ElMessage({
                   type: 'info',
@@ -234,7 +234,7 @@ export default {
               }
             })
           } else {
-            resolve(fileName)
+            resolve(appRootFilePath + fileName)
           }
         })
       })
@@ -537,14 +537,16 @@ export default {
     async navtoPdf() {
       const toolStore = useToolState()
       if (toolStore.isPdfWin) return this.$message.error('您当前已打开课本，请勿重复操作')
-      let path = await this.getBookPathFromServer()
+      // let path = await this.getBookPathFromServer()
-      createWindow('open-PDF', { url: '/classBegins/index?textbookId='+this.uploadData.textbookId+'&path='+ path })
+      // console.log(path)
+      // console.log(this.uploadData.textbookId) 
+      createWindow('open-PDF', { url: '/classBegins/index?textbookId='+this.uploadData.textbookId })
     },
     // 上课-工具类悬浮
     openLesson() {
       const toolStore = useToolState()
       if (toolStore.isToolWin) return this.$message.error('您当前已开始上课，请勿重复操作')
-      createWindow('tool-sphere', { url: '/tool/sphere?entpcourseid=' + this.entpcourseid })
+      createWindow('tool-sphere', { url: '/tool/sphere' })
     }
   }
 }

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

@@ -1,198 +0,0 @@
-<template>
-  <div class="homework-content">
-    <div class="homework-top">
-      <h3 class="title">沁园春-长沙</h3>
-      <div class="grade">{{ usertore.edusubject}}</div>
-    </div>
-    <div class="homework-list" v-loading="loading">
-      <el-scrollbar height="360px">
-        <ul>
-          <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>
-</template>
-
-<script setup>
-import { ref, onMounted } from 'vue';
-import { useRoute } from 'vue-router';
-import useUserStore from '@/store/modules/user'
-import { homeworklist } from '@/api/teaching/classwork'
-import SetHomework from '@/views/prepare/container/set-homework.vue'
-import { ipcMsgSend } from '@/utils/tool'
-
-const route = useRoute();
-const usertore = useUserStore().user
-const entpcourseid = ref('')
-const loading = ref(false)
-//作业数据
-const dataList = ref([])
-const setDialog = ref(false)
-
-//
-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 getHomework = () => {
-  loading.value = true
-  try {
-    homeworklist({
-      entpcourseid: entpcourseid.value,
-      edituserid: usertore.userId,
-      pageSize: 100
-    }).then(res => {
-      console.log(res.rows)
-      //以下代码 参照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
-  }
-}
-
-
-onMounted(() => {
-  entpcourseid.value = route.query.entpcourseid
-  getHomework()
-})
-</script>
-
-<style lang="scss" scoped>
-.homework-content {
-  padding: 0 15px;
-  color: #fff;
-
-  .homework-top {
-    margin-bottom: 20px;
-
-    .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;
-          }
-        }
-      }
-    }
-
-
-  }
-}
-</style>

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

@@ -17,17 +17,13 @@
     <!-- 内容部分 -->
     <transition name="el-fade-in">
       <div class="c-popover" :style="`--top: ${topPos}px;--height:${hPost}px;`" v-show="isVisible">
-        <div class="content">
+        <div class="content">{{activeObj}}</div>
-          <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'])