Merge branch 'master' of http://gitea.yxtsoft.com/yxt_group/demo

demo-web-ui/src/api/system/Role/role.js

@@ -13,7 +13,7 @@ export function rolemenus(data) {
 // 获取左侧菜单
 export function getrolemenus(data) {
   return request({
-    url: 'v1/SysMenu/list',
+    url: 'v1/SysMenu/list/'+data.Sid,
     method: 'POST',
     async: false,
     data: data,

demo-web-ui/src/api/system/datamapping/datamapping.js

@@ -1,8 +1,8 @@
 import request from '@/utils/request'
 
-export function saveSysPlanSchedule(data) {
+export function alterSysPlan(data) {
   return request({
-    url: 'v1/sysPlanSchedule/saveSysPlanSchedule',
+    url: 'v1/sysPlan/alterSysPlan',
     method: 'post',
     data: data,
     headers: { 'Content-Type': 'application/json' }

demo-web-ui/src/api/system/functional/functional.js

@@ -31,7 +31,7 @@ export function savePost(data) {
 // 模块名称
 export function sourceList(data) {
   return request({
-    url: 'v1/SysMenu/list',
+    url: 'v1/SysMenu/listList',
     method: 'POST',
     data: data,
     headers: {
@@ -40,6 +40,26 @@ export function sourceList(data) {
     }
   })
 }
+// 查询角色
+export function alterRole(data){
+  return request({
+    url: 'v1/sysrole/RoleOne',
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json'},
+    'token':tokens
+  })
+}
+//设置权限
+export function addSysMenuRole(data){
+  return request({
+    url: 'v1/sysmenurole/addSysMenuRole',
+    method: 'post',
+    data: data,
+    headers: {'Content-Type': 'application/json'},
+    'token':tokens
+  })
+}
 
 // 删除
 export function delOrgroles(data) {

demo-web-ui/src/api/system/menu/index.js

@@ -7,7 +7,7 @@ let tokens = window.sessionStorage.getItem('token');
 //获取菜单 分页列表
 export function pageList(data) {
   return request({
-    url: 'v1/SysMenu/list',
+    url: 'v1/SysMenu/listList',
     method: 'POST',
     data: data,
     headers: {

demo-web-ui/src/api/system/region/region.js

@@ -12,7 +12,7 @@ export function selectSysPlanXs(data) {
     }
   })
 }
-export function saveSysPlan(data) {
+export function saveSysPlanSchedule(data) {
   return request({
     url: 'v1/sysPlanSchedule/saveSysPlanSchedule',
     method: 'POST',
@@ -22,6 +22,17 @@ export function saveSysPlan(data) {
     }
   })
 }
+// 提交
+export function upSysPlan(data) {
+  return request({
+    url: 'v1/sysPlan/upSysPlan',
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
 // 新增保存
 export function selectSysPlanComment(sid) {
   return request({
@@ -57,3 +68,23 @@ export function selectSysPlan(data) {
     }
   })
 }
+export function selectTeacher(data) {
+  return request({
+    url: 'v1/sysinfo/selectTeacher',
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+export function selectSysPlanComment11(data) {
+  return request({
+    url: 'v1/sysPlan/selectSysPlanComment/'+data.sid,
+    method: 'POST',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}

demo-web-ui/src/api/system/sources/index.js

@@ -130,3 +130,35 @@ export function alterInfoUser(data) {
     }
   })
 }
+
+// 查看成绩
+export function selectScore(data) {
+  return request({
+    url: 'v1/sysscore/selectScore',
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}
+export function save(data) {
+  return request({
+    url: 'v1/sysscore/save',
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}
+export function update(data) {
+  return request({
+    url: 'v1/sysscore/update',
+    method: 'POST',
+    data: data,
+    headers: {'Content-Type': 'application/json',
+    'token':tokens
+    }
+  })
+}

demo-web-ui/src/layout/components/Sidebar/index.vue

@@ -52,7 +52,8 @@
   export default {
     data() {
       return {
-        routes: []
+        routes: [],
+        sid: window.sessionStorage.getItem("sid"),
       }
     },
     components: {
@@ -94,7 +95,7 @@
           sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa33',
           userSid: userSid
         }
-        getrolemenus(params).then(res => {
+        getrolemenus({Sid:this.sid}).then(res => {
           console.log('aaa')
           console.log(res)
           this.routes = res.data

demo-web-ui/src/store/modules/user.js

@@ -46,7 +46,8 @@ const actions = {
           defaultOrgPath: data.defaultOrgPath,
           postName: data.postName,
           sid: data.sid,
-          type:data.type
+          type:data.type,
+          id:data.id
         }
         commit('SET_UESRINFO', user)
         window.sessionStorage.setItem('userSid', user.userSid)
@@ -61,6 +62,7 @@ const actions = {
         window.sessionStorage.setItem('postName', user.postName)
         window.sessionStorage.setItem('sid', user.sid)
         window.sessionStorage.setItem('type', user.type)
+        window.sessionStorage.setItem('id', user.id)
         resolve(data)
       }).catch(error => {
         reject(error)

demo-web-ui/src/views/PwdModify/PwdModify.vue

@@ -66,23 +66,11 @@
                 width="100px"
               >
               </el-table-column>
-              <el-table-column
+              <el-table-column prop="department" label="系别" align="center">
-                prop="department"
-                label="系别"
-                align="center"
-              >
               </el-table-column>
-              <el-table-column
+              <el-table-column prop="speciality" label="专业" align="center">
-                prop="speciality"
-                label="专业"
-                align="center"
-              >
               </el-table-column>
-              <el-table-column
+              <el-table-column prop="studyYear" label="入学年份" align="center">
-                prop="studyYear"
-                label="入学年份"
-                align="center"
-              >
               </el-table-column>
             </el-table>
           </div>
@@ -108,7 +96,7 @@
                 <td>
                   <el-input
                     type="password"
-                    v-model="usePwd.id"
+                    v-model="usePwd.pwd"
                     show-password
                   />
                   <span>*</span>
@@ -198,7 +186,7 @@ import {
   UserInfo,
   saveSourcesInfo,
   alterPassword,
-  alterInfoUser
+  alterInfoUser,
 } from "@/api/system/sources/index.js";
 export default {
   data() {
@@ -231,8 +219,10 @@ export default {
       zylb: [],
       sourceList: [],
       usePwd: {
-        id: "",
+        pwd: "",
-        password: ""
+        id: window.sessionStorage.getItem("id"),
+        sid: window.sessionStorage.getItem("sid"),
+        password: "",
       },
       token: window.sessionStorage.getItem("token"),
       sid: window.sessionStorage.getItem("sid"),
@@ -314,25 +304,25 @@ export default {
       // })
     },
     updatePsw() {
-      // if (this.formPwd.password != this.formPwd.confirmPassword) {
+      if (this.pwd === this.password) {
-      //     this.$message({
+        alterPassword(this.usePwd).then((res) => {
-      //       type: 'warning',
+          if (res.code === 200) {
-      //       message: '两次密码输入不一致!'
+            this.$alert("密码修改成！请重新登录点击确定后退出。", "修改成功", {
-      //     });
+              confirmButtonText: "确定",
-      //     return
+              callback: (action) => {
-      //   }
+                window.sessionStorage.removeStorage("token");
-      alterPassword(this.usePwd).then((res) => {
+                window.sessionStorage.removeStorage("userSid");
-        if(res.code===200){
+                this.$router.push("/login");
-          this.$alert("密码修改成！请重新登录点击确定后退出。", "修改成功", {
+              },
-          confirmButtonText: "确定",
+            });
-          callback: (action) => {
+          }
-            window.sessionStorage.removeStorage("token");
-            window.sessionStorage.removeStorage("userSid");
-            this.$router.push({ path: "/login" });
-          },
         });
-        }
+      }else{
-      });
+        this.$message({
+            message: '两次密码不一致请重新输入',
+            type: "warning",
+          });
+      }
     },
   },
 };

demo-web-ui/src/views/RoleAdminister/RoleAdminister.vue

@@ -130,7 +130,7 @@
                     v-for="item in postSidData"
                     :key="item.num"
                     :label="item.type"
-                    :value="item.num"
+                    :value="item.type"
                   ></el-option>
                 </el-select>
               </td>

demo-web-ui/src/views/functional/functional.vue

@@ -6,88 +6,20 @@
     @tab-click="handleClick"
   >
     <el-tab-pane label="成绩设置" name="roleList">
-      <el-input
-        placeholder="请输入班级"
-        v-model="input"
-        clearable
-        style="width: 120px"
-      >
-      </el-input>
-      <el-select
-        v-model="id"
-        class="addinputw"
-        placeholder="请选择科目"
-        style="width: 150px; margin-left: 20px"
-      >
-        <el-option
-          v-for="(item, i) in formList"
-          :key="i"
-          :label="item.type"
-          :value="item.id"
-        />
-      </el-select>
-      <el-button style="margin-left: 20px" type="primary" @click="toLook()"
-        >查询</el-button
-      >
       <div class="container">
         <el-table :data="tableData" border style="width: 100%">
-          <el-table-column prop="name" label="教师姓名" align="center">
+          <el-table-column prop="type" label="学科名" align="center">
           </el-table-column>
-          <el-table-column prop="infoId" label="教师工号" align="center">
+          <el-table-column prop="score" label="及格分数" align="center">
-          </el-table-column>
-          <el-table-column label="查看" align="center" width="100px">
-            <template slot-scope="scope">
-              <el-button type="text" @click="lookstuder(scope.row)"
-                >查看学生</el-button
-              >
-            </template>
           </el-table-column>
           <el-table-column label="操作" align="center">
             <template slot-scope="scope">
               <el-button type="primary" size="mini" @click="editRow(scope.row)">
-                添加
+                修改
               </el-button>
             </template>
           </el-table-column>
         </el-table>
-
-        <pagination
-          :total="page.total"
-          :page.sync="page.current"
-          :limit.sync="page.size"
-          @pagination="pagination"
-        />
-        <el-dialog title="学生" :visible.sync="lookstuders">
-          <el-table
-            ref="multipleTable"
-            :data="gridData"
-            row-key="sid"
-            :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
-            border
-          >
-            <el-table-column
-              property="studentName"
-              label="姓名"
-              width="200"
-            ></el-table-column>
-            <el-table-column
-              property="studentNo"
-              label="学号"
-            ></el-table-column>
-            <el-table-column property="calss" label="班级"></el-table-column>
-            <el-table-column label="操作" align="center">
-              <template slot-scope="scope">
-                <el-button
-                  type="danger"
-                  size="mini"
-                  @click.native.prevent="deleteRow(scope.row)"
-                >
-                  删除
-                </el-button>
-              </template>
-            </el-table-column>
-          </el-table>
-        </el-dialog>
         <!-- 编辑角色信息 -->
         <el-dialog
           :title="dialogTitle + '学生'"
@@ -96,51 +28,23 @@
         >
           <table class="e-table" cellspacing="0">
             <tr>
-              <td>教师姓名</td>
+              <td>学科名</td>
               <td>
                 <el-input
-                  v-model="teacher.teacherName"
+                  v-model="teacher.type"
                   style="width: 300px"
                 ></el-input>
               </td>
             </tr>
             <tr>
-              <td>教师工号</td>
+              <td>学分</td>
               <td>
                 <el-input
-                  v-model="teacher.teacherNo"
+                  v-model="teacher.score"
                   style="width: 300px"
                 ></el-input>
               </td>
             </tr>
-            <tr>
-              <td>学生姓名</td>
-              <td>
-                <el-select v-model="teacher.studentName" placeholder="请选择">
-                  <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.name"
-                    :value="item.name"
-                  >
-                  </el-option>
-                </el-select>
-              </td>
-            </tr>
-            <tr>
-              <td>学生学号</td>
-              <td>
-                <el-select v-model="teacher.studentNo" placeholder="请选择">
-                  <el-option
-                    v-for="item in options"
-                    :key="item.value"
-                    :label="item.infoId"
-                    :value="item.infoId"
-                  >
-                  </el-option>
-                </el-select>
-              </td>
-            </tr>
           </table>
           <div style="margin-top: 20px; text-align: center">
             <el-button type="primary" @click="save()">保存</el-button>
@@ -158,8 +62,10 @@ import {
   saveSysInfoShip,
   selectTeacherDownStudent,
   deleteSysInfoShip,
+  selectScore,
+  save,
+  update
 } from "@/api/system/sources/index.js";
-import { selectScoreKM } from "@/api/system/userAdminister/index.js";
 export default {
   data() {
     return {
@@ -168,12 +74,14 @@ export default {
       editDialog: false,
       lookstuders: false,
       form: {},
-      id:'',
+      id: "",
-      formList:{},
+      formList: {},
       gridData: [],
       teacher: {
-        teacherName: "",
+        type: "",
-        teacherNo: "",
+        score: "",
+        sid:'',
+        id:''
       },
       formBackup: Object.assign({}, this.form),
       page: {
@@ -198,8 +106,13 @@ export default {
   mounted() {
     this.getPageList(this.page);
     this.getstuder();
-    selectScoreKM().then((res) => {
+    // selectScoreKM().then((res) => {
-      this.formList=res.data
+    //   this.formList=res.data
+    // });
+    selectScore().then((res) => {
+      console.log(res);
+      this.tableData=res.data
+      this.formList = res.data;
     });
   },
   methods: {
@@ -238,11 +151,7 @@ export default {
     },
     getPageList(data) {
       // 获取列表
-      pageList(data).then((res) => {
+
-        console.log(res);
-        this.tableData = res.data.records;
-        this.page.total = res.data.total;
-      });
     },
     handleClick(tab, event) {
       if (tab.name == "addrole") {
@@ -258,12 +167,13 @@ export default {
     editRow(row) {
       this.dialogTitle = "添加";
       this.editDialog = true;
-      this.teacher.teacherName = row.name;
+      this.teacher.sid = row.sid;
-      this.teacher.teacherNo = row.infoId;
+      this.teacher.id = row.id;
       this.form = Object.assign({}, row);
+      this.teacher.type=row.type
     },
     save() {
-      saveSysInfoShip(this.teacher).then((res) => {
+      update(this.teacher).then((res) => {
         if (res.code == 200) {
           this.$message({
             type: "success",

demo-web-ui/src/views/logManage/logManage.vue

@@ -6,15 +6,20 @@
     @tab-click="handleClick"
   >
     <el-tab-pane label="统计信息管理" name="roleList">
-      <el-input
-        placeholder="请输入班级"
-        v-model="calss"
-        clearable
-        style="width: 120px"
-      >
-      </el-input>
       <el-select
-        v-model="name"
+        v-model="lookArr.calss"
+        class="addinputw"
+        placeholder="请选择班级"
+      >
+        <el-option
+          v-for="(item, i) in calssArr"
+          :key="i"
+          :label="item.calss"
+          :value="item.calss"
+        />
+      </el-select>
+      <el-select
+        v-model="lookArr.name"
         class="addinputw"
         placeholder="请选择科目"
         style="width: 150px; margin-left: 20px"
@@ -23,7 +28,7 @@
           v-for="(item, i) in formList"
           :key="i"
           :label="item.type"
-          :value="item.id"
+          :value="item.type"
         />
       </el-select>
       <el-button style="margin-left: 20px" type="primary" @click="toLook()"
@@ -31,32 +36,16 @@
       >
       <div class="container">
         <el-table :data="tableData" border style="width: 100%">
-          <el-table-column prop="name" label="教师姓名" align="center">
+          <el-table-column prop="calss" label="班级" align="center">
           </el-table-column>
-          <el-table-column prop="infoId" label="教师工号" align="center">
+          <el-table-column prop="count" label="人数" align="center">
           </el-table-column>
-          <el-table-column label="查看" align="center" width="100px">
+          <el-table-column prop="name" label="名称" align="center">
-            <template slot-scope="scope">
-              <el-button type="text" @click="lookstuder(scope.row)"
-                >查看学生</el-button
-              >
-            </template>
           </el-table-column>
-          <el-table-column label="操作" align="center">
+          <el-table-column prop="yield" label="通过率(%)" align="center">
-            <template slot-scope="scope">
-              <el-button type="primary" size="mini" @click="editRow(scope.row)">
-                添加
-              </el-button>
-            </template>
           </el-table-column>
         </el-table>
 
-        <pagination
-          :total="page.total"
-          :page.sync="page.current"
-          :limit.sync="page.size"
-          @pagination="pagination"
-        />
         <el-dialog title="学生" :visible.sync="lookstuders">
           <el-table
             ref="multipleTable"
@@ -159,7 +148,11 @@ import {
   selectTeacherDownStudent,
   deleteSysInfoShip,
 } from "@/api/system/sources/index.js";
-import { selectScoreKM,selectClass,selectStudentScoreYIELD } from "@/api/system/userAdminister/index.js";
+import {
+  selectScoreKM,
+  selectClass,
+  selectStudentScoreYIELD,
+} from "@/api/system/userAdminister/index.js";
 export default {
   data() {
     return {
@@ -168,8 +161,13 @@ export default {
       editDialog: false,
       lookstuders: false,
       form: {},
-      name:'',
+      lookArr: {
-      formList:{},
+        calss: "",
+        name: "",
+      },
+      formList: [],
+      formList1: [],
+      arr:[{type:'就业'},{type:'升学'},{type:'考公'}],
       gridData: [],
       teacher: {
         teacherName: "",
@@ -193,22 +191,22 @@ export default {
       sourceList: [],
       options: {},
       value: "",
-      calss:'8班'
+      calssArr: {},
     };
   },
   mounted() {
     this.getPageList(this.page);
     this.getstuder();
     selectScoreKM().then((res) => {
-      this.formList=res.data
+      this.formList1 = res.data;
+      console.log(res);
+      this.formList=this.formList1.concat(this.arr);
     });
     selectClass().then((res) => {
       // this.formList=res.data
+      this.calssArr = res.data;
       console.log(res);
     });
-    selectStudentScoreYIELD(this.name,this.calss).then((res)=>{
-      console.log(res);
-    })
   },
   methods: {
     lookstuder(row) {
@@ -218,6 +216,17 @@ export default {
         this.gridData = res.data;
       });
     },
+    toLook() {
+      selectStudentScoreYIELD(this.lookArr).then((res) => {
+        this.tableData = res.data;
+        if(res.data.calss==undefined){
+          res.data.calss=this.lookArr.calss
+          // console.log(this.lookArr.calss);
+          this.tableData = res.data;
+        }
+
+        });
+    },
     pagination(val) {
       // 分页
       this.page.current = val.pageNum;
@@ -248,7 +257,6 @@ export default {
       // 获取列表
       pageList(data).then((res) => {
         console.log(res);
-        this.tableData = res.data.records;
         this.page.total = res.data.total;
       });
     },

demo-web-ui/src/views/menuManage/menuManage.vue

@@ -16,6 +16,9 @@
           <el-table-column prop="name" label="菜单名称" width="220"/>
           <el-table-column label="操作" width="260" align="center">
             <template slot-scope="scope">
+              <el-button  type="primary" size="mini" @click="editRol(scope.row)">
+                添加权限
+              </el-button>
               <el-button  type="primary" size="mini" @click="editRow(scope.row)">
                 修改
               </el-button>
@@ -102,7 +105,37 @@
           <el-button @click="editDialog = false">关 闭</el-button>
         </div>
       </el-dialog>
-
+      <!-- 添加角色权限 -->
+      <el-dialog :title="dialogTitle + '角色权限'" :visible.sync="editRolDialog" width="40%">
+        <table class="e-table" cellspacing="0">
+          <tr>
+            <td>菜单名称</td>
+            <td>
+              <el-input v-model="Rol.menuSid"/>
+            </td>
+          </tr>
+          <tr>
+            <td>备注</td>
+            <td>
+              <el-select
+                  v-model="Rol.roleSid"
+                  style="width: 300px"
+                >
+                  <el-option
+                    v-for="(item,i) in postSidData"
+                    :key="i"
+                    :label="item.name"
+                    :value="item.sid"
+                  ></el-option>
+                </el-select>
+            </td>
+          </tr>
+        </table>
+        <div style="margin-top: 20px; text-align: center;">
+          <el-button type="primary" @click="saveRol()">保 存</el-button>
+          <el-button @click="editRolDialog = false">关 闭</el-button>
+        </div>
+      </el-dialog>
     </el-tab-pane>
     <el-tab-pane label="新增菜单" name="addrole">
       <!-- 添加 -->
@@ -170,15 +203,19 @@
 
 <script>
   import {pageList, menusTreelist, saveMenusInfo, putMenusInfo, delMenus, IsEnable} from '@/api/system/menu/index.js'
-  import {sourceList} from '@/api/system/functional/functional.js'
+  import {sourceList,alterRole,addSysMenuRole} from '@/api/system/functional/functional.js'
 
   export default {
     data() {
       return {
         activeName: 'roleList',
         editDialog: false,
+        editRolDialog:false,
         dialogTitle: '',
         checked: '',
+        Rol:{
+          menuSid:''
+        },
         form: {
           pname: '顶级菜单',
           iconUrl: '',
@@ -194,6 +231,8 @@
           sortNo: 0,
           sourceSid: ''
         },
+        rolsid:'',
+        postSidData:{},
         formBackup: Object.assign({}, this.form),
         tableData: [],
         page: {
@@ -216,9 +255,9 @@
       this.getPageList()
       this.getsourceList()
 
-//    getsourceList().then(res => {
+      alterRole().then(res => {
-//      this.sourceNameData = res.data
+     this.postSidData=res.data
-//    })
+   })
     },
     methods: {
       pagination(val) { // 分页
@@ -281,6 +320,14 @@
         this.form.isShow = 1
         this.form.pname = row.psid == '0' ? '顶级菜单' : row.pname
       },
+      editRol(row) {
+        this.dialogTitle = '添加'
+        this.editRolDialog = true
+        this.form = Object.assign({}, row)
+        this.Rol.menuSid=row.name
+        this.rolsid=row.sid
+        console.log(this.rolsid);
+      },
       save() {
         if (this.form.sid) {
           putMenusInfo(this.form).then(res => {
@@ -302,6 +349,20 @@
           })
         }
       },
+      saveRol(){
+        this.editRolDialog = false
+        this.Rol.menuSid=this.rolsid
+        console.log(this.Rol);
+        addSysMenuRole(this.Rol).then((res)=>{
+          console.log(res);
+          if(res.code==200){
+            this.$message({
+              type: 'success',
+              message: '添加成功!'
+            })
+          }
+        })
+      },
       deleteRow(row) {
         this.$confirm('确定要删除该菜单吗, 是否继续?', '提示', {
           confirmButtonText: '确定',

demo-web-ui/src/views/postManage/postManage.vue

@@ -178,6 +178,8 @@ import {
   selectSysPlan,
   selectSysPlanComment,
   saveSysPlan,
+  selectSysPlanXs,
+  saveSysPlanSchedule
 } from "@/api/system/region/region.js";
 // import organizationManageInfo from './organizationManageInfo.vue'
 export default {
@@ -195,6 +197,7 @@ export default {
       tableData: [],
       formList: [],
       sid: "",
+      userName: window.sessionStorage.getItem("userName"),
     };
   },
   mounted() {
@@ -203,9 +206,10 @@ export default {
   methods: {
     getPageList() {
       // 获取列表
-      selectSysPlan().then((res) => {
+      selectSysPlanXs({ userName: this.userName }).then((res) => {
         this.formList = res.data;
       });
+      console.log(this.userName);
     },
     toLook() {
       console.log(this.sid);
@@ -232,7 +236,7 @@ export default {
     save() {
       console.log("form", this.form);
       if (this.form.planSid != null) {
-        saveSysPlan(this.form).then((res) => {
+        saveSysPlanSchedule(this.form).then((res) => {
           this.activeName = "roleList";
           this.getPageList();
           this.$message({
@@ -251,7 +255,7 @@ export default {
     },
     save1() {
       if (this.form.planSid != null) {
-        saveSysPlan(this.form).then((res) => {
+        saveSysPlanSchedule(this.form).then((res) => {
           this.editDialog = false;
           this.getPageList();
           this.$message({

demo-web-ui/src/views/region/region.vue

@@ -1,18 +1,36 @@
 <template>
   <div class="app-container">
-    <div v-show="viewState ==1">
+    <div v-show="viewState == 1">
-      <el-tabs class="my-tabs" v-model="activeName" type="card" @tab-click="handleClick">
+      <el-tabs
+        class="my-tabs"
+        v-model="activeName"
+        type="card"
+        @tab-click="handleClick"
+      >
         <el-tab-pane label="自主学习计划" name="roleList">
           <div class="container">
             <el-table :data="tableData" border style="width: 100%">
-              <el-table-column label="序号" width="70px" type="index" align="center">
+              <el-table-column
+                label="序号"
+                width="70px"
+                type="index"
+                align="center"
+              >
               </el-table-column>
               <el-table-column label="操作" width="150px" align="center">
                 <template slot-scope="scope">
-                  <el-button type="primary" size="mini" @click="editRow(scope.row)">
+                  <el-button
+                    type="primary"
+                    size="mini"
+                    @click="editRow(scope.row)"
+                  >
                     编辑
                   </el-button>
-                  <el-button type="danger" size="mini" @click.native.prevent="deleteRow(scope.row)">
+                  <el-button
+                    type="danger"
+                    size="mini"
+                    @click.native.prevent="deleteRow(scope.row)"
+                  >
                     删除
                   </el-button>
                   <!-- <el-button type="primary" size="mini" @click="detail(scope.row)">
@@ -20,11 +38,42 @@
                   </el-button> -->
                 </template>
               </el-table-column>
-              <el-table-column prop="teacherNo" label="教师工号" align="center" />
+              <el-table-column
-              <el-table-column prop="studentNo" label="学生学号" align="center" />
+                prop="teacherNo"
-              <el-table-column prop="planContent" label="学习计划" align="center" />
+                label="教师工号"
-              <el-table-column prop="stateChinese" label="数据状态" align="center" />
+                align="center"
-              <el-table-column prop="planOpinionYj" label="反馈意见" align="center" />
+              />
+              <el-table-column
+                prop="studentNo"
+                label="学生学号"
+                align="center"
+              />
+              <el-table-column
+                prop="planContent"
+                label="学习计划"
+                align="center"
+              />
+              <el-table-column
+                prop="stateChinese"
+                label="数据状态"
+                align="center"
+              />
+              <el-table-column label="操作" width="150px" align="center">
+                <template slot-scope="scope">
+                  <el-button
+                    type="primary"
+                    size="mini"
+                    @click="tijiao(scope.row)"
+                  >
+                    提交
+                  </el-button>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="planOpinionYj"
+                label="反馈意见"
+                align="center"
+              />
             </el-table>
           </div>
         </el-tab-pane>
@@ -34,24 +83,37 @@
             <tr>
               <td>教师工号</td>
               <td>
-                <!-- <el-select v-model="form.type" class="addinputw" placeholder="请选择论坛类别" style="width:300px"
+                <el-select
-                  @change="getType">
+                  v-model="form.teacherNo"
-                  <el-option v-for="item in typeList" :key="item.dictKey" :label="item.dictValue"
+                  class="addinputw"
-                    :value="item.dictKey" />
+                  placeholder="请选择学习计划"
-                </el-select> -->
+                  style="width: 300px"
-                <el-input v-model="form.teacherNo" style="width: 300px"></el-input>
+                >
+                  <el-option
+                    v-for="(item, i) in formList"
+                    :key="i"
+                    :label="item.name"
+                    :value="item.userName"
+                  />
+                </el-select>
               </td>
             </tr>
             <tr>
               <td>学生学号</td>
               <td>
-                <el-input v-model="form.studentNo" style="width: 300px"></el-input>
+                <el-input
+                  v-model="form.studentNo"
+                  style="width: 300px"
+                ></el-input>
               </td>
             </tr>
             <tr>
               <td>学习计划内容</td>
               <td>
-                <el-input v-model="form.planContent" style="width: 300px"></el-input>
+                <el-input
+                  v-model="form.planContent"
+                  style="width: 300px"
+                ></el-input>
               </td>
             </tr>
           </table>
@@ -59,32 +121,39 @@
             <el-button type="primary" @click="save()">保存</el-button>
           </div>
         </el-tab-pane>
-        <el-dialog :title="dialogTitle + '学习计划'" :visible.sync="editDialog" width="40%">
+        <el-dialog
+          :title="dialogTitle + '学习计划'"
+          :visible.sync="editDialog"
+          width="40%"
+        >
           <table class="e-table" cellspacing="0">
             <tr>
               <td>教师工号</td>
               <td>
-                <!-- <el-select v-model="form.type" class="addinputw" placeholder="请选择论坛类别" style="width:300px"
+                <el-input
-             @change="getType">
+                  v-model="form.teacherNo"
-             <el-option v-for="item in typeList" :key="item.dictKey" :label="item.dictValue"
+                  style="width: 300px"
-               :value="item.dictKey" />
+                ></el-input>
-           </el-select> -->
-                <!-- <span>{{form.teacherNo}}</span> -->
-                <el-input v-model="form.teacherNo" style="width: 300px"></el-input>
               </td>
             </tr>
             <tr>
               <td>学生学号</td>
               <td>
                 <!-- <span>{{form.studentNo}}</span> -->
-                <el-input v-model="form.studentNo" style="width: 300px"></el-input>
+                <el-input
+                  v-model="form.studentNo"
+                  style="width: 300px"
+                ></el-input>
               </td>
             </tr>
             <tr>
               <td>学习计划内容</td>
               <td>
                 <!-- <span>{{form.planContent}}</span> -->
-                <el-input v-model="form.planContent" style="width: 300px"></el-input>
+                <el-input
+                  v-model="form.planContent"
+                  style="width: 300px"
+                ></el-input>
               </td>
             </tr>
           </table>
@@ -92,6 +161,56 @@
             <el-button type="primary" @click="save()">保存</el-button>
           </div>
         </el-dialog>
+
+        <el-dialog
+          :title="dialogTitle + '学习计划'"
+          :visible.sync="editDialog1"
+          width="40%"
+        >
+          <table class="e-table" cellspacing="0">
+            <tr>
+              <td>教师工号</td>
+              <td>
+                <el-select
+                  v-model="form.teacherNo"
+                  class="addinputw"
+                  placeholder="请选择学习计划"
+                  style="width: 300px"
+                >
+                  <el-option
+                    v-for="(item, i) in formList"
+                    :key="i"
+                    :label="item.name"
+                    :value="item.userName"
+                  />
+                </el-select>
+              </td>
+            </tr>
+            <tr>
+              <td>学生学号</td>
+              <td>
+                <!-- <span>{{form.studentNo}}</span> -->
+                <el-input
+                  v-model="form.studentNo"
+                  style="width: 300px"
+                ></el-input>
+              </td>
+            </tr>
+            <tr>
+              <td>学习计划内容</td>
+              <td>
+                <!-- <span>{{form.planContent}}</span> -->
+                <el-input
+                  v-model="form.planContent"
+                  style="width: 300px"
+                ></el-input>
+              </td>
+            </tr>
+          </table>
+          <div style="margin-top: 20px; text-align: center">
+            <el-button type="primary" @click="save1()">保存</el-button>
+          </div>
+        </el-dialog>
       </el-tabs>
     </div>
     <!-- <organizationManageInfo v-show="viewState ==4" ref="divInfo" @doback="resetState" /> -->
@@ -99,108 +218,144 @@
 </template>
 
 <script>
-  import {selectSysPlanXs,alterSysPlant,saveSysPlan,deleteSysPlan} from "@/api/system/region/region.js";
+import {
-  // import organizationManageInfo from './organizationManageInfo.vue'
+  selectSysPlanXs,
-  export default {
+  alterSysPlant,
-    components: {
+  saveSysPlan,
-      // organizationManageInfo,
+  deleteSysPlan,
+  upSysPlan,
+  selectTeacher
+} from "@/api/system/region/region.js";
+// import organizationManageInfo from './organizationManageInfo.vue'
+export default {
+  components: {
+    // organizationManageInfo,
+  },
+  data() {
+    return {
+      viewState: 1,
+      activeName: "roleList",
+      dialogTitle: "",
+      editDialog: false,
+      editDialog1:false,
+      form: {
+        teacherNo:''
+      },
+      formBackup: Object.assign({}, this.form),
+      tableData: [],
+      userName: window.sessionStorage.getItem("userName"),
+      formList:{}
+    };
+  },
+  mounted() {
+    this.getPageList();
+    selectTeacher().then((res) => {
+        this.formList=res.data
+      });
+  },
+  methods: {
+    getPageList() {
+      // 获取列表
+      selectSysPlanXs({ userName: this.userName }).then((res) => {
+        this.tableData = res.data;
+      });
+      console.log(this.userName);
     },
-    data() {
+    handleClick(tab, event) {
-      return {
+      if (tab.name == "addrole") {
-        viewState: 1,
+        this.dialogTitle = "新增";
-        activeName: "roleList",
+        this.roleForm = Object.assign({}, this.formBackup);
-        dialogTitle: "",
+      } else {
-        editDialog: false,
+        this.getPageList();
-        form: {},
-        formBackup: Object.assign({}, this.form),
-        tableData: [],
-        userName: window.sessionStorage.getItem("userName"),
       }
     },
-    mounted() {
+    save() {
-      this.getPageList();
+      console.log("form", this.form);
-    },
+
-    methods: {
+      if (this.form.sid) {
-      getPageList() {
+        alterSysPlant(this.form).then((res) => {
-        // 获取列表
+          this.editDialog = false;
-        selectSysPlanXs({userName:this.userName}).then((res) => {
-          this.tableData = res.data;
-        });
-        console.log(this.userName);
-      },
-      handleClick(tab, event) {
-        if (tab.name == "addrole") {
-          this.dialogTitle = "新增";
-          this.roleForm = Object.assign({}, this.formBackup);
-        } else {
           this.getPageList();
-        }
+          this.$message({
-      },
+            message: res.msg,
-      save() {
+            type: "success",
-        console.log("form", this.form)
-
-        if (this.form.sid) {
-          alterSysPlant(this.form).then((res) => {
-            this.editDialog = false;
-            this.getPageList();
-            this.$message({
-              message: res.msg,
-              type: "success",
-            });
           });
-        } else {
-          saveSysPlan(this.form).then((res) => {
-            this.getPageList();
-            this.activeName = "roleList";
-            this.$message({
-              message: res.msg,
-              type: "success",
-            });
-          });
-        }
-          this.reset();
-      },
-      reset() {
-        this.form = {};
-      },
-      resetState() {
-        this.viewState = 1
-      },
-      editRow(row) {
-        this.dialogTitle = "编辑";
-        this.editDialog = true;
-        this.form = Object.assign({}, row);
-      },
-      detail(row) {
-        this.viewState = 4
-        this.$refs['divInfo'].showAdd(row)
-
-      },
-      deleteRow(row) {
-        this.$confirm("确定要删除该资源吗, 是否继续?", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-        }).then(() => {
-          deleteSysPlan(row.sid).then((res) => {
-            this.getPageList();
-
-            this.$message({
-              type: "success",
-              message: "删除成功!",
-            });
-
-          });
-
         });
+      } else {
+        saveSysPlan(this.form).then((res) => {
+          this.getPageList();
+          this.activeName = "roleList";
+          this.$message({
+            message: res.msg,
+            type: "success",
+          });
+        });
+      }
+      this.reset();
+    },
+    save1(){
+      upSysPlan(this.form).then((res) => {
+          this.getPageList();
+          this.editDialog1 = false;
+          this.$message({
+            type: "success",
+            message: "提交成功!",
+          });
+        });
+    },
+    reset() {
+      this.form = {};
+    },
+    resetState() {
+      this.viewState = 1;
+    },
+    tijiao(row) {
+      if (row.teacherNo) {
+        upSysPlan(row).then((res) => {
+          this.getPageList();
+          this.$message({
+            type: "success",
+            message: "提交成功!",
+          });
+        });
+      } else {
+        this.dialogTitle = "编辑";
+        this.editDialog1 = true;
+        this.form = Object.assign({}, row);
+      }
+    },
+    editRow(row) {
+      this.dialogTitle = "编辑";
+      this.editDialog = true;
+      this.form = Object.assign({}, row);
+      this.teacherNo=row.teacherNo
+    },
+    detail(row) {
+      this.viewState = 4;
+      this.$refs["divInfo"].showAdd(row);
+    },
+    deleteRow(row) {
+      this.$confirm("确定要删除该资源吗, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        deleteSysPlan(row.sid).then((res) => {
+          this.getPageList();
 
-      },
+          this.$message({
-    }
+            type: "success",
-  };
+            message: "删除成功!",
+          });
+        });
+      });
+    },
+  },
+};
 </script>
 
 <style scoped="scoped" lang="scss">
-  .my-tabs {
+.my-tabs {
-    margin-top: 10px;
+  margin-top: 10px;
-  }
+}
 </style>

demo-web-ui/src/views/workflow/form/form.vue

@@ -211,7 +211,7 @@
             sourceName: ''
           },
         }
-        this.getPageList()
+        this.getPageList(this.page)
       },
       getPageList(data) { // 获取列表
         pageList(data).then((res) => {
@@ -227,7 +227,7 @@
           this.dialogTitle = '新增'
           this.roleForm = Object.assign({}, this.formBackup)
         } else {
-          this.getPageList()
+          this.getPageList(this.page)
         }
       },
       save() {
@@ -242,7 +242,7 @@
           })
         } else {
           saveSourcesInfo(this.form).then(res => {
-            this.getPageList()
+            this.getPageList(this.page)
             this.activeName = "roleList"
             this.$message({
               message: res.msg,
@@ -267,7 +267,7 @@
           type: 'warning'
         }).then(() => {
           delSources({sid: row.sid}).then(res => {
-            this.getPageList()
+            this.getPageList(this.page)
             this.$message({
               type: 'success',
               message: '删除成功!'