Merge remote-tracking branch 'origin/master'

ruoyi-ui/src/views/smartSchool/classTeacherWork/laboratoryManagement/laboratoryArrangements/index.vue

@@ -192,7 +192,7 @@ export default {
                 experimentClassify: "",
                 experimentClassify: "",
                 experimentName: "",
                 experimentName: "",
             },
             },
-          
+
             //班级
             //班级
             classData: [],
             classData: [],
             //实验名称
             //实验名称
@@ -268,6 +268,8 @@ export default {
                 schoolYear: this.queryForm.schoolYear,
                 schoolYear: this.queryForm.schoolYear,
                 experimentClassify: this.queryForm.experimentClassify,
                 experimentClassify: this.queryForm.experimentClassify,
                 experimentName: this.queryForm.experimentName,
                 experimentName: this.queryForm.experimentName,
+                pageNum: this.queryForm.pageNum, // 绑定到 queryForm.pageNum 上
+                pageSize: this.queryForm.pageSize, // 绑定到 queryForm.pageSize 上
             };
             };
 
 
             try {
             try {
@@ -281,6 +283,7 @@ export default {
                 console.error(error);
                 console.error(error);
             }
             }
         },
         },
+
         //获取当前学期
         //获取当前学期
         async getSemester() {
         async getSemester() {
             try {
             try {

ruoyi-ui/src/views/smartSchool/laboratoryManagement/laboratoryManagements/laboratoryCompetition/index.vue

@@ -422,6 +422,7 @@ export default {
         if (valid) {
         if (valid) {
           if (this.form.id != "") {
           if (this.form.id != "") {
             updateCompetition(this.form).then(({ code }) => {
             updateCompetition(this.form).then(({ code }) => {
+              console.log(this.form, 'this.form');
               if (code == 200) {
               if (code == 200) {
                 this.$modal.msgSuccess('修改成功')
                 this.$modal.msgSuccess('修改成功')
                 this.dialogVisible = false
                 this.dialogVisible = false

ruoyi-ui/src/views/smartSchool/massOrganization/communityStyle/index.vue

@@ -157,7 +157,7 @@
               <img
               <img
                 v-for="(item, index) in form.file"
                 v-for="(item, index) in form.file"
                 :key="index"
                 :key="index"
-                :src="item"
+                :src="pev + item"
                 class="avatar"
                 class="avatar"
               />
               />
             </div>
             </div>

ruoyi-ui/src/views/smartSchool/schoolProperty/lendingReturn/index.vue

@@ -104,8 +104,8 @@
         <el-row :gutter="30">
         <el-row :gutter="30">
           <el-col :span="12">
           <el-col :span="12">
             <el-form-item label="借用期限（天）" prop="deadline">
             <el-form-item label="借用期限（天）" prop="deadline">
-              <el-input v-model="lendReturnForm.deadline" placeholder="请输入借用期限" :disabled="nowType == 2 ? true : false"
-                type="number"></el-input>
+              <el-input v-model="lendReturnForm.deadline" placeholder="请输入借用期限" :disabled="nowType === 2"
+                @input="handleInput"></el-input>
             </el-form-item>
             </el-form-item>
           </el-col>
           </el-col>
           <el-col :span="12">
           <el-col :span="12">
@@ -204,7 +204,7 @@ export default {
         borrowById: '',
         borrowById: '',
         borrowBy: '',
         borrowBy: '',
         purpose: '',
         purpose: '',
-        deadline: '',
+        deadline: null,
         returnTime: '',
         returnTime: '',
         returnEquipmentCondition: '',
         returnEquipmentCondition: '',
         receivedById: '',
         receivedById: '',
@@ -245,6 +245,15 @@ export default {
     this.getList()
     this.getList()
   },
   },
   methods: {
   methods: {
+    handleInput() {
+      // 获取输入框的值
+      let value = this.lendReturnForm.deadline;
+      // 移除非数字字符，包括小数点和负号
+      value = value.replace(/[^0-9]/g, '');
+      // 更新输入框的值
+      this.lendReturnForm.deadline = value;
+    },
+
     // 获取列表数据
     // 获取列表数据
     getList() {
     getList() {
       this.loading = true
       this.loading = true

ruoyi-ui/src/views/smartSchool/teacherManage/teacherInforManage/index.vue

@@ -7,9 +7,10 @@
             style="margin-bottom: 20px" />
             style="margin-bottom: 20px" />
         </div>
         </div>
         <div class="head-container">
         <div class="head-container">
-          <el-tree :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
-            :filter-node-method="filterNode" ref="tree" default-expand-all="false" highlight-current
-            @node-click="handleNodeClick" />
+          <el-tree v-if="deptOptions.length > 0" :data="deptOptions" :props="defaultProps" :expand-on-click-node="false"
+            :filter-node-method="filterNode" ref="tree" :default-expanded-keys="[]" highlight-current
+            @node-click="handleNodeClick"></el-tree>
+
         </div>
         </div>
       </el-col>
       </el-col>
       <el-col :span="20" :xs="24">
       <el-col :span="20" :xs="24">
@@ -569,7 +570,7 @@ export default {
     //   this.initPassword = response.msg
     //   this.initPassword = response.msg
     // })
     // })
   },
   },
- 
+
   methods: {
   methods: {
     handleSelectionChange(selectedItems) {
     handleSelectionChange(selectedItems) {
       if (selectedItems.length > 8) {
       if (selectedItems.length > 8) {