Merge branch 'main' of http://47.112.118.149:10082/xgxt_sd/zhxg_pc

2025-10-22 10:01:49 +08:00
parent f0a7bf3c6c 679f7b7b15
commit 081939df01
2 changed files with 11 additions and 14 deletions
--- a/src/views/routine/classmetting/content/xw.vue
+++ b/src/views/routine/classmetting/content/xw.vue
@@ -250,7 +250,7 @@
    methods: {
      downloadFile(row) {
        console.log(row)
-        this.$download.zip('/runtine/ClassMettingTheme/downloadFile/' + row.cmNo, row.cmTitle + '.zip')
+        this.$download.zip('/runtine/ClassMettingTheme/downloadXwFile/' + row.cmNo, row.cmTitle + '.zip')
      },
      doExport(row){
        this.download('runtine/ClassMettingTheme/exportXwSubmit/'+row.cmNo, {
--- a/src/views/stuCQS/good/MeritStudentView.vue
+++ b/src/views/stuCQS/good/MeritStudentView.vue
@@ -607,10 +607,6 @@ export default {
        this.getList()
      }
    },
-  },
-
-
-  // ... existing code ...
    resetAddForm() {
      this.addForm = {
        zzmm: '',
@@ -622,6 +618,7 @@ export default {
      }
    }

+  }
 }
 </script>
 <style lang="scss" scoped>