Compare commits

...

9 Commits

Author SHA1 Message Date
baigl 7ae8547d41 Merge pull request '作业批改 loading Bug修复' (#212) from baigl into main
Reviewed-on: #212
2024-09-14 17:38:44 +08:00
zhengdegang c5c28b4bf5 Merge pull request 'zdg' (#211) from zdg into main
Reviewed-on: #211
2024-09-14 17:34:21 +08:00
zdg 67d7395c47 Merge branch 'main' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg
# Conflicts:
#	src/renderer/src/views/desktop/container/work-trend.vue
2024-09-14 17:32:04 +08:00
白了个白 46adf4c058 作业批改 loading Bug修复 2024-09-14 17:00:14 +08:00
zdg f615efbd88 Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-14 16:39:38 +08:00
zdg 741e7336f3 上课 2024-09-14 16:39:31 +08:00
zhangxuelin 0fa3c84f5e 修改注册bug 2024-09-12 11:09:51 +08:00
zhangxuelin 490536654a Merge branch 'zdg' of http://27.128.240.72:3000/zhuhao/AIx_Smarttalk into zdg 2024-09-12 10:51:38 +08:00
zhangxuelin 2efb870a16 添加注册提示 2024-09-12 10:51:12 +08:00
19 changed files with 1111 additions and 23 deletions

View File

@ -49,6 +49,7 @@
"pinia": "^2.1.7", "pinia": "^2.1.7",
"pinia-plugin-persistedstate": "^3.2.1", "pinia-plugin-persistedstate": "^3.2.1",
"spark-md5": "^3.0.2", "spark-md5": "^3.0.2",
"vue-qr": "^4.0.9",
"vue-router": "^4.4.0", "vue-router": "^4.4.0",
"xgplayer": "^3.0.19", "xgplayer": "^3.0.19",
"xlsx": "^0.18.5" "xlsx": "^0.18.5"

View File

@ -133,7 +133,7 @@ async function createLinkWin(data) {
contextIsolation: true contextIsolation: true
} }
}) })
linkWin[data.key].type = 'link' // 唯一标识 linkWin[data.key].type = 'link'+data.key // 唯一标识
let cookieDetails = { ...data.cookieData } let cookieDetails = { ...data.cookieData }
await linkWin[data.key].webContents.session.cookies await linkWin[data.key].webContents.session.cookies

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

View File

@ -0,0 +1,89 @@
import request from '@/utils/request'
// 查询classcourse列表
export function listClasscourse(query) {
return request({
url: '/education/classcourse/list',
method: 'get',
params: query
})
}
// 查询classcourse详细
export function getClasscourse(id) {
return request({
url: '/education/classcourse/' + id,
method: 'get'
})
}
// 新增classcourse
export function addClasscourse(data) {
return request({
url: '/education/classcourse',
method: 'post',
data: data
})
}
// 新增classcourse
export function addClasscourseReturnId(data) {
return request({
url: '/education/classcourse/saveReturnId',
method: 'post',
data: data
})
}
// 修改classcourse
export function updateClasscourse(data) {
return request({
url: '/education/classcourse',
method: 'put',
data: data
})
}
// 删除classcourse
export function delClasscourse(id) {
return request({
url: '/education/classcourse/' + id,
method: 'delete'
})
}
// 删除classcourse
export function delClasscourseWithData(id) {
return request({
url: '/education/classcourse/removeData/' + id,
method: 'delete'
})
}
// classcourse开始上课
export function startCourseTeaching(id) {
return request({
url: '/education/classcourse/startCourseTeaching/'+id,
method: 'post',
})
}
// 老师学生发送新的消息
export function sendCourseTeachingMsg(data) {
return request({
url: '/education/classcourse/sendCourseTeachingMsg',
method: 'post',
data: data
})
}
// 老师学生获取新的交互消息
export function getCourseTeachingMsg(id) {
return request({
url: '/education/classcourse/getCourseTeachingMsg/'+id,
method: 'post',
})
}

View File

