zhuhao
/
AIx_Smarttalk_WS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zhuhao:1c463ed58bcf36eef0bda7b31fe9da26e911e784
Branches Tags
zhuhao:main
zhuhao:lyc-dev
zhuhao:yangws_ws
zhuhao:zxl
zhuhao:zouyf_dev
zhuhao:baigl
..
compare: zhuhao:7a18c1927a66f336a2b3c56fb53c7065f8acb4dc
Branches Tags
zhuhao:lyc-dev
zhuhao:main
zhuhao:yangws_ws
zhuhao:zxl
zhuhao:zouyf_dev
zhuhao:baigl

No commits in common. "1c463ed58bcf36eef0bda7b31fe9da26e911e784" and "7a18c1927a66f336a2b3c56fb53c7065f8acb4dc" have entirely different histories.
1c463ed58b ... 7a18c1927a

10 changed files with 470 additions and 266 deletions
Show Stats Expand all files Collapse all files

10
src/renderer/src/assets/iconfont/iconfont.css
View File

@ -1,8 +1,8 @@
@font-face {
font-family: "iconfont"; /* Project id 4723712 */
src: url('iconfont.woff2?t=1730256542457') format('woff2'),
url('iconfont.woff?t=1730256542457') format('woff'),
url('iconfont.ttf?t=1730256542457') format('truetype');
src: url('iconfont.woff2?t=1730255375658') format('woff2'),
url('iconfont.woff?t=1730255375658') format('woff'),
url('iconfont.ttf?t=1730255375658') format('truetype');
}
.iconfont {
@ -13,10 +13,6 @@
-moz-osx-font-smoothing: grayscale;
}
.icon-A:before {
content: "\e6ef";
}
.icon-yanhouke-shengyinyichang:before {
content: "\e672";
}

2
src/renderer/src/assets/iconfont/iconfont.js
View File

File diff suppressed because one or more lines are too long

7
src/renderer/src/assets/iconfont/iconfont.json
View File

