Browse Source

11111111111

master
guoxing 2 years ago
parent
commit
b92aab2d41
  1. 6
      demo-web-ui/.env.development
  2. 15
      demo-web-ui/src/api/system/datamapping/datamapping.js
  3. 11
      demo-web-ui/src/api/system/region/region.js
  4. 51
      demo-web-ui/src/router/index.js
  5. 364
      demo-web-ui/src/views/datamapping/shujuyingshe.vue
  6. 5
      demo-web-ui/src/views/organizationManage/organizationManageInfo.vue
  7. 20
      demo-web-ui/src/views/region/region.vue

6
demo-web-ui/.env.development

@ -5,7 +5,5 @@ ENV = 'development'
VUE_APP_BASE_API = '/api' VUE_APP_BASE_API = '/api'
## 配置测试和本地开发时的 接口地址 ## 配置测试和本地开发时的 接口地址
##VUE_APP_URL = "http://26077a35f5.wicp.vip" ##VUE_APP_URL = "http://39.104.100.138:9112"
## VUE_APP_URL = "http://anrui.yyundong.com" VUE_APP_URL = "http://192.168.3.183:9112"
##VUE_APP_URL = "http://1mn7264414.qicp.vip"
VUE_APP_URL = "http://39.104.100.138:9112"

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

@ -6,5 +6,18 @@ export function listPage(data) {
method: 'post', method: 'post',
data: data, data: data,
headers: { 'Content-Type': 'application/json' } headers: { 'Content-Type': 'application/json' }
}) })
} }
// 自主学习计划指导
export function selectSysPlanStudent(data) {
return request({
url: '/v1/sysPlan/selectSysPlanStudent',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
}

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

@ -128,6 +128,17 @@ export default {
}) })
}, },
//提交数据
upSysPlan: function(data) {
return request({
url: 'v1/sysPlan/upSysPlan',
method: 'post',
data: data,
headers: {
'Content-Type': 'application/json'
}
})
},

51
demo-web-ui/src/router/index.js