@ -0,0 +1,209 @@
<template>
<!-- 表单-组件(自定义) -->
<slot>
<el-row v-bind="rows||{}">
<!-- 其他内容-start -->
<slot name="start"></slot>
<el-form :model="form" ref="form" @submit.native.prevent
v-bind="option||{}"
:status-icon="option.isIcon" :inline-message="option.inlineMsg"
:label-width="option.labelW" :label-position="option.labelP" :label-suffix="option.labelS">
<!-- 内容区 -->
<template v-for="(item, index) in itemFields">
<slot :name="'cols_'+item.prop" :row="item" :index="index" :prop="item.prop">
<el-col :span="colsFn(item,'span')" :offset="colsFn(item,'offset')" :push="colsFn(item,'push')" :pull="colsFn(item,'pull')"
:xs="colsFn(item,'xs')" :sm="colsFn(item,'sm')" :md="colsFn(item,'md')" :lg="colsFn(item,'lg')" :xl="colsFn(item,'xl')"
:tag="colsFn(item,'tag')" :key="index" :style="item.style">
<!-- slot可自定义-元素 默认input -->
<slot :name="item.prop" :row="item" :index="index" :prop="item.prop" :form="form">
<el-form-item :label="item.label" :prop="item.prop" :label-width="item.labelW"
:required="item.required" :rules="item.rules" :error="item.error"
:show-message="item.showMsg" :inline-message="item.inlineMsg" :size="item.size">
<!-- slot可自定义-item内部 单个 -->
<slot :name="'item_'+item.prop" :row="item" :index="index" :value="form[item.prop]" :prop="item.prop" :form="form">
<!-- slot可自定义-item内部 所有 -->
<slot name="input" :row="item" :index="index" :value="form[item.prop]" :prop="item.prop" :form="form">
<el-input v-model="form[item.prop]" v-bind="item.inputOpt||{}"
@keyup.enter.native="handle(item, $event)" v-on="item.on||{}">
<!-- slot自定义-输入框头部内容 单个 -->
<template #prefix v-if="slotKeys.includes(`prefix_${item.prop}`)"><slot :name="'prefix_'+item.prop"></slot></template>
<!-- slot自定义-输入框尾部内容 单个 -->
<template #suffix v-if="slotKeys.includes(`suffix_${item.prop}`)"><slot :name="'suffix_'+item.prop"></slot></template>
<!-- slot自定义-输入框前置内容 单个 -->
<template #prepend v-if="slotKeys.includes(`prepend_${item.prop}`)"><slot :name="'prepend_'+item.prop"></slot></template>
<!-- slot自定义-输入框后置内容 单个 -->
<template #append v-if="slotKeys.includes(`append_${item.prop}`)"><slot :name="'append_'+item.prop"></slot></template>
<!-- slot自定义-输入框头部内容 所有 -->
<template #prefix v-if="slotKeys.includes(`prefix`)"><slot :name="'prefix_'+item.prop"></slot></template>
<!-- slot自定义-输入框尾部内容 所有 -->
<template #suffix v-if="slotKeys.includes(`suffix`)"><slot :name="'suffix_'+item.prop"></slot></template>
<!-- slot自定义-输入框前置内容 所有 -->
<template #prepend v-if="slotKeys.includes(`prepend`)"><slot :name="'prepend_'+item.prop"></slot></template>
<!-- slot自定义-输入框后置内容 所有 -->
<template #append v-if="slotKeys.includes(`append`)"><slot :name="'append_'+item.prop"></slot></template>
</el-input>
</slot>
</slot>
<!-- slot自定义-标签文本的内容 单个 -->
<template #label v-if="slotKeys.includes(`label_${item.prop}`)">
<slot :name="'label_'+item.prop" :row="item" :index="index" :prop="item.prop"></slot>
</template>
<!-- slot自定义-标签文本的内容 所有 -->
<template #label v-if="slotKeys.includes(`label`)">
<slot name="label" :row="item" :index="index" :prop="item.prop"></slot>
</template>
<!-- slot自定义-自定义表单校验信息的显示方式 单个 -->
<template #error="{error}" v-if="slotKeys.includes(`error_${item.prop}`)">
<slot :name="'error_'+item.prop" :row="item" :index="index" :prop="item.prop" :error="error"></slot>
</template>
<!-- slot自定义-自定义表单校验信息的显示方式 所有 -->
<template #error="{error}" v-if="slotKeys.includes(`error`)">
<slot name="error" :row="item" :index="index" :prop="item.prop" :error="error"></slot>
</template>
</el-form-item>
</slot>
</el-col>
</slot>
</template>
<!-- 其他内容 -->
<slot name="add"></slot>
<!-- 提交 -->
<slot name="submit" :formRef="$refs.form">
<div class="subBtn" v-if="btnDef" :style="btnStyle">
<el-button type="primary" size="small" @click="confirm" :loading="btnLoad">{{btnText}}</el-button>
</div>
</slot>
</el-form>
<!-- 其他内容-end -->
<slot name="end"></slot>
</el-row>
</slot>
</template>
<script>
export default {
name: 'cForm',
props: {
form: { // form
type: Object,
default: _ => { return {} }
},
option: { //
type: Object,
default: _ => {
return { labelW: '80px' }
}
},
itemOption: { // item
type: Array,
required: true
},
rows: { // layout
type: Object,
default: _ => { return {} }
},
cols: { // layout
type: Object,
default: _ => { return {} }
},
// onEnter: Function, //
onEnter: {
type: Function,
default: () => {}
},
btnText: { //
type: String,
default: '确 定'
},
btnDef: Boolean, // -
btnStyle: String, // css
btnLoad: Boolean, // load
},
data() {
return {
slotKeys: [] //
}
},
computed: {
itemFields() {
return this.itemOption
.filter(o => o.show !== false)
.map(o => {
for (const key in o) {
const inputOpt = {placeholder:'请输入'}
if (key.startsWith('i')) {
const newKey = key.substring(1)
inputOpt[newKey] = o[key]
delete o[key]
}
o.inputOpt = inputOpt
return o
}
})
}
},
created() {
window.test = this
this.slotKeys = Object.keys(this.$slots)
},
methods: {
// --cols
colsFn(row, attr) {
const cols = row.cols || this.cols
return cols[attr]
},
// input --
handle(row, e) {
const onEnter = row.onEnter || this.onEnter
if (row.prop) onEnter(row, e)
},
// --
confirm() {
const formRefs = this.$refs.form
this.$emit('confirm', formRefs)
},
//
resetFields() {
this.$refs.form.resetFields()
},
//
clearValidate(props) {
this.$refs.form.clearValidate(props)
},
// -
validateField(props, callback) {
this.$refs.form.validateField(props, callback)
},
//
validate(callback) {
return this.$refs.form.validate(callback)
}
},
// filters: {
// // input-
// clearable_f(val) {
// return val == null ? true : val
// }
// }
}
</script>
<style lang="scss" scoped>
.subBtn{
float: left;
width: 100%;
text-align: center;
}
.el-form {
width: 100%;
}
.el-form--inline > .el-col {
width: auto;
display: inline-block;
float: unset;
}
.el-form-item .el-input{
vertical-align: bottom;
}
</style>

View File

