yxt_group
/
demo
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

11

master
fengdong777 2 years ago
parent
4c7c48d111
commit
bcefdbc02c
9 changed files with 451 additions and 393 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      demo-web-ui/.env.development
  2. 9
      demo-web-ui/src/api/system/datamapping/datamapping.js
  3. 10
      demo-web-ui/src/api/system/region/region.js
  4. 294
      demo-web-ui/src/views/menuManage/menuManage.vue
  5. 7
      demo-web-ui/src/views/organizationManage/organizationManage.vue
  6. 2
      demo-web-ui/src/views/postManage/postManage.vue
  7. 12
      demo-web-ui/src/views/region/region.vue
  8. 18
      demo-web-ui/src/views/workflow/definition/definition.vue
  9. 16
      demo-web-ui/src/views/workflow/form/form.vue

2
demo-web-ui/.env.development
View File

@ -6,4 +6,4 @@ VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址 ## 配置测试和本地开发时的 接口地址
##VUE_APP_URL = "http://39.104.100.138:9112" ##VUE_APP_URL = "http://39.104.100.138:9112"
VUE_APP_URL = "http://192.168.3.183:9112" VUE_APP_URL = "http://192.168.1.177:9112"

9
demo-web-ui/src/api/system/datamapping/datamapping.js
View File