@ -5,13 +5,6 @@
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
{
"icon_id": "12688893",
"name": "A",
"font_class": "A",
"unicode": "e6ef",
"unicode_decimal": 59119
},
{
"icon_id": "5257347",
"name": "咽喉科-声音异常",

443
src/renderer/src/assets/iconfont/iconfont.svg Normal file
View File

File diff suppressed because one or more lines are too long
Side by Side

After

Width:  |  Height:  |  Size: 369 KiB

BIN
src/renderer/src/assets/iconfont/iconfont.ttf
View File

Binary file not shown.

BIN
src/renderer/src/assets/iconfont/iconfont.woff
View File

Binary file not shown.

BIN
src/renderer/src/assets/iconfont/iconfont.woff2
View File

Binary file not shown.

232
src/renderer/src/views/classManage/components/newClass.vue
View File

@ -1,232 +0,0 @@
<template>
<div>
<el-dialog v-model="dialogVisible" title="创建班级" width="50%" append-to-body>
<el-form
style="width: 100%"
label-width="auto"
:model="classForm"
:rules="rules"
ref="myForm"
>
<el-form-item label="班级名称" style="margin-right: 10px;width: 100%" prop="caption">
<el-input v-model="classForm.caption" placeholder="请输入班级名称"></el-input>
</el-form-item>
<el-form-item label="任选学科" style="margin-right: 10px;">
<el-radio-group v-model="classForm.edusubject" class="ml-4">
<template v-for="(item, index) in courseList" :key="index">
<el-radio v-if="item.edustage == userStore.edustage" :label="item.itemtitle">{{ item.itemtitle }}</el-radio>
</template>
</el-radio-group>
</el-form-item>
<el-form-item label="年级" style="margin-right: 10px;" prop="agekey">
<el-radio-group v-model="classForm.agekey">
<template v-for="(item, index) in gradeList" :key="index">
<el-radio v-if="item.edustage == userStore.edustage" :label="item.agekey">{{ item.label }}</el-radio>
</template>
</el-radio-group>
</el-form-item>
<el-form-item label="老师" prop="teacherid">
{{ userStore.nickName }}
</el-form-item>
<el-form-item label="简要说明" style="margin-right: 10px;" prop="classdesc">
<el-input v-model="classForm.classdesc" placeholder="请输入简要说明"></el-input>
</el-form-item>
</el-form>
<template #footer>
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="btnSave">确 定</el-button>
</template>
</el-dialog>
</div>
</template>
<script setup>
import { ref, onMounted, reactive, watch, defineEmits, defineExpose } from 'vue'
import { listClassmain, addClassmain, listEvaluation } from '@/api/classManage/index'
import useUserStore from '@/store/modules/user'
import { ElMessage } from 'element-plus'
import delClassDemo from '@/store/modules/delClass'
const userStore = useUserStore().user
const emit = defineEmits(['refreshList'])
const isDel = delClassDemo()
// 获取班级信息
const classList = ref([])
// 创建班级基本信息
const classForm = reactive({
caption: '',
classdesc: '',
teacherid: '',
agekey: '',
edusubject: userStore.edusubject,
edudegree: userStore.edustage
})
// 学科列表
const courseList = ref([])
// 班级id
const classId = ref('')
// 当前页面
const currentIndex = ref(0)
// 年级
const gradeList = ref([
{ label: '一年级', value: '1年级', checked: false, edustage: '小学', agekey: 1 },
{ label: '二年级', value: '2年级', checked: false, edustage: '小学', agekey: 2 },
{ label: '三年级', value: '3年级', checked: false, edustage: '小学', agekey: 3 },
{ label: '四年级', value: '4年级', checked: false, edustage: '小学', agekey: 4 },
{ label: '五年级', value: '5年级', checked: false, edustage: '小学', agekey: 5 },
{ label: '六年级', value: '6年级', checked: false, edustage: '小学', agekey: 6 },
{ label: '初一', value: '初一', checked: false, edustage: '初中', agekey: 7 },
{ label: '初二', value: '初二', checked: false, edustage: '初中', agekey: 8 },
{ label: '初三', value: '初三', checked: false, edustage: '初中', agekey: 9 },
{ label: '高一', value: '高一', checked: false, edustage: '高中', agekey: 10 },
{ label: '高二', value: '高二', checked: false, edustage: '高中', agekey: 11 },
{ label: '高三', value: '高三', checked: false, edustage: '高中', agekey: 12 },
])
// 打开班级
const dialogVisible = ref(false)
// 校验表单
const myForm = ref(null)
const rules = reactive({
caption: [
{ required: true, message: '请输入班级名称', trigger: 'blur' },
{ min: 1, max: 10, message: '班级名称必须是 1-10 位 的字符', trigger: 'blur' }
],
agekey: [
{ required: true, message: '请选择年级', trigger: 'change' }
],
})
// 获取班级信息
const getClassInfo = () => {
classList.value = []
listClassmain({ entpid: userStore.deptId, pageSize: 500, status: 'open' }).then(response => {
response.rows.forEach(item => {
if (item.classteacherids && Number(item.classteacherids) === userStore?.id) {
classList.value.push(item)
}
})
if (classList.value.length > 0) {
classId.value = classList.value[0].id
currentIndex.value = 0
}
});
}
// 获取所有学科
const getCourseList = () => {
// 获取基础的学科
listEvaluation({ itemkey: "subject", pageSize: 500 }).then((res) => {
courseList.value = [...res.rows];
});
}
// 新增班级
const addClass = () => {
dialogVisible.value = true
getCourseList()
getClassInfo()
}
const btnSave = () => {
myForm.value.validate((valid) => {
if (valid) {
// 查看班级是否重名
listClassmain({ entpid: userStore.deptId, status: 'open', pageSize: 500 }).then(response => {
const data = [...response.rows]
const existList = [];
data.forEach(item => {
if (parseInt(textSimilar(item.caption, classForm.caption, 2)) > 80) {
existList.push(item);
}
})
if (existList.length == 0) {
const age = classForm.agekey;
const index = gradeList.value.findIndex(item => item.agekey === age);
classForm.edudegree = gradeList.value[index].value
classForm.entpid = userStore.deptId;
classForm.status = 'open';
classForm.teachername = userStore.nickName;
classForm.teacherid = userStore.userId;
classForm.teacherSubject = classForm.edusubject;
classForm.action = 'new';
classForm.teachtype = 'standard';
classForm.isSaving = true;
addClassmain(classForm).then(response => {
if (response.code === 200) {
dialogVisible.value = false
ElMessage({
message: '新增成功',
type: 'success',
})
emit('refreshList')
}
});
} else {
ElMessage({
message: '班级名称重复',
type: 'warning',
})
}
})
}
})
}
// 文本计算
const textSimilar = (s, t, f) => {
if (!s || !t) {
return 0
}
if (s === t) {
return 100;
}
var l = s.length > t.length ? s.length : t.length
var n = s.length
var m = t.length
var d = []
f = f || 2
var min = function (a, b, c) {
return a < b ? (a < c ? a : c) : (b < c ? b : c)
}
var i, j, si, tj, cost
if (n === 0) return m
if (m === 0) return n
for (i = 0; i <= n; i++) {
d[i] = []
d[i][0] = i
}
for (j = 0; j <= m; j++) {
d[0][j] = j
}
for (i = 1; i <= n; i++) {
si = s.charAt(i - 1)
for (j = 1; j <= m; j++) {
tj = t.charAt(j - 1)
if (si === tj) {
cost = 0
} else {
cost = 1
}
d[i][j] = min(d[i - 1][j] + 1, d[i][j - 1] + 1, d[i - 1][j - 1] + cost)
}
}
let res = (1 - d[n][m] / l) * 100
return res.toFixed(f)
}
watch(() => isDel.idDelete, () => {
// 判断是否更改了班级
getClassInfo()
isDel.idDelete = false
})
defineExpose({
addClass
})
</script>
<style scoped>
.el-card-demo {
width: 200px;
overflow-y: auto;
display: flex;
justify-content: space-between;
flex-direction: column;
}
</style>

41
src/renderer/src/views/classManage/index.vue
View File

@ -1,15 +1,14 @@
<template>
<div class="common-layout">
<el-container>
<el-aside style="width: 230px;">
<el-card style="width: 230px" class="el-card-demo">
<el-aside style="width: 200px;">
<el-card style="width: 200px" class="el-card-demo">
<div >
<Aside :menuItems="menuItems" :classList="classList" @handleSelect="handleSelect"></Aside>
</div>
<template #footer>
<div style="display: flex;">
<el-button @click="addClass" type="primary">加入班级</el-button>
<el-button @click="addNewClass" type="primary">创建班级</el-button>
<div>
<el-button @click="addClass" type="primary" :icon="Plus" >加入班级</el-button>
</div>
</template>
</el-card>
@ -24,11 +23,11 @@
<!-- 分组情况-->
<BasicGroup v-else-if="currentIndex==2" :classId="classId"></BasicGroup>
</div>
<!-- 创建班级 -->
<NewClass ref="newClassRef" @refreshList="refreshList"/>
</el-container>
</div>
<el-dialog v-model="dialogVisible" title="加入班级" width="50%" append-to-body>
<el-dialog v-model="dialogVisible" title="新增班级" width="50%" append-to-body>
<el-form
style="width: 100%"
label-width="auto"
@ -70,14 +69,11 @@
import BasicGroup from './basicGroup.vue'
import ClassInfo from './classInfo.vue'
import Aside from './aside.vue'
import NewClass from './components/newClass.vue'
const userStore = useUserStore().user
const isDel = delClassDemo()
//获取班级信息
const classList = ref([])
// 创建新班级
const newClassRef = ref()
const menuItems = [
{
index: '1-1',
@ -112,6 +108,21 @@
const classId = ref(0)
//当前页面
const currentIndex = ref(0)
//年级
const gradeList = ref([
{ label: '一年级', value: '1年级', checked: false, edustage: '小学', agekey: 1 },
{ label: '二年级', value: '2年级', checked: false, edustage: '小学', agekey: 2 },
{ label: '三年级', value: '3年级', checked: false, edustage: '小学', agekey: 3 },
{ label: '四年级', value: '4年级', checked: false, edustage: '小学', agekey: 4 },
{ label: '五年级', value: '5年级', checked: false, edustage: '小学', agekey: 5},
{ label: '六年级', value: '6年级', checked: false, edustage: '小学', agekey: 6 },
{ label: '初一', value: '初一', checked: false, edustage: '初中', agekey: 7 },
{ label: '初二', value: '初二', checked: false, edustage: '初中', agekey: 8 },
{ label: '初三', value: '初三', checked: false, edustage: '初中', agekey: 9 },
{ label: '高一', value: '高一', checked: false, edustage: '高中', agekey: 10 },
{ label: '高二', value: '高二', checked: false, edustage: '高中', agekey: 11 },
{ label: '高三', value: '高三', checked: false, edustage: '高中', agekey: 12 },
])
//打开班级
const dialogVisible = ref(false)
//班级列表
@ -276,14 +287,6 @@
classId.value = obj.id
currentIndex.value = obj.index
}
// 创建班级
const addNewClass = () => {
newClassRef.value.addClass()
}
// 刷新列表
const refreshList = () => {
getClassInfo()
}
onMounted(() => {
getClassInfo()

1
src/renderer/src/views/profile/index.vue
View File

@ -66,6 +66,7 @@ onMounted(() => {
}
.text-center {
margin-bottom: 15px;
border-bottom: 1px solid #dddddd;
display: flex;
align-items: center;
.info{