@ -0,0 +1,64 @@
/**
* 使用-批量导入--方式
*/
// 导入 import.meta.glob 用于获取所有符合要求的 .vue 文件
const files = import.meta.glob('./!(index).vue', { eager: true });
export default {
install(Vue, options) {
Object.entries(files).forEach(([path, file]) => {
const fileName = path.split('/').pop().replace(/\.\w+$/, '')
// fileName == 'cDialog' && initDialog(Vue, file) // 弹窗--组件化
Vue.component(fileName, file.default)
});
}
}
// 弹窗--函数化
function initDialog(Vue, dialog) {
// 全局绑定
Vue.prototype.$cDialog = (props) => {
// props.dialog = Object.assign({ isOpen: true }, props.dialog) // 默认配置 propsData: option
props.dialog.isOpen == null && (props.dialog.isOpen = true) // 默认打开
props.isRemove == null && (props.isRemove = true) // 默认关闭后移除
const Constructor = Vue.extend(dialog)
const Instance = new Constructor({ propsData: props })
props.slots && (Instance.$slots = props.slots) // 插槽内容
props.scopedSlots && (Instance.$scopedSlots = props.scopedSlots) // 作用域插槽内容
props.content && (Instance.$slots.default = props.content) // 插槽内容
document.body.appendChild(Instance.$mount().$el)
return Instance.showBox().then(v => {
props.callback && props.callback(v)
return Promise.resolve(v)
}).catch(v => {
props.callback && props.callback(v)
// 移除弹窗
props.isRemove && document.body.removeChild(Instance.$mount().$el)
return Promise.reject(v)
})
}
// 全局绑定2
Vue.prototype.$cDialog2 = (props) => {
// props.dialog = Object.assign({ isOpen: true }, props.dialog) // 默认配置 propsData: option
props.dialog.isOpen == null && (props.dialog.isOpen = true) // 默认打开
props.isRemove == null && (props.isRemove = true) // 默认关闭后移除
const Constructor = Vue.extend(dialog)
const Instance = new Constructor({ propsData: props })
props.slots && (Instance.$slots = props.slots) // 插槽内容
props.scopedSlots && (Instance.$scopedSlots = props.scopedSlots) // 作用域插槽内容
props.content && (Instance.$slots.default = props.content) // 插槽内容
document.body.appendChild(Instance.$mount().$el)
Instance.showBox().then(v => {
props.callback && props.callback(v)
return Promise.resolve(v)
}).catch(v => {
props.callback && props.callback(v)
// 移除弹窗
props.isRemove && document.body.removeChild(Instance.$mount().$el)
return Promise.reject(v)
})
return Instance
}
}

View File

