2024-08-13 16:23:05 +08:00
11 changed files with 62 additions and 33 deletions
--- a/src/main/index.js
+++ b/src/main/index.js
@ -126,12 +126,8 @@ async function createLinkWin(data) {
  let cookieDetails = { ...data.cookieData }
  await linkWin[data.key].webContents.session.cookies
    .set(cookieDetails)
-    .then(() => {
-      console.log('Cookie is successful')
-    })
-    .catch((error) => {
-      console.error('Cookie is error', error)
-    })
+    .then(() => {})
+    .catch((error) => {})
  data.fullPath = data.fullPath.replaceAll('//', '/')
  linkWin[data.key].loadURL(data.fullPath)

--- a/src/renderer/src/assets/iconfont/iconfont.css
+++ b/src/renderer/src/assets/iconfont/iconfont.css
@ -1,9 +1,9 @@
@font-face {
  font-family: "iconfont"; /* Project id 2794390 */
-  src: url('iconfont.woff2?t=1723452423265') format('woff2'),
-       url('iconfont.woff?t=1723452423265') format('woff'),
-       url('iconfont.ttf?t=1723452423265') format('truetype'),
-       url('iconfont.svg?t=1723452423265#iconfont') format('svg');
+  src: url('iconfont.woff2?t=1723453634574') format('woff2'),
+       url('iconfont.woff?t=1723453634574') format('woff'),
+       url('iconfont.ttf?t=1723453634574') format('truetype'),
+       url('iconfont.svg?t=1723453634574#iconfont') format('svg');
 }

 .iconfont {
@ -14,6 +14,10 @@
  -moz-osx-font-smoothing: grayscale;
 }

+.icon-arrangement:before {
+  content: "\e656";
+}
+
 .icon-zanwushuju:before {
  content: "\e655";
 }
--- a/src/renderer/src/assets/iconfont/iconfont.js
+++ b/src/renderer/src/assets/iconfont/iconfont.js
--- a/src/renderer/src/assets/iconfont/iconfont.json
+++ b/src/renderer/src/assets/iconfont/iconfont.json
@ -5,6 +5,13 @@
  "css_prefix_text": "icon-",
  "description": "",
  "glyphs": [
+    {
+      "icon_id": "4978988",
+      "name": "作业-布置作业",
+      "font_class": "arrangement",
+      "unicode": "e656",
+      "unicode_decimal": 58966
+    },
    {
      "icon_id": "9689424",
      "name": "暂无数据",
--- a/src/renderer/src/assets/iconfont/iconfont.svg
+++ b/src/renderer/src/assets/iconfont/iconfont.svg
@ -14,6 +14,8 @@
    />
      <missing-glyph />
      
+      <glyph glyph-name="arrangement" unicode="&#58966;" d="M939.52 199.67999999999995c-10.24 10.24-25.6 10.24-35.84 0l-184.32-184.32-81.92 81.92c-10.24 10.24-25.6 10.24-35.84 0s-10.24-25.6 0-35.84l102.4-102.4c5.12-5.12 10.24-5.12 20.48-5.12s15.36 0 20.48 5.12l204.8 204.8c-5.12 5.12-5.12 25.6-10.24 35.84zM688.64 537.6c0 15.36-10.24 25.6-25.6 25.6h-409.6c-15.36 0-25.6-10.24-25.6-25.6s10.24-25.6 25.6-25.6h409.6c15.36 0 25.6 10.24 25.6 25.6zM458.24 153.60000000000002h-204.8c-15.36 0-25.6-10.24-25.6-25.6s10.24-25.6 25.6-25.6h204.8c15.36 0 25.6 10.24 25.6 25.6s-10.24 25.6-25.6 25.6zM611.84-76.79999999999995h-460.8c-15.36 0-25.6 10.24-25.6 25.6V742.4c0 15.36 10.24 25.6 25.6 25.6H227.84C227.84 727.04 263.68 691.2 304.64 691.2h307.2c40.96 0 76.8 35.84 76.8 76.8h76.8c15.36 0 25.6-10.24 25.6-25.6v-460.8c0-15.36 10.24-25.6 25.6-25.6s25.6 10.24 25.6 25.6V742.4c0 40.96-35.84 76.8-76.8 76.8H688.64c0 40.96-35.84 76.8-76.8 76.8h-307.2C263.68 896 227.84 860.16 227.84 819.2H151.04C110.08 819.2 74.24 783.36 74.24 742.4v-793.6c0-40.96 35.84-76.8 76.8-76.8h460.8c15.36 0 25.6 10.24 25.6 25.6s-10.24 25.6-25.6 25.6zM279.04 819.2c0 15.36 10.24 25.6 25.6 25.6h307.2c15.36 0 25.6-10.24 25.6-25.6v-51.2c0-15.36-10.24-25.6-25.6-25.6h-307.2c-15.36 0-25.6 10.24-25.6 25.6v51.2zM458.24 358.4h-204.8c-15.36 0-25.6-10.24-25.6-25.6s10.24-25.6 25.6-25.6h204.8c15.36 0 25.6 10.24 25.6 25.6s-10.24 25.6-25.6 25.6z"  horiz-adv-x="1024" />
+      
      <glyph glyph-name="zanwushuju" unicode="&#58965;" d="M876.202667 543.445333H147.882667L0 282.752V-42.666667h1024v325.376l-147.797333 260.736z m-234.112-263.637333c0-70.485333-58.197333-127.658667-130.090667-127.658667-71.893333 0-130.133333 57.173333-130.133333 127.658667H61.098667L179.541333 501.76H844.373333l118.442667-221.952H642.133333zM500.138667 810.666667h44.629333v-157.610667h-44.629333V810.666667zM197.290667 732.416l31.573333 31.018667L342.272 651.946667l-31.573333-31.018667-113.493334 111.445333z m491.52-80.512l113.493333 111.445333 31.573333-30.976-113.493333-111.445333-31.573333 30.976z"  horiz-adv-x="1024" />
      
      <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" />
--- a/src/renderer/src/assets/iconfont/iconfont.ttf
+++ b/src/renderer/src/assets/iconfont/iconfont.ttf
--- a/src/renderer/src/assets/iconfont/iconfont.woff
+++ b/src/renderer/src/assets/iconfont/iconfont.woff
--- a/src/renderer/src/assets/iconfont/iconfont.woff2
+++ b/src/renderer/src/assets/iconfont/iconfont.woff2
--- a/src/renderer/src/utils/linkConfig.js
+++ b/src/renderer/src/utils/linkConfig.js
@ -47,6 +47,12 @@ export default () => {
      data: { ...baseConfig() },
      fullPath: `${baseConfig().url}/platofai`
    },
+    // 文件资源 布置作业
+    filehomework: {
+      data: { ...baseConfig() },
+
+      fullPath: `${baseConfig().url}/teaching/classtaskassign?titleName=作业布置`
+    },

    getBaseData: () => {
      return {
--- a/src/renderer/src/views/prepare/container/file-list-item.vue
+++ b/src/renderer/src/views/prepare/container/file-list-item.vue
@ -95,6 +95,12 @@
              </template>
              <template v-else>
 <!--                判断是不是自己创建的课件-->
+                <div class="item-popover-item">
+                  <el-button text @click="openFileLink(item)">
+                    <i class="iconfont icon-arrangement"></i>
+                    <span>布置</span>
+                  </el-button>
+                </div>
                <div class="item-popover-item" v-if="userInfo.userId === Number(item.createUserId)">
                  <el-button text @click="editTalk(item, index)">
                    <i class="iconfont icon-bianji"></i>
@ -142,6 +148,7 @@ import { toTimeText } from '@/utils/date'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { deleteSmarttalk, updateSmarttalk, getPrepareById } from '@/api/file'
 import useUserStore from '@/store/modules/user'
+import outLink from '@/utils/linkConfig'

 const { ipcRenderer } = window.electron || {}
 export default {
@ -256,6 +263,18 @@ export default {
    // 删除作业
    deleteHomework(item){
      this.$emit('on-delhomework', item)
+    },
+    // 文件资源打开web AIX 布置作业
+    openFileLink(item){
+      // key 对应的 linkConfig.js 外部链接配置
+      let key = 'filehomework'
+      let configObj = outLink()[key]
+      // 通知主进程
+      ipcRenderer.send('openWindow', {
+        key,
+        fullPath: configObj.fullPath + `&fileShowName=${item.fileShowName}&fileFullPath=${item.fileFullPath}`,
+        cookieData: { ...configObj.data }
+      })
    }
  },
  mounted() {
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@ -192,10 +192,10 @@ export default {
      // 用户信息
      userStore: '',
      entpcourseid: '',
-      timerId: null,
      // 布置作业弹窗
      setDialog: false,
-      row: ''
+      row: '',
+      isOpenHomework: false
    }
  },
  computed: {
@ -205,13 +205,7 @@ export default {
      )
    }
  },
-  watch: {
-    $route(to) {
-      if (to.path != '/prepare' && this.timerId) {
-        clearInterval(this.timerId)
-      }
-    }
-  },
+
  created() {
    this.userStore = useUserStore().user
    ipcRenderer.removeAllListeners('copy-file-default-reply')
@ -229,6 +223,16 @@ export default {
        setTimeout(this.initReserv, 500)
      }
    )
+    // electron 当前窗口
+    const curWin = Remote.getCurrentWindow()
+    curWin.on('focus', ()=>{
+      if(!this.isOpenHomework) return
+      console.log(100)
+      this.initHomeWork()
+      this.isOpenHomework = false
+    })
+
+    
  },
  // activated() {
  //   if (this.uploadData.textbookId !== null) {
@ -423,9 +427,7 @@ export default {
      await this.asyncAllFile()
    },
    async initHomeWork() {
-      if (this.timerId) {
-        clearInterval(this.timerId)
-      }
+ 
      if (this.uploadData.levelSecondId) {
        // 获取作业列表所需ID 可能存在没有
        let { rows } = await this.getChapterId()
@ -469,8 +471,7 @@ export default {
    // 打开外部链接
    handleOutLink(key) {
      if(key == 'homeWork'){
-        // 查询作业
-        this.createTimer()
+        this.isOpenHomework = true
      }
      // key 对应的 linkConfig.js 外部链接配置
      let configObj = outLink()[key]
@ -483,19 +484,13 @@ export default {
    },
    // 根据教材章节单元ID 查询作业列表所需ID
    getChapterId() {
-      console.log(this.userStore, 'this.userStore')
      return listEntpcourse({
        evalid: this.uploadData.levelSecondId,
        edituserid: this.userStore.userId,
        pageSize: 500
      })
    },
-    // 查询作业列表定时器
-    createTimer() {
-      this.timerId = setInterval(() => {
-        this.getHomeWorkList()
-      }, 2500)
-    },
+
    // 查询作业列表
    getHomeWorkList() {
      homeworklist({