@ -7,8 +7,7 @@ Vue.use(Router)
/* 所有角色可以访问/没有权限要求的基页 */ /* 所有角色可以访问/没有权限要求的基页 */
export const constantRoutes = [ export const constantRoutes = [{
{
path: '/redirect', path: '/redirect',
component: Layout, component: Layout,
hidden: true, hidden: true,
@ -33,8 +32,7 @@ export const constantRoutes = [
path: '/index', path: '/index',
component: Layout, component: Layout,
redirect: '/index', redirect: '/index',
children: [ children: [{
{
path: '/index', path: '/index',
component: () => component: () =>
import('@/views/index.vue'), import('@/views/index.vue'),
@ -56,7 +54,7 @@ export const constantRoutes = [
path: '/region', path: '/region',
component: () => component: () =>
import('@/views/region/region.vue'), import('@/views/region/region.vue'),
name: 'region', name: 'region',
meta: { meta: {
title: '自主学习计划管理' title: '自主学习计划管理'
} }
@ -117,7 +115,7 @@ export const constantRoutes = [
{ {
path: '/personalization', path: '/personalization',
component: () => import('@/views/personalization/personalization.vue'), component: () => import('@/views/personalization/personalization.vue'),
name: 'personalization', name: 'personalization',
meta: { meta: {
title: '公告管理' title: '公告管理'
} }
@ -125,7 +123,7 @@ export const constantRoutes = [
{ {
path: '/copyofprocess', path: '/copyofprocess',
component: () => import('@/views/copyofprocess/liuchengchasongguanli.vue'), component: () => import('@/views/copyofprocess/liuchengchasongguanli.vue'),
name: 'liuchengchasongguanli', name: 'liuchengchasongguanli',
meta: { meta: {
title: '论坛管理' title: '论坛管理'
} }
@ -156,15 +154,18 @@ export const constantRoutes = [
path: '/organizationManage', path: '/organizationManage',
component: () => component: () =>
import('@/views/organizationManage/organizationManage.vue'), import('@/views/organizationManage/organizationManage.vue'),
name: 'organizationManage', name: 'organizationManage',
meta: { meta: {
title: '论坛交流' title: '论坛交流'
} }
}, },
{ {
path: '/datamapping', path: '/datamapping',
component: () => import('@/views/datamapping/shujuyingshe.vue'), component: () => import('@/views/datamapping/shujuyingshe.vue'),
meta: { title: '自主学习计划制定指导' } name: 'shujuyingshe',
meta: {
title: '自主学习计划制定指导'
}
}, },
{ {
path: '/organizationManage', path: '/organizationManage',
@ -207,7 +208,8 @@ export const constantRoutes = [
redirect: '/RoleAdminister', redirect: '/RoleAdminister',
children: [{ children: [{
path: '/RoleAdminister', path: '/RoleAdminister',
component: () => import('@/views/RoleAdminister/RoleAdminister.vue'), name: 'RoleAdminister', component: () => import('@/views/RoleAdminister/RoleAdminister.vue'),
name: 'RoleAdminister',
meta: { meta: {
title: '角色管理' title: '角色管理'
} }
@ -363,8 +365,7 @@ export const constantRoutes = [
meta: { meta: {
title: '用户管理' title: '用户管理'
}, },
children: [ children: [{
{
path: '/workflow/definition', path: '/workflow/definition',
component: () => component: () =>
import('@/views/workflow/definition/definition.vue'), import('@/views/workflow/definition/definition.vue'),
@ -392,7 +393,10 @@ export const constantRoutes = [
path: '/datamapping', path: '/datamapping',
component: () => import('@/views/datamapping/shujuyingshe.vue'), component: () => import('@/views/datamapping/shujuyingshe.vue'),
name: 'shujuyingshe', name: 'shujuyingshe',
meta: { title: '数据映射', noCache: true } meta: {
title: '数据映射',
noCache: true
}
}] }]
}, },
// { // {
@ -450,12 +454,13 @@ export const constantRoutes = [
path: '/flow/flowRecordForBusiness', path: '/flow/flowRecordForBusiness',
component: () => import('@/views/flow/flowRecordForBusiness'), component: () => import('@/views/flow/flowRecordForBusiness'),
name: 'flowRecordForBusiness' name: 'flowRecordForBusiness'
}/*, }
{ /*,
path: '/portal/flow/flowRecord', {
component: ()=> import('@/views/flow/flowRecord'), path: '/portal/flow/flowRecord',
name: 'flowRecord' component: ()=> import('@/views/flow/flowRecord'),
}*/ name: 'flowRecord'
}*/
// 404 page must be placed at the end !!! // 404 page must be placed at the end !!!
// { path: '*', redirect: '/404', hidden: true } // { path: '*', redirect: '/404', hidden: true }
] ]
@ -464,7 +469,9 @@ export const constantRoutes = [
const createRouter = () => new Router({ const createRouter = () => new Router({
// mode: 'history', // require service support // mode: 'history', // require service support
scrollBehavior: () => ({ y: 0 }), scrollBehavior: () => ({
y: 0
}),
routes: constantRoutes routes: constantRoutes
}) })
@ -476,4 +483,4 @@ export function resetRouter() {
router.matcher = newRouter.matcher // reset router router.matcher = newRouter.matcher // reset router
} }
export default router export default router

364
demo-web-ui/src/views/datamapping/shujuyingshe.vue

@ -1,261 +1,135 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<!-- Start 列表页面 --> <div v-show="viewState ==1">
<div> <el-tabs class="my-tabs" v-model="activeName" type="card" @tab-click="handleClick">
<button-bar view-title="业务数据映射查询" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/> <el-tab-pane label="自主学习计划指导" name="roleList">
<div class="main-content"> <div class="container">
<div class="searchcon"> <el-table :data="tableData" border style="width: 100%">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button> <el-table-column label="序号" width="70px" type="index" align="center">
<div v-show="isSearchShow" class="search"> </el-table-column>
<el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header" label-width="150px"> <el-table-column label="操作" width="100px" align="center">
<el-form-item label="数据字典类别编码:"> <template slot-scope="scope">
<el-input v-model="listQuery.params.dictTypeCode" clearable placeholder=""/> <el-button type="primary" size="mini" @click="editRow(scope.row)">
</el-form-item> 反馈
<el-form-item label="数据字典类别名称:"> </el-button>
<el-input v-model="listQuery.params.dictTypeName" clearable placeholder=""/> <!-- <el-button type="primary" size="mini" @click="detail(scope.row)">
</el-form-item> 查看
<el-form-item label="数据key:"> </el-button> -->
<el-input v-model="listQuery.params.dictKey" clearable placeholder=""/> </template>
</el-form-item> </el-table-column>
<el-form-item label="数据value:"> <el-table-column prop="teacherNo" label="教师工号" align="center" />
<el-input v-model="listQuery.params.dictValue" clearable placeholder=""/> <el-table-column prop="studentNo" label="学生学号" align="center" />
</el-form-item> <el-table-column prop="planContent" label="学习计划" align="center" />
<el-form-item label="映射来源:"> <el-table-column prop="stateChinese" label="数据状态" align="center" />
<el-select v-model="listQuery.params.map_sourceKey" filterable placeholder=""> <el-table-column prop="plan0pinion" label="反馈意见" align="center" />
<el-option v-for="item in mappingsource_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option> </el-table>
</el-select>
</el-form-item>
<el-form-item label="映射实体名称:">
<el-input v-model="listQuery.params.map_object" clearable placeholder=""/>
</el-form-item>
<el-form-item label="映射项目类别:">
<el-input v-model="listQuery.params.map_item" clearable placeholder=""/>
</el-form-item>
<el-form-item label="映射项目编码:">
<el-input v-model="listQuery.params.map_itemKey" clearable placeholder=""/>
</el-form-item>
<el-form-item label="映射项目值:">
<el-input v-model="listQuery.params.map_itemValue" clearable placeholder=""/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
</div>
</div> </div>
</div> </el-tab-pane>
<div class="listtop">
<div class="tit">数据映射列表</div> <el-dialog :title="dialogTitle + '学习计划'" :visible.sync="editDialog" width="40%">
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/> <table class="e-table" cellspacing="0">
</div> <tr>
<div class=""> <td>教师工号</td>
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;"> <td>
<el-table-column fixed width="60px" label="序号" type="index" :index="indexMethod" align="center"/> <!-- <el-select v-model="form.type" class="addinputw" placeholder="请选择论坛类别" style="width:300px"
<el-table-column label="数据字典类别编码" width="200" align="center"> @change="getType">
<template slot-scope="scope"> <el-option v-for="item in typeList" :key="item.dictKey" :label="item.dictValue"
<span>{{ scope.row.dictTypeCode }}</span> :value="item.dictKey" />
</template> </el-select> -->
</el-table-column> <span>{{form.teacherNo}}</span>
<el-table-column label="数据字典类别名称" align="center" width="200"> <!-- <el-input v-model="form.teacherNo" style="width: 300px"></el-input> -->
<template slot-scope="scope"> </td>
<span>{{ scope.row.dictTypeName }}</span> </tr>
</template> <tr>
</el-table-column> <td>学生学号</td>
<el-table-column label="数据key" align="center" width="150"> <td>
<template slot-scope="scope"> <span>{{form.studentNo}}</span>
<span>{{ scope.row.dictKey }}</span> <!-- <el-input v-model="form.studentNo" style="width: 300px"></el-input> -->
</template> </td>
</el-table-column> </tr>
<el-table-column label="数据value" align="center" width="150"> <tr>
<template slot-scope="scope"> <td>学习计划内容</td>
<span>{{ scope.row.dictValue }}</span> <td>
</template> <span>{{form.planContent}}</span>
</el-table-column> <!-- <el-input v-model="form.planContent" style="width: 300px"></el-input> -->
<el-table-column label="映射来源" align="center" width="100"> </td>
<template slot-scope="scope"> </tr>
<span>{{ scope.row.map_sourceValue }}</span> <tr>
</template> <td>反馈意见</td>
</el-table-column> <td>
<el-table-column label="映射实体名称" align="center" width="200"> <!-- <span>{{form.planContent}}</span> -->
<template slot-scope="scope"> <el-input v-model="form.planOpinion" style="width: 300px"></el-input>
<span>{{ scope.row.map_object }}</span> </td>
</template> </tr>
</el-table-column> </table>
<el-table-column label="映射项目类别" align="center" width="200"> <div style="margin-top: 20px; text-align: center">
<template slot-scope="scope"> <el-button type="primary" @click="save()">保存</el-button>
<span>{{ scope.row.map_item }}</span> </div>
</template> </el-dialog>
</el-table-column> </el-tabs>
<el-table-column label="映射项目编码" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.map_itemKey }}</span>
</template>
</el-table-column>
<el-table-column label="映射项目值" align="center" width="200">
<template slot-scope="scope">
<span>{{ scope.row.map_itemValue }}</span>
</template>
</el-table-column>
</el-table>
</div>
<div class="pages">
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
</div>
</div> </div>
<!-- <organizationManageInfo v-show="viewState ==4" ref="divInfo" @doback="resetState" /> -->
</div> </div>
</template> </template>
<script> <script>
import Pagination from '@/components/pagination' import {
import pageye from '@/components/pagination/pageye' selectSysPlanStudent,
import ButtonBar from '@/components/ButtonBar' } from "@/api/system/datamapping/datamapping.js";
import { listPage } from '@/api/system/datamapping/datamapping' // import organizationManageInfo from './organizationManageInfo.vue'
import { typeValues } from '@/api/system/roleAdminister' export default {
components: {
export default { // organizationManageInfo,
name: 'shujuyingshe',
components: {
Pagination,
pageye,
ButtonBar,
},
data() {
return {
btndisabled: false,
btnList: [
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
// -----------
tableKey: 0,
list: [],
mappingsource_list: [],
FormLoading: false,
listLoading: false,
listQuery: {
params: {
map_sourceKey: '',
map_sourceValue: '',
map_object: '',
map_item: '',
map_itemKey: '',
map_itemValue: '',
dictTypeCode: '',
dictTypeName: '',
dictKey: '',
dictValue: ''
},
current: 1,
size: 5,
total: 0
},
rules: {}
}
},
created() {
//
this.getList()
this.init()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
init() {
typeValues({ type: 'sys_mappingsource' }).then((resp) => {
if (resp.success) {
this.mappingsource_list = resp.data
}
})
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
}, },
btnHandle(btnKey) { data() {
console.log('XXXXXXXXXXXXXXX ' + btnKey) return {
switch (btnKey) { viewState: 1,
case 'doClose': activeName: "roleList",
this.doClose() dialogTitle: "",
break editDialog: false,
default: form: {},
break formBackup: Object.assign({}, this.form),
tableData: [],
} }
}, },
// mounted() {
indexMethod(index) { this.getPageList();
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
}, },
// methods: {
getList() { getPageList() {
this.listLoading = true //
listPage(this.listQuery).then((response) => { selectSysPlanStudent().then((res) => {
console.log('列表查询结果:', response) this.tableData = res.data;
this.listLoading = false });
if (response.success && response.data && response.data.total > 0) { },
this.list = response.data.records handleClick(tab, event) {
this.listQuery.total = response.data.total if (tab.name == "addrole") {
this.dialogTitle = "新增";
this.roleForm = Object.assign({}, this.formBackup);
} else { } else {
this.list = [] this.getPageList();
this.listQuery.total = 0
} }
}) },
}, save() {
// console.log("form", this.form)
handleFilter() {
this.listQuery.current = 1
this.getList() this.reset();
}, },
handleReset() { reset() {
this.listQuery = { this.form = {};
params: { },
map_sourceKey: '', editRow(row) {
map_sourceValue: '', this.dialogTitle = "反馈";
map_object: '', this.editDialog = true;
map_item: '', this.form = Object.assign({}, row);
map_itemKey: '', },
map_itemValue: '',
dictTypeCode: '',
dictTypeName: '',
dictKey: '',
dictValue: ''
},
current: 1,
size: 5,
total: 0
}
this.getList()
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
} }
} };
}
</script> </script>
<style scoped>
/*表格列设置fixed后固定列出现下边框的设置*/ <style scoped="scoped" lang="scss">
/deep/ .el-table__fixed { .my-tabs {
height: 100% !important; margin-top: 10px;
} }
/*表格列设置fixed后固定列出现下边框的设置*/ </style>
/deep/ .el-table__fixed-right {
height: 100% !important;
}
</style>

5
demo-web-ui/src/views/organizationManage/organizationManageInfo.vue

@ -60,7 +60,7 @@
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-button type="primary" size="mini" @click="toPersonnelDetail(scope.row.sid)">查看</el-button> --> <!-- <el-button type="primary" size="mini" @click="toPersonnelDetail(scope.row.sid)">查看</el-button> -->
<!-- <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button> --> <!-- <el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button> -->
<el-button type="primary" size="mini" @click="doDel(scope.row)">删除</el-button> <el-button :disabled='userSid != scope.row.createBySid' type="primary" size="mini" @click="doDel(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="评论人员" prop="name" align="center" /> <el-table-column label="评论人员" prop="name" align="center" />
@ -88,11 +88,10 @@
activeNames: ['1'], activeNames: ['1'],
form: {}, form: {},
temp: [] ,// temp: [] ,//
userSid :"" userSid :window.sessionStorage.getItem('userSid')
}; };
}, },
mounted() { mounted() {
this.userSid = window.sessionStorage.getItem('userSid')
console.log("ddddddddddddddd", this.userSid ) console.log("ddddddddddddddd", this.userSid )
}, },
methods: { methods: {

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

@ -9,10 +9,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=' scope.row.state!= 0' 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=' scope.row.state!= 0' type="danger" size="mini" @click.native.prevent="deleteRow(scope.row)">
删除 删除
</el-button> </el-button>
<!-- <el-button type="primary" size="mini" @click="detail(scope.row)"> <!-- <el-button type="primary" size="mini" @click="detail(scope.row)">
@ -23,7 +23,7 @@
<el-table-column prop="teacherNo" label="教师工号" align="center" /> <el-table-column prop="teacherNo" label="教师工号" align="center" />
<el-table-column prop="studentNo" label="学生学号" align="center" /> <el-table-column prop="studentNo" label="学生学号" align="center" />
<el-table-column prop="planContent" label="学习计划" align="center" /> <el-table-column prop="planContent" label="学习计划" align="center" />
<el-table-column prop="state" label="数据状态" align="center" /> <el-table-column prop="stateChinese" label="数据状态" align="center" />
<el-table-column prop="plan0pinion" label="反馈意见" align="center" /> <el-table-column prop="plan0pinion" label="反馈意见" align="center" />
</el-table> </el-table>
</div> </div>
@ -89,7 +89,8 @@
</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 type="primary" @click="submit()">提交</el-button>
</div> </div>
</el-dialog> </el-dialog>
</el-tabs> </el-tabs>
@ -158,6 +159,17 @@
} }
this.reset(); this.reset();
}, },
submit(){
req.upSysPlan(this.form).then((res) => {
this.getPageList();
this.editDialog = false;
this.$message({
message: res.msg,
type: "success",
});
});
this.reset();
},
reset() { reset() {
this.form = {}; this.form = {};
}, },

Loading…
Cancel
Save