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

Reviewed-on: #277

src/renderer/src/components/common/cForm.vue

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

src/renderer/src/components/pdf/index copy.vue

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

src/renderer/src/components/pdf/index.vue

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

src/renderer/src/views/classTask/container/item-dialog.vue

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

src/renderer/src/views/login/components/Register.vue

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

src/renderer/src/views/tool/sphere.vue

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