zpy 10.12

ruoyi-ui/src/views/smartSchool/InstrumentDrugAdministration/instrumentClassification/index.vue

@@ -41,7 +41,6 @@
                 </template>
             </el-table-column>
         </el-table>
-
         <!-- 弹窗 -->
         <el-dialog :title="title" :visible.sync="dialogTableVisible" width="30%" show-close>
             <el-form :model="form" ref="form" size="small" :rules="rules" label-width="108px">
@@ -75,7 +74,6 @@
                                 <el-radio label='1'>是</el-radio>
                                 <el-radio label='0'>否</el-radio>
                             </el-radio-group>
-
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -87,13 +85,11 @@
                     </el-col>
                 </el-row>
             </el-form>
-
             <div slot="footer">
                 <el-button type="primary" @click="submitparentForm">确定</el-button>
                 <el-button @click="cancel">取 消</el-button>
             </div>
         </el-dialog>
-
         <!-- 分页 -->
         <pagination v-show="total > 0" :total="total" :page.sync="queryForm.pageNum" :limit.sync="queryForm.pageSize"
             @pagination="getList" />
@@ -123,9 +119,7 @@ export default {
             },
             selectedRows: [], // 用于存储选择的行数据
             //表格数据
-            tableData: [
-
-            ],
+            tableData: [  ],
             nowType: 0, // 0新增、1编辑、2查看
             title: '',
             // 弹窗
@@ -216,6 +210,7 @@ export default {
                         Object.keys(this.form).forEach(key => {
                             if (res.data[key]) {
                                 this.$set(this.form, key, res.data[key]);
+                                
                             }
                         });
                     }

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

@@ -361,8 +361,6 @@ export default {
             } else {
                 this.postForm.accessoryUrl = '';
                 this.postForm.accessoryName = '';
-
-
             }
         },
 

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

@@ -339,7 +339,6 @@ export default {
                 console.log('response', response);
                 this.loading = false;
                 this.getClasslist();
-        
                 this.dialogTableVisible = true;
             });
         },

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

@@ -406,8 +406,7 @@ export default {
     methods: {
 
         getList() {
-            getApplylist(this.queryForm)
-                .then(response => {
+            getApplylist(this.queryForm).then(response => {
                 this.tableData = response.rows;
                 this.tableData = response.rows.map(item => {
                     item.accessoryList = item.schoolAccessoryList; // 将附件信息赋值给accessoryList属性
@@ -519,6 +518,7 @@ export default {
 
 
         },
+
         //上传按钮
         getFileList(data) {
             console.log('data', data);
@@ -527,6 +527,8 @@ export default {
             if (this.fileList.length != 0) {
                 this.postForm.accessoryUrl = data[0].fjlj;
                 this.postForm.accessoryName = data[0].fjmc;
+                console.log(this.postForm.accessoryName);
+                console.log(this.postForm.accessoryUrl);
                 console.log('this.postForm', this.postForm);
             } else {
                 this.postForm.accessoryUrl = '';
@@ -724,6 +726,4 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped>
-
-</style>
\ No newline at end of file
+<style lang="scss" scoped></style>
\ No newline at end of file

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

@@ -42,8 +42,8 @@
           <el-image style="width: 100px; height: 100px" :src="scope.row.pictureUrl"
             :preview-src-list="scope.row.previewUrls"></el-image>
         </template>
-      </el-table-column>
 
+      </el-table-column>
       <el-table-column label="备注1" align="center" prop="remark1" />
       <el-table-column label="备注2" align="center" prop="remark2" />
       <el-table-column label="备注3" align="center" prop="remark3" />
@@ -60,16 +60,16 @@
 
     <!-- 新增、编辑、查看弹窗 -->
     <el-dialog title="详细信息" :visible.sync="dialogVisible" width="50%">
-      <el-form :model="form" ref="form" size="small" label-width="108px" :disabled="isEdit">
+      <el-form :model="form" ref="form" size="small" label-width="108px" :disabled="isEdit" :rules="rules">
         <el-row>
           <el-col :span="10">
-            <el-form-item label="学年">
+            <el-form-item label="学年" prop="schoolYear">
               <el-input v-model="form.schoolYear" placeholder="请输入" clearable
                 :disabled="nowType == 2 ? true : false"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="参赛老师">
+            <el-form-item label="参赛老师" prop="teacherName">
               <el-select v-model="form.teacherName" placeholder="请选择级部" clearable style="width: 100%;"
                 :disabled="nowType == 2 ? true : false">
                 <el-option v-for="(item, index) in teacherList" :key="index" :label="item.userName"
@@ -103,7 +103,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10">
-            <el-form-item label="比赛级别">
+            <el-form-item label="比赛级别" prop="competitionLevel">
               <el-select v-model="form.competitionLevel" placeholder="请选择" clearable style="width: 100%;"
                 :disabled="nowType == 2 ? true : false">
                 <el-option v-for="dict in dict.type.competition_level" :key="dict.value" :label="dict.label"
@@ -185,6 +185,8 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        competitionType: "",
+        competitionName: "",
       },
       previewImageUrl: '',
       //获取子组件传来的信息
@@ -216,6 +218,27 @@ export default {
         schoolAccessoryList: [],
 
       },
+      rules: {
+        schoolYear: [
+          { required: true, message: "学年不能为空", trigger: "blur" }
+        ],
+        teacherName: [
+          { required: true, message: "教师名称不能为空", trigger: "blur" }
+        ],
+        entrySubject: [
+          { required: true, message: "参赛课题不能为空", trigger: "blur" }
+        ],
+        competitionType: [
+          { required: true, message: "比赛类型不能为空", trigger: "blur" }
+        ],
+        competitionLevel: [
+          { required: true, message: "比赛级别不能为空", trigger: "blur" }
+        ],
+        schoolAccessoryList: [
+          { required: true, message: "证书照片不能为空", trigger: "blur" }
+        ],
+
+      },
       previewDialogVisible: false,
       teacherList: [],
       rules: {},
@@ -242,19 +265,20 @@ export default {
     },
     //获取列表数据
     getList() {
-      getCompetition(this.queryForm).then(response => {
-        this.competitionData = response.rows;
+      getCompetition(this.queryParams).then(response => {
+        this.competitionData = response.rows.map(item => {
+          item.previewUrls = item.schoolAccessoryList.map(accessory => accessory.accessoryUrl);
+
+          item.pictureUrl = item.schoolAccessoryList[0]?.accessoryUrl || ''; // 取第一个照片的URL或者为空字符串
+          return item;
+        });
         console.log('response', response);
         this.total = response.total;
         this.loading = false;
-
-        this.competitionData.forEach(item => {
-          item.previewUrls = [item.schoolAccessoryList.map(accessory => accessory.accessoryUrl)];
-          item.pictureUrl = item.schoolAccessoryList.map(accessory => accessory.accessoryUrl);
-        });
       });
     },
 
+
     //获取图片信息
     getSchoolInfoPic(val) {
       this.pic = val
@@ -306,7 +330,13 @@ export default {
 
     //重置
     resetQuery() {
-
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        competitionType: "",
+        competitionName: "",
+      },
+        this.getList();
 
     },