zhuhao
/
AIx_Smarttalk
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 26 Wiki Activity

Merge pull request 'zdg' (#277) from zdg into main 

Reviewed-on: #277
This commit is contained in:
zhengdegang 2024-09-27 09:29:44 +08:00
parent 0d5e9755cb 785b70d888
commit 1152859479
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/renderer/src/components/common/cForm.vue
View File

@ -145,7 +145,6 @@ export default {
} }
}, },
created() { created() {
window.test = this
this.slotKeys = Object.keys(this.$slots) this.slotKeys = Object.keys(this.$slots)
}, },
methods: { methods: {

2
src/renderer/src/components/pdf/index copy.vue
View File

@ -285,7 +285,7 @@ onMounted(async () => {
canvas2.canvas.setWidth(window.innerWidth / 2 - 100) canvas2.canvas.setWidth(window.innerWidth / 2 - 100)
// canvas2.canvas.isDrawingMode=false // canvas2.canvas.isDrawingMode=false
canvas1FabricVue.value = canvas2 canvas1FabricVue.value = canvas2
window.test = { canvas1, canvas2 } // window.test = { canvas1, canvas2 }
emit('update:numPagesTotal', pdf.numPages) emit('update:numPagesTotal', pdf.numPages)
if (props.pdfObj.allPageData.length) { if (props.pdfObj.allPageData.length) {

2
src/renderer/src/components/pdf/index.vue
View File

@ -294,7 +294,7 @@ onMounted(async () => {
canvas2.canvas.setWidth(window.innerWidth / 2 - 100) canvas2.canvas.setWidth(window.innerWidth / 2 - 100)
// canvas2.canvas.isDrawingMode=false // canvas2.canvas.isDrawingMode=false
canvas1FabricVue.value = canvas2 canvas1FabricVue.value = canvas2
window.test = { canvas1, canvas2 } // window.test = { canvas1, canvas2 }
emit('update:numPagesTotal', pdf.numPages) emit('update:numPagesTotal', pdf.numPages)
if (props.pdfObj.allPageData.length) { if (props.pdfObj.allPageData.length) {

2
src/renderer/src/views/classTask/container/item-dialog.vue
View File

@ -234,7 +234,7 @@ const openDialog = (data) => {
classWorkAnalysis.activeQuizAnalysisData = [] classWorkAnalysis.activeQuizAnalysisData = []
classWorkAnalysis.row = data classWorkAnalysis.row = data
window.test = this // window.test = this
// zdg: 学生列表 // zdg: 学生列表
const studentArr = data.classworkdatastudentids const studentArr = data.classworkdatastudentids
? JSON.parse(`[${data.classworkdatastudentids}]`) ? JSON.parse(`[${data.classworkdatastudentids}]`)

13
src/renderer/src/views/login/components/Register.vue
View File

@ -44,7 +44,6 @@
v-model="ruleForm.address" v-model="ruleForm.address"
:options="regionData" :options="regionData"
@change="handleChange" @change="handleChange"
:props="{checkStrictly: true}"
/> />
</el-form-item> </el-form-item>
<el-form-item label="学校" prop="school" v-if="activeIndex==2"> <el-form-item label="学校" prop="school" v-if="activeIndex==2">
@ -241,15 +240,16 @@ const handleClose = () => {
confirmPassword:'', confirmPassword:'',
class:[], class:[],
discipline:[], discipline:[],
school:[], school:[100,255,279],
address:["50","5001","500101"]
} }
Object.assign(ruleForm, restValue); Object.assign(ruleForm, restValue);
schoolSubject.value=[] schoolSubject.value=[]
gradeTree.value=[] gradeTree.value=[]
if (ruleFormRef.value) ruleFormRef.value.resetFields() if (ruleFormRef.value) ruleFormRef.value.resetFields()
removeToken(); removeToken();
activeIndex.value=1
dialogVisible.value=false dialogVisible.value=false
activeIndex.value=1
} }
const nextStep = (formEl) => { const nextStep = (formEl) => {
@ -346,13 +346,14 @@ const submitForm = async (formEl) => {
confirmPassword:'', confirmPassword:'',
class:[], class:[],
discipline:[], discipline:[],
school:[], school:[100,255,279],
address:["50","5001","500101"]
} }
schoolSubject.value=[] schoolSubject.value=[]
gradeTree.value=[] gradeTree.value=[]
Object.assign(ruleForm, restValue); Object.assign(ruleForm, restValue);
activeIndex.value=1
dialogVisible.value=false dialogVisible.value=false
activeIndex.value=1
}else{ }else{
ElMessage.error(res.msg) ElMessage.error(res.msg)
} }
@ -495,7 +496,7 @@ const gradeName = (key) =>{
} }
onMounted(()=>{ onMounted(()=>{
//默认给到地区重庆 //默认给到地区重庆
ruleForm.address = ['50'] ruleForm.address = ["50","5001","500101"]
//默认给到学校的值 //默认给到学校的值
ruleForm.school = [100,255,279] ruleForm.school = [100,255,279]
}) })

4
src/renderer/src/views/tool/sphere.vue
View File

@ -84,8 +84,8 @@ const btnList = [ // 工具栏按钮列表
// === 页面加载完毕 === // === 页面加载完毕 ===
onMounted(async() => { onMounted(async() => {
if (!electron) return // 浏览器端 if (!electron) return // 浏览器端
window.test = sessionStore // window.test = sessionStore
window.test1 = toolStore // window.test1 = toolStore
getClassInfo() // 获取课堂详情 ex3 getClassInfo() // 获取课堂详情 ex3
resetStatus() // 开启重置状态-监听 resetStatus() // 开启重置状态-监听
}) })