Merge branch 'master' of 49.232.152.146:xhxy/smart_school

ruoyi-ui/src/store/modules/user.js

@@ -82,7 +82,7 @@ const user = {
     GetInfo({commit, state}) {
     GetInfo({commit, state}) {
       return new Promise((resolve, reject) => {
       return new Promise((resolve, reject) => {
         getInfo().then(res => {
         getInfo().then(res => {
-          console.log(res, 81)
+          // console.log(res, 81)
           const user = res.user
           const user = res.user
           const teacher = res.teacher
           const teacher = res.teacher
           const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
           const avatar = (user.avatar == "" || user.avatar == null) ? require("@/assets/images/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;

ruoyi-ui/src/views/smartSchool/gradeWork/courseSelection/performance/index.vue

@@ -31,7 +31,8 @@
                      size="mini" :disabled="!isMultiple" @click="handleDelete">批量删除</el-button>
                      size="mini" :disabled="!isMultiple" @click="handleDelete">批量删除</el-button>
         </el-col>
         </el-col>
       </el-row>
       </el-row>
-      <el-table v-loading="loading" :data="achievementData" stripe>
+      <el-table v-loading="loading" :data="achievementData" stripe @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55"></el-table-column>
         <el-table-column fixed="left" label="序号" type="index" width="55" align="center"/>
         <el-table-column fixed="left" label="序号" type="index" width="55" align="center"/>
         <el-table-column fixed="left" label="学生姓名" align="center" prop="deviceNum"/>
         <el-table-column fixed="left" label="学生姓名" align="center" prop="deviceNum"/>
         <el-table-column fixed="left" label="学号" align="center" prop="userName"/>
         <el-table-column fixed="left" label="学号" align="center" prop="userName"/>
@@ -73,7 +74,7 @@
       <!-- 导入弹出框 -->
       <!-- 导入弹出框 -->
 
 
       <!--  新增编辑弹出框 -->
       <!--  新增编辑弹出框 -->
-      <el-dialog title="详细信息" :visible.sync="dialogVisible" width="40%">
+      <el-dialog title="详细信息" :visible.sync="dialogVisible" width="50%">
         <el-form :model="achievementForm" label-width="70px" label-position="left">
         <el-form :model="achievementForm" label-width="70px" label-position="left">
           <el-row :gutter="30">
           <el-row :gutter="30">
             <el-col :span="12">
             <el-col :span="12">
@@ -262,7 +263,9 @@ export default {
       loading:false,
       loading:false,
       total:0,
       total:0,
       isMultiple:false, // table是否有选择
       isMultiple:false, // table是否有选择
-      achievementData:[], // table数据
+      achievementData:[
+        {orgname:'111111'}
+      ], // table数据
       dialogVisible:false, // 新增编辑弹出框
       dialogVisible:false, // 新增编辑弹出框
       upload: {
       upload: {
         // 是否显示弹出层（用户导入）
         // 是否显示弹出层（用户导入）
@@ -302,7 +305,28 @@ export default {
       this.dialogVisible = true
       this.dialogVisible = true
     },
     },
     //批量删除
     //批量删除
-    handleDelete(){},
+    handleDelete(){
+      this.$confirm('此操作将永久删除选中数据, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.$message({
+          type: 'success',
+          message: '删除成功!'
+        });
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+    },
+    //table点击事件
+    handleSelectionChange(val) {
+      console.log("val",val)
+      this.isMultiple = val.length == 0?false:true
+    },
 
 
     //下载模板
     //下载模板
     downloadTemplate() {
     downloadTemplate() {