@ -8,6 +8,15 @@ export function alterSysPlan(data) {
headers: { 'Content-Type': 'application/json' } headers: { 'Content-Type': 'application/json' }
}) })
}
export function saveSysPlanSchedule(data) {
return request({
url: 'v1/sysPlanSchedule/saveSysPlanSchedule',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
} }
// 自主学习计划指导 // 自主学习计划指导

10
demo-web-ui/src/api/system/region/region.js
View File

@ -22,6 +22,16 @@ export function saveSysPlanSchedule(data) {
} }
}) })
} }
export function saveSysPlan(data) {
return request({
url: 'v1/sysPlan/saveSysPlan',
method: 'POST',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
}
// 提交 // 提交
export function upSysPlan(data) { export function upSysPlan(data) {
return request({ return request({

294
demo-web-ui/src/views/menuManage/menuManage.vue
View File

@ -1,15 +1,20 @@
<template> <template>
<el-tabs v-model="activeName" class="my-tabs" type="card" @tab-click="handleClick"> <el-tabs
v-model="activeName"
class="my-tabs"
type="card"
@tab-click="handleClick"
>
<el-tab-pane label="菜单列表" name="roleList"> <el-tab-pane label="菜单列表" name="roleList">
<div class="content"> <div class="content">
<div class="table-describe clearfix"> <div class="table-describe clearfix">
<h4 style="color:#000;">菜单列表</h4> <h4 style="color: #000">菜单列表</h4>
</div> </div>
<el-table <el-table
ref="multipleTable" ref="multipleTable"
:data="tableData" :data="tableData"
border border
style="width: 100%;" style="width: 100%"
row-key="sid" row-key="sid"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
> >
@ -32,21 +37,25 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="pageUrl" label="链接地址" align="center" /> <el-table-column prop="pageUrl" label="链接地址" align="center" />
<el-table-column prop="isEnable" label="可见性" align="center"> <el-table-column prop="isShow" label="可见性" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch <el-switch
v-model="scope.row.isEnable" v-model="scope.row.isShow"
active-color="#13ce66" active-color="#13ce66"
inactive-color="#ff4949" inactive-color="#ff4949"
active-value="1" active-value="1"
inactive-value="0" inactive-value="0"
@change="enabledChange(scope.row.isEnable,scope.row)" @change="enabledChange(scope.row.isShow, scope.row)"
/> />
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
<el-dialog :title="dialogTitle + '功能信息'" :visible.sync="editDialog" width="40%"> <el-dialog
:title="dialogTitle + '功能信息'"
:visible.sync="editDialog"
width="40%"
>
<table class="e-table" cellspacing="0"> <table class="e-table" cellspacing="0">
<tr> <tr>
<td>菜单名称</td> <td>菜单名称</td>
@ -100,13 +109,17 @@
</td> </td>
</tr> </tr>
</table> </table>
<div style="margin-top: 20px; text-align: center;"> <div style="margin-top: 20px; text-align: center">
<el-button type="primary" @click="save()">保 存</el-button> <el-button type="primary" @click="save()">保 存</el-button>
<el-button @click="editDialog = false">关 闭</el-button> <el-button @click="editDialog = false">关 闭</el-button>
</div> </div>
</el-dialog> </el-dialog>
<!-- 添加角色权限 --> <!-- 添加角色权限 -->
<el-dialog :title="dialogTitle + '角色权限'" :visible.sync="editRolDialog" width="40%"> <el-dialog
:title="dialogTitle + '角色权限'"
:visible.sync="editRolDialog"
width="40%"
>
<table class="e-table" cellspacing="0"> <table class="e-table" cellspacing="0">
<tr> <tr>
<td>菜单名称</td> <td>菜单名称</td>
@ -115,12 +128,9 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td>备注</td> <td>角色</td>
<td> <td>
<el-select <el-select v-model="Rol.roleSid" style="width: 300px">
v-model="Rol.roleSid"
style="width: 300px"
>
<el-option <el-option
v-for="(item, i) in postSidData" v-for="(item, i) in postSidData"
:key="i" :key="i"
@ -131,7 +141,7 @@
</td> </td>
</tr> </tr>
</table> </table>
<div style="margin-top: 20px; text-align: center;"> <div style="margin-top: 20px; text-align: center">
<el-button type="primary" @click="saveRol()">保 存</el-button> <el-button type="primary" @click="saveRol()">保 存</el-button>
<el-button @click="editRolDialog = false">关 闭</el-button> <el-button @click="editRolDialog = false">关 闭</el-button>
</div> </div>
@ -193,45 +203,55 @@
</td> </td>
</tr> </tr>
</table> </table>
<div style="margin-top: 20px; text-align: center;"> <div style="margin-top: 20px; text-align: center">
<el-button type="primary" @click="save()">保存</el-button> <el-button type="primary" @click="save()">保存</el-button>
</div> </div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</template> </template>
<script> <script>
import {pageList, menusTreelist, saveMenusInfo, putMenusInfo, delMenus, IsEnable} from '@/api/system/menu/index.js' import {
import {sourceList,alterRole,addSysMenuRole} from '@/api/system/functional/functional.js' pageList,
menusTreelist,
saveMenusInfo,
putMenusInfo,
delMenus,
IsEnable,
} from "@/api/system/menu/index.js";
import {
sourceList,
alterRole,
addSysMenuRole,
} from "@/api/system/functional/functional.js";
export default { export default {
data() { data() {
return { return {
activeName: 'roleList', activeName: "roleList",
editDialog: false, editDialog: false,
editRolDialog: false, editRolDialog: false,
dialogTitle: '', dialogTitle: "",
checked: '', checked: "",
Rol: { Rol: {
menuSid:'' menuSid: "",
}, },
form: { form: {
pname: '顶级菜单', pname: "顶级菜单",
iconUrl: '', iconUrl: "",
isShow: 1, isShow: 1,
menuName: '', menuName: "",
menuUrl: '', menuUrl: "",
pageAliasName: '', pageAliasName: "",
pageName: '', pageName: "",
pageUrl: '', pageUrl: "",
pageUrlRedirect: '', pageUrlRedirect: "",
psid: '', psid: "",
remarks: '', remarks: "",
sortNo: 0, sortNo: 0,
sourceSid: '' sourceSid: "",
}, },
rolsid:'', rolsid: "",
postSidData: {}, postSidData: {},
formBackup: Object.assign({}, this.form), formBackup: Object.assign({}, this.form),
tableData: [], tableData: [],
@ -240,61 +260,64 @@
size: 10, size: 10,
total: 0, total: 0,
params: { params: {
name: '', name: "",
psid: '', psid: "",
sourceName: '', sourceName: "",
sourceSid: '' sourceSid: "",
}
}, },
rank: '1', },
rank: "1",
sourceNameData: [], // 资源 sourceNameData: [], // 资源
isadd: false isadd: false,
} };
}, },
mounted() { mounted() {
this.getPageList() this.getPageList();
this.getsourceList() this.getsourceList();
alterRole().then(res => { alterRole().then((res) => {
this.postSidData=res.data this.postSidData = res.data;
}) });
}, },
methods: { methods: {
pagination(val) { // 分页 pagination(val) {
this.page.current = val.pageNum // 分页
this.page.size = val.pageSize this.page.current = val.pageNum;
this.getPageList() this.page.size = val.pageSize;
this.getPageList();
}, },
resetSearch() { // 重置 resetSearch() {
this.page.params = this.pageBackup // 重置
this.page.params = this.pageBackup;
}, },
getPageList() { // 获取列表 getPageList() {
// 获取列表
pageList(this.page).then((res) => { pageList(this.page).then((res) => {
console.log('这里是条件查询', this.page) console.log("这里是条件查询", this.page);
const treedata = res.data const treedata = res.data;
console.log('菜单列表', res) console.log("菜单列表", res);
this.tableData = treedata this.tableData = treedata;
this.page.total = res.data.total this.page.total = res.data.total;
}) });
}, },
// 资源名称 // 资源名称
getsourceList() { getsourceList() {
const params = {} const params = {};
sourceList(params).then(res => { sourceList(params).then((res) => {
this.sourceNameData = res.data this.sourceNameData = res.data;
this.loading = false this.loading = false;
}) });
}, },
handleClick(tab, event) { handleClick(tab, event) {
if (tab.name == 'addrole') { if (tab.name == "addrole") {
this.dialogTitle = '新增' this.dialogTitle = "新增";
this.roleForm = Object.assign({}, this.formBackup) this.roleForm = Object.assign({}, this.formBackup);
} else { } else {
this.getPageList() this.getPageList();
} }
}, },
add(row) { add(row) {
this.activeName = 'addrole' this.activeName = "addrole";
// if(row == 0){ // if(row == 0){
// this.isadd = false // this.isadd = false
// }else{ // }else{
@ -302,106 +325,105 @@
// } // }
// this.dialogTitle = '新增' // this.dialogTitle = '新增'
// this.editDialog = true // this.editDialog = true
this.form = Object.assign({}, this.formBackup) this.form = Object.assign({}, this.formBackup);
this.form.isShow = 1 this.form.isShow = 1;
// this.form.psid = row.sid || 0 // this.form.psid = row.sid || 0
this.form.pname = row.name || '顶级菜单' this.form.pname = row.name || "顶级菜单";
this.form.sourceSid = row.sourceSid || '' this.form.sourceSid = row.sourceSid || "";
if (row.isSource == '1') { if (row.isSource == "1") {
this.form.psid = 0 this.form.psid = 0;
} else { } else {
this.form.psid = row.sid this.form.psid = row.sid;
} }
}, },
editRow(row) { editRow(row) {
this.dialogTitle = '编辑' this.dialogTitle = "编辑";
this.editDialog = true this.editDialog = true;
this.form = Object.assign({}, row) this.form = Object.assign({}, row);
this.form.isShow = 1 this.form.isShow = 1;
this.form.pname = row.psid == '0' ? '顶级菜单' : row.pname this.form.pname = row.psid == "0" ? "顶级菜单" : row.pname;
}, },
editRol(row) { editRol(row) {
this.dialogTitle = '添加' this.dialogTitle = "添加";
this.editRolDialog = true this.editRolDialog = true;
this.form = Object.assign({}, row) this.form = Object.assign({}, row);
this.Rol.menuSid=row.name this.Rol.menuSid = row.name;
this.rolsid=row.sid this.rolsid = row.sid;
console.log(this.rolsid); console.log(this.rolsid);
}, },
save() { save() {
if (this.form.sid) { if (this.form.sid) {
putMenusInfo(this.form).then(res => { putMenusInfo(this.form).then((res) => {
this.editDialog = false this.editDialog = false;
this.getPageList(this.page) this.getPageList(this.page);
this.$message({ this.$message({
message: res.msg, message: res.msg,
type: 'success' type: "success",
}) });
}) });
} else { } else {
saveMenusInfo(this.form).then(res => { saveMenusInfo(this.form).then((res) => {
this.activeName = 'roleList' this.activeName = "roleList";
this.getPageList() this.getPageList(this.page);
this.$message({ this.$message({
message: res.msg, message: res.msg,
type: 'success' type: "success",
}) });
}) });
} }
}, },
saveRol() { saveRol() {
this.editRolDialog = false this.editRolDialog = false;
this.Rol.menuSid=this.rolsid this.Rol.menuSid = this.rolsid;
console.log(this.Rol); console.log(this.Rol);
addSysMenuRole(this.Rol).then((res) => { addSysMenuRole(this.Rol).then((res) => {
console.log(res); console.log(res);
if (res.code == 200) { if (res.code == 200) {
this.$message({ this.$message({
type: 'success', type: "success",
message: '添加成功!' message: "添加成功!",
}) });
} }
}) });
}, },
deleteRow(row) { deleteRow(row) {
this.$confirm('确定要删除该菜单吗, 是否继续?', '提示', { this.$confirm("确定要删除该菜单吗, 是否继续?", "提示", {
confirmButtonText: '确定', confirmButtonText: "确定",
cancelButtonText: '取消', cancelButtonText: "取消",
type: 'warning' type: "warning",
}).then(() => { }).then(() => {
delMenus({sid: row.sid}).then(res => { delMenus({ sid: row.sid }).then((res) => {
this.getPageList(this.page) this.getPageList(this.page);
this.$message({ this.$message({
type: 'success', type: "success",
message: '删除成功!' message: "删除成功!",
}) });
}) });
}) });
}, },
// 是否可用 按钮 // 是否可用 按钮
enabledChange(value, row) { enabledChange(value, row) {
IsEnable({ putMenusInfo({
sid: row.sid, sid: row.sid,
isEnable:value id:row.id,
}).then(res => { isShow: value,
}).then((res) => {
this.$message({ this.$message({
type: 'success', type: "success",
message: res.msg message: res.msg,
}) });
}) });
}, },
//保存排序 //保存排序
getSorting(){ getSorting() {},
},
retname(sid) { retname(sid) {
obj = this.sourceNameData.find((item) => { obj = this.sourceNameData.find((item) => {
return item.sid == sid// 筛选出匹配数据 return item.sid == sid; // 筛选出匹配数据
}) });
return obj.name return obj.name;
} },
} },
} };
</script> </script>
<style> <style>
@ -417,17 +439,17 @@
padding: 0 20px; padding: 0 20px;
border: 1px solid #ccc; border: 1px solid #ccc;
border-radius: 2px; border-radius: 2px;
background-color: #FFFFFF; background-color: #ffffff;
} }
.el-icon-arrow-left:before, .el-icon-arrow-left:before,
.el-icon-arrow-right:before { .el-icon-arrow-right:before {
content: '下一页'; content: "下一页";
color: #727272; color: #727272;
} }
.el-icon-arrow-left:before { .el-icon-arrow-left:before {
content: '上一页'; content: "上一页";
} }
.content { .content {

7
demo-web-ui/src/views/organizationManage/organizationManage.vue
View File

@ -32,11 +32,6 @@
label="学习计划" label="学习计划"
align="center" align="center"
/> />
<el-table-column
prop="planOpinion"
label="反馈意见"
align="center"
/>
<el-table-column label="查看进度" width="200px" align="center"> <el-table-column label="查看进度" width="200px" align="center">
<!-- <template slot-scope="scope"> <!-- <template slot-scope="scope">
<el-button type="primary" size="mini" @click="editRow(scope.row)"> <el-button type="primary" size="mini" @click="editRow(scope.row)">
@ -81,7 +76,7 @@
size="mini" size="mini"
@click.native.prevent="deleteRow(scope.row)" @click.native.prevent="deleteRow(scope.row)"
> >
删除 添加意见
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>

2
demo-web-ui/src/views/postManage/postManage.vue
View File

@ -63,7 +63,7 @@
align="center" align="center"
/> />
<el-table-column <el-table-column
prop="planOpinionYj" prop="planOpinion"
label="反馈意见" label="反馈意见"
align="center" align="center"
/> />

12
demo-web-ui/src/views/region/region.vue
View File

@ -70,7 +70,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="planOpinionYj" prop="planOpinion"
label="反馈意见" label="反馈意见"
align="center" align="center"
/> />
@ -224,7 +224,7 @@ import {
saveSysPlan, saveSysPlan,
deleteSysPlan, deleteSysPlan,
upSysPlan, upSysPlan,
selectTeacher selectTeacher,
} from "@/api/system/region/region.js"; } from "@/api/system/region/region.js";
// import organizationManageInfo from './organizationManageInfo.vue' // import organizationManageInfo from './organizationManageInfo.vue'
export default { export default {
@ -239,18 +239,18 @@ export default {
editDialog: false, editDialog: false,
editDialog1: false, editDialog1: false,
form: { form: {
teacherNo:'' teacherNo: "",
}, },
formBackup: Object.assign({}, this.form), formBackup: Object.assign({}, this.form),
tableData: [], tableData: [],
userName: window.sessionStorage.getItem("userName"), userName: window.sessionStorage.getItem("userName"),
formList:{} formList: {},
}; };
}, },
mounted() { mounted() {
this.getPageList(); this.getPageList();
selectTeacher().then((res) => { selectTeacher().then((res) => {
this.formList=res.data this.formList = res.data;
}); });
}, },
methods: { methods: {
@ -328,7 +328,7 @@ export default {
this.dialogTitle = "编辑"; this.dialogTitle = "编辑";
this.editDialog = true; this.editDialog = true;
this.form = Object.assign({}, row); this.form = Object.assign({}, row);
this.teacherNo=row.teacherNo this.teacherNo = row.teacherNo;
}, },
detail(row) { detail(row) {
this.viewState = 4; this.viewState = 4;

18
demo-web-ui/src/views/workflow/definition/definition.vue
View File

@ -17,10 +17,11 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" width="150px" align="center"> <el-table-column label="操作" width="150px" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="editRow(scope.row)"> <el-button :disabled="chooseStore1" type="primary" size="mini" @click="editRow(scope.row)">
修改 修改
</el-button> </el-button>
<el-button <el-button
:disabled="chooseStore1"
type="danger" type="danger"
size="mini" size="mini"
@click.native.prevent="deleteRow(scope.row)" @click.native.prevent="deleteRow(scope.row)"
@ -75,7 +76,7 @@
</el-table-column> </el-table-column>
<el-table-column width="200px" label="成绩录入" align="center"> <el-table-column width="200px" label="成绩录入" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="chengji(scope.row)"> <el-button :disabled="chooseStore" type="primary" size="mini" @click="chengji(scope.row)">
成绩录入 成绩录入
</el-button> </el-button>
</template> </template>
@ -303,6 +304,8 @@ export default {
dialogTitle: "", dialogTitle: "",
editDialog: false, editDialog: false,
entry: false, entry: false,
chooseStore:false,
chooseStore1:false,
form: { form: {
id:'', id:'',
sid:'', sid:'',
@ -330,10 +333,12 @@ export default {
], ],
zylb: [], zylb: [],
sourceList: [], sourceList: [],
type: window.sessionStorage.getItem("type"),
}; };
}, },
mounted() { mounted() {
this.getPageList(this.page); this.getPageList(this.page);
this.panduan()
// getsourceList().then(res => { // getsourceList().then(res => {
// this.sourceList = res.data // this.sourceList = res.data
// }) // })
@ -348,6 +353,15 @@ export default {
this.page.size = val.pageSize; this.page.size = val.pageSize;
this.getPageList(this.page); this.getPageList(this.page);
}, },
panduan(){
console.log(this.type);
if(this.type==0){
this.chooseStore=true,
this.chooseStore1=true
}else{
this.chooseStore1=true
}
},
resetSearch() { resetSearch() {
// 重置 // 重置
this.page = { this.page = {

16
demo-web-ui/src/views/workflow/form/form.vue
View File

@ -7,10 +7,10 @@
</el-table-column> </el-table-column>
<el-table-column label="操作" width="150px" align="center"> <el-table-column label="操作" width="150px" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="mini" @click="editRow(scope.row)"> <el-button :disabled="chooseStore" type="primary" size="mini" @click="editRow(scope.row)">
修改 修改
</el-button> </el-button>
<el-button type="danger" size="mini" @click.native.prevent="deleteRow(scope.row)"> <el-button :disabled="chooseStore" type="danger" size="mini" @click.native.prevent="deleteRow(scope.row)">
删除 删除
</el-button> </el-button>
</template> </template>
@ -169,6 +169,7 @@
return { return {
activeName: 'roleList', activeName: 'roleList',
dialogTitle: '', dialogTitle: '',
chooseStore:false,
editDialog: false, editDialog: false,
form: { form: {
id:'', id:'',
@ -187,11 +188,13 @@
}, },
tableData: [], tableData: [],
zylb: [], zylb: [],
sourceList: [] sourceList: [],
type: window.sessionStorage.getItem("type"),
} }
}, },
mounted() { mounted() {
this.getPageList(this.page) this.getPageList(this.page),
this.panduan()
}, },
methods: { methods: {
pagination(val) { // 分页 pagination(val) { // 分页
@ -212,6 +215,11 @@
}, },
} }
this.getPageList(this.page) this.getPageList(this.page)
},
panduan(){
if(this.type==1 || this.type==0){
this.chooseStore=true
}
}, },
getPageList(data) { // 获取列表 getPageList(data) { // 获取列表
pageList(data).then((res) => { pageList(data).then((res) => {

Write Preview
Loading…
Cancel
Save