@ -14,6 +14,7 @@ import { store } from '@/store'
import App from './App.vue' import App from './App.vue'
import router from './router' import router from './router'
import log from 'electron-log/renderer' // 渲染进程日志-文件记录 import log from 'electron-log/renderer' // 渲染进程日志-文件记录
import customComponent from '@/components/common' // 自定义组件
if(process.env.NODE_ENV != 'development') { // 非开发环境,将日志打印到日志文件 if(process.env.NODE_ENV != 'development') { // 非开发环境,将日志打印到日志文件
Object.assign(console, log.functions) // 渲染进程日志-控制台替换 Object.assign(console, log.functions) // 渲染进程日志-控制台替换
@ -37,4 +38,6 @@ app.config.globalProperties.$requestGetJYW = (url,config)=>{
app.use(router) app.use(router)
.use(store) .use(store)
.use(ElementPlus, { locale: zhLocale }).mount('#app') .use(ElementPlus, { locale: zhLocale })
.use(customComponent) // 自定义组件
.mount('#app')

View File

@ -173,6 +173,7 @@ export class ImChat {
return this.timChat.TIMLogout().then(res => { return this.timChat.TIMLogout().then(res => {
this.setConsole('%cim-chat: logout', '登出成功') this.setConsole('%cim-chat: logout', '登出成功')
this.status.isLogin = false this.status.isLogin = false
this.status.isConnect = false
this.timChat.TIMUninit() // 反初始化 this.timChat.TIMUninit() // 反初始化
return res return res
}).catch(error => { }).catch(error => {

View File

@ -0,0 +1,312 @@
/**
* @description 公共工具类
* @author zdg
* @date 2024-4-26
*/
// ============= 文件工具--相关 ===================
/**
* 获取上传文件
*/
export function getFiles() {
const cb = resolve => {
const fileDom = document.createElement('input')
fileDom.type = 'file'
fileDom.onchange = e => {
resolve(e.target.files)
return fileDom.remove()
}
fileDom.click()
}
return new Promise(cb)
}
// ============= 数学公式--相关 ===================
/**
* @description 计算两点直线距离 (获取直径)
* (欧几里得距离公式): [ \text{distance} = \sqrt{(x2 - x1)^2 + (y2 - y1)^2} ]
* @param {*} x1
* @param {*} y1
* @param {*} x2
* @param {*} y2
*/
export function getDistance(x1,y1,x2,y2) {
return Math.sqrt(Math.pow((x2 - x1), 2) + Math.pow((y2 - y1), 2))
}
// 获取半径
export function getRadius(x1,y1,x2,y2) { return getDistance(x1,y1,x2,y2) / 2 }
/**
* 计算某个值在总数中所占的百分比
*
* 此函数用于根据给定的值和总数计算该值占总数的百分比它还支持指定百分比的小数位数
* 如果计算结果小于0则返回0如果大于100则返回100以确保百分比的合理范围
*
* @param {number} v - 待计算的值
* @param {number} total - 总数
* @param {number} [step=2] - 百分比的小数位数默认为2
* @returns {number} - 返回计算后的百分比保证在0到100之间
*/
export function getPercent(v, total, step=2) {
!v && (v = 0)
!total && (total = 1)
// 计算百分比,保留指定的小数位,并转换为数字类型
let res = (v / total * 100).toFixed(step)-0
// 确保百分比在0到100之间
return res < 0 ? 0 : res > 100 ? 100 : res
}
// ============= 格式化--相关 ===================
/**
* @description 手机号隐藏中间几位
* @param {*} phone 手机号
* @param {*} start 前面保留几位 默认 3
* @param {*} end 后面保留几位 默认 3
* @param {*} rstr 替换字符 默认 ****
* @returns
*/
export function phoneHideFormat(phone, start = 3, end = 4, rstr = '****') {
// const reg = /^(\d{3})\d*(\d{4})$/
if (!phone) return ''
const reg = new RegExp(`(\\d\{${start}\})\\d*(\\d\{${end}\})`)
return phone.replace(reg, `$1${rstr}$2`)
}
// ============= 习题工具--相关 ===================
/**
* @description 将字符串转换为数组
* @param {*} str
* @returns
*/
export function quizStrToList(str = '') {
if (!str) return []
let resList = []
if (isJson(str, true)) resList = JSON.parse(str) // 数组对象
else if (str.includes('#&')) resList = str.split('#&') // 字符串数组 #&
else if (str.includes(',')) resList = str.split(',') // 字符串数组 ,
else resList = [str]
return resList
}
// ============= 常用工具--相关 ===================
export function isJson(str, isArray = false) {
if(typeof str == 'string'){
try {
const res = JSON.parse(str)
let isBool = typeof res == 'object' && res
if(isBool && isArray) isBool = Array.isArray(res)
return isBool
} catch (error) {}
}
return false
}
//获取临时唯一ID
export const generateUniqueID = ()=> {
const date = new Date();
const timestamp = date.getTime().toString(36); // 使用36进制转换时间戳
const random = Math.random().toString(36).substring(2, 9); // 获取随机数的一部分并转换为36进制
return timestamp + random;
}
// 清理参数中的undefined、null
export const removePropertyOf = function(obj){
Object.keys(obj).forEach(item=>{
if(obj[item] === undefined || obj[item] === null) delete obj[item]
})
return obj;
}
/**
* 移除children 为空 -- tree
*/
export function removeTree(list) {
var this_ = this
for (var i in list) {
if (list[i].children.length == 0) {
list[i].children = undefined
} else {
this_.removeTree(list[i].children)
}
}
return list
}
// ============= 校验工具--相关 ===================
// url校验
export const validateUrl = (url) => {
const regex = /^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$/;
if (!regex.test(url.trim())) {
return false;
} else {
return true;
}
}
// ============= 时间工具--相关 ===================
/**
* @description 时间 转化 时分秒
* @param {*} seconds
* @returns
*/
export function formatTime(seconds) {
seconds = parseInt(seconds) // 转换整数
const h = (Math.floor(seconds / 3600)+'').padStart(2,'0')
const m = (Math.floor((seconds % 3600) / 60)+'').padStart(2,'0')
const s = ((seconds % 60)+'').padStart(2,'0')
return `${h}:${m}:${s}`
}
/**
* @description 时间格式化
* @param {*} time
* @param {*} fmt
* @returns
*/
export function formatDate(time, fmt = 'yyyy-MM-dd') {
let date
if (time) {
if (typeof time === 'object') {
date = time
} else {
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
time = parseInt(time)
}
if ((typeof time === 'number') && (time.toString().length === 10)) {
time = time * 1000
}
date = new Date(time)
}
} else {
date = new Date()
}
if (/(y+)/.test(fmt)) {
fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length))
}
const o = {
'M+': date.getMonth() + 1,
'd+': date.getDate(),
'h+': date.getHours(),
'm+': date.getMinutes(),
's+': date.getSeconds(),
'a': date.getDay()
}
for (const k in o) {
if (new RegExp(`(${k})`).test(fmt)) {
if (k === 'a') {
const str = ['日', '一', '二', '三', '四', '五', '六'][o[k]]
fmt = fmt.replace(RegExp.$1, str)
continue
}
const str = o[k] + ''
// fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str))
fmt = fmt.replace(RegExp.$1, str.padStart(2, '0'))
}
}
return fmt
}
/**
* 快速获取日期
* num: 1 今日 2 昨日 3 本周 4 上周 5 本月
* bool: true 有时分秒 false | null 不要时分秒
*/
export function getDateStr(num, bool) {
let now = new Date() // 当前日期
let nowDayOfWeek = now.getDay() // 今天本周的第几天
let nowDay = now.getDate() // 当前日
let nowMonth = now.getMonth() // 当前月
let nowYear = now.getYear() // 当前年
nowYear += (nowYear < 2000) ? 1900 : 0 //
let monthStartDate = new Date(nowYear, nowMonth, 1)
let monthEndDate = new Date(nowYear, nowMonth + 1, 1)
let days = (monthEndDate - monthStartDate) / (1000 * 60 * 60 * 24)
let fmt = 'yyyy-MM-dd'
let startTime = ''
let endTime = ''
if (num == 1) { // 今日
startTime = formatDate(now, fmt)
endTime = startTime
}
if (num == 2) { // 昨日
now.setDate(nowDay - 1)
startTime = formatDate(now, fmt)
endTime = startTime
}
if (num == 3) { // 本周
startTime = formatDate(new Date(nowYear, nowMonth, nowDay - nowDayOfWeek), fmt)
endTime = formatDate(new Date(nowYear, nowMonth, nowDay + (6 - nowDayOfWeek)), fmt)
}
if (num == 4) { // 上周
startTime = formatDate(new Date(nowYear, nowMonth, nowDay - nowDayOfWeek - 7), fmt)
endTime = formatDate(new Date(nowYear, nowMonth, nowDay - nowDayOfWeek - 1), fmt)
}
if (num == 5) { // 本月
startTime = formatDate(new Date(nowYear, nowMonth, 1), fmt)
endTime = formatDate(new Date(nowYear, nowMonth, days), fmt)
}
if (num == 6) { // 本年
startTime = formatDate(new Date(nowYear, 0, 1), fmt)
endTime = formatDate(new Date(nowYear, 11, 31), fmt)
}
if (bool) {
startTime += ' 00:00:00'
endTime += ' 23:59:59'
}
return [startTime, endTime]
}
/**
* 获取 昨天 今天 明天 一周前 一月前 1-5
*/
export function getDateStr1(num, fmt = 'yyyy-MM-dd hh:mm:ss') {
const now = new Date() // 当前日期
const curr = Date.now() // 当前时间戳
if (num == 1) return formatDate(new Date(curr-(24*60*60*1000)),fmt) // 昨天
else if (num == 2) return formatDate(now,fmt) // 今天
else if (num == 3) return formatDate(new Date(curr+(24*60*60*1000)),fmt) // 明天
else if (num == 4) return formatDate(new Date(curr-(7*24*60*60*1000)),fmt) // 一周前
else if (num == 5) return formatDate(new Date(curr-(30*24*60*60*1000)),fmt) // 一月前
return ''
}
/**
* 获取当前 0:0:0:0 时间
* @param {*} [fmt] 格式 'yyyy-MM-dd hh:mm:ss'
*/
export function getDateNow(fmt) {
const date = new Date()
date.setHours(0, 0, 0, 0)
if (fmt) return formatDate(date, fmt)
return date
}
/** 默认加上-时分秒 */
export function toTimeStr(arr = ['','']) {
return [`${arr[0]} 00:00:00`, `${arr[1]} 23:59:59`]
}
/**
* 秒转时分
*/
export function timeToStr(time,str = '时分秒', isPad = false) {
let s = parseInt(time)
let h = 0, m = 0 // 初始化时|分
if (s >= 60) {
// 如果秒数大于60将秒数转换成整数
m = parseInt(s / 60) // 获取分钟除以60取整数得到整数分钟
s = parseInt(s % 60) // 获取秒数,秒数取佘,得到整数秒数
if (m >= 60) { // 如果分钟大于60将分钟转换成小时
h = parseInt(m / 60) // 获取小时获取分钟除以60得到整数小时
m = parseInt(m % 60) // 获取小时后取佘的分获取分钟除以60取佘的分
}
}
const toStr = v => v.toString().padStart(2, '0') // 转换字符
const arr = str.split('')
if (isPad) return `${h?toStr(h)+arr[0]:''}${m?toStr(m)+arr[1]:''}${toStr(s)}${arr[2]||''}`
return `${h?h+arr[0]:''}${m?m+arr[1]:''}${s?s+arr[2]||'':''}`
}

View File

@ -1,6 +1,6 @@
import useUserStore from '@/store/modules/user' import useUserStore from '@/store/modules/user'
const baseConfig = () => { export const baseConfig = (token) => {
const userStore = useUserStore() const userStore = token ? {} : useUserStore()
return { return {
// Electron 设置cookie // Electron 设置cookie
url: import.meta.env.VITE_APP_BUILD_BASE_PATH, url: import.meta.env.VITE_APP_BUILD_BASE_PATH,
@ -8,7 +8,7 @@ const baseConfig = () => {
//cookie 名称 这里为 token //cookie 名称 这里为 token
name: 'Admin-Token', name: 'Admin-Token',
//cookie 值 //cookie 值
value: userStore.token, value: token ? '' : userStore.token,
// 域名 // 域名
domain: import.meta.env.VITE_APP_DOMAIN domain: import.meta.env.VITE_APP_DOMAIN
} }

View File

@ -12,8 +12,8 @@ const Remote = isNode?require('@electron/remote'):{}
const { ipcRenderer } = isNode?require('electron'):window.electron || {} const { ipcRenderer } = isNode?require('electron'):window.electron || {}
const API = isNode?window.api:{} // preload-api const API = isNode?window.api:{} // preload-api
import { useToolState } from '@/store/modules/tool' // 获取store状态 import { useToolState } from '@/store/modules/tool' // 获取store状态
// const Store = isNode?require('electron-store'):null // 持久化存储
import store from './store' import store from './store'
import { baseConfig } from './linkConfig' // 外部连接-配置
// 常用变量 // 常用变量
const BaseUrl = isNode?process.env['ELECTRON_RENDERER_URL']+'/#':'' const BaseUrl = isNode?process.env['ELECTRON_RENDERER_URL']+'/#':''
const isDev = isNode?process.env.NODE_ENV !== 'production':'' const isDev = isNode?process.env.NODE_ENV !== 'production':''
@ -297,6 +297,23 @@ const eventHandles = (type, win) => {
} }
} }
/**
* @description 外部跳转-web网页
* @param {*} path
* @param {*} params
*/
export const toLinkWeb = (path) => {
const config = baseConfig()
console.log(config)
const fullPath = config.url + path
// 通知主进程
ipcRenderer.send('openWindow', {
key: `win-${Date.now()}`,
fullPath: fullPath,
cookieData: { ...config }
})
}
// const taskHandles = () => { // const taskHandles = () => {
// // 设置任务栏上下文菜单 // // 设置任务栏上下文菜单
// const contextMenu = new Remote.Menu() // const contextMenu = new Remote.Menu()

View File

@ -118,6 +118,7 @@ const getData = () => {
getClassWorkList() getClassWorkList()
// 3 // 3
getStudentClassWorkData() getStudentClassWorkData()
loading.value = false
} }
/** /**
* 1获取班级列表数据 * 1获取班级列表数据

View File

@ -0,0 +1,369 @@
<template>
<el-dialog v-model="visible" width="75%" :close-on-click-modal="false"
@close="handleClose">
<template #header><b>准备开始上课</b></template>
<div class="class-all">
<el-row>
<el-col :span="10">
<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>
<template #item_student>
<el-scrollbar max-height="30em">
<template v-for="(item, index) in listData.activeStudentList">
<el-tag style="margin:0 7px 7px 0;cursor:default;">{{ item.name }}</el-tag>
</template>
</el-scrollbar>
</template>
</c-form>
</el-col>
<el-col :span="14">
<c-form v-bind="teacherForm">
<!-- 上课 -->
<template #item_classcourseid="{prop,form}">
<el-radio-group v-model="form[prop]">
<el-radio :value="0">开始新课</el-radio>
<template v-for="(item,index) in listData.classcourseList">
<template v-if="dt.isCreate&&!index">
<el-radio :value="item.id">{{ item.opendate }} <span style="color: silver">({{ item.teachername }})</span></el-radio>
</template>
<template v-else-if="dt.isHistory&&(dt.isCreate&&index||!dt.isCreate)">
<el-radio :value="item.id">{{ item.opendate }} <span style="color: silver">({{ item.teachername }})</span></el-radio>
</template>
</template>
<el-button class="absolute top-1 right-0" size="small" type="primary" round
:plain="!dt.isHistory" @click="getClasscourseList('toggle')">历史记录</el-button>
</el-radio-group>
</template>
<!-- 老师扫码 -->
<template #item_qrUrl="{value}">
<div :title="value" v-if="!!value">
<vue-qr :text="value" :size="200" :margin="10" colorDark="green" colorLight="white" logoSrc="/img/logo.png" :logoScale="0.2" :dotScale="0.7"></vue-qr>
</div>
<el-button type="warning" :loading="dt.loadingDel" @click="removeClasscourse()">删除记录</el-button>
</template>
<!-- 手机登录 -->
<template #item_mobile>
<div>
<div>开始新的课堂需要点击先创建课堂才能显示手机二维码</div>
<el-button type="warning" :loading="dt.loading" @click="createClasscourse">创建课堂</el-button>
</div>
</template>
<!-- 故障备用 -->
<template #item_backup>
<div>
<div>如果手机扫码后进入课堂但本页面没自动跳转请点击下面按钮</div>
<el-button type="primary" plain @click="classTeachingStart">开始上课</el-button>
</div>
</template>
</c-form>
</el-col>
</el-row>
</div>
</el-dialog>
<!-- im-chat 聊天组件 -->
<im-chat ref="imChatRef" v-if="visible" @change="chatChange" />
</template>
<script setup>
//
import { onMounted, reactive, ref, watchEffect, watch, nextTick } from 'vue' // vue
import { ElMessage, ElMessageBox } from 'element-plus' // ui:
import vueQr from 'vue-qr/src/packages/vue-qr.vue' // :
import imChat from '@/views/tool/components/imChat.vue' // im-chat-
import MsgEnum from '@/plugins/imChat/msgEnum' // -(nuem)
import * as commUtil from '@/utils/comm' // -
import { toLinkWeb } from '@/utils/tool'
import * as Http_ClassManage from '@/api/classManage' // api
import * as Http_Classcourse from '@/api/teaching/classcourse' // api
import * as Http_Entpcoursefile from '@/api/education/entpcoursefile' // api
import useUserStore from "@/store/modules/user" // user
const baseUrl = import.meta.env.VITE_APP_BUILD_BASE_PATH
const userStore = useUserStore()
const visible = ref(false) //
const myClassActive = ref({}) // APT
const imChatRef = ref(null) // im-chat ref
const classForm = reactive({ // ()
form: {}, itemOption: [], option: {}
})
const teacherForm = reactive({ // ()
form: {}, itemOption: []
})
const listData = reactive({ //
classList: [], //
activeStudentList: [], // -
classcourseList: [], // -
})
const dt = reactive({ //
isCreate: false, //
isHistory: false, // -
loading: false, // -loading
loadingDel: false, // -loading
atCourse: {}, //
})
let chat = null // im-chat
//
onMounted(() => {
initData() // -
})
/**
* @description 暴露方法-打开对话框
* @param row 课件对象
*/
const open = async (id) => {
visible.value = true
// apt
if (id) await getAptInfo(id)
//
// myClassActive.value = {
// "createBy": null,
// "createTime": null,
// "updateBy": null,
// "updateTime": null,
// "remark": null,
// "id": 14740,
// "idarray": null,
// "jsonarray": null,
// "entpid": 255,
// "parentid": 14741,
// "linkids": "",
// "linklist": "",
// "entpcourseid": 7300,
// "entpcourseidarray": null,
// "evalid": 39952,
// "evaltitle": " ",
// "coursetitle": " ",
// "classid": 0,
// "ppttype": "file",
// "title": " ",
// "fileidx": 0,
// "fileurl": "",
// "pathfile": null,
// "filetype": "ppt",
// "filesize": null,
// "datacontent": "",
// "filekey": "",
// "filetag": "",
// "dflag": 0,
// "status": "",
// "edituserid": 2781,
// "editusername": "",
// "edituserheadimgurl": "/profile/avatar/2024/08/12/blob_20240812152930A001.jpeg",
// "edituserentpname": "AIx",
// "editstudentid": null,
// "editstudentname": null,
// "timestamp": "2024-09-10 15:07:20",
// "token": null,
// "base64Code": null,
// "orderby": null,
// "childcount": 4,
// "commentlikecount": 0,
// "commenttextcount": 0,
// "commentusecount": 0,
// "commentvisitcount": 90,
// "unixstamp": null,
// "classworkcount": 0,
// "classworklist": "",
// "authjson": "",
// "defaultslide": null
// }
//
getClassList()
// im-chat
nextTick(async() => {
chat = await imChatRef.value?.initImChat()
})
}
//
const handleClose = async () => {
await chat?.logout()
chat = null
}
// -
const initData = () => {
// -
classForm.option = { labelW: 40 }
classForm.itemOption = [
{ label: '班级', prop: 'classid' },
{ label: '学生', prop: 'student' },
]
// -
teacherForm.form = { classcourseid: 0 }
teacherForm.itemOption = [
{ label: '上课', prop: 'classcourseid' },
{ label: '老师扫码', prop: 'qrUrl', show: false },
{ label: '手机登录', prop: 'mobile', show: false },
{ label: '故障备用', prop: 'backup', show: false },
]
}
// APT
const getAptInfo = async (id) => {
const res = await Http_Entpcoursefile.getEntpcoursefile(id)
if (res.code == 200) {
myClassActive.value = res.data
}
}
// -
const getClassList = async () => {
const res = await Http_ClassManage.listClassmain({
classuserid: userStore.id, pageSize: 100, status: 'open'
})
if (res.code == 200) {
listData.classList = (res.rows || []).map(o => {
if(!!o.classstudentlist) { //
o.classstudentlist = JSON.parse('[' + o.classstudentlist + ']')
}
return o
});
//
if (listData.classList.length > 0) {
classForm.form.classid = listData.classList[0].id
}
}
}
// -
const getClasscourseList = async type => {
if (type == 'toggle') { //
dt.isHistory = !dt.isHistory
if (!dt.isHistory || listData.classcourseList.length) return // -
}
const {classid} = classForm.form
const {entpcourseid} = myClassActive.value
if (!classid || !entpcourseid) return
const params = {classid, entpcourseid, entpcoursefileid: 0}
const res = await Http_Classcourse.listClasscourse(params)
if (res.code == 200) {
// zdg: id()
const list = (res.rows || []).sort((a, b) => b.id - a.id)
listData.classcourseList = list
//
if (type == 'update' && list.length) {
dt.isCreate = true // -
teacherForm.form.classcourseid = list[0].id
}
}
}
//
const createClasscourse = async () => {
dt.loading = true
const { classid } = classForm.form
const { entpcourseid, evalid, id, coursetitle } = myClassActive.value //
const curDate = commUtil.getDateNow('yyyy-MM-dd')
const params = {
id: 0, coursetype: '', courseverid: 0, coursedesc: '', status: '',
teacherid: userStore.id, entpcoursefileid: id, classid,
entpcourseid, evalid, coursetitle,
plandate: curDate, opendate: curDate
}
await Http_Classcourse.addClasscourseReturnId(params)
dt.loading = false
getClasscourseList('update') //
ElMessage.success('创建课程-成功')
}
//
const removeClasscourse = async () => {
const { classcourseid:id } = teacherForm.form
const ind = listData.classcourseList.findIndex(o => o.id == id)
if(ind < 0) return ElMessage.warning('删除课堂记录-失败')
await ElMessageBox.confirm('请确认是否删除课堂记录?')
dt.loadingDel = true
const res = await Http_Classcourse.delClasscourse(id)
dt.loadingDel = false
if (res.code == 200) {
const list = listData.classcourseList
list.splice(ind, 1) // -id
//
if (list.length==0) teacherForm.classcourseid = 0
else {
const newInd = ind < list.length ? ind : ind-1
teacherForm.form.classcourseid = list[newInd].id
}
ElMessage.success('删除成功')
}
}
//
const classTeachingStart = async () => {
const { classcourseid:id } = teacherForm.form
if (id) { //
const url = `/teaching/classteaching?classcourseid=${id}&actor=classTeachingOnPublicScreen`
toLinkWeb(url) // web-
visible.value = false //
handleClose() // im-chat
}
}
//
const getQrUrl = () => {
const { classcourseid:id } = teacherForm.form
const { userName } = userStore.user
if (!id||!userName) return
const qrCodeUrl = `wxlogin?username=${userName}&nextaction=classteaching&id=${id}`
teacherForm.form.qrUrl = baseUrl + qrCodeUrl
}
// ================== =======================
// im-chat: {type, data}
const chatChange = (type, data, ...args) => {
if (type == 'msg') { // im-chat
console.log('msg:===== ',data, args)
// const msgId = (args||[])[0].message_msg_id
const { msgKey:head, msgcontent:msg, senduserid:sendId, msgType } = data
switch(head) {
case MsgEnum.HEADS.MSG_classcourseopen:{ // ,
const { classcourseid:id } = teacherForm.form
const { classcourseid: imId, status } = data
if (imId == id && status == 'open') {
classTeachingStart() //
}
break}
default:
console.log('未知消息:', data)
break
}
}
}
// -id
watch(() => classForm.form.classid, (val)=> {
//
dt.atCourse = listData.classList.find(o => o.id === val) || {}
// -
listData.activeStudentList = dt.atCourse?.classstudentlist || []
//
listData.classcourseList = []
// ,
if (dt.isHistory) getClasscourseList()
})
// -id
watch(() => teacherForm.form.classcourseid, (val) => {
const bool = !!val
// -
bool && getQrUrl()
// id
teacherForm.itemOption.forEach(o => {
// id
if (['qrUrl','backup'].includes(o.prop)) o.show = bool
// id
if (['mobile'].includes(o.prop)) o.show = !bool
})
})
//
defineExpose({
open
})
</script>
<style lang="scss" scoped>
.class-all{
text-align: left;
}
</style>

View File

@ -19,23 +19,23 @@
ref="ruleFormRef" ref="ruleFormRef"
> >
<el-form-item label="姓名" prop="name" v-if="type==1 && activeIndex==1"> <el-form-item label="姓名" prop="name" v-if="type==1 && activeIndex==1">
<el-input v-model="ruleForm.name" /> <el-input v-model="ruleForm.name" placeholder="请输入姓名" />
</el-form-item> </el-form-item>
<el-form-item label="身份证号" prop="idNumber" v-if="type==1 && activeIndex==1"> <el-form-item label="身份证号" prop="idNumber" v-if="type==1 && activeIndex==1">
<el-input v-model="ruleForm.idNumber" /> <el-input v-model="ruleForm.idNumber" placeholder="请输入身份证号码" />
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="phoneNumber" v-if="activeIndex==1"> <el-form-item label="手机号" prop="phoneNumber" v-if="activeIndex==1">
<el-input v-model="ruleForm.phoneNumber" /> <el-input v-model="ruleForm.phoneNumber" placeholder="请输入手机号" />
</el-form-item> </el-form-item>
<el-form-item label="验证码" prop="Code" v-if="activeIndex==1"> <el-form-item label="验证码" prop="Code" v-if="activeIndex==1">
<el-input style="width:60%" v-model="ruleForm.Code" :disabled="true" /> <el-input style="width:60%" v-model="ruleForm.Code" :disabled="true" placeholder="请输入验证码" />
<el-button type="primary" style="margin-left:10px" @click="sendcaptchaImg">发送验证码</el-button> <el-button type="primary" style="margin-left:10px" @click="sendcaptchaImg">发送验证码</el-button>
</el-form-item> </el-form-item>
<el-form-item label="设置密码" prop="password" v-if="activeIndex==1"> <el-form-item label="设置密码" prop="password" v-if="activeIndex==1">
<el-input v-model="ruleForm.password" type="password" /> <el-input v-model="ruleForm.password" type="password" placeholder="6-30位至少包含数字和字母,允许特殊符号" />
</el-form-item> </el-form-item>
<el-form-item label="确认密码" prop="confirmPassword" v-if="activeIndex==1"> <el-form-item label="确认密码" prop="confirmPassword" v-if="activeIndex==1">
<el-input v-model="ruleForm.confirmPassword" type="password" /> <el-input v-model="ruleForm.confirmPassword" type="password" placeholder="请确认密码" />
</el-form-item> </el-form-item>
<el-form-item label="所属地区" prop="address" v-if="activeIndex==2"> <el-form-item label="所属地区" prop="address" v-if="activeIndex==2">
<el-cascader <el-cascader
@ -54,7 +54,7 @@
:data="gradeTree" :data="gradeTree"
multiple multiple
:render-after-expand="false" :render-after-expand="false"
style="width: 100%" style="width: 100%;-webkit-app-region: no-drag;"
/> />
</el-form-item> </el-form-item>
<el-form-item label="学科" prop="discipline" v-if="activeIndex==2"> <el-form-item label="学科" prop="discipline" v-if="activeIndex==2">
@ -235,6 +235,20 @@ const OpenModel = v =>{
} }
// //
const handleClose = () => { const handleClose = () => {
var restValue={
name: '',
idNumber:'',
phoneNumber: '',
Code:'',
password:'',
confirmPassword:'',
class:[],
discipline:[],
school:[],
}
Object.assign(ruleForm, restValue);
schoolSubject.value=[]
gradeTree.value=[]
if (ruleFormRef.value) ruleFormRef.value.resetFields() if (ruleFormRef.value) ruleFormRef.value.resetFields()
removeToken(); removeToken();
activeIndex.value=1 activeIndex.value=1
@ -337,6 +351,8 @@ const submitForm = async (formEl) => {
discipline:[], discipline:[],
school:[], school:[],
} }
schoolSubject.value=[]
gradeTree.value=[]
Object.assign(ruleForm, restValue); Object.assign(ruleForm, restValue);
activeIndex.value=1 activeIndex.value=1
dialogVisible.value=false dialogVisible.value=false

View File

@ -33,7 +33,7 @@
</el-form-item> </el-form-item>
<div class="flex mb-4" style="display: flex;justify-content: center;color: #ccc;cursor: pointer;"> <div class="flex mb-4" style="display: flex;justify-content: center;color: #ccc;cursor: pointer;">
<a class="hover:text-sky-500" style="margin-right: 10px;" @click="RegisterModel(1)">注册账号</a> <a class="hover:text-sky-500" style="margin-right: 10px;" @click="RegisterModel(1)">注册账号</a>
<!-- | --> |
<a class="hover:text-sky-500" style="margin-left: 10px;" @click="RegisterModel(2)">忘记密码</a> <a class="hover:text-sky-500" style="margin-left: 10px;" @click="RegisterModel(2)">忘记密码</a>
</div> </div>
</el-form> </el-form>

View File

@ -159,6 +159,8 @@
:book-id="uploadData.textbookId" :book-id="uploadData.textbookId"
@add-success="initReserv" @add-success="initReserv"
></reserv> ></reserv>
<!-- 上课配置 -->
<class-start ref="calssRef"/>
</template> </template>
<script setup> <script setup>
import { Check,Plus } from '@element-plus/icons-vue' import { Check,Plus } from '@element-plus/icons-vue'
@ -190,6 +192,7 @@ import { getClassInfo, getSelfReserv } from '@/api/classManage'
import { useGetHomework } from '@/hooks/useGetHomework' import { useGetHomework } from '@/hooks/useGetHomework'
import { addEntpcoursefileReturnId } from '@/api/education/entpcoursefile' import { addEntpcoursefileReturnId } from '@/api/education/entpcoursefile'
import ClassReserv from '@/views/classManage/classReserv.vue' import ClassReserv from '@/views/classManage/classReserv.vue'
import classStart from '@/views/desktop/container/class-start.vue' //
const toolStore = useToolState() const toolStore = useToolState()
const fs = require('fs') const fs = require('fs')
@ -206,7 +209,8 @@ export default {
FileOperBatch, FileOperBatch,
MoveFile, MoveFile,
SetHomework, SetHomework,
ClassReserv ClassReserv,
classStart
}, },
data() { data() {
return { return {
@ -300,6 +304,8 @@ export default {
} }
if(item.fileFlag === 'apt') { if(item.fileFlag === 'apt') {
//TODO apt //TODO apt
const { fileId: aptId } = item
this.$refs.calssRef.open(aptId)
} }
}, },
initReserv(id) { initReserv(id) {

View File

@ -8,7 +8,7 @@ import { ipcMsgSend, ipcHandle, ipcMain, ipcMsgInvoke } from '@/utils/tool' //
const userStore = useUserStore() const userStore = useUserStore()
const emits = defineEmits(['change']) const emits = defineEmits(['change'])
const props = defineProps({ const props = defineProps({
isGroup: { type: Boolean, default: false }, // group: { type: Boolean, default: false }, //
}) })
const imChatObj = reactive({imChat:null}) const imChatObj = reactive({imChat:null})
onMounted(() => { onMounted(() => {
@ -16,7 +16,7 @@ onMounted(() => {
}) })
// im-chat // im-chat
const initImChat = async (timGroupId) => { const initImChat = async (timGroupId) => {
// console.log('im-chat', userStore.user.timuserid) // console.log('im-chat', userStore.user.timuserid, props)
try { try {
const { timuserid, deptId, userId } = userStore.user const { timuserid, deptId, userId } = userStore.user
// //
@ -26,7 +26,6 @@ const initImChat = async (timGroupId) => {
// //
const groupName = `${deptId}-classteaching-${userId}` const groupName = `${deptId}-classteaching-${userId}`
// im-chat // im-chat
// await ipcMsgInvoke('im-chat:init', sdkAppId)
imChatObj.imChat = new ImChat(sdkAppId, sign, timuserid) imChatObj.imChat = new ImChat(sdkAppId, sign, timuserid)
// im-chat // im-chat
await imChatObj.imChat.init() await imChatObj.imChat.init()
@ -37,11 +36,12 @@ const initImChat = async (timGroupId) => {
}) })
// im-chat(-) // im-chat(-)
await imChatObj.imChat.login() await imChatObj.imChat.login()
// console.log('im-chat-login-success', userStore.user)
// //
if (!timGroupId||props.isGroup) { // if (timGroupId) { // -id
await createGroup(groupName)
} else { // -id
imChatObj.imChat.timGroupId = timGroupId imChatObj.imChat.timGroupId = timGroupId
} else {
if (props.group) await createGroup(groupName) //
} }
return imChatObj.imChat return imChatObj.imChat
} }

View File

@ -10,7 +10,7 @@
<upvote-vue ref="upvoteRef" type="2"></upvote-vue> <upvote-vue ref="upvoteRef" type="2"></upvote-vue>
<!-- im-chat 聊天组件 --> <!-- im-chat 聊天组件 -->
<im-chat ref="imChatRef" @change="chatChange" /> <im-chat ref="imChatRef" @change="chatChange" isGroup />
<!-- 底部工具栏 --> <!-- 底部工具栏 -->
<div class="tool-bottom-all" @mouseenter="mouseChange(0)" @mouseleave="mouseChange(1)"> <div class="tool-bottom-all" @mouseenter="mouseChange(0)" @mouseleave="mouseChange(1)">