2024-09-25 15:28:35 +08:00
6 changed files with 64 additions and 36 deletions
--- a/package.json
+++ b/package.json
@ -17,7 +17,7 @@
    "build:test": "electron-vite build --mode test && electron-builder --win --config ./electron-builder.yml",
    "build:prod": "electron-vite build --mode production && electron-builder --win --config ./electron-builder-prod.yml",
    "build:lt": "electron-vite build --mode lt && electron-builder --win --config ./electron-builder-lt.yml",
-    "build:mac": "npm run build && electron-builder --mac",
+    "build:mac": "electron-vite build --mode production && electron-builder --mac --config ./electron-builder-prod.yml",
    "build:linux": "npm run build && electron-builder --linux"
  },
  "dependencies": {
--- a/src/renderer/src/components/PdfJs/index.vue
+++ b/src/renderer/src/components/PdfJs/index.vue
@ -6,6 +6,7 @@

 <script setup>
 import { onMounted, ref } from 'vue';
+import { getAppInstallUrl } from '@/utils/tool'
 const props = defineProps({
  url: {
    type: String,
@ -16,7 +17,7 @@ const props = defineProps({
 /**pdf文件地址 */
 const pdfUrl = ref('');
 /**pdfjs文件地址 */
-const fileUrl = '/pdfjs-dist/web/viewer.html?file=';
+const fileUrl = getAppInstallUrl('pdfjs-dist/web/viewer.html', 'user', '\\out\\renderer', true) + "?file=" //本地
 onMounted(() => {
    /** 将传入的pdf地址进行编码，防止中文识别错误 */
    pdfUrl.value = fileUrl + encodeURIComponent(props.url)
--- a/src/renderer/src/utils/tool.js
+++ b/src/renderer/src/utils/tool.js
@ -49,6 +49,18 @@ export const getStaticUrl = (url = '', type = 'app', exitPath = '', isFile = fal
    }
  }
 }
+
+export const getAppInstallUrl = (url = '', type = 'app', exitPath = '', isFile = false) => {
+  if (isDev) return url
+  else { // 生产环境获取-url
+    switch(type) {
+      case 'app': return path.join(__dirname, url) // 应用目录
+      case 'user': return (isFile?'file://':'')+path.join(Remote.app.getAppPath(),exitPath, url) // 用户目录
+      // case 'user': return (isFile?'file://':'')+path.join(Remote.app.getPath('userData'),exitPath, url) // 用户目录
+      default: return ''
+    }
+  }
+}
 /**
 * @description 消息发送-nodejs 消息发送
 * @form src/main/tool.js 来源
--- a/src/renderer/src/views/prepare/container/class-start.vue
+++ b/src/renderer/src/views/prepare/container/class-start.vue
@ -1,10 +1,10 @@
 <template>
-  <el-dialog v-model="visible" width="75%" :close-on-click-modal="false"
+  <el-dialog v-model="visible" width="35%" :close-on-click-modal="false"
    @close="handleClose">
-    <template #header><b>准备开始上课</b></template>
+    <template #header><div style="width: 100%;text-align: left"><b>开始上课（APT）</b></div></template>
    <div class="class-all">
      <el-row>
-        <el-col :span="10">
+<!--        <el-col :span="10">
          <c-form v-bind="classForm">
            <template #item_classid="{prop, form}">
              <el-select v-model="form[prop]" placeholder="请选择班级">
@ -20,8 +20,16 @@
              </el-scrollbar>
            </template>
          </c-form>
-        </el-col>
-        <el-col :span="14">
+        </el-col>-->
+        <el-col :span="24">
+          <c-form v-bind="classForm">
+            <template #item_classid="{prop, form}">
+              <el-select v-model="form[prop]" placeholder="请选择班级">
+                <el-option v-for="item in listData.classList" :value="item.id"
+                           :label="`${item.caption} (${item.classstudentcount}人)`" />
+              </el-select>
+            </template>
+          </c-form>
          <c-form v-bind="teacherForm">
            <!-- 上课 -->
            <template #item_classcourseid="{prop,form}">
@ -44,7 +52,7 @@
              <div :title="value" v-if="!!value">
                <vue-qr :text="value" :size="200" :margin="10" colorDark="green" colorLight="white" :logoSrc="getStaticUrl('/img/logo.png')" :logoScale="0.2" :dotScale="0.7"></vue-qr>
              </div>
-              <el-button type="warning" :loading="dt.loadingDel" @click="removeClasscourse()">删除记录</el-button>
+<!--              <el-button type="warning" :loading="dt.loadingDel" @click="removeClasscourse()">删除记录</el-button>-->
             </template>
             <!-- 手机登录 -->
             <template #item_mobile>
@ -90,7 +98,6 @@ const visible = ref(false)      // 是否打开窗口
 const myClassActive = ref({})   // 我的课件：准备上课的APT课件
 const imChatRef = ref(null)     // im-chat ref
 const emit = defineEmits(['close'])
-
 const classForm = reactive({    // 班级(左侧)：表单数据 表单配置
  form: {}, itemOption: [], option: {}
 })
@ -144,15 +151,16 @@ const handleClose = async () => {
 // 初始化-数据
 const initData = () => {
  // 班级-表单配置
-  classForm.option = { labelW: 40 }
+  classForm.option = { labelW: 80 }
  classForm.itemOption = [
    { label: '班级', prop: 'classid' },
-    { label: '学生', prop: 'student' },
+    // { label: '学生', prop: 'student' },
  ]
  // 老师-表单提交
  teacherForm.form = { classcourseid: 0 }
  teacherForm.itemOption = [
-    { label: '上课', prop: 'classcourseid' },
+    // { label: '班级', prop: 'classid' },
+    // { label: '上课', prop: 'classcourseid' },
    { label: '老师扫码', prop: 'qrUrl', show: false },
    { label: '手机登录', prop: 'mobile', show: false },
    { label: '故障备用', prop: 'backup', show: false },
@ -187,9 +195,9 @@ const getClassList = async () => {
      return o
    });
    // 默认选中第一项
-    if (listData.classList.length > 0) {
+    /*if (listData.classList.length > 0) {
      classForm.form.classid = listData.classList[0].id
-    }
+    }*/

  }
 }
@ -217,8 +225,12 @@ const getClasscourseList = async type => {
 }
 // 创建课程
 const createClasscourse = async () => {
-  dt.loading = true
  const { classid } = classForm.form
+  if (!classid) {
+    ElMessage.warning('请选择班级')
+    return
+  }
+  dt.loading = true
  const { entpcourseid, evalid, id, coursetitle } = myClassActive.value // 课件对象
  const curDate = commUtil.getDateNow('yyyy-MM-dd')
  const params = {
--- a/src/renderer/src/views/prepare/container/reserv.vue
+++ b/src/renderer/src/views/prepare/container/reserv.vue
@ -2,10 +2,10 @@
  <el-dialog
    v-model="centerDialogVisible"
    class="reserv-dialog"
-    title="上课"
+    title="开始上课（PPT）"
    destroy-on-close
    :before-close="closeDialog"
-    width="600"
+    width="35%"
    style="text-align: left"
  >
    <el-form
@ -15,7 +15,7 @@
      label-width="auto"
      style="max-width: 600px"
    >
-      <el-form-item label="课程名称" prop="name">
+<!--      <el-form-item label="课程名称" prop="name">
        <el-input v-model="form.name" />
      </el-form-item>
      <el-form-item label="课程类型" prop="type">
@ -59,17 +59,21 @@
            />
          </el-col>
        </el-form-item>
-      </el-form-item>
-      <el-form-item label="授课对象" prop="resource">
-        <el-checkbox-group v-model="form.resource">
+      </el-form-item>-->
+      <el-form-item label-width="80px" label="班级" prop="resource">
+        <el-select v-model="form.resource" placeholder="请选择班级">
+          <el-option v-for="(item, index) in classList" :value="item.id"
+                     :label="`${item.caption} (${item.classstudentcount}人)`" />
+        </el-select>
+<!--        <el-checkbox-group v-model="form.resource">
          <el-checkbox v-for="(item, index) in classList" :key="index" name="type" :value="item.id"
            >{{ item.caption }}({{ item.classstudentcount }})人
          </el-checkbox>
-        </el-checkbox-group>
+        </el-checkbox-group>-->
      </el-form-item>
-      <el-form-item label="教室" prop="classRoom">
+<!--      <el-form-item label="教室" prop="classRoom">
        <el-input v-model="form.classRoom" />
-      </el-form-item>
+      </el-form-item>-->
    </el-form>
    <template #footer>
      <div class="dialog-footer">
@ -272,7 +276,7 @@ const updateClassReserv = (formData) => {
  })
 }
 const addClassReserv = (formData) => {
-  let ids = formData.resource.join(',')
+  let ids = formData.resource
  // 判断是否添加教材
  if(!props.bookId){
    ElMessage.warning('请选择教材')
@ -293,10 +297,10 @@ const addClassReserv = (formData) => {
  addSmartClassReserv(param).then((res) => {
    if (res.msg) {
      closeDialog()
-      ElMessage({
+      /*ElMessage({
        type: 'success',
        message: '预约成功！'
-      })
+      })*/
      emit('addSuccess',res.msg)
    } else {
      ElMessage({
--- a/src/renderer/src/views/prepare/index.vue
+++ b/src/renderer/src/views/prepare/index.vue
@ -313,7 +313,6 @@ export default {
        this.openReserv()
      }
      if(item.fileFlag === 'apt') {
-        //TODO 打开apt - fileId: aptId
        this.$refs.calssRef.open(item.fileId)
      }
      // 当前